IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

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/opihi/dvo
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • 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;
Note: See TracChangeset for help on using the changeset viewer.