IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 5, 2007, 3:29:29 PM (19 years ago)
Author:
eugene
Message:

importing updates from eam_branch_20071130

Location:
trunk/Ohana/src/addstar/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/addstar/src/SEDfit.c

    r15509 r15743  
    210210    }
    211211  }
    212   outcat[0].Naverage = Nave;
    213   outcat[0].Nmeasure = Nmeas;
     212  outcat[0].Naverage  = Nave;
     213  outcat[0].Nmeasure  = Nmeas;
     214  outcat[0].Nsecf_mem = Nave*Nsec;
    214215 
    215216  free (sourceValue.mags);

  • trunk/Ohana/src/addstar/src/UpdateDatabase_Image.c

    r15036 r15743  
    1313
    1414  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    15   if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
     15  if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
    1616 
    1717  // XXX this is probably not needed anymore
    … …  
    4949    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    5050    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    51     if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
     51    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
    5252
    5353    // an error exit status here is a significant error
    … …  
    5757    }
    5858
    59     // Nave_disk == 0 implies an empty catalog file
     59    // Naves_disk == 0 implies an empty catalog file
    6060    // for only_match, skip empty catalogs
    61     if ((catalog.Nave_disk == 0) && options[0].only_match) {
     61    if ((catalog.Naves_disk == 0) && options[0].only_match) {
    6262      dvo_catalog_unlock (&catalog);
    6363      dvo_catalog_free (&catalog);
    … …  
    7373    if (!options[0].only_images) {
    7474      SetProtect (TRUE);
    75       dvo_catalog_save (&catalog, VERBOSE);
     75      if (options[0].update) {
     76        catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     77        dvo_catalog_update (&catalog, VERBOSE);
     78      } else {
     79        dvo_catalog_save (&catalog, VERBOSE);
     80      }
    7681      SetProtect (FALSE);
    7782    }

  • trunk/Ohana/src/addstar/src/UpdateDatabase_Refcat.c

    r14401 r15743  
    3737    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    3838    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    39     if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
     39    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
    4040 
    4141    // an error exit status here is a significant error
    … …  
    4545    }
    4646
    47     // Nave_disk == 0 implies an empty catalog file
     47    // Naves_disk == 0 implies an empty catalog file
    4848    // for only_match, skip empty catalogs
    49     if ((catalog.Nave_disk == 0) && options[0].only_match) {
     49    if ((catalog.Naves_disk == 0) && options[0].only_match) {
    5050      dvo_catalog_unlock (&catalog);
    5151      dvo_catalog_free (&catalog);
    … …  
    6262    if (!options[0].only_images) {
    6363      SetProtect (TRUE);
    64       dvo_catalog_save (&catalog, VERBOSE);
     64      if (options[0].update) {
     65        catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     66        dvo_catalog_update (&catalog, VERBOSE);
     67      } else {
     68        dvo_catalog_save (&catalog, VERBOSE);
     69      }
    6570      SetProtect (FALSE);
    6671    }

  • trunk/Ohana/src/addstar/src/UpdateDatabase_Reflist.c

    r14401 r15743  
    3737    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    3838    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    39     if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
     39    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
    4040
    4141    // an error exit status here is a significant error
    … …  
    4646
    4747    /* for only_match, skip empty catalogs XXX EAM : this leaves behind empty files */
    48     if ((catalog.Nave_disk == 0) && options[0].only_match) {
     48    if ((catalog.Naves_disk == 0) && options[0].only_match) {
    4949      dvo_catalog_unlock (&catalog);
    5050      dvo_catalog_free (&catalog);
    … …  
    5858    if (!options[0].only_images) {
    5959      SetProtect (TRUE);
    60       dvo_catalog_save (&catalog, VERBOSE);
     60      if (options[0].update) {
     61        catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     62        dvo_catalog_update (&catalog, VERBOSE);
     63      } else {
     64        dvo_catalog_save (&catalog, VERBOSE);
     65      }
    6166      SetProtect (FALSE);
    6267    }

  • trunk/Ohana/src/addstar/src/addstar.c

    r15209 r15743  
    9090    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    9191    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    92     if (options.update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
     92    if (options.update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
    9393
    9494    // open as read or write, depending on desire
    … …  
    105105    }
    106106
    107     // Nave_disk == 0 implies an empty catalog file
     107    // Naves_disk == 0 implies an empty catalog file
    108108    // for only_match, skip empty catalogs
    109     if ((catalog.Nave_disk == 0) && options.only_match) {
     109    if ((catalog.Naves_disk == 0) && options.only_match) {
    110110      dvo_catalog_unlock (&catalog);
    111111      dvo_catalog_free (&catalog);
    … …  
    142142    if (Nsubset && !options.only_images) {
    143143      SetProtect (TRUE);
    144       dvo_catalog_save (&catalog, VERBOSE);
     144      if (options.update) {
     145        catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     146        dvo_catalog_update (&catalog, VERBOSE);
     147      } else {
     148        dvo_catalog_save (&catalog, VERBOSE);
     149      }
    145150      SetProtect (FALSE);
    146151    }

  • trunk/Ohana/src/addstar/src/find_matches.c

    r15509 r15743  
    361361  catalog[0].Naverage = Nave;
    362362  catalog[0].Nmeasure = Nmeas;
     363  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    363364  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d %d %d, (%d matches)\n", Nstars, Nave, Nmeas, Nmatch);
    364365

  • trunk/Ohana/src/addstar/src/find_matches_closest.c

    r15509 r15743  
    362362  catalog[0].Naverage = Nave;
    363363  catalog[0].Nmeasure = Nmeas;
     364  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    364365  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d %d %d, (%d matches)\n", Nstars, Nave, Nmeas, Nmatch);
    365366

  • trunk/Ohana/src/addstar/src/find_matches_refstars.c

    r15509 r15743  
    372372  catalog[0].Nmeasure = Nmeas;
    373373  catalog[0].Nmissing = Nmiss;
     374  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    374375  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nmiss: %d %d %d %d, (%d matches)\n", Nstars, Nave, Nmeas, Nmiss, Nmatch);
    375376  return (Nmatch);

  • trunk/Ohana/src/addstar/src/load2mass_catalog.c

    r15509 r15743  
    7979  catalog[0].Naverage = Nave;
    8080  catalog[0].Nmeasure = Nmeas;
     81  catalog[0].Nsecf_mem = Nave*Nsec;
    8182  return (TRUE);
    8283}

  • trunk/Ohana/src/addstar/src/sedstar.c

    r8361 r15743  
    3434    }
    3535
    36     // Nave_disk == 0 implies an empty catalog file
    37     if ((incatalog.Nave_disk == 0) && options.only_match) {
     36    // Naves_disk == 0 implies an empty catalog file
     37    if ((incatalog.Naves_disk == 0) && options.only_match) {
    3838      if (VERBOSE) fprintf (stderr, "skipping empty region\n");
    3939      dvo_catalog_unlock (&incatalog);
Note: See TracChangeset for help on using the changeset viewer.