IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38471


Ignore:
Timestamp:
Jun 14, 2015, 10:12:31 AM (11 years ago)
Author:
eugene
Message:

make sure the full catalog structure is initialized before calling dvo_catalog_open

Location:
trunk/Ohana/src
Files:
92 edited

Legend:

Unmodified
Added
Removed

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

    r38441 r38471  
    4343
    4444    // set the parameters which guide catalog open/load/create
     45    dvo_catalog_init (&catalog, TRUE);
     46    catalog.filename  = skylist[0].filename[i];
    4547    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    4648    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    47     catalog.filename  = skylist[0].filename[i];
    4849    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    4950    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;

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

    r38441 r38471  
    3232
    3333    // set the parameters which guide catalog open/load/create
     34    dvo_catalog_init (&catalog, TRUE);
    3435    catalog.filename  = skylist[0].filename[i];
    3536    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

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

    r38441 r38471  
    3232
    3333    // set the parameters which guide catalog open/load/create
     34    dvo_catalog_init (&catalog, TRUE);
    3435    catalog.filename  = skylist[0].filename[i];
    3536    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

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

    r38441 r38471  
    104104
    105105    // set the parameters which guide catalog open/load/create
     106    dvo_catalog_init (&catalog, TRUE);
    106107    catalog.filename    = skylist[0].filename[i];
    107108    catalog.catmode     = dvo_catalog_catmode (CATMODE);         // set the default catmode from config data

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

    r38441 r38471  
    178178
    179179        // now we have all of the loaded stars in this catalog
     180        dvo_catalog_init (&catalog, TRUE);
    180181        catalog.filename = skylist[0].filename[0];
    181182        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

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

    r38441 r38471  
    77
    88  // now we have all of the loaded stars in this catalog
     9  dvo_catalog_init (&catalog, TRUE);
    910  catalog.filename = filename;
    1011  catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

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

    r38441 r38471  
    77
    88  // now we have all of the loaded stars in this catalog
     9  dvo_catalog_init (&catalog, TRUE);
    910  catalog.filename = filename;
    1011  catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

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

    r38467 r38471  
    168168
    169169        // now we have all of the loaded stars in this catalog
     170        dvo_catalog_init (&catalog, TRUE);
    170171        catalog.filename = skylist[0].filename[0];
    171172        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

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

    r38470 r38471  
    128128
    129129      // now we have all of the loaded stars in this catalog
     130      dvo_catalog_init (&catalog, TRUE);
    130131      catalog.filename = skylist[0].filename[0];
    131132      catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

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

    r38441 r38471  
    183183
    184184        // now we have all of the loaded stars in this catalog
     185        dvo_catalog_init (&catalog, TRUE);
    185186        catalog.filename = skylist[0].filename[0];
    186187        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

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

    r38467 r38471  
    185185
    186186        // now we have all of the loaded stars in this catalog
     187        dvo_catalog_init (&catalog, TRUE);
    187188        catalog.filename = skylist[0].filename[0];
    188189        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

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

    r38441 r38471  
    4040    char hostfile[1024];
    4141    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, threadData->region->name);
     42
     43    dvo_catalog_init (&catalog, TRUE);
    4244    catalog.filename  = HOST_ID ? hostfile : threadData->filename;
    4345

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

    r38441 r38471  
    1818    char hostfile[1024];
    1919    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     20
     21    dvo_catalog_init (&catalog, TRUE);
    2022    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    2123

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

    r38441 r38471  
    2525
    2626  for (i = 0; i < skylist[0].Nregions; i++) {
     27    dvo_catalog_init (&incatalog, TRUE);
    2728    incatalog.filename = skylist[0].filename[i];
    2829    incatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/addstar/test/relphot.flatcorr.dvo

    r38441 r38471  
    194194
    195195  # run relphot on the db and check that the images now match the expected values
    196   tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $catdir -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update -synthphot_zpts $fileroot.synthzpts.fits
     196  tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $catdir -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update -synthphot-zpts $fileroot.synthzpts.fits
    197197  for i 0 mjd_uc[]
    198198    ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot_uc

  • trunk/Ohana/src/checkastro/src/load_catalogs.c

    r38441 r38471  
    3030    char hostfile[1024];
    3131    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     32
     33    dvo_catalog_init (pcatalog, TRUE);
    3234    pcatalog->filename = hostID ? hostfile : skylist[0].filename[i];
    3335

  • trunk/Ohana/src/delstar/src/delete_duplicate_images.c

    r38441 r38471  
    108108    char hostfile[1024];
    109109    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     110
     111    dvo_catalog_init (&catalog, TRUE);
    110112    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    111113    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/delstar/src/delete_duplicate_measures.c

    r38441 r38471  
    4343    char hostfile[1024];
    4444    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     45
     46    dvo_catalog_init (&catalog, TRUE);
    4547    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    4648    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/delstar/src/delete_fix_LAP.c

    r38441 r38471  
    4141    char hostfile[1024];
    4242    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     43
     44    dvo_catalog_init (&catalog, TRUE);
    4345    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    4446    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/delstar/src/delete_fix_LAP_edges.c

    r38441 r38471  
    4949    char hostfile[1024];
    5050    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     51
     52    dvo_catalog_init (&catalog, TRUE);
    5153    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    5254    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/delstar/src/delete_fix_LAP_edges_delete.c

    r38441 r38471  
    8989    char hostfile[1024];
    9090    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     91
     92    dvo_catalog_init (&catalog, TRUE);
    9193    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    9294    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/delstar/src/delete_imagefile.c

    r38441 r38471  
    2424
    2525    if (VERBOSE) fprintf (stderr, "deleting from %s\n", sky[0].filename[i]);
     26
     27    dvo_catalog_init (&catalog, TRUE);
    2628    catalog.filename = sky[0].filename[i];  /* don't free region before catalog! */
    2729    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/delstar/src/delete_imagename.c

    r38441 r38471  
    3939    for (i = 0; i < skylist[0].Nregions; i++) {
    4040      if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].filename[i]);
     41      dvo_catalog_init (&catalog, TRUE);
    4142      catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
    4243      catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/delstar/src/delete_photcodes.c

    r38441 r38471  
    3939    char hostfile[1024];
    4040    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     41
     42    dvo_catalog_init (&catalog, TRUE);
    4143    catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
    4244    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/delstar/src/delete_photcodes_single.c

    r38441 r38471  
    88  PhotCode **photcodes = ParsePhotcodeList (PHOTCODE_LIST, &Nphotcodes, FALSE);
    99
     10  dvo_catalog_init (&catalog, TRUE);
    1011  catalog.filename  = cptname;
    1112  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/delstar/src/delete_times.c

    r38441 r38471  
    6060  for (i = 0; i < skylist[0].Nregions; i++) {
    6161    if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].filename[i]);
     62    dvo_catalog_init (&catalog, TRUE);
    6263    catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
    6364    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/dvolens/src/update_objects.c

    r38441 r38471  
    4949    char hostfile[1024];
    5050    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     51
     52    dvo_catalog_init (&catalog, TRUE);
    5153    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
    5254

  • trunk/Ohana/src/dvomerge/src/LoadCatalog.c

    r38441 r38471  
    33int LoadCatalog (Catalog *catalog, SkyRegion *region, char *filename, char *mode, int Nsecfilt) {
    44
    5     // set the parameters which guide catalog open/load/create
    6     catalog[0].filename  = filename;
    7     catalog[0].Nsecfilt  = Nsecfilt;
     5  // set the parameters which guide catalog open/load/create
     6  dvo_catalog_init (catalog, TRUE);
     7  catalog[0].filename  = filename;
     8  catalog[0].Nsecfilt  = Nsecfilt;
    89
    9     // always load all of the data (if any exists)
    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 | DVO_LOAD_GALPHOT;
    11 
    12     catalog[0].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    13     catalog[0].catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
    14 
    15     if (!dvo_catalog_open (catalog, region, VERBOSE, mode)) {
    16         fprintf (stderr, "ERROR: failure to open catalog file %s\n", filename);
    17         exit (2);
    18     }
    19     return (TRUE);
     10  // always load all of the data (if any exists)
     11  catalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR | DVO_LOAD_GALPHOT;
     12 
     13  catalog[0].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
     14  catalog[0].catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
     15 
     16  if (!dvo_catalog_open (catalog, region, VERBOSE, mode)) {
     17    fprintf (stderr, "ERROR: failure to open catalog file %s\n", filename);
     18    exit (2);
     19  }
     20  return (TRUE);
    2021}

  • trunk/Ohana/src/dvomerge/src/dvosecfilt_catalogs.c

    r38468 r38471  
    3535    char hostfile[1024];
    3636    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist->regions[i]->name);
     37
     38    dvo_catalog_init (&catalog, TRUE);
    3739    catalog.filename  = HOST_ID ? hostfile : skylist->filename[i];
    3840

  • trunk/Ohana/src/dvomerge/src/dvoverify_utils.c

    r38441 r38471  
    175175
    176176  // set the parameters which guide catalog open/load/create
     177    dvo_catalog_init (&catalog, TRUE);
    177178  catalog.filename  = filename;
    178   catalog.catformat = DVO_FORMAT_UNDEF; // read-only,do not set the catformat
    179   catalog.catmode   = DVO_MODE_UNDEF; // read-only, do not set the catmode
    180179  catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ;
    181180  catalog.Nsecfilt  = 0;

  • trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps.c

    r38441 r38471  
    5050
    5151    // set up the basic catalog info
     52    dvo_catalog_init (&catalog, TRUE);
    5253    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    53     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    54     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    5554    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_LENSOBJ;
    5655    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/dvopsps/src/insert_detections_dvopsps.c

    r38441 r38471  
    6262
    6363    // set up the basic catalog info
     64    dvo_catalog_init (&catalog, TRUE);
    6465    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    65     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    66     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    6766    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    6867    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps.c

    r38441 r38471  
    5050
    5151    // set up the basic catalog info
     52    dvo_catalog_init (&catalog, TRUE);
    5253    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    53     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    54     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    5554    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    5655    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/dvopsps/src/insert_objects_dvopsps.c

    r38441 r38471  
    5050
    5151    // set up the basic catalog info
     52    dvo_catalog_init (&catalog, TRUE);
    5253    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    5354    catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs

  • trunk/Ohana/src/dvosplit/src/dvosplit.c

    r38441 r38471  
    7878
    7979    // set the parameters which guide catalog open/load/create
     80    dvo_catalog_init (&incatalog, TRUE);
    8081    incatalog.filename = skylist[0].filename[i];
    8182    incatalog.Nsecfilt = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/dvosplit/src/open_output_catalogs.c

    r38441 r38471  
    1212   
    1313    // set the parameters which guide catalog open/load/create
     14    dvo_catalog_init (&outcatalogs[i], TRUE);
    1415    outcatalogs[i].filename  = outlist[0].filename[i];
    1516    outcatalogs[i].Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/fakeastro/src/fakeastro_2mass.c

    r38441 r38471  
    1818
    1919    // set the parameters which guide catalog open/load/create
     20    dvo_catalog_init (&catalog, TRUE);
    2021    catalog.filename  = skylist[0].filename[i];
    2122    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

  • trunk/Ohana/src/fakeastro/src/fakestar_catalog.c

    r38441 r38471  
    66
    77  // now we have all of the loaded stars in this catalog
     8  dvo_catalog_init (&catalog, TRUE);
    89  catalog.filename = filename;
    910  catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

  • trunk/Ohana/src/fakeastro/src/load_fake_stars.c

    r38441 r38471  
    1212
    1313    // set the parameters which guide catalog open/load/create
     14    dvo_catalog_init (&catalog[i], TRUE);
    1415    catalog[i].filename  = skylist[0].filename[i];
    1516    catalog[i].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

  • trunk/Ohana/src/fakeastro/src/save_fake_stars.c

    r38441 r38471  
    2020
    2121    // set the parameters which guide catalog open/load/create
     22    dvo_catalog_init (&catalog, TRUE);
    2223    catalog.filename  = skylist[0].filename[i];
    2324    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

  • trunk/Ohana/src/gastro/src/getptolemy.c

    r38441 r38471  
    2525  for (i = 0; i <skylist[0].Nregions; i++) {
    2626    // set the parameters which guide catalog open/load/create
     27
     28    dvo_catalog_init (&catalog, TRUE);
    2729    catalog.filename  = skylist[0].filename[i];
    2830    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;

  • trunk/Ohana/src/gastro2/src/getptolemy.c

    r38441 r38471  
    2727  for (i = 0; i < skylist[0].Nregions; i++) {
    2828    // set the parameters which guide catalog open/load/create
     29    dvo_catalog_init (&catalog, TRUE);
    2930    catalog.filename  = skylist[0].filename[i];
    3031    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;

  • trunk/Ohana/src/getstar/src/getstar.c

    r38441 r38471  
    2424
    2525  // create an output catalog with the desired name and format options
     26  dvo_catalog_init (&output, TRUE);
     27
    2628  dvo_catalog_init (&output, TRUE);
    2729  output.filename  = OUTPUT;
    … …  
    6163      for (i = 0; i < skylist[0].Nregions; i++) {
    6264        // set the parameters which guide catalog open/load/create
     65        dvo_catalog_init (&catalog, TRUE);
    6366        catalog.filename = skylist[0].filename[i];
    6467        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    … …  
    9396      for (i = 0; i < skylist[0].Nregions; i++) {
    9497        // set the parameters which guide catalog open/load/create
     98        dvo_catalog_init (&catalog, TRUE);
    9599        catalog.filename = skylist[0].filename[i];
    96100        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/libdvo/src/dvo_util.c

    r38441 r38471  
    206206      /* lock, load, unlock catalog */
    207207      Catalog catalog;
     208
     209      dvo_catalog_init (&catalog, TRUE);
    208210      catalog.filename = skylist->filename[reg];
    209211      catalog.catflags = GetMeasures ? DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT : DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/libfits/table/F_compress_T.c

    r38441 r38471  
    3434
    3535void gfits_compress_timing () {
     36  return;
     37
    3638  fprintf (stderr, "cmp times: %f %f %f\n", timeSum1, timeSum2, timeSum3);
    3739  fprintf (stderr, "cmp times: %f %f %f %f %f\n", timeSum2a, timeSum2b, timeSum2c, timeSum2d, timeSum2e);

  • trunk/Ohana/src/libfits/table/F_uncompress_T.c

    r38441 r38471  
    5858
    5959void gfits_uncompress_timing () {
     60  return;
     61
    6062  fprintf (stderr, "unc times: %f %f %f\n", timeSum1, timeSum2, timeSum3);
    6163  fprintf (stderr, "unc times: %f %f %f %f %f %f\n", timeSum2a, timeSum2b, timeSum2c, timeSum2d, timeSum2e, timeSum2f);

  • trunk/Ohana/src/markrock/src/markrock.c

    r38441 r38471  
    3636  if (!check_file_access (RockCat, TRUE, TRUE, TRUE)) exit (1);
    3737
     38  dvo_catalog_init (&catalog, TRUE);
    3839  catalog.filename = argv[1];
    3940  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/markstar/src/markstar.c

    r38441 r38471  
    4040  dvo_image_lock (&db, ImageCat, 3600.0, LCK_XCLD);
    4141
     42  dvo_catalog_init (&catalog, TRUE);
    4243  catalog.filename = argv[1];
    4344  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/mosastro/src/getptolemy.c

    r38441 r38471  
    2525  for (i = 0; i <skylist[0].Nregions; i++) {
    2626    // set the parameters which guide catalog open/load/create
     27    dvo_catalog_init (&catalog, TRUE);
    2728    catalog.filename  = skylist[0].filename[i];
    2829    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;

  • trunk/Ohana/src/opihi/dvo/avextract.c

    r38441 r38471  
    184184    }
    185185    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     186
     187    dvo_catalog_init (&catalog, TRUE);
    186188    catalog.filename = (HOST_ID || PARALLEL_LOCAL) ? hostfile : skylist[0].filename[i];
    187189    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/avmatch.c

    r38441 r38471  
    189189    char hostfile[1024];
    190190    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     191
     192    dvo_catalog_init (&catalog, TRUE);
    191193    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
    192194    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    193     catalog.catflags |= needMeasure ? DVO_LOAD_MEASURE    : DVO_SKIP_MEASURE;
     195    catalog.catflags |= needMeasure ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
    194196    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
    195197    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;

  • trunk/Ohana/src/opihi/dvo/calextract.c

    r38441 r38471  
    6060
    6161    /* lock, load, unlock catalog */
     62    dvo_catalog_init (&catalog, TRUE);
    6263    catalog.filename = skylist[0].filename[Nr];
    6364    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/calmextract.c

    r38441 r38471  
    7373
    7474    /* lock, load, unlock catalog */
     75    dvo_catalog_init (&catalog, TRUE);
    7576    catalog.filename = skylist[0].filename[Nr];
    7677    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/catalog.c

    r38441 r38471  
    314314     
    315315      /* lock, load, unlock catalog */
     316      dvo_catalog_init (&catalog, TRUE);
    316317      catalog.filename = filename;
    317318      catalog.catflags = DVO_LOAD_AVERAGE;

  • trunk/Ohana/src/opihi/dvo/ccd.c

    r38441 r38471  
    6868  for (k = 0; (k < skylist[0].Nregions) && !interrupt; k++) {
    6969    /* lock, load, unlock catalog */
     70    dvo_catalog_init (&catalog, TRUE);
    7071    catalog.filename = skylist[0].filename[k];
    7172    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/cmatch.c

    r38441 r38471  
    2828
    2929  /* load data from the photometry database file */
     30  dvo_catalog_init (&catalog1, TRUE);
    3031  catalog1.filename = filename;
    3132  catalog1.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/cmd.c

    r38441 r38471  
    6767  for (j = 0; (j < skylist[0].Nregions) && !interrupt; j++) {
    6868    /* lock, load, unlock catalog */
     69    dvo_catalog_init (&catalog, TRUE);
    6970    catalog.filename = skylist[0].filename[j];
    7071    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/ddmags.c

    r38441 r38471  
    6565  for (k = 0; k < skylist[0].Nregions; k++) {
    6666    /* lock, load, unlock catalog */
     67    dvo_catalog_init (&catalog, TRUE);
    6768    catalog.filename = skylist[0].filename[k];
    6869    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/dmagmeas.c

    r38441 r38471  
    6565  for (j = 0; j < skylist[0].Nregions; j++) {
    6666    /* lock, load, unlock catalog */
     67    dvo_catalog_init (&catalog, TRUE);
    6768    catalog.filename = skylist[0].filename[j];
    6869    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/dmt.c

    r38441 r38471  
    7676  for (k = 0; k < skylist[0].Nregions; k++) {
    7777    /* lock, load, unlock catalog */
     78    dvo_catalog_init (&catalog, TRUE);
    7879    catalog.filename = skylist[0].filename[k];
    7980    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/fitcolors.c

    r38441 r38471  
    161161  for (k = 0; k < skylist[0].Nregions; k++) {
    162162    /* lock, load, unlock catalog */
     163    dvo_catalog_init (&catalog[k], TRUE);
    163164    catalog[k].filename = skylist[0].filename[k];
    164165    catalog[k].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/fitsed.c

    r38441 r38471  
    187187  for (k = 0; k < skylist[0].Nregions; k++) {
    188188    /* lock, load, unlock catalog */
     189    dvo_catalog_init (&catalog, TRUE);
    189190    catalog.filename = skylist[0].filename[k];
    190191    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/gstar.c

    r38463 r38471  
    233233  }
    234234
     235  dvo_catalog_init (&catalog, TRUE);
     236
    235237  HostTable *table = NULL; 
    236238  if (PARALLEL) {

  • trunk/Ohana/src/opihi/dvo/imdata.c

    r38441 r38471  
    135135
    136136    /* get file name and open */
     137    dvo_catalog_init (&catalog, TRUE);
    137138    catalog.filename = skylist[0].filename[j];
    138139    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/lcurve.c

    r38441 r38471  
    7575
    7676  /* set filename, read in header */
     77  dvo_catalog_init (&catalog, TRUE);
    7778  catalog.filename = skylist[0].filename[0];
    7879  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;

  • trunk/Ohana/src/opihi/dvo/lightcurve.c

    r38441 r38471  
    5858
    5959  /* set filename, read in header */
     60  dvo_catalog_init (&catalog, TRUE);
    6061  catalog.filename = skylist[0].filename[0];
    6162  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/mextract.c

    r38441 r38471  
    230230    char hostfile[1024];
    231231    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     232
     233    dvo_catalog_init (&catalog, TRUE);
    232234    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
    233235    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/mmatch.c

    r38441 r38471  
    247247    char hostfile[1024];
    248248    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     249    dvo_catalog_init (&catalog, TRUE);
    249250    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
    250251    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;

  • trunk/Ohana/src/opihi/dvo/mmextract.c

    r38441 r38471  
    182182  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
    183183    /* lock, load, unlock catalog */
     184    dvo_catalog_init (&catalog, TRUE);
    184185    catalog.filename = skylist[0].filename[i];
    185186    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/objectcoverage.c

    r38441 r38471  
    183183  for (k = 0; (k < skylist[0].Nregions) && !interrupt; k++) {
    184184    /* lock, load, unlock catalog */
     185    dvo_catalog_init (&catalog, TRUE);
    185186    catalog.filename = skylist[0].filename[k];
    186187    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/paverage.c

    r38441 r38471  
    104104  Nloaded = 0;
    105105  for (j = 0; (j < skylist[0].Nregions) && !interrupt; j++) {
     106    dvo_catalog_init (&catalog, TRUE);
    106107    catalog.filename = skylist[0].filename[j];
    107108    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;

  • trunk/Ohana/src/opihi/dvo/pmeasure.c

    r38441 r38471  
    177177  Nloaded = 0;
    178178  for (j = 0; (j < skylist[0].Nregions) && !interrupt; j++) {
     179    dvo_catalog_init (&catalog, TRUE);
    179180    catalog.filename = skylist[0].filename[j];
    180181    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;

  • trunk/Ohana/src/opihi/dvo/subpix.c

    r38441 r38471  
    3939
    4040  /* lock, load, unlock catalog */
     41  dvo_catalog_init (&catalog, TRUE);
    4142  catalog.filename = skylist[0].filename[0];
    4243  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;

  • trunk/Ohana/src/photdbc/src/photdbc_catalogs.c

    r38441 r38471  
    2222    char hostfile[DVO_MAX_PATH];
    2323    snprintf (hostfile, DVO_MAX_PATH, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     24
     25    dvo_catalog_init (&incatalog, TRUE);
    2426    incatalog.filename  = hostID ? hostfile : skylist[0].filename[i];
    2527    incatalog.Nsecfilt = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/relastro/src/UpdateObjectOffsets.c

    r38441 r38471  
    2929    char hostfile[1024];
    3030    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     31
     32    dvo_catalog_init (&catalog, TRUE);
    3133    catalog.filename = hostID ? hostfile : skylist[0].filename[i];
    3234

  • trunk/Ohana/src/relastro/src/high_speed_catalogs.c

    r38441 r38471  
    2828    char hostfile[1024];
    2929    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     30
     31    dvo_catalog_init (&catalog, TRUE);
    3032    catalog.filename  = hostID ? hostfile : skylist[0].filename[i];
    3133    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data

  • trunk/Ohana/src/relastro/src/hpm_catalogs.c

    r38441 r38471  
    2626    char hostfile[1024];
    2727    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     28
     29    dvo_catalog_init (&catalog, TRUE);
    2830    catalog.filename  = hostID ? hostfile : skylist[0].filename[i];
    2931    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data

  • trunk/Ohana/src/relastro/src/load_catalogs.c

    r38441 r38471  
    3535    char hostfile[1024];
    3636    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     37
     38    dvo_catalog_init (pcatalog, TRUE);
    3739    pcatalog->filename = hostID ? hostfile : skylist[0].filename[i];
    3840

  • trunk/Ohana/src/relastro/src/relastro_objects.c

    r38441 r38471  
    3939    char hostfile[1024];
    4040    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     41
     42    dvo_catalog_init (&catalog, TRUE);
    4143    catalog.filename  = hostID ? hostfile : skylist[0].filename[i];
    4244

  • trunk/Ohana/src/relphot/src/load_catalogs.c

    r38441 r38471  
    4242    char hostfile[1024];
    4343    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     44    dvo_catalog_init (&tcatalog, TRUE);
    4445    tcatalog.filename    = hostID ? hostfile : skylist[0].filename[i];
    4546    tcatalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;    // don't need to load all data at this point
    4647    tcatalog.Nsecfilt    = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
    47 
    48     // tcatalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    49     // tcatalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    50     // tcatalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
    5148
    5249    if (!dvo_catalog_open (&tcatalog, skylist[0].regions[i], VERBOSE2, "r")) {

  • trunk/Ohana/src/relphot/src/reload_catalogs.c

    r38470 r38471  
    4949    char hostfile[1024];
    5050    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     51
     52    dvo_catalog_init (&catalog, TRUE);
    5153    catalog.filename = hostID ? hostfile : skylist[0].filename[i];
    5254
    … …  
    5961    TIMESTAMP(time1);
    6062
    61     // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    62     // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    63     // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
    6463    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    6564    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog

  • trunk/Ohana/src/relphot/src/relphot_objects.c

    r38470 r38471  
    4242    char hostfile[1024];
    4343    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     44
     45    dvo_catalog_init (&catalog, TRUE);
    4446    catalog.filename    = hostID ? hostfile : skylist[0].filename[i];
    45     // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    46     // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    47     // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
    4847    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4948    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/relphot/src/relphot_synthphot.c

    r38466 r38471  
    4141    char hostfile[1024];
    4242    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     43
     44    dvo_catalog_init (&catalog, TRUE);
    4345    catalog.filename    = hostID ? hostfile : skylist[0].filename[i];
    44     // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    45     // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    46     // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
    4746    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    4847    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/relphot/src/setMrelCatalog.c

    r38466 r38471  
    128128
    129129    // these bits should not be set unless we use them in this pass
    130     measure[k].dbFlags &= ~(ID_MEAS_PHOTOM_PSF | ID_MEAS_PHOTOM_APER | ID_MEAS_PHOTOM_KRON);
     130    // (note that we can only un-set them in the final pass when we actually have measure, not just measureT
     131    if (measure) measure[k].dbFlags &= ~(ID_MEAS_PHOTOM_PSF | ID_MEAS_PHOTOM_APER | ID_MEAS_PHOTOM_KRON);
    131132
    132133    // skip measurements that do not have a valid photcode (raise exception?)

  • trunk/Ohana/src/uniphot/src/update_dvo_ckids.c

    r38441 r38471  
    4343
    4444    // set up the basic catalog info
     45    dvo_catalog_init (&catalog, TRUE);
    4546    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    46     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    47     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    4847    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4948    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/uniphot/src/update_dvo_fiximids.c

    r38441 r38471  
    3838
    3939    // set up the basic catalog info
     40    dvo_catalog_init (&catalog, TRUE);
    4041    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    41     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    42     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    4342    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4443    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/uniphot/src/update_dvo_fixstkids.c

    r38441 r38471  
    3838
    3939    // set up the basic catalog info
     40    dvo_catalog_init (&catalog, TRUE);
    4041    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    41     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    42     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    4342    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4443    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/uniphot/src/update_dvo_setastrom.c

    r38464 r38471  
    4040
    4141    // set up the basic catalog info
     42    dvo_catalog_init (&catalog, TRUE);
    4243    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    43     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    44     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    4544    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    4645    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/uniphot/src/update_dvo_setgalmodel.c

    r38441 r38471  
    3535
    3636    // set up the basic catalog info
     37    dvo_catalog_init (&catalog, TRUE);
    3738    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    38     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    39     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    4039    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
    4140    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/uniphot/src/update_dvo_setphot.c

    r38441 r38471  
    5151
    5252    // set up the basic catalog info
    53     catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    54     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    55     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    56     catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    57     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     53    dvo_catalog_init (&catalog, TRUE);
     54    catalog.filename    = HOST_ID ? localFilename : skylist[0].filename[i];
     55    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     56    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
    5857
    5958    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {

  • trunk/Ohana/src/uniphot/src/update_dvo_setposangle.c

    r38441 r38471  
    5252
    5353    // set up the basic catalog info
     54    dvo_catalog_init (&catalog, TRUE);
    5455    catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
    55     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
    56     catalog.catmode   = DVO_MODE_UNDEF;   // not needed since we skip empty catalogs
    5756    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
    5857    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/uniphot/src/update_dvo_uniphot.c

    r38441 r38471  
    6060 
    6161  for (i = 0; i < pglob.gl_pathc; i++) {
     62    dvo_catalog_init (&catalog, TRUE);
    6263    catalog.filename = pglob.gl_pathv[i];
    6364    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
Note: See TracChangeset for help on using the changeset viewer.