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/addstar
Files:
15 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
Note: See TracChangeset for help on using the changeset viewer.