IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38352


Ignore:
Timestamp:
Jun 2, 2015, 12:37:17 PM (11 years ago)
Author:
eugene
Message:

rename some dvo-internal structures and enums to enable macro-ization and to avoid namespace collisions

Location:
branches/eam_branches/ohana.20150429/src
Files:
130 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20150429/src/addstar/src/SEDfit.c

    r37036 r38352  
    198198  outcat[0].Naverage  = Nave;
    199199  outcat[0].Nmeasure  = Nmeas;
    200   outcat[0].Nsecf_mem = Nave*Nsec;
     200  outcat[0].Nsecfilt_mem = Nave*Nsec;
    201201 
    202202  free (sourceValue.mags);

  • branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c

    r38346 r38352  
    1212  }
    1313
    14   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    15   if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
     14  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     15  if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    1616 
    1717  // XXX this is probably not needed anymore
    … …  
    4747    catalog.filename  = skylist[0].filename[i];
    4848    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    49     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    50     if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
     49    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     50    if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    5151
    5252    // an error exit status here is a significant error
    … …  
    5656    }
    5757
    58     // Naves_disk == 0 implies an empty catalog file
     58    // Naverage_disk == 0 implies an empty catalog file
    5959    // for only_match, skip empty catalogs
    60     if ((catalog.Naves_disk == 0) && options[0].only_match) {
     60    if ((catalog.Naverage_disk == 0) && options[0].only_match) {
    6161      dvo_catalog_unlock (&catalog);
    6262      dvo_catalog_free (&catalog);
    … …  
    7373      SetProtect (TRUE);
    7474      if (options[0].update) {
    75         catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     75        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    7676        dvo_catalog_update (&catalog, VERBOSE);
    7777      } else {

  • branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Refcat.c

    r15743 r38352  
    3636    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    3737    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    38     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    39     if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
     38    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     39    if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4040 
    4141    // an error exit status here is a significant error
    … …  
    4545    }
    4646
    47     // Naves_disk == 0 implies an empty catalog file
     47    // Naverage_disk == 0 implies an empty catalog file
    4848    // for only_match, skip empty catalogs
    49     if ((catalog.Naves_disk == 0) && options[0].only_match) {
     49    if ((catalog.Naverage_disk == 0) && options[0].only_match) {
    5050      dvo_catalog_unlock (&catalog);
    5151      dvo_catalog_free (&catalog);
    … …  
    6363      SetProtect (TRUE);
    6464      if (options[0].update) {
    65         catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     65        catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    6666        dvo_catalog_update (&catalog, VERBOSE);
    6767      } else {

  • branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Reflist.c

    r27435 r38352  
    3636    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    3737    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    38     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    39     if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
     38    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     39    if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    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.Naves_disk == 0) && options[0].only_match) {
     48    if ((catalog.Naverage_disk == 0) && options[0].only_match) {
    4949      dvo_catalog_unlock (&catalog);
    5050      dvo_catalog_free (&catalog);
    … …  
    5959      SetProtect (TRUE);
    6060      if (options[0].update) {
    61         catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     61        catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    6262        dvo_catalog_update (&catalog, VERBOSE);
    6363      } else {

  • branches/eam_branches/ohana.20150429/src/addstar/src/addstar.c

    r38346 r38352  
    108108    catalog.catformat   = dvo_catalog_catformat (CATFORMAT);     // set the default catformat from config data
    109109    catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
    110     catalog.catflags    = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_LENSING;
     110    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING;
    111111    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
    112112
    … …  
    118118    if (catalog.catmode != DVO_MODE_SPLIT) options.update = FALSE;
    119119
    120     if (options.update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
     120    if (options.update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    121121
    122122    // open as read or write, depending on desire
    … …  
    135135    if (VERBOSE) MARKTIME ("load cpt: %f sec\n", dtime); RESETTIME;
    136136
    137     // Naves_disk == 0 implies an empty catalog file
     137    // Naverage_disk == 0 implies an empty catalog file
    138138    // for only_match, skip empty catalogs
    139     if ((catalog.Naves_disk == 0) && options.only_match) {
     139    if ((catalog.Naverage_disk == 0) && options.only_match) {
    140140      dvo_catalog_unlock (&catalog);
    141141      dvo_catalog_free (&catalog);
    … …  
    175175      SetProtect (TRUE);
    176176      if (options.update) {
    177         catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_LENSING;
     177        catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING;
    178178        dvo_catalog_update (&catalog, VERBOSE);
    179179      } else {

  • branches/eam_branches/ohana.20150429/src/addstar/src/find_matches.c

    r37807 r38352  
    9191
    9292  /* set up pointers for linked list of measure */
    93   if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeas_disk)) {
     93  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeasure_disk)) {
    9494    next_meas = init_measure_links (catalog[0].average, Nave, catalog[0].measure, Nmeas);
    9595  } else {
    … …  
    320320  catalog[0].Naverage = Nave;
    321321  catalog[0].Nmeasure = Nmeas;
    322   catalog[0].Nsecf_mem = Nave*Nsecfilt;
     322  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
    323323  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
    324324

  • branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_ICRF.c

    r37807 r38352  
    164164  catalog[0].Naverage  = Nave;
    165165  catalog[0].Nmeasure  = Nmeas;
    166   catalog[0].Nsecf_mem = Nave*Nsecfilt;
     166  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
    167167  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d "OFF_T_FMT" "OFF_T_FMT" ("OFF_T_FMT" matches)\n",  Nstars, Nave, Nmeas, Nmatch);
    168168

  • branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_closest.c

    r37807 r38352  
    9191
    9292  /* set up pointers for linked list of measure */
    93   if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeas_disk)) {
     93  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeasure_disk)) {
    9494    // this version is only valid if we have done a full catalog load, and if the catalog
    9595    // is sorted while processed
    … …  
    381381  catalog[0].Nmeasure = Nmeas;
    382382  catalog[0].Nlensing = Nlens;
    383   catalog[0].Nsecf_mem = Nave*Nsecfilt;
     383  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
    384384  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nlens: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nlens, Nmatch);
    385385

  • branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_closest_refstars.c

    r37807 r38352  
    8585
    8686  /* set up pointers for linked list of measure */
    87   if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeas_disk)) {
     87  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeasure_disk)) {
    8888    // this version is only valid if we have done a full catalog load, and if the catalog
    8989    // is sorted while processed
    … …  
    322322  catalog[0].Naverage = Nave;
    323323  catalog[0].Nmeasure = Nmeas;
    324   catalog[0].Nsecf_mem = Nave*Nsecfilt;
     324  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
    325325  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
    326326

  • branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_refstars.c

    r37807 r38352  
    7070
    7171  /* set up pointers for linked list of measurements */
    72   if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeas_disk)) {
     72  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeasure_disk)) {
    7373    // this version is only valid if we have done a full catalog load, and if the catalog
    7474    // is sorted while processed
    … …  
    298298  catalog[0].Naverage = Nave;
    299299  catalog[0].Nmeasure = Nmeas;
    300   catalog[0].Nsecf_mem = Nave*Nsecfilt;
     300  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
    301301  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
    302302

  • branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_starpar.c

    r37807 r38352  
    205205  catalog[0].Naverage  = Nave;
    206206  catalog[0].Nstarpar  = Nstarpar;
    207   catalog[0].Nsecf_mem = Nave*Nsecfilt;
     207  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
    208208  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nstarpar: %d "OFF_T_FMT" "OFF_T_FMT" ("OFF_T_FMT" matches)\n",  Nstars, Nave, Nstarpar, Nmatch);
    209209

  • branches/eam_branches/ohana.20150429/src/addstar/src/load2mass_as_rawdata.c

    r34088 r38352  
    181181        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    182182        catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    183         catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     183        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    184184        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    185185

  • branches/eam_branches/ohana.20150429/src/addstar/src/load2mass_catalog.c

    r37036 r38352  
    5656  catalog[0].Naverage = Nave;
    5757  catalog[0].Nmeasure = Nmeas;
    58   catalog[0].Nsecf_mem = Nave*Nsec;
     58  catalog[0].Nsecfilt_mem = Nave*Nsec;
    5959  return (TRUE);
    6060}

  • branches/eam_branches/ohana.20150429/src/addstar/src/loadICRF_catalog.c

    r37807 r38352  
    1010  catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    1111  catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    12   catalog.catflags = LOAD_AVES | LOAD_SECF | LOAD_MEAS;
     12  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;
    1313  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    1414   

  • branches/eam_branches/ohana.20150429/src/addstar/src/loadstarpar_catalog.c

    r37807 r38352  
    1010  catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    1111  catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    12   catalog.catflags = LOAD_AVES | LOAD_SECF | LOAD_STARPAR;
     12  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
    1313  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    1414   

  • branches/eam_branches/ohana.20150429/src/addstar/src/loadsupercos_rawdata.c

    r33653 r38352  
    168168        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    169169        catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    170         catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     170        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    171171        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    172172

  • branches/eam_branches/ohana.20150429/src/addstar/src/loadwise_prelim_rawdata.c

    r33653 r38352  
    186186        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    187187        catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    188         catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     188        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    189189        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    190190

  • branches/eam_branches/ohana.20150429/src/addstar/src/loadwise_rawdata.c

    r38062 r38352  
    198198        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    199199        catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    200         catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     200        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    201201        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    202202

  • branches/eam_branches/ohana.20150429/src/addstar/src/resort_threaded.c

    r37116 r38352  
    4545    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    4646    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    47     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_LENSING;
     47    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING;
    4848    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    4949 
    … …  
    5757    }
    5858
    59     // Naves_disk == 0 implies an empty catalog file, skip empty catalogs
    60     if (catalog.Naves_disk == 0) {
     59    // Naverage_disk == 0 implies an empty catalog file, skip empty catalogs
     60    if (catalog.Naverage_disk == 0) {
    6161      dvo_catalog_unlock (&catalog);
    6262      dvo_catalog_free (&catalog);

  • branches/eam_branches/ohana.20150429/src/addstar/src/resort_unthreaded.c

    r37116 r38352  
    2323    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    2424    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    25     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_LENSING;
     25    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING;
    2626    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    2727
    … …  
    3232    }
    3333
    34     // Naves_disk == 0 implies an empty catalog file, skip empty catalogs
    35     if (catalog.Naves_disk == 0) {
     34    // Naverage_disk == 0 implies an empty catalog file, skip empty catalogs
     35    if (catalog.Naverage_disk == 0) {
    3636      dvo_catalog_unlock (&catalog);
    3737      dvo_catalog_free (&catalog);

  • branches/eam_branches/ohana.20150429/src/addstar/src/sedstar.c

    r25757 r38352  
    2626  for (i = 0; i < skylist[0].Nregions; i++) {
    2727    incatalog.filename = skylist[0].filename[i];
    28     incatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     28    incatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    2929
    3030    // an error exit status here is a significant error
    … …  
    3434    }
    3535
    36     // Naves_disk == 0 implies an empty catalog file
    37     if ((incatalog.Naves_disk == 0) && options.only_match) {
     36    // Naverage_disk == 0 implies an empty catalog file
     37    if ((incatalog.Naverage_disk == 0) && options.only_match) {
    3838      if (VERBOSE) fprintf (stderr, "skipping empty region\n");
    3939      dvo_catalog_unlock (&incatalog);
    … …  
    5454    outcatalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    5555    outcatalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    56     outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     56    outcatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    5757
    5858    // an error exit status here is a significant error

  • branches/eam_branches/ohana.20150429/src/checkastro/src/bcatalog.c

    r37807 r38352  
    408408  subcatalog[0].Nmeasure = Nmeasure;
    409409  subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
    410   subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
     410  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
    411411
    412412  return (TRUE);
    … …  
    515515  subcatalog[0].Nmeasure = Nmeasure;
    516516  subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
    517   subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
     517  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
    518518
    519519  return (TRUE);
    … …  
    609609  subcatalog[0].Nmeasure = Nmeasure;
    610610  subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
    611   subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
     611  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
    612612
    613613  return (TRUE);

  • branches/eam_branches/ohana.20150429/src/checkastro/src/load_catalogs.c

    r36833 r38352  
    3535    pcatalog->catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    3636    pcatalog->catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    37     pcatalog->catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF; // don't need to load all data at this point
     37    pcatalog->catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT; // don't need to load all data at this point
    3838    pcatalog->Nsecfilt  = GetPhotcodeNsecfilt ();
    3939
    … …  
    4343      exit (1);
    4444    }
    45     if (!pcatalog[0].Naves_disk) {
     45    if (!pcatalog[0].Naverage_disk) {
    4646      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
    4747      dvo_catalog_unlock (pcatalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_images.c

    r38345 r38352  
    110110    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    111111    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    112     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     112    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    113113
    114114    if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
    … …  
    119119      exit (2);
    120120    }
    121     if (!catalog.Naves_disk) {
     121    if (!catalog.Naverage_disk) {
    122122      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    123123      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_measures.c

    r37807 r38352  
    4545    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    4646    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    47     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     47    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4848
    4949    if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
    … …  
    5454      exit (2);
    5555    }
    56     if (!catalog.Naves_disk) {
     56    if (!catalog.Naverage_disk) {
    5757      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5858      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP.c

    r35807 r38352  
    4343    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    4444    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    45     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     45    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4646
    4747    if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
    … …  
    5252      exit (2);
    5353    }
    54     if (!catalog.Naves_disk) {
     54    if (!catalog.Naverage_disk) {
    5555      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5656      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP_edges.c

    r37040 r38352  
    5151    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    5252    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    53     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     53    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    5454
    5555    if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
    … …  
    6060      exit (2);
    6161    }
    62     if (!catalog.Naves_disk) {
     62    if (!catalog.Naverage_disk) {
    6363      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    6464      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP_edges_delete.c

    r35805 r38352  
    9191    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    9292    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    93     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     93    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    9494
    9595    if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
    … …  
    100100      exit (2);
    101101    }
    102     if (!catalog.Naves_disk) {
     102    if (!catalog.Naverage_disk) {
    103103      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    104104      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagefile.c

    r34749 r38352  
    2626    catalog.filename = sky[0].filename[i];  /* don't free region before catalog! */
    2727    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    28     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     28    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    2929
    3030    // an error exit status here is a significant error
    … …  
    3333      exit (2);
    3434    }
    35     if (!catalog.Naves_disk) {
     35    if (!catalog.Naverage_disk) {
    3636      dvo_catalog_unlock (&catalog);
    3737      dvo_catalog_free (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagename.c

    r38345 r38352  
    4141      catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
    4242      catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    43       catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     43      catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4444
    4545      // an error exit status here is a significant error
    … …  
    4848        exit (2);
    4949      }
    50       if (!catalog.Naves_disk) {
     50      if (!catalog.Naverage_disk) {
    5151        dvo_catalog_unlock (&catalog);
    5252        dvo_catalog_free (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_orphans.c

    r27435 r38352  
    252252  catalog.Nmeasure = Nmeas;
    253253  catalog.Nmissing = Nmiss;
    254   catalog.Nsecf_mem = Nave*Nsecfilt;
     254  catalog.Nsecfilt_mem = Nave*Nsecfilt;
    255255
    256256  if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_photcodes.c

    r35758 r38352  
    4141    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    4242    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    43     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     43    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4444
    4545    if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
    … …  
    5050      exit (2);
    5151    }
    52     if (!catalog.Naves_disk) {
     52    if (!catalog.Naverage_disk) {
    5353      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5454      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_photcodes_single.c

    r35107 r38352  
    1010  catalog.filename  = cptname;
    1111  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    12   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     12  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    1313
    1414  if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
    … …  
    1919    return FALSE;
    2020  }
    21   if (!catalog.Naves_disk) {
     21  if (!catalog.Naverage_disk) {
    2222    if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    2323    dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_times.c

    r38344 r38352  
    6262    catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
    6363    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    64     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     64    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    6565
    6666    // an error exit status here is a significant error
    … …  
    6969      exit (2);
    7070    }
    71     if (!catalog.Naves_disk) {
     71    if (!catalog.Naverage_disk) {
    7272      dvo_catalog_unlock (&catalog);
    7373      dvo_catalog_free (&catalog);

  • branches/eam_branches/ohana.20150429/src/delstar/src/find_matches.c

    r34088 r38352  
    245245  catalog[0].Nmeasure = Nmeas;
    246246  catalog[0].Nmissing = Nmiss;
    247   catalog[0].Nsecf_mem = Nave*Nsecfilt;
     247  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
    248248
    249249  if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT"\n",  Nave,  Nmeas,  Nmiss);

  • branches/eam_branches/ohana.20150429/src/dvolens/src/update_objects.c

    r37358 r38352  
    6161    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    6262    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    63     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_LENSING | LOAD_LENSOBJ;
     63    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ;
    6464    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
    6565
    … …  
    6868      exit (1);
    6969    }
    70     if (VERBOSE && (catalog.Naves_disk == 0)) {
     70    if (VERBOSE && (catalog.Naverage_disk == 0)) {
    7171        fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    7272        dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/LoadCatalog.c

    r37807 r38352  
    88
    99    // always load all of the data (if any exists)
    10     catalog[0].catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_LENSING | LOAD_LENSOBJ | LOAD_STARPAR;
     10    catalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR;
    1111
    1212    catalog[0].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoconvert.c

    r38346 r38352  
    8282
    8383      // skip empty input catalogs
    84       if (!incatalog.Naves_disk) {
     84      if (!incatalog.Naverage_disk) {
    8585        dvo_catalog_unlock (&incatalog);
    8686        dvo_catalog_free (&incatalog);
    … …  
    9393    SkyListFree (inlist);
    9494
    95     outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     95    outcatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    9696    dvo_catalog_save (&outcatalog, VERBOSE);
    9797    dvo_catalog_unlock (&outcatalog);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeContinue.c

    r37116 r38352  
    109109    LoadCatalog (&incatalog, &inlist[0].regions[i][0], inlist[0].filename[i], "r", NsecfiltInput);
    110110    // skip empty input catalogs
    111     if (!incatalog.Naves_disk) {
     111    if (!incatalog.Naverage_disk) {
    112112        dvo_catalog_unlock (&incatalog);
    113113        dvo_catalog_free (&incatalog);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeContinue_threaded.c

    r37116 r38352  
    4747    LoadCatalog (&incatalog, threadData->region, threadData->filename, "r", threadData->NsecfiltInput);
    4848    // skip empty input catalogs
    49     if (!incatalog.Naves_disk) {
     49    if (!incatalog.Naverage_disk) {
    5050      dvo_catalog_unlock (&incatalog);
    5151      dvo_catalog_free (&incatalog);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeCreate.c

    r38346 r38352  
    145145
    146146      // skip empty input catalogs
    147       if (!incatalog.Naves_disk) {
     147      if (!incatalog.Naverage_disk) {
    148148        dvo_catalog_unlock (&incatalog);
    149149        dvo_catalog_free (&incatalog);
    … …  
    166166
    167167      // skip empty input catalogs
    168       if (!incatalog.Naves_disk) {
     168      if (!incatalog.Naverage_disk) {
    169169        dvo_catalog_unlock (&incatalog);
    170170        dvo_catalog_free (&incatalog);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeFromList.c

    r37116 r38352  
    113113
    114114    // skip empty input catalogs
    115     if (!incatalog.Naves_disk) {
     115    if (!incatalog.Naverage_disk) {
    116116        dvo_catalog_unlock (&incatalog);
    117117        dvo_catalog_free (&incatalog);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeUpdate_catalogs.c

    r38062 r38352  
    142142
    143143    // skip empty input catalogs
    144     if (!incatalog.Naves_disk) {
     144    if (!incatalog.Naverage_disk) {
    145145        dvo_catalog_unlock (&incatalog);
    146146        dvo_catalog_free (&incatalog);
    … …  
    176176
    177177      // if no catalog already exists, use the input catalog to define the format or the specified format
    178       if (outcatalog.Naves_disk == 0) {
     178      if (outcatalog.Naverage_disk == 0) {
    179179        if (UPDATE_CATFORMAT) {
    180180          outcatalog.catformat = dvo_catalog_catformat (UPDATE_CATFORMAT);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeUpdate_threaded.c

    r37116 r38352  
    4444    LoadCatalog (&incatalog, threadData->region, threadData->filename, "r", threadData->NsecfiltInput);
    4545    // skip empty input catalogs
    46     if (!incatalog.Naves_disk) {
     46    if (!incatalog.Naverage_disk) {
    4747      dvo_catalog_unlock (&incatalog);
    4848      dvo_catalog_free (&incatalog);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairCPT.c

    r38345 r38352  
    7676  }
    7777
    78   measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
     78  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
    7979  myAssert(measure, "failed to convert ftable to measure data");
    8080

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImageList.c

    r38348 r38352  
    246246        gfits_scan(&cpmHeaderTBL, "NAXIS1", "%d", 1, &NbytesPerRow);
    247247
    248         measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
     248        measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
    249249        myAssert(measure, "failed to convert ftable to measure data");
    250250   
    … …  
    284284
    285285        // convert internal to external format
    286         if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat)) {
     286        if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat, TRUE)) {
    287287          myAbort("trouble converting format");
    288288        }
    … …  
    531531
    532532    /* convert internal to external format */
    533     if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat)) {
     533    if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat, TRUE)) {
    534534      myAbort("trouble converting format");
    535535    }

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImagesByExternID.c

    r38348 r38352  
    284284        // NOTE: FtableToMeasure (and equivalent) free the data associated with cpmFtable.
    285285        // We are left with the data in measure.
    286         measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
     286        measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
    287287        myAssert(measure, "failed to convert ftable to measure data");
    288288   
    … …  
    333333
    334334        // convert internal to external format
    335         if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat)) {
     335        if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat, TRUE)) {
    336336          myAbort("trouble converting format");
    337337        }
    … …  
    732732
    733733    /* convert internal to external format */
    734     if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat)) {
     734    if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat, TRUE)) {
    735735      myAbort("trouble converting format");
    736736    }

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixCPT.c

    r38348 r38352  
    121121
    122122  myAbort ("fix cpts");
    123   measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
     123  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
    124124  myAssert(measure, "failed to convert ftable to measure data");
    125125
    … …  
    128128
    129129  // convert internal to external format
    130   if (!MeasureToFtable (&cpmFtable, NULL, measure, Nmeasure, catformat)) {
     130  if (!MeasureToFtable (&cpmFtable, NULL, measure, Nmeasure, catformat, TRUE)) {
    131131    myAbort("trouble converting format");
    132132  }

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixTables.c

    r38345 r38352  
    103103
    104104      // convert internal to external format
    105       if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat)) {
     105      if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat, TRUE)) {
    106106        myAbort("trouble converting format");
    107107      }
    … …  
    183183  gfits_scan(&cpmHeaderTBL, "NAXIS2", "%d", 1, &Nrows);
    184184
    185   measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
     185  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
    186186  myAssert(measure, "failed to convert ftable to measure data");
    187187   
    … …  
    390390
    391391    /* convert internal to external format */
    392     if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat)) {
     392    if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat, TRUE)) {
    393393      myAbort("trouble converting format");
    394394    }

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairImageVsMeasure.c

    r37046 r38352  
    128128      gfits_scan(&cpmHeaderTBL, "NAXIS1", "%d", 1, &NbytesPerRow);
    129129
    130       measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
     130      measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
    131131      myAssert(measure, "failed to convert ftable to measure data");
    132132   

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairImagesVsMeasures.c

    r38348 r38352  
    134134      gfits_scan(&cpmHeaderTBL, "NAXIS1", "%d", 1, &NbytesPerRow);
    135135
    136       measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
     136      measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
    137137      myAssert(measure, "failed to convert ftable to measure data");
    138138   

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvosecfilt_catalogs.c

    r35416 r38352  
    3939    // always load all of the data (if any exists)
    4040    catalog.Nsecfilt  = 0;
    41     catalog.catflags  = LOAD_SECF;  // XXX this will fail for MEF version
     41    catalog.catflags  = DVO_LOAD_SECFILT;  // XXX this will fail for MEF version
    4242    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    4343    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    … …  
    4848    }
    4949
    50     if (catalog.Naves_disk == 0) {
     50    if (catalog.Naverage_disk == 0) {
    5151      dvo_catalog_unlock (&catalog);
    5252      dvo_catalog_free (&catalog);
    … …  
    6464
    6565    insec = catalog.secfilt;
    66     ALLOCATE (outsec, SecFilt, catalog.Naves_disk * Nsecfilt);
     66    ALLOCATE (outsec, SecFilt, catalog.Naverage_disk * Nsecfilt);
    6767
    68     for (k = 0; k < catalog.Naves_disk; k++) {
     68    for (k = 0; k < catalog.Naverage_disk; k++) {
    6969      for (j = 0; (j < catalog.Nsecfilt) && (j < Nsecfilt); j++) {
    7070        outsec[k*Nsecfilt + j] = insec[k*NsecInput + j];
    … …  
    7777    catalog.secfilt = outsec;
    7878    catalog.Nsecfilt = Nsecfilt;
    79     catalog.Nsecf_mem = Nsecfilt * catalog.Naves_disk;
    80     catalog.Nsecf_disk = Nsecfilt * catalog.Naves_disk;
     79    catalog.Nsecfilt_mem = Nsecfilt * catalog.Naverage_disk;
     80    catalog.Nsecfilt_disk = Nsecfilt * catalog.Naverage_disk;
    8181
    8282    dvo_catalog_save (&catalog, VERBOSE);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoverify_utils.c

    r38346 r38352  
    178178  catalog.catformat = DVO_FORMAT_UNDEF; // read-only,do not set the catformat
    179179  catalog.catmode   = DVO_MODE_UNDEF; // read-only, do not set the catmode
    180   catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_LENSING | LOAD_LENSOBJ;
     180  catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ;
    181181  catalog.Nsecfilt  = 0;
    182182 
    … …  
    187187  }
    188188
    189   // Naves_disk == 0 implies an empty catalog file, skip empty catalogs
    190   if (catalog.Naves_disk == 0) {
     189  // Naverage_disk == 0 implies an empty catalog file, skip empty catalogs
     190  if (catalog.Naverage_disk == 0) {
    191191    dvo_catalog_unlock (&catalog);
    192192    dvo_catalog_free (&catalog);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs.c

    r27435 r38352  
    5757  output[0].Naverage = Naverage;
    5858  output[0].Nmeasure = Nmeasure;
    59   output[0].Nsecf_mem = Naverage * Nsecfilt;
     59  output[0].Nsecfilt_mem = Naverage * Nsecfilt;
    6060 
    6161  if (VERBOSE) {

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs_new.c

    r37814 r38352  
    115115  output[0].Nlensing = Nlensing;
    116116  output[0].Nstarpar = Nstarpar;
    117   output[0].Nsecf_mem = Naverage * NsecfiltOut;
     117  output[0].Nsecfilt_mem = Naverage * NsecfiltOut;
    118118
    119119  // If we are using dvomergeCreate to split an existing catalog, then the max objID in

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs_old.c

    r37807 r38352  
    112112
    113113  /* set up pointers for linked list of measure */
    114   if (output[0].sorted && (output[0].Nmeasure >= output[0].Nmeas_disk)) {
     114  if (output[0].sorted && (output[0].Nmeasure >= output[0].Nmeasure_disk)) {
    115115    // this version is only valid if we have done a full catalog load, and if the catalog
    116116    // is sorted while processed
    … …  
    504504  output[0].Nlensing = Nlens;
    505505  output[0].Nstarpar = Nstar;
    506   output[0].Nsecf_mem = Nave*NsecfiltOut;
     506  output[0].Nsecfilt_mem = Nave*NsecfiltOut;
    507507  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nlens: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nlens, Nmatch);
    508508

  • branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_FWobjects_dvopsps.c

    r37672 r38352  
    5353    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    5454    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    55     catalog.catflags  = LOAD_AVES | LOAD_SECF | LOAD_LENSOBJ;
     55    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_LENSOBJ;
    5656    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    5757
    … …  
    6060      exit (1);
    6161    }
    62     if (!catalog.Naves_disk) {
     62    if (!catalog.Naverage_disk) {
    6363      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    6464      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_detections_dvopsps.c

    r37361 r38352  
    6565    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    6666    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    67     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     67    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    6868    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    6969
    … …  
    7272      exit (1);
    7373    }
    74     if (!catalog.Naves_disk) {
     74    if (!catalog.Naverage_disk) {
    7575      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    7676      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_diffobj_dvopsps.c

    r37923 r38352  
    5353    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    5454    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    55     catalog.catflags  = LOAD_AVES | LOAD_SECF;
     55    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    5656    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    5757
    … …  
    6060      exit (1);
    6161    }
    62     if (!catalog.Naves_disk) {
     62    if (!catalog.Naverage_disk) {
    6363      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    6464      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_objects_dvopsps.c

    r37361 r38352  
    5353    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    5454    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    55     catalog.catflags  = LOAD_AVES | LOAD_SECF;
     55    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    5656    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    5757
    … …  
    6060      exit (1);
    6161    }
    62     if (!catalog.Naves_disk) {
     62    if (!catalog.Naverage_disk) {
    6363      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    6464      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/dvosplit/src/dvosplit.c

    r37043 r38352  
    8080    incatalog.filename = skylist[0].filename[i];
    8181    incatalog.Nsecfilt = GetPhotcodeNsecfilt ();
    82     incatalog.catflags = LOAD_NONE;
     82    incatalog.catflags = DVO_LOAD_NONE;
    8383
    8484    // an error exit status here is a significant error
    … …  
    8989
    9090    // skip empty input catalogs
    91     if (!incatalog.Naves_disk) {
     91    if (!incatalog.Naverage_disk) {
    9292      dvo_catalog_unlock (&incatalog);
    9393      dvo_catalog_free (&incatalog);

  • branches/eam_branches/ohana.20150429/src/dvosplit/src/open_output_catalogs.c

    r33656 r38352  
    1414    outcatalogs[i].filename  = outlist[0].filename[i];
    1515    outcatalogs[i].Nsecfilt  = GetPhotcodeNsecfilt ();
    16     outcatalogs[i].catflags  = LOAD_NONE;
     16    outcatalogs[i].catflags  = DVO_LOAD_NONE;
    1717    outcatalogs[i].catformat = CATFORMAT ? dvo_catalog_catformat (CATFORMAT) : catformat;  // set the default catformat from config data
    1818    outcatalogs[i].catmode   = CATMODE   ? dvo_catalog_catmode (CATMODE)     : catmode;    // set the default catmode from config data

  • branches/eam_branches/ohana.20150429/src/dvosplit/src/split_averages.c

    r37807 r38352  
    1010  AveLinks *avelinks;
    1111
    12   ALLOCATE (outref, int, incatalog[0].Naves_disk);
    13   ALLOCATE (outcat, int, incatalog[0].Naves_disk);
     12  ALLOCATE (outref, int, incatalog[0].Naverage_disk);
     13  ALLOCATE (outcat, int, incatalog[0].Naverage_disk);
    1414  ALLOCATE (outmem, int, outlist[0].Nregions);
    1515
    … …  
    2525
    2626  // split out the average & secfilt entries:
    27   incatalog[0].catflags = LOAD_AVES | LOAD_SECF;
     27  incatalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    2828
    2929  if ((incatalog[0].catmode == DVO_MODE_SPLIT) && !FULL_TABLE) {
    30     Nblocks = incatalog[0].Naves_disk / NROWS;
    31     if (incatalog[0].Naves_disk % NROWS) Nblocks ++;
     30    Nblocks = incatalog[0].Naverage_disk / NROWS;
     31    if (incatalog[0].Naverage_disk % NROWS) Nblocks ++;
    3232  } else {
    3333    Nblocks = 1;
    … …  
    4040      dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
    4141      fprintf (stderr, "splitting %s (averages) .. %d of %d\n", incatalog[0].filename, block, Nblocks);
    42       assert (block*NROWS == incatalog[0].Naves_off);
     42      assert (block*NROWS == incatalog[0].Naverage_off);
    4343    } else {
    4444      dvo_catalog_load (incatalog, VERBOSE);
    … …  
    4848    // distribute data to the output catalogs
    4949    for (ave = 0; ave < incatalog[0].Naverage; ave++) {
    50       averef = ave + incatalog[0].Naves_off;
     50      averef = ave + incatalog[0].Naverage_off;
    5151       
    5252      inR = incatalog[0].average[ave].R;
    … …  
    7575
    7676      Nout = outcatalogs[Ncat].Naverage;
    77       outref[averef] = Nout + outcatalogs[Ncat].Naves_off;
     77      outref[averef] = Nout + outcatalogs[Ncat].Naverage_off;
    7878      outcat[averef] = Ncat;
    7979
    … …  
    8585      for (n = 0; n < Nsecfilt; n++) {
    8686        outcatalogs[Ncat].secfilt[Nout*Nsecfilt + n] = incatalog[0].secfilt[ave*Nsecfilt + n];
    87         outcatalogs[Ncat].Nsecf_mem++;
     87        outcatalogs[Ncat].Nsecfilt_mem++;
    8888      }
    8989
    … …  
    9696    dvo_catalog_free_data (incatalog);
    9797
    98     // double check the values of Naverage, Nsecf_mem?
     98    // double check the values of Naverage, Nsecfilt_mem?
    9999
    100100    // XXX for output.catformat == MEF, we probably need to skip this stuff and the free below
    … …  
    103103    if (!FULL_TABLE) {
    104104      for (cat = 0; cat < outlist[0].Nregions; cat++) {
    105         outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF;
     105        outcatalogs[cat].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    106106
    107107        dvo_catalog_save (&outcatalogs[cat], VERBOSE);
    108         // fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecf_mem, outcatalogs[cat].Nsecf_disk, outcatalogs[cat].Nsecf_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
     108        // fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecfilt_mem, outcatalogs[cat].Nsecfilt_disk, outcatalogs[cat].Nsecfilt_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
    109109
    110110        // advance the pointers and free the current data
    111111        // XXX these should be done within save segment:
    112         outcatalogs[cat].Naves_disk += outcatalogs[cat].Naverage;
    113         outcatalogs[cat].Naves_off  += outcatalogs[cat].Naverage;
    114         outcatalogs[cat].Nsecf_disk += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
    115         outcatalogs[cat].Nsecf_off  += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
     112        outcatalogs[cat].Naverage_disk += outcatalogs[cat].Naverage;
     113        outcatalogs[cat].Naverage_off  += outcatalogs[cat].Naverage;
     114        outcatalogs[cat].Nsecfilt_disk += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
     115        outcatalogs[cat].Nsecfilt_off  += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
    116116        outcatalogs[cat].Nsecfilt    = Nsecfilt;
    117117
    118118        outcatalogs[cat].Naverage    = 0;
    119         outcatalogs[cat].Nsecf_mem   = 0;
     119        outcatalogs[cat].Nsecfilt_mem   = 0;
    120120      }
    121121    }

  • branches/eam_branches/ohana.20150429/src/dvosplit/src/split_measures.c

    r37807 r38352  
    1919
    2020  // split out the measure entries:
    21   incatalog[0].catflags = LOAD_MEAS | LOAD_AVES | LOAD_SECF;
     21  incatalog[0].catflags = DVO_LOAD_MEASURE | DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    2222
    2323  // if ((incatalog[0].catformat == DVO_FORMAT_ELIXIR) || (incatalog[0].catformat == DVO_FORMAT_LONEOS)) {
    2424  //   // for these two formats, we need the average and secfilt values around until we do the measures...
    2525  //   // XXX I am loading these 2x -- perhaps I can make the API smarter about reloading?
    26   //   incatalog[0].catflags |= LOAD_AVES | LOAD_SECF;
     26  //   incatalog[0].catflags |= DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    2727  // }
    2828
    2929  if ((incatalog[0].catmode == DVO_MODE_SPLIT) && !FULL_TABLE) {
    30     Nblocks = incatalog[0].Nmeas_disk / NROWS;
    31     if (incatalog[0].Nmeas_disk % NROWS) Nblocks ++;
     30    Nblocks = incatalog[0].Nmeasure_disk / NROWS;
     31    if (incatalog[0].Nmeasure_disk % NROWS) Nblocks ++;
    3232  } else {
    3333    Nblocks = 1;
    … …  
    4040      dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
    4141      fprintf (stderr, "splitting %s (measures) .. %d of %d\n", incatalog[0].filename, block, Nblocks);
    42       assert (block*NROWS == incatalog[0].Nmeas_off);
     42      assert (block*NROWS == incatalog[0].Nmeasure_off);
    4343    } else {
    4444      dvo_catalog_load (incatalog, VERBOSE);
    … …  
    7272    if (!FULL_TABLE) {
    7373      for (cat = 0; cat < outlist[0].Nregions; cat++) {
    74         outcatalogs[cat].catflags = LOAD_MEAS;
     74        outcatalogs[cat].catflags = DVO_LOAD_MEASURE;
    7575        dvo_catalog_save (&outcatalogs[cat], VERBOSE);
    7676
    77         outcatalogs[cat].Nmeas_disk += outcatalogs[cat].Nmeasure;
    78         outcatalogs[cat].Nmeas_off  += outcatalogs[cat].Nmeasure;
     77        outcatalogs[cat].Nmeasure_disk += outcatalogs[cat].Nmeasure;
     78        outcatalogs[cat].Nmeasure_off  += outcatalogs[cat].Nmeasure;
    7979        outcatalogs[cat].Nmeasure    = 0;
    8080      }
    … …  
    8484  if (FULL_TABLE) {
    8585    for (cat = 0; cat < outlist[0].Nregions; cat++) {
    86       outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF | LOAD_MEAS;
     86      outcatalogs[cat].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;
    8787      dvo_catalog_save (&outcatalogs[cat], VERBOSE);
    8888    }

  • branches/eam_branches/ohana.20150429/src/dvosplit/src/split_missings.c

    r15743 r38352  
    1515
    1616  // split out the missing entries:
    17   incatalog[0].catflags = LOAD_MISS;
    18   Nblocks = incatalog[0].Nmiss_disk / NROWS;
    19   if (incatalog[0].Nmiss_disk % NROWS) Nblocks ++;
     17  incatalog[0].catflags = DVO_LOAD_MISSING;
     18  Nblocks = incatalog[0].Nmissing_disk / NROWS;
     19  if (incatalog[0].Nmissing_disk % NROWS) Nblocks ++;
    2020  for (block = 0; block < Nblocks; block++) {
    2121
    … …  
    3535
    3636    for (cat = 0; cat < outlist[0].Nregions; cat++) {
    37       outcatalogs[cat].catflags = LOAD_MISS;
     37      outcatalogs[cat].catflags = DVO_LOAD_MISSING;
    3838      dvo_catalog_save_segment (&outcatalog[cat], VERBOSE);
    3939
    40       outcatalog[cat].Nmiss_disk += outcatalog[cat].Nmissing;
    41       outcatalog[cat].Nmiss_off  += outcatalog[cat].Nmissing;
     40      outcatalog[cat].Nmissing_disk += outcatalog[cat].Nmissing;
     41      outcatalog[cat].Nmissing_off  += outcatalog[cat].Nmissing;
    4242      outcatalog[cat].Nmissing    = 0;
    4343

  • branches/eam_branches/ohana.20150429/src/fakeastro/src/fakeastro_2mass.c

    r37807 r38352  
    2121    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    2222    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    23     catalog.catflags  = LOAD_AVES | LOAD_SECF | LOAD_MEAS | LOAD_STARPAR;
     23    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE | DVO_LOAD_STARPAR;
    2424    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    2525    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
    … …  
    2727      exit (1);
    2828    }
    29     if (!catalog.Naves_disk) {
     29    if (!catalog.Naverage_disk) {
    3030        if (VERBOSE2) { fprintf (stderr, "no data in %s, skipping\n", catalog.filename); }
    3131        dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/fakeastro/src/fakestar_catalog.c

    r37807 r38352  
    99  catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    1010  catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    11   catalog.catflags = LOAD_AVES | LOAD_SECF | LOAD_STARPAR;
     11  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
    1212  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    1313   

  • branches/eam_branches/ohana.20150429/src/fakeastro/src/insert_fakestar.c

    r37814 r38352  
    118118  catalog[0].Naverage  = Nave;
    119119  catalog[0].Nstarpar  = Nstarpar;
    120   catalog[0].Nsecf_mem = Nave*Nsecfilt;
     120  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
    121121  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nstarpar: %d "OFF_T_FMT" "OFF_T_FMT" ("OFF_T_FMT" matches)\n",  Nstars, Nave, Nstarpar, Nmatch);
    122122

  • branches/eam_branches/ohana.20150429/src/fakeastro/src/load_fake_stars.c

    r37807 r38352  
    1515    catalog[i].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    1616    catalog[i].catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    17     catalog[i].catflags  = LOAD_AVES | LOAD_SECF | LOAD_STARPAR;
     17    catalog[i].catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
    1818    catalog[i].Nsecfilt  = GetPhotcodeNsecfilt ();
    1919    if (!dvo_catalog_open (&catalog[i], skylist[0].regions[i], VERBOSE, "r")) {
    … …  
    2323    dvo_catalog_unlock (&catalog[i]);
    2424
    25     if (!catalog[i].Naves_disk) {
     25    if (!catalog[i].Naverage_disk) {
    2626        if (VERBOSE2) { fprintf (stderr, "no data in %s, skipping\n", catalog[i].filename); }
    2727        dvo_catalog_free (&catalog[i]);

  • branches/eam_branches/ohana.20150429/src/fakeastro/src/match_fake_stars.c

    r37807 r38352  
    282282  catalog[0].Nmeasure = Nmeas;
    283283  catalog[0].Nstarpar = Nstarpar;
    284   catalog[0].Nsecf_mem = Nave*Nsecfilt;
     284  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
    285285  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
    286286

  • branches/eam_branches/ohana.20150429/src/fakeastro/src/save_fake_stars.c

    r37807 r38352  
    2323    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    2424    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    25     // catalog.catflags  = LOAD_AVES | LOAD_SECF | LOAD_MEAS | LOAD_STARPAR; // use this for non-update mode
    26     catalog.catflags  = LOAD_AVES | LOAD_SECF | LOAD_STARPAR;
     25    // catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE | DVO_LOAD_STARPAR; // use this for non-update mode
     26    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
    2727    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    2828

  • branches/eam_branches/ohana.20150429/src/gastro/src/getptolemy.c

    r25757 r38352  
    2626    // set the parameters which guide catalog open/load/create
    2727    catalog.filename  = skylist[0].filename[i];
    28     catalog.catflags  = LOAD_AVES | LOAD_MEAS;
     28    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
    2929    catalog.Nsecfilt  = 0;
    3030
    … …  
    3636    dvo_catalog_unlock (&catalog);
    3737
    38     // Naves_disk == 0 implies an empty catalog file
     38    // Naverage_disk == 0 implies an empty catalog file
    3939    // for only_match, skip empty catalogs
    40     if (!catalog.Naves_disk) {
     40    if (!catalog.Naverage_disk) {
    4141      dvo_catalog_free (&catalog);
    4242      continue;

  • branches/eam_branches/ohana.20150429/src/gastro2/src/getptolemy.c

    r25757 r38352  
    2828    // set the parameters which guide catalog open/load/create
    2929    catalog.filename  = skylist[0].filename[i];
    30     catalog.catflags  = LOAD_AVES | LOAD_MEAS;
     30    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
    3131    catalog.Nsecfilt  = 0;
    3232
    … …  
    3838    dvo_catalog_unlock (&catalog);
    3939
    40     // Naves_disk == 0 implies an empty catalog file
     40    // Naverage_disk == 0 implies an empty catalog file
    4141    // for only_match, skip empty catalogs
    42     if (!catalog.Naves_disk) {
     42    if (!catalog.Naverage_disk) {
    4343      dvo_catalog_free (&catalog);
    4444      continue;

  • branches/eam_branches/ohana.20150429/src/getstar/src/getstar.c

    r37359 r38352  
    2828  output.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    2929  output.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    30   output.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     30  output.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    3131  output.Nsecfilt  = GetPhotcodeNsecfilt ();
    3232
    … …  
    6363        catalog.filename = skylist[0].filename[i];
    6464        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    65         catalog.catflags = LOAD_AVES | LOAD_SECF;
    66         catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
     65        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
     66        catalog.catflags |= needMeas ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
    6767
    6868        // an error exit status here is a significant error
    … …  
    7171          exit (2);
    7272        }
    73         if (!catalog.Naves_disk) {
     73        if (!catalog.Naverage_disk) {
    7474          dvo_catalog_unlock (&catalog);
    7575          dvo_catalog_free (&catalog);
    … …  
    9595        catalog.filename = skylist[0].filename[i];
    9696        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    97         catalog.catflags = LOAD_AVES | LOAD_SECF;
    98         catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
     97        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
     98        catalog.catflags |= needMeas ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
    9999
    100100        // an error exit status here is a significant error
    … …  
    104104        }
    105105        /* skip empty catalogs */
    106         if (!catalog.Naves_disk) continue;
     106        if (!catalog.Naverage_disk) continue;
    107107        stars = select_by_image (&catalog, &image, 0, 0, stars, &Nstars);
    108108      }

  • branches/eam_branches/ohana.20150429/src/getstar/src/select_by_region.c

    r37044 r38352  
    162162  output[0].Naverage = Nave;
    163163  output[0].Nmeasure = Nmeas;
    164   output[0].Nsecf_mem = Nave*Nsecfilt;
     164  output[0].Nsecfilt_mem = Nave*Nsecfilt;
    165165
    166166  fprintf (stderr, "output catalog has "OFF_T_FMT" stars ("OFF_T_FMT" measures, %d secfilt)\n",

  • branches/eam_branches/ohana.20150429/src/markrock/src/markrock.c

    r25757 r38352  
    3838  catalog.filename = argv[1];
    3939  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    40   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     40  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4141
    4242  // an error exit status here is a significant error
    … …  
    4545    exit (2);
    4646  }
    47   if (catalog.Naves_disk) {
     47  if (catalog.Naverage_disk) {
    4848    dvo_catalog_unlock (&catalog);
    4949    dvo_catalog_free (&catalog);

  • branches/eam_branches/ohana.20150429/src/markstar/src/markstar.c

    r38346 r38352  
    4242  catalog.filename = argv[1];
    4343  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    44   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     44  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4545
    4646  // an error exit status here is a significant error
    … …  
    4949    exit (2);
    5050  }
    51   if (!catalog.Naves_disk) {
     51  if (!catalog.Naverage_disk) {
    5252    dvo_catalog_unlock (&catalog);
    5353    dvo_catalog_free (&catalog);

  • branches/eam_branches/ohana.20150429/src/mosastro/src/getptolemy.c

    r25757 r38352  
    2626    // set the parameters which guide catalog open/load/create
    2727    catalog.filename  = skylist[0].filename[i];
    28     catalog.catflags  = LOAD_AVES | LOAD_MEAS;
     28    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
    2929    catalog.Nsecfilt  = 0;
    3030
    … …  
    3636    dvo_catalog_unlock (&catalog);
    3737
    38     // Naves_disk == 0 implies an empty catalog file
     38    // Naverage_disk == 0 implies an empty catalog file
    3939    // for only_match, skip empty catalogs
    40     if (!catalog.Naves_disk) {
     40    if (!catalog.Naverage_disk) {
    4141      dvo_catalog_free (&catalog);
    4242      continue;

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/avextract.c

    r38330 r38352  
    185185    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
    186186    catalog.filename = (HOST_ID || PARALLEL_LOCAL) ? hostfile : skylist[0].filename[i];
    187     catalog.catflags = LOAD_AVES | LOAD_SECF;
    188     catalog.catflags |= needMeasure ? LOAD_MEAS : SKIP_MEAS;
    189     catalog.catflags |= needLensobj ? LOAD_LENSOBJ : SKIP_LENSOBJ;
    190     catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
     187    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
     188    catalog.catflags |= needMeasure ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
     189    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
     190    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
    191191    catalog.Nsecfilt = 0;
    192192

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/avmatch.c

    r38330 r38352  
    190190    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
    191191    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
    192     catalog.catflags = LOAD_AVES | LOAD_SECF;
    193     catalog.catflags |= needMeasure ? LOAD_MEAS    : SKIP_MEAS;
    194     catalog.catflags |= needLensobj ? LOAD_LENSOBJ : SKIP_LENSOBJ;
    195     catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
     192    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
     193    catalog.catflags |= needMeasure ? DVO_LOAD_MEASURE    : DVO_SKIP_MEASURE;
     194    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
     195    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
    196196    catalog.Nsecfilt = 0;
    197197

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/calextract.c

    r34088 r38352  
    6161    /* lock, load, unlock catalog */
    6262    catalog.filename = skylist[0].filename[Nr];
    63     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     63    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    6464    catalog.Nsecfilt = 0;
    6565

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/calmextract.c

    r34088 r38352  
    7474    /* lock, load, unlock catalog */
    7575    catalog.filename = skylist[0].filename[Nr];
    76     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     76    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    7777    catalog.Nsecfilt = 0;
    7878

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/catalog.c

    r19823 r38352  
    315315      /* lock, load, unlock catalog */
    316316      catalog.filename = filename;
    317       catalog.catflags = LOAD_AVES;
     317      catalog.catflags = DVO_LOAD_AVERAGE;
    318318
    319319      // an error exit status here is a significant error

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/ccd.c

    r34088 r38352  
    6969    /* lock, load, unlock catalog */
    7070    catalog.filename = skylist[0].filename[k];
    71     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     71    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    7272    catalog.Nsecfilt = 0;
    7373

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/cmatch.c

    r28241 r38352  
    2929  /* load data from the photometry database file */
    3030  catalog1.filename = filename;
    31   catalog1.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     31  catalog1.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    3232
    3333  // an error exit status here is a significant error

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/cmd.c

    r34088 r38352  
    6868    /* lock, load, unlock catalog */
    6969    catalog.filename = skylist[0].filename[j];
    70     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     70    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    7171    catalog.Nsecfilt = 0;
    7272

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/ddmags.c

    r15509 r38352  
    6666    /* lock, load, unlock catalog */
    6767    catalog.filename = skylist[0].filename[k];
    68     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     68    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    6969    catalog.Nsecfilt = 0;
    7070

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/dmagaves.c

    r14401 r38352  
    5858    /* lock, load, unlock catalog */
    5959    catalog.filename = skylist[0].filename[j];
    60     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     60    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    6161    catalog.Nsecfilt = 0;
    6262

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/dmagmeas.c

    r15509 r38352  
    6666    /* lock, load, unlock catalog */
    6767    catalog.filename = skylist[0].filename[j];
    68     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     68    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    6969    catalog.Nsecfilt = 0;
    7070

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/dmags.c

    r15509 r38352  
    6464    /* lock, load, unlock catalog */
    6565    catalog.filename = skylist[0].filename[j];
    66     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     66    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    6767    catalog.Nsecfilt = 0;
    6868

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/dmt.c

    r31635 r38352  
    7777    /* lock, load, unlock catalog */
    7878    catalog.filename = skylist[0].filename[k];
    79     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     79    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    8080    catalog.Nsecfilt = 0;
    8181

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/extract.c

    r31635 r38352  
    252252      catalog.measure = (Measure *) NULL;
    253253      catalog.secfilt = (SecFilt *) NULL;
    254       loadmode = LOAD_AVES | LOAD_SECF;
     254      loadmode = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    255255      if ((mode == REF) || (mode == TYPE) || (mode == NPHOT) || (mode == NCODE))
    256         loadmode = loadmode | LOAD_MEAS;
     256        loadmode = loadmode | DVO_LOAD_MEASURE;
    257257
    258258      /* lock, load, unlock catalog */

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/fitcolors.c

    r34584 r38352  
    162162    /* lock, load, unlock catalog */
    163163    catalog[k].filename = skylist[0].filename[k];
    164     catalog[k].catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     164    catalog[k].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    165165    catalog[k].Nsecfilt = 0;
    166166

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/fitsed.c

    r37049 r38352  
    188188    /* lock, load, unlock catalog */
    189189    catalog.filename = skylist[0].filename[k];
    190     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     190    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    191191    catalog.Nsecfilt = 0;
    192192

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/gstar.c

    r37246 r38352  
    235235
    236236  /* lock, load, unlock catalog */
    237   catalog.catflags = LOAD_AVES | LOAD_SECF;
    238   catalog.catflags |= GetMeasures ? LOAD_MEAS : SKIP_MEAS;
     237  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
     238  catalog.catflags |= GetMeasures ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
    239239  catalog.Nsecfilt = 0;
    240240

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/imdata.c

    r37807 r38352  
    136136    /* get file name and open */
    137137    catalog.filename = skylist[0].filename[j];
    138     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     138    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    139139    catalog.Nsecfilt = 0;
    140140

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/lcurve.c

    r37049 r38352  
    7676  /* set filename, read in header */
    7777  catalog.filename = skylist[0].filename[0];
    78   catalog.catflags = LOAD_AVES | LOAD_MEAS;
     78  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
    7979  catalog.Nsecfilt = 0;
    8080

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/lightcurve.c

    r37049 r38352  
    5959  /* set filename, read in header */
    6060  catalog.filename = skylist[0].filename[0];
    61   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     61  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    6262  catalog.Nsecfilt = 0;
    6363

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/mextract.c

    r38330 r38352  
    229229    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
    230230    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
    231     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
    232     // catalog.catflags |= needLensing ? LOAD_LENSING : SKIP_LENSING;
    233     catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
     231    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     232    // catalog.catflags |= needLensing ? DVO_LOAD_LENSING : DVO_SKIP_LENSING;
     233    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
    234234    catalog.Nsecfilt = Nsecfilt;
    235235

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/mmatch.c

    r38330 r38352  
    248248    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
    249249    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
    250     catalog.catflags = LOAD_AVES | LOAD_SECF | LOAD_MEAS;
    251     catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
     250    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;
     251    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
    252252    catalog.Nsecfilt = Nsecfilt;
    253253

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/mmextract.c

    r37807 r38352  
    183183    /* lock, load, unlock catalog */
    184184    catalog.filename = skylist[0].filename[i];
    185     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     185    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    186186    catalog.Nsecfilt = Nsecfilt;
    187187

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/objectcoverage.c

    r37807 r38352  
    184184    /* lock, load, unlock catalog */
    185185    catalog.filename = skylist[0].filename[k];
    186     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     186    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    187187    catalog.Nsecfilt = 0;
    188188

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/paverage.c

    r34088 r38352  
    105105  for (j = 0; (j < skylist[0].Nregions) && !interrupt; j++) {
    106106    catalog.filename = skylist[0].filename[j];
    107     catalog.catflags = LOAD_AVES | LOAD_SECF;
     107    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    108108    catalog.Nsecfilt = Nsecfilt;
    109109

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/pmeasure.c

    r37049 r38352  
    178178  for (j = 0; (j < skylist[0].Nregions) && !interrupt; j++) {
    179179    catalog.filename = skylist[0].filename[j];
    180     catalog.catflags = LOAD_AVES | LOAD_MEAS;
     180    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
    181181    catalog.Nsecfilt = 0;
    182182

  • branches/eam_branches/ohana.20150429/src/opihi/dvo/subpix.c

    r37807 r38352  
    4040  /* lock, load, unlock catalog */
    4141  catalog.filename = skylist[0].filename[0];
    42   catalog.catflags = LOAD_AVES | LOAD_MEAS;
     42  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
    4343  catalog.Nsecfilt = 0;
    4444

  • branches/eam_branches/ohana.20150429/src/photdbc/src/join_stars.c

    r37807 r38352  
    224224  catalog[0].Naverage = Naves;
    225225  catalog[0].Nmeasure = Nmeas;
    226   catalog[0].Nsecf_mem = Naves*catalog[0].Nsecfilt;
     226  catalog[0].Nsecfilt_mem = Naves*catalog[0].Nsecfilt;
    227227 
    228228  return;

  • branches/eam_branches/ohana.20150429/src/photdbc/src/make_subcatalog.c

    r37045 r38352  
    190190  subcatalog[0].Nmeasure = Nmeasure;
    191191  subcatalog[0].Nsecfilt = Nsecfilt;
    192   subcatalog[0].Nsecf_mem = Naverage * Nsecfilt;
     192  subcatalog[0].Nsecfilt_mem = Naverage * Nsecfilt;
    193193
    194194  // XXX for now, don't copy the missing entries (these should be re-computed)

  • branches/eam_branches/ohana.20150429/src/photdbc/src/photdbc_catalogs.c

    r37807 r38352  
    2424    incatalog.filename  = hostID ? hostfile : skylist[0].filename[i];
    2525    incatalog.Nsecfilt = GetPhotcodeNsecfilt ();
    26     incatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     26    incatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    2727
    2828    // an error exit status here is a significant error
    … …  
    3232    }
    3333    // skip empty input catalogs
    34     if (!incatalog.Naves_disk) {
     34    if (!incatalog.Naverage_disk) {
    3535      dvo_catalog_unlock (&incatalog);
    3636      dvo_catalog_free (&incatalog);
    … …  
    5454    outcatalog.catmode   = CATMODE   ? dvo_catalog_catmode (CATMODE)     : incatalog.catmode;
    5555    outcatalog.Nsecfilt  = incatalog.Nsecfilt;                 // inherit from the incatalog
    56     outcatalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     56    outcatalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    5757
    5858    // output catalogs always represent the same skyregions as the input catalogs

  • branches/eam_branches/ohana.20150429/src/relastro/src/UpdateObjectOffsets.c

    r37807 r38352  
    3434    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    3535    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    36     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     36    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    3737    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    3838
    … …  
    4141      exit (1);
    4242    }
    43     if (!catalog.Naves_disk) {
     43    if (!catalog.Naverage_disk) {
    4444      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    4545      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/relastro/src/bcatalog.c

    r37807 r38352  
    521521  subcatalog[0].Nmeasure = Nmeasure;
    522522  subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
    523   subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
     523  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
    524524
    525525  return (TRUE);
    … …  
    628628  subcatalog[0].Nmeasure = Nmeasure;
    629629  subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
    630   subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
     630  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
    631631
    632632  return (TRUE);
    … …  
    722722  subcatalog[0].Nmeasure = Nmeasure;
    723723  subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
    724   subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
     724  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
    725725
    726726  return (TRUE);

  • branches/eam_branches/ohana.20150429/src/relastro/src/high_speed_catalogs.c

    r35763 r38352  
    3131    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    3232    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    33     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     33    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    3434    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    3535
    … …  
    3838      exit (1);
    3939    }
    40     if (!catalog.Naves_disk) {
     40    if (!catalog.Naverage_disk) {
    4141      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    4242      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/relastro/src/high_speed_objects.c

    r37807 r38352  
    3232  catalogOut.filename = filename; // based on the input name, need to keep everything below the catdir portion
    3333  catalogOut.Nsecfilt = Nsecfilt;
    34   catalogOut.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF; // load all data
     34  catalogOut.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT; // load all data
    3535 
    3636  catalogOut.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    … …  
    263263  catalogOut.Nmeasure=Nmatchmeas;
    264264  catalogOut.Nsecfilt=Nsecfilt;
    265   catalogOut.Nsecf_mem=Nmatch*Nsecfilt;
     265  catalogOut.Nsecfilt_mem=Nmatch*Nsecfilt;
    266266
    267267  populate_tiny_values (&catalogOut, DVO_TV_MEASURE);

  • branches/eam_branches/ohana.20150429/src/relastro/src/hpm_catalogs.c

    r35763 r38352  
    2929    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    3030    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    31     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     31    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    3232    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    3333
    … …  
    3636      exit (1);
    3737    }
    38     if (!catalog.Naves_disk) {
     38    if (!catalog.Naverage_disk) {
    3939      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    4040      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/relastro/src/hpm_objects.c

    r37807 r38352  
    3333  catalogOut.filename = filename;
    3434  catalogOut.Nsecfilt = Nsecfilt;
    35   catalogOut.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF; // load all data
     35  catalogOut.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT; // load all data
    3636 
    3737  catalogOut.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    … …  
    279279  }
    280280  catalogOut.Nsecfilt = Nsecfilt;
    281   catalogOut.Nsecf_mem = Nsecfilt * catalogOut.Naverage;
     281  catalogOut.Nsecfilt_mem = Nsecfilt * catalogOut.Naverage;
    282282
    283283  populate_tiny_values (&catalogOut, DVO_TV_MEASURE);

  • branches/eam_branches/ohana.20150429/src/relastro/src/load_catalogs.c

    r38062 r38352  
    4040    pcatalog->catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    4141    pcatalog->catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    42     pcatalog->catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF; // don't need to load all data at this point
     42    pcatalog->catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT; // don't need to load all data at this point
    4343    pcatalog->Nsecfilt  = GetPhotcodeNsecfilt ();
    4444
    … …  
    4848      exit (1);
    4949    }
    50     if (!pcatalog[0].Naves_disk) {
     50    if (!pcatalog[0].Naverage_disk) {
    5151      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
    5252      dvo_catalog_unlock (pcatalog);

  • branches/eam_branches/ohana.20150429/src/relastro/src/relastro_merge_source.c

    r37038 r38352  
    4545  catalog_src.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    4646  catalog_src.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    47   catalog_src.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     47  catalog_src.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4848  catalog_src.Nsecfilt  = GetPhotcodeNsecfilt ();
    4949
    … …  
    5252    exit (1);
    5353  }
    54   if (!catalog_src.Naves_disk) {
     54  if (!catalog_src.Naverage_disk) {
    5555    fprintf (stderr, "no data in %s, error in cat ID?\n", catalog_src.filename);
    5656    exit (1);

  • branches/eam_branches/ohana.20150429/src/relastro/src/relastro_objects.c

    r37807 r38352  
    4444    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    4545    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    46     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     46    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4747    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    4848
    … …  
    5252      exit (1);
    5353    }
    54     if (!catalog.Naves_disk) {
     54    if (!catalog.Naverage_disk) {
    5555      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5656      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/relphot/src/bcatalog.c

    r37116 r38352  
    245245  subcatalog[0].Nmeasure = Nmeasure;
    246246  subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
    247   subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
     247  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
    248248
    249249  if (VERBOSE) {
    … …  
    368368  subcatalog[0].Nmeasure = Nmeasure;
    369369  subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
    370   subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
     370  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
    371371
    372372  return (TRUE);
    … …  
    461461  subcatalog[0].Nmeasure = Nmeasure;
    462462  subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
    463   subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
     463  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
    464464
    465465  return (TRUE);

  • branches/eam_branches/ohana.20150429/src/relphot/src/load_catalogs.c

    r37037 r38352  
    4545    tcatalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    4646    tcatalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    47     tcatalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;    // don't need to load all data at this point
     47    tcatalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;    // don't need to load all data at this point
    4848    tcatalog.Nsecfilt  = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
    4949
    … …  
    5252      exit (1);
    5353    }
    54     if (!tcatalog.Naves_disk) {
     54    if (!tcatalog.Naverage_disk) {
    5555        if (VERBOSE2) { fprintf (stderr, "no data in %s, skipping\n", tcatalog.filename); }
    5656        dvo_catalog_unlock (&tcatalog);

  • branches/eam_branches/ohana.20150429/src/relphot/src/reload_catalogs.c

    r37907 r38352  
    5858    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    5959    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    60     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     60    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    6161    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
    6262
    … …  
    6565      exit (1);
    6666    }
    67     if (VERBOSE && (catalog.Naves_disk == 0)) {
     67    if (VERBOSE && (catalog.Naverage_disk == 0)) {
    6868        fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    6969        dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/relphot/src/relphot_objects.c

    r37807 r38352  
    4242    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    4343    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    44     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     44    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4545    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    4646
    … …  
    4949      exit (1);
    5050    }
    51     if (!catalog.Naves_disk) {
     51    if (!catalog.Naverage_disk) {
    5252      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5353      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/relphot/src/relphot_synthphot.c

    r38062 r38352  
    4343    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    4444    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    45     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     45    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    4646    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    4747
    … …  
    5050      exit (1);
    5151    }
    52     if (!catalog.Naves_disk) {
     52    if (!catalog.Naverage_disk) {
    5353      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5454      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_ckids.c

    r35764 r38352  
    4646    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    4747    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    48     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     48    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4949    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    5050
    … …  
    5353      exit (1);
    5454    }
    55     if (!catalog.Naves_disk) {
     55    if (!catalog.Naverage_disk) {
    5656      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5757      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_fiximids.c

    r35764 r38352  
    4141    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    4242    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    43     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     43    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4444    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    4545
    … …  
    4848      exit (1);
    4949    }
    50     if (!catalog.Naves_disk) {
     50    if (!catalog.Naverage_disk) {
    5151      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5252      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_fixstkids.c

    r35764 r38352  
    4141    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    4242    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    43     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     43    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4444    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    4545
    … …  
    4848      exit (1);
    4949    }
    50     if (!catalog.Naves_disk) {
     50    if (!catalog.Naverage_disk) {
    5151      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5252      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setastrom.c

    r38062 r38352  
    4242    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    4343    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    44     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     44    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4545    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    4646
    … …  
    4949      exit (1);
    5050    }
    51     if (!catalog.Naves_disk) {
     51    if (!catalog.Naverage_disk) {
    5252      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5353      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setgalmodel.c

    r37807 r38352  
    3838    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    3939    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    40     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_STARPAR;
     40    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
    4141    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    4242
    … …  
    4545      exit (1);
    4646    }
    47     if (!catalog.Naves_disk) {
     47    if (!catalog.Naverage_disk) {
    4848      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    4949      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setphot.c

    r36630 r38352  
    5454    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    5555    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    56     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     56    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    5757    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    5858
    … …  
    6161      exit (1);
    6262    }
    63     if (!catalog.Naves_disk) {
     63    if (!catalog.Naverage_disk) {
    6464      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    6565      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setposangle.c

    r35103 r38352  
    5555    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    5656    catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    57     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     57    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    5858    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    5959
    … …  
    6262      exit (1);
    6363    }
    64     if (!catalog.Naves_disk) {
     64    if (!catalog.Naverage_disk) {
    6565      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    6666      dvo_catalog_unlock (&catalog);

  • branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_uniphot.c

    r38344 r38352  
    6161  for (i = 0; i < pglob.gl_pathc; i++) {
    6262    catalog.filename = pglob.gl_pathv[i];
    63     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     63    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    6464    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    6565
    … …  
    6969      exit (2);
    7070    }
    71     if (!catalog.Naves_disk) {
     71    if (!catalog.Naverage_disk) {
    7272      dvo_catalog_unlock (&catalog);
    7373      dvo_catalog_free (&catalog);
Note: See TracChangeset for help on using the changeset viewer.