IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 8361


Ignore:
Timestamp:
Aug 15, 2006, 2:30:53 PM (20 years ago)
Author:
eugene
Message:

moving to the new DVO image/catalog API set

Location:
trunk/Ohana/src/addstar
Files:
21 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/addstar/Makefile

    r8342 r8361  
    2222
    2323ADDSTAR = \
     24$(SRC)/ConfigInit.$(ARCH).o \
     25$(SRC)/SetSignals.$(ARCH).o \
     26$(SRC)/Shutdown.$(ARCH).o \
     27$(SRC)/SkyListForStars.$(ARCH).o \
     28$(SRC)/SkyRegionUtils.$(ARCH).o \
     29$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
    2430$(SRC)/addstar.$(ARCH).o \
    2531$(SRC)/airmass.$(ARCH).o \
    … …  
    2733$(SRC)/build_links.$(ARCH).o \
    2834$(SRC)/calibrate.$(ARCH).o \
    29 $(SRC)/ConfigInit.$(ARCH).o \
    3035$(SRC)/dump.$(ARCH).o \
     36$(SRC)/edge_check.$(ARCH).o \
     37$(SRC)/fakeimage.$(ARCH).o \
     38$(SRC)/find_matches.$(ARCH).o \
     39$(SRC)/find_matches_closest.$(ARCH).o \
     40$(SRC)/find_matches_refstars.$(ARCH).o \
     41$(SRC)/find_subset.$(ARCH).o \
     42$(SRC)/get2mass.$(ARCH).o \
     43$(SRC)/get2mass_as.$(ARCH).o \
     44$(SRC)/get2mass_as_raw.$(ARCH).o \
     45$(SRC)/get2mass_dr2.$(ARCH).o \
     46$(SRC)/get2mass_ops.$(ARCH).o \
     47$(SRC)/getgsc.$(ARCH).o \
     48$(SRC)/gettycho.$(ARCH).o \
     49$(SRC)/getusno.$(ARCH).o \
     50$(SRC)/getusnob.$(ARCH).o \
     51$(SRC)/gimages.$(ARCH).o \
     52$(SRC)/greference.$(ARCH).o \
     53$(SRC)/grefstars.$(ARCH).o \
     54$(SRC)/gstars.$(ARCH).o \
     55$(SRC)/in_image.$(ARCH).o \
     56$(SRC)/load_subpix.$(ARCH).o \
     57$(SRC)/opening_angle.$(ARCH).o \
     58$(SRC)/parse_time.$(ARCH).o \
     59$(SRC)/replace_match.$(ARCH).o \
     60$(SRC)/resort_catalog.$(ARCH).o \
     61$(SRC)/rfits.$(ARCH).o \
     62$(SRC)/rtext.$(ARCH).o \
     63$(SRC)/sort_lists.$(ARCH).o \
     64$(SRC)/update_coords.$(ARCH).o
     65
     66ADDSTARD = \
     67$(SRC)/CheckPassword.$(ARCH).o \
     68$(SRC)/ConfigInit.$(ARCH).o \
     69$(SRC)/NewImage.$(ARCH).o \
     70$(SRC)/NewRefcat.$(ARCH).o \
     71$(SRC)/NewReflist.$(ARCH).o \
     72$(SRC)/SetSignals.$(ARCH).o \
     73$(SRC)/Shutdown.$(ARCH).o \
     74$(SRC)/SkyListForStars.$(ARCH).o \
     75$(SRC)/SkyRegionUtils.$(ARCH).o \
     76$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
     77$(SRC)/SocketOps.$(ARCH).o \
     78$(SRC)/UpdateDatabase_Image.$(ARCH).o \
     79$(SRC)/UpdateDatabase_Refcat.$(ARCH).o \
     80$(SRC)/UpdateDatabase_Reflist.$(ARCH).o \
     81$(SRC)/addstard.$(ARCH).o \
     82$(SRC)/airmass.$(ARCH).o \
     83$(SRC)/args_server.$(ARCH).o \
     84$(SRC)/build_links.$(ARCH).o \
     85$(SRC)/calibrate.$(ARCH).o \
    3186$(SRC)/edge_check.$(ARCH).o \
    3287$(SRC)/find_matches.$(ARCH).o \
    … …  
    3489$(SRC)/find_matches_refstars.$(ARCH).o \
    3590$(SRC)/find_subset.$(ARCH).o \
    36 $(SRC)/fakeimage.$(ARCH).o \
    3791$(SRC)/get2mass.$(ARCH).o \
    3892$(SRC)/get2mass_as.$(ARCH).o \
    39 $(SRC)/get2mass_ops.$(ARCH).o \
    4093$(SRC)/get2mass_as_raw.$(ARCH).o \
    4194$(SRC)/get2mass_dr2.$(ARCH).o \
     95$(SRC)/get2mass_ops.$(ARCH).o \
    4296$(SRC)/getgsc.$(ARCH).o \
     97$(SRC)/gettycho.$(ARCH).o \
    4398$(SRC)/getusno.$(ARCH).o \
    4499$(SRC)/getusnob.$(ARCH).o \
    45 $(SRC)/gettycho.$(ARCH).o \
     100$(SRC)/gimages.$(ARCH).o \
    46101$(SRC)/greference.$(ARCH).o \
    47 $(SRC)/grefstars.$(ARCH).o \
    48 $(SRC)/gimages.$(ARCH).o \
    49 $(SRC)/gstars.$(ARCH).o \
    50102$(SRC)/in_image.$(ARCH).o \
    51103$(SRC)/load_subpix.$(ARCH).o \
    52104$(SRC)/opening_angle.$(ARCH).o \
    53 $(SRC)/parse_time.$(ARCH).o \
    54 $(SRC)/replace_match.$(ARCH).o \
    55 $(SRC)/resort_catalog.$(ARCH).o \
    56 $(SRC)/SetSignals.$(ARCH).o \
    57 $(SRC)/sort_lists.$(ARCH).o \
    58 $(SRC)/update_coords.$(ARCH).o \
    59 $(SRC)/Shutdown.$(ARCH).o \
    60 $(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
    61 $(SRC)/SkyRegionUtils.$(ARCH).o \
    62 $(SRC)/SkyListForStars.$(ARCH).o \
    63 $(SRC)/rfits.$(ARCH).o \
    64 $(SRC)/rtext.$(ARCH).o
    65 
    66 GSC-OPS = \
    67 $(SRC)/RegionOps.$(ARCH).o \
    68 $(SRC)/gregion_image.$(ARCH).o \
    69 $(SRC)/gregion_match.$(ARCH).o \
    70 $(SRC)/gregion_patch.$(ARCH).o \
    71 $(SRC)/gregion_star.$(ARCH).o
    72 
    73 MKACC-2MASS = \
    74 $(SRC)/mkacc-2mass.$(ARCH).o \
    75 $(SRC)/image-db.$(ARCH).o \
    76 $(SRC)/ConfigInit.$(ARCH).o \
    77 $(SRC)/SetSignals.$(ARCH).o \
    78 $(SRC)/wimage.$(ARCH).o \
    79 $(SRC)/get2mass_as.$(ARCH).o
    80 
    81 SCAN-2MASS = \
    82 $(SRC)/scan2mass.$(ARCH).o \
    83 $(SRC)/scan2mass_as_data.$(ARCH).o \
    84 $(SRC)/get2mass_as.$(ARCH).o \
    85 $(SRC)/ConfigInit.$(ARCH).o \
    86 $(SRC)/Shutdown.$(ARCH).o \
    87 $(SRC)/SetSignals.$(ARCH).o
    88 
    89 LOAD-2MASS = \
    90 $(SRC)/load2mass.$(ARCH).o \
    91 $(SRC)/load2mass_as_rawdata.$(ARCH).o \
    92 $(SRC)/load2mass_catalog.$(ARCH).o \
    93 $(SRC)/get2mass_ops.$(ARCH).o \
    94 $(SRC)/find_matches_refstars.$(ARCH).o \
    95 $(SRC)/load_pt_catalog.$(ARCH).o \
    96 $(SRC)/args_load2mass.$(ARCH).o \
    97 $(SRC)/sort_lists.$(ARCH).o \
    98 $(SRC)/replace_match.$(ARCH).o \
    99 $(SRC)/update_coords.$(ARCH).o \
    100 $(SRC)/gcatalog.$(ARCH).o \
    101 $(SRC)/mkcatalog.$(ARCH).o \
    102 $(SRC)/wcatalog.$(ARCH).o \
    103 $(SRC)/ConfigInit.$(ARCH).o \
    104 $(SRC)/Shutdown.$(ARCH).o \
    105 $(SRC)/SetSignals.$(ARCH).o
    106 
    107 SEDSTAR = \
    108 $(SRC)/sedstar.$(ARCH).o \
    109 $(SRC)/SEDtableLoad.$(ARCH).o \
    110 $(SRC)/SEDfit.$(ARCH).o \
    111 $(SRC)/SEDops.$(ARCH).o \
    112 $(SRC)/args_sedstar.$(ARCH).o \
    113 $(SRC)/gcatalog.$(ARCH).o \
    114 $(SRC)/mkcatalog.$(ARCH).o \
    115 $(SRC)/wcatalog.$(ARCH).o \
    116 $(SRC)/ConfigInit.$(ARCH).o \
    117 $(SRC)/Shutdown.$(ARCH).o \
    118 $(SRC)/SetSignals.$(ARCH).o
    119 
    120 EXTRA = \
    121 $(SRC)/bracket.$(ARCH).o \
    122 $(SRC)/find_proper.$(ARCH).o \
    123 $(SRC)/gregion_match_glob.$(ARCH).o \
    124 $(SRC)/gregions.$(ARCH).o \
    125 $(SRC)/match_refstars.$(ARCH).o \
    126 
    127 ADDSTARD = \
    128 $(SRC)/addstard.$(ARCH).o \
     105$(SRC)/replace_match.$(ARCH).o \
     106$(SRC)/sort_lists.$(ARCH).o \
     107$(SRC)/update_coords.$(ARCH).o
     108
     109ADDSTART = \
     110$(SRC)/addstart.$(ARCH).o \
     111$(SRC)/DatasetOps.$(ARCH).o \
    129112$(SRC)/SocketOps.$(ARCH).o \
    130113$(SRC)/ConfigInit.$(ARCH).o \
    … …  
    143126$(SRC)/get2mass.$(ARCH).o \
    144127$(SRC)/get2mass_as.$(ARCH).o \
     128$(SRC)/get2mass_as_raw.$(ARCH).o \
    145129$(SRC)/get2mass_dr2.$(ARCH).o \
     130$(SRC)/get2mass_ops.$(ARCH).o \
    146131$(SRC)/getgsc.$(ARCH).o \
    147132$(SRC)/getusno.$(ARCH).o \
    … …  
    149134$(SRC)/gettycho.$(ARCH).o \
    150135$(SRC)/greference.$(ARCH).o \
    151 $(SRC)/gcatalog.$(ARCH).o \
    152136$(SRC)/gimages.$(ARCH).o \
    153 $(SRC)/image-db.$(ARCH).o \
    154137$(SRC)/in_image.$(ARCH).o \
    155 $(SRC)/load_pt_catalog.$(ARCH).o \
    156 $(SRC)/load_subpix.$(ARCH).o \
    157 $(SRC)/mkcatalog.$(ARCH).o \
     138$(SRC)/load_subpix.$(ARCH).o \
    158139$(SRC)/replace_match.$(ARCH).o \
    159140$(SRC)/SetSignals.$(ARCH).o \
    … …  
    162143$(SRC)/sort_lists.$(ARCH).o \
    163144$(SRC)/update_coords.$(ARCH).o \
    164 $(SRC)/wcatalog.$(ARCH).o \
    165 $(SRC)/Shutdown.$(ARCH).o \
    166 $(SRC)/edge_check.$(ARCH).o \
    167 $(SRC)/opening_angle.$(ARCH).o \
    168 $(SRC)/NewImage.$(ARCH).o \
    169 $(SRC)/NewReflist.$(ARCH).o \
    170 $(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
    171 $(SRC)/NewRefcat.$(ARCH).o
    172 
    173 ADDSTART = \
    174 $(SRC)/addstart.$(ARCH).o \
    175 $(SRC)/DatasetOps.$(ARCH).o \
    176 $(SRC)/SocketOps.$(ARCH).o \
    177 $(SRC)/ConfigInit.$(ARCH).o \
    178 $(SRC)/args_server.$(ARCH).o \
    179 $(SRC)/CheckPassword.$(ARCH).o \
    180 $(SRC)/UpdateDatabase_Image.$(ARCH).o \
    181 $(SRC)/UpdateDatabase_Reflist.$(ARCH).o \
    182 $(SRC)/UpdateDatabase_Refcat.$(ARCH).o \
    183 $(SRC)/airmass.$(ARCH).o \
    184 $(SRC)/build_links.$(ARCH).o \
    185 $(SRC)/calibrate.$(ARCH).o \
    186 $(SRC)/find_matches.$(ARCH).o \
    187 $(SRC)/find_matches_closest.$(ARCH).o \
    188 $(SRC)/find_matches_refstars.$(ARCH).o \
    189 $(SRC)/find_subset.$(ARCH).o \
    190 $(SRC)/get2mass.$(ARCH).o \
    191 $(SRC)/get2mass_as.$(ARCH).o \
    192 $(SRC)/get2mass_dr2.$(ARCH).o \
    193 $(SRC)/getgsc.$(ARCH).o \
    194 $(SRC)/getusno.$(ARCH).o \
    195 $(SRC)/getusnob.$(ARCH).o \
    196 $(SRC)/gettycho.$(ARCH).o \
    197 $(SRC)/greference.$(ARCH).o \
    198 $(SRC)/gcatalog.$(ARCH).o \
    199 $(SRC)/gimages.$(ARCH).o \
    200 $(SRC)/image-db.$(ARCH).o \
    201 $(SRC)/in_image.$(ARCH).o \
    202 $(SRC)/load_pt_catalog.$(ARCH).o \
    203 $(SRC)/load_subpix.$(ARCH).o \
    204 $(SRC)/mkcatalog.$(ARCH).o \
    205 $(SRC)/replace_match.$(ARCH).o \
    206 $(SRC)/SetSignals.$(ARCH).o \
    207 $(SRC)/SkyRegionUtils.$(ARCH).o \
    208 $(SRC)/SkyListForStars.$(ARCH).o \
    209 $(SRC)/sort_lists.$(ARCH).o \
    210 $(SRC)/update_coords.$(ARCH).o \
    211 $(SRC)/wcatalog.$(ARCH).o \
    212145$(SRC)/Shutdown.$(ARCH).o \
    213146$(SRC)/edge_check.$(ARCH).o \
    … …  
    233166$(SRC)/args_client.$(ARCH).o
    234167
     168### this program may need to be repaired (EAM 2006.08)
     169MKACC-2MASS = \
     170$(SRC)/mkacc-2mass.$(ARCH).o \
     171$(SRC)/ConfigInit.$(ARCH).o \
     172$(SRC)/SetSignals.$(ARCH).o \
     173$(SRC)/get2mass_as.$(ARCH).o
     174
     175LOAD-2MASS = \
     176$(SRC)/load2mass.$(ARCH).o \
     177$(SRC)/load2mass_as_rawdata.$(ARCH).o \
     178$(SRC)/load2mass_catalog.$(ARCH).o \
     179$(SRC)/get2mass_ops.$(ARCH).o \
     180$(SRC)/find_matches_refstars.$(ARCH).o \
     181$(SRC)/args_load2mass.$(ARCH).o \
     182$(SRC)/sort_lists.$(ARCH).o \
     183$(SRC)/replace_match.$(ARCH).o \
     184$(SRC)/update_coords.$(ARCH).o \
     185$(SRC)/ConfigInit.$(ARCH).o \
     186$(SRC)/Shutdown.$(ARCH).o \
     187$(SRC)/SetSignals.$(ARCH).o
     188
     189SEDSTAR = \
     190$(SRC)/sedstar.$(ARCH).o \
     191$(SRC)/SEDtableLoad.$(ARCH).o \
     192$(SRC)/SEDfit.$(ARCH).o \
     193$(SRC)/SEDops.$(ARCH).o \
     194$(SRC)/args_sedstar.$(ARCH).o \
     195$(SRC)/ConfigInit.$(ARCH).o \
     196$(SRC)/Shutdown.$(ARCH).o \
     197$(SRC)/SetSignals.$(ARCH).o
     198
    235199$(ADDSTARC) : $(INC)/addstar.h
    236200$(ADDSTARD) : $(INC)/addstar.h
    … …  
    252216$(BIN)/addstarc.$(ARCH) : $(ADDSTARC)
    253217
    254 gztest                  : $(BIN)/gztest.$(ARCH)
    255 
    256218mkacc-2mass                : $(BIN)/mkacc-2mass.$(ARCH)
    257219$(BIN)/mkacc-2mass.$(ARCH) : $(MKACC-2MASS)
    258220mkacc-2mass.install        : $(DESTBIN)/mkacc-2mass
    259221
    260 scan2mass                : $(BIN)/scan2mass.$(ARCH)
    261 $(BIN)/scan2mass.$(ARCH) : $(SCAN-2MASS)
    262 scan2mass.install        : $(DESTBIN)/scan2mass
     222sedstar                  : $(BIN)/sedstar.$(ARCH)
     223$(BIN)/sedstar.$(ARCH)   : $(SEDSTAR)
     224sedstar.install          : $(DESTBIN)/sedstar
    263225
    264226load2mass                : $(BIN)/load2mass.$(ARCH)
    … …  
    266228load2mass.install        : $(DESTBIN)/load2mass
    267229
    268 sedstar                  : $(BIN)/sedstar.$(ARCH)
    269 $(BIN)/sedstar.$(ARCH)   : $(SEDSTAR)
    270 sedstar.install          : $(DESTBIN)/sedstar
    271 
    272 all: addstar addstarc addstard addstart
     230gztest                  : $(BIN)/gztest.$(ARCH)
     231
     232all: addstar addstarc addstard addstart sedstar load2mass
    273233
    274234INSTALL = addstar

  • trunk/Ohana/src/addstar/include/2mass.h

    r7780 r8361  
    2222
    2323SkyTable *get2mass_acc (SkyRegion *patch, char *path, char *accel);
    24 Stars *get2mass_2DR_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars);
    25 Stars *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
    26 Stars *get2mass_AS_rawdata (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
     24Stars    *get2mass_2DR_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars);
     25Stars    *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
     26Stars    *get2mass_AS_rawdata (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
    2727
    2828SkyTable *scan2mass_acc (char *path, char *accel);
    29 int scan2mass_as_data (char *filename);
     29int       scan2mass_as_data (char *filename);
    3030
    31 char *skipNbounds (char *line, char bound, int Nbound, int Nbyte);
    32 e_time get2mass_time (char *ptr, int Nbound, int Nbyte);
     31char     *skipNbounds (char *line, char bound, int Nbound, int Nbyte);
     32e_time    get2mass_time (char *ptr, int Nbound, int Nbyte);
     33e_time    get2mass_date (char *ptr, int Nbound, int Nmax);
    3334
    34 int load2mass_as_rawdata (SkyTable *skytable, char *filename, AddstarClientOptions options);
     35int       load2mass_as_rawdata (SkyTable *skytable, char *filename, AddstarClientOptions options);
    3536SkyTable *load2mass_acc (char *path, char *accel);
    36 int get2mass_3star (Stars *star, char *line, int Nmax);
    37 int load2mass_catalog (Catalog *catalog, Stars *stars, int Nstars);
     37int       get2mass_3star (Stars *star, char *line, int Nmax);
     38int       load2mass_catalog (Catalog *catalog, Stars *stars, int Nstars);
    3839
    39 int get2mass_setup (int photcode);
    40 int get2mass_coords (char *line, double *R, double *D, int Nmax);
     40int       get2mass_setup (int photcode);
     41int       get2mass_coords (char *line, double *R, double *D, int Nmax);
     42int       get2mass_star (Stars *star, char *line, int Nmax);
     43int       get2mass_3star (Stars *star, char *line, int Nmax);

  • trunk/Ohana/src/addstar/include/sedstar.h

    r7696 r8361  
    3838SEDfit SEDchisq (SEDtableRow *ref, SEDtableRow *data, SEDtableRow *error, int Nfilter);
    3939SEDtable *SEDtableLoad (char *filename);
    40 int SEDcolorBracket (SEDtable *table, float color);
     40int SEDcolorBracket (SEDtable *table, float color, float delta);
    4141int SEDfitInit (SEDtable *table);
    4242int SEDfitPlot (SEDtable *table, double R, double D, SEDfit *minFit, SEDtableRow *sourceValue, SEDtableRow *sourceError);
     43int SEDfitClear ();
    4344int SEDfitCatalog (Catalog *outcat, Catalog *incat, SEDtable *table);
    4445void SetLimitsRaw (float *xvec, float *yvec, int Nelements, Graphdata *graphmode);

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

    r8002 r8361  
    55int SEDfitCatalog (Catalog *outcat, Catalog *incat, SEDtable *table) {
    66 
    7   int i, j, m, idx, start, done, row, Nsec, Nfit, Nphot, fd;
    8   int Nave, Nmeas, NAVE, NMEAS;
     7  int i, j, m, n, idx, start, done, row, Nsec, Nfit, Nphot;
     8  int Nave, Nmeas, NAVE, NMEAS, Nmodel, Nreq;
    99  unsigned short USNOred, USNOblu;
    1010  float color;
    … …  
    183183    }
    184184
    185     for (j = 0; valid && (j < Nmodel; j++) {
     185    for (j = 0; valid && (j < Nmodel); j++) {
    186186      n = modelRow[j];
    187187      outcat[0].measure[Nmeas].dR_PS       = 0.0;
    … …  
    222222
    223223  SEDfitClear ();
     224  return (TRUE);
    224225}

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

    r8002 r8361  
    141141
    142142  int j, minRow, Nfilter;
    143   double tmp, X, Y;
     143  double X, Y;
    144144  char line[1024], key[20];
    145145

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

    r6236 r8361  
    1212  // sky = SkyTableFromGSC (GSCFILE, SKY_DEPTH, VERBOSE);
    1313
    14   if (options[0].update) {
    15     catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
    16   } else {
    17     catalog.catflags = LOAD_AVES | LOAD_MEAS      | LOAD_MISS | LOAD_SECF;
    18   }
    19  
    2014  if (options[0].mode != M_IMAGE) {
    2115    fprintf (stderr, "error: expecting only IMAGE mode\n");
    … …  
    2317  }
    2418
     19  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     20  if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
     21 
    2522  SetAirmassQuality (options[0].quality_airmass);
    2623
    … …  
    5754  for (i = 0; i < skylist[0].Nregions; i++) {
    5855
    59     catalog.filename = skylist[0].filename[i];
    60     load_pt_catalog (&catalog, skylist[0].regions[i]);
     56    // set the parameters which guide catalog open/load/create
     57    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
     58    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
     59    catalog.filename  = skylist[0].filename[i];
     60    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     61    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     62    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
    6163
    62     /* for only_match, skip empty catalogs XXX EAM : this leaves behind empty files */
     64    // an error exit status here is a significant error
     65    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
     66      fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", catalog.filename);
     67      exit (2);
     68    }
     69
     70    // Nave_disk == 0 implies an empty catalog file
     71    // for only_match, skip empty catalogs
    6372    if ((catalog.Nave_disk == 0) && options[0].only_match) {
    64       unlock_catalog (&catalog);
     73      dvo_catalog_unlock (&catalog);
     74      dvo_catalog_free (&catalog);
    6575      continue;
    6676    }
    … …  
    7282    }
    7383
    74     SetProtect (TRUE);
    75     if (!options[0].only_images) wcatalog (&catalog);
    76     SetProtect (FALSE);
    77     unlock_catalog (&catalog);
     84    if (!options[0].only_images) {
     85      SetProtect (TRUE);
     86      dvo_catalog_save (&catalog, VERBOSE);
     87      SetProtect (FALSE);
     88    }
     89    dvo_catalog_unlock (&catalog);
     90    dvo_catalog_free (&catalog);
    7891  }
    7992
    8093  if (options[0].calibrate) { FindCalibration (image); }
    81 
     94 
    8295  /*** load image db, save new image ***/
    8396  {
    … …  
    92105    overlap = gimages (&db, image, mosaic, &Noverlap);
    93106
    94     if (db.dbstate == LCK_EMPTY) create_image_db (&db);
     107    if (db.dbstate == LCK_EMPTY) dvo_image_create (&db, ZeroPt);
    95108 
    96109    /* write out new image */
    … …  
    101114    dvo_image_unlock (&db);
    102115  }
     116  free (mosaic);
     117  free (image);
     118  free (stars);
    103119  return (TRUE);
    104120}

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

    r6236 r8361  
    88  SkyList *skylist;
    99
    10   if (options[0].update) {
    11     catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
    12   } else {
    13     catalog.catflags = LOAD_AVES | LOAD_MEAS      | LOAD_MISS | LOAD_SECF;
    14   }
    15  
    1610  if (options[0].mode != M_REFCAT) {
    1711    fprintf (stderr, "error: expecting only REFCAT mode\n");
    … …  
    1913  }
    2014
    21   /* check on directory, create if needed */
    22   {
    23     int status, cmode;
    24     struct stat filestat;
    25    
    26     status = stat (CATDIR, &filestat);
    27     if (status == -1) {
    28       fprintf (stderr, "directory %s does not exist, creating...\n", CATDIR);
    29       cmode = S_IRWXU | S_IRWXG | S_IRWXO;
    30       status = mkdir (CATDIR, cmode);
    31       if (status == -1) {
    32         fprintf (stderr, "ERROR: can't create %s\n", CATDIR);
    33         exit (1);
    34       }
    35     }
    36   }
     15  if (!check_dir_access (CATDIR, VERBOSE)) exit (1);
    3716
    3817  /*** update catalog: average, measure, etc ***/
    … …  
    5231  for (i = 0; i < skylist[0].Nregions; i++) {
    5332
    54     catalog.filename = skylist[0].filename[i];
    55     load_pt_catalog (&catalog, skylist[0].regions[i]);
     33    // set the parameters which guide catalog open/load/create
     34    catalog.filename  = skylist[0].filename[i];
     35    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     36    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
     37    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_MEAS_META | LOAD_MISS | LOAD_SECF;
     40 
     41    // an error exit status here is a significant error
     42    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
     43      fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", catalog.filename);
     44      exit (2);
     45    }
    5646
    57     /* for only_match, skip empty catalogs XXX EAM : this leaves behind empty files */
     47    // Nave_disk == 0 implies an empty catalog file
     48    // for only_match, skip empty catalogs
    5849    if ((catalog.Nave_disk == 0) && options[0].only_match) {
    59       unlock_catalog (&catalog);
     50      dvo_catalog_unlock (&catalog);
     51      dvo_catalog_free (&catalog);
    6052      continue;
    6153    }
    6254
    63     /* load stars from corresponding catalog */
     55    // load stars from corresponding catalog
    6456    stars = grefcat (refcat, skylist[0].regions[i], options[0].photcode, &Nstars);
    6557
    … …  
    6860    if (Nsubset) free (subset);
    6961
    70     SetProtect (TRUE);
    71     if (!options[0].only_images) wcatalog (&catalog);
    72     SetProtect (FALSE);
    73     unlock_catalog (&catalog);
     62    if (!options[0].only_images) {
     63      SetProtect (TRUE);
     64      dvo_catalog_save (&catalog, VERBOSE);
     65      SetProtect (FALSE);
     66    }
     67    dvo_catalog_unlock (&catalog);
     68    dvo_catalog_free (&catalog);
     69    free (stars);
    7470  }
    7571  return (TRUE);

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

    r6236 r8361  
    88  SkyList *skylist;
    99
    10   /* this should be loaded by addstard on start -- keep static? */
    11   /* need to load the correct sky table (GSC default or local verison) */
    12   // sky = SkyTableFromGSC (GSCFILE, SKY_DEPTH, VERBOSE);
    13 
    14   if (options[0].update) {
    15     catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
    16   } else {
    17     catalog.catflags = LOAD_AVES | LOAD_MEAS      | LOAD_MISS | LOAD_SECF;
    18   }
    19  
    2010  if (options[0].mode != M_REFLIST) {
    2111    fprintf (stderr, "error: expecting only REFLIST mode\n");
    … …  
    2313  }
    2414
    25   /* check on directory, create if needed XXX : move to utils */
    26   {
    27     int status, cmode;
    28     struct stat filestat;
    29    
    30     status = stat (CATDIR, &filestat);
    31     if (status == -1) {
    32       fprintf (stderr, "directory %s does not exist, creating...\n", CATDIR);
    33       cmode = S_IRWXU | S_IRWXG | S_IRWXO;
    34       status = mkdir (CATDIR, cmode);
    35       if (status == -1) {
    36         fprintf (stderr, "ERROR: can't create %s\n", CATDIR);
    37         exit (1);
    38       }
    39     }
    40   }
     15  if (!check_dir_access (CATDIR, VERBOSE)) exit (1);
    4116
    4217  /*** update catalog: average, measure, etc ***/
    … …  
    4621
    4722  /* reduce regions to existing subset, if necessary */
    48   SkyListSetFilenames (skylist, CATDIR, "cpt");
    4923  if (options[0].only_match || options[0].existing_regions) {
    5024    SkyList *tmp;
    … …  
    5731  for (i = 0; i < skylist[0].Nregions; i++) {
    5832
    59     catalog.filename = skylist[0].filename[i];
    60     load_pt_catalog (&catalog, skylist[0].regions[i]);
     33    // set the parameters which guide catalog open/load/create
     34    catalog.filename  = skylist[0].filename[i];
     35    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     36    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
     37    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_MEAS_META | LOAD_MISS | LOAD_SECF;
     40
     41    // an error exit status here is a significant error
     42    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
     43      fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", catalog.filename);
     44      exit (2);
     45    }
    6146
    6247    /* for only_match, skip empty catalogs XXX EAM : this leaves behind empty files */
    6348    if ((catalog.Nave_disk == 0) && options[0].only_match) {
    64       unlock_catalog (&catalog);
     49      dvo_catalog_unlock (&catalog);
     50      dvo_catalog_free (&catalog);
    6551      continue;
    6652    }
    … …  
    7056    if (Nsubset) free (subset);
    7157
    72     SetProtect (TRUE);
    73     if (!options[0].only_images) wcatalog (&catalog);
    74     SetProtect (FALSE);
    75     unlock_catalog (&catalog);
     58    if (!options[0].only_images) {
     59      SetProtect (TRUE);
     60      dvo_catalog_save (&catalog, VERBOSE);
     61      SetProtect (FALSE);
     62    }
     63    dvo_catalog_unlock (&catalog);
     64    dvo_catalog_free (&catalog);
    7665  }
     66
     67  free (stars);
    7768  return (TRUE);
    7869}

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

    r8342 r8361  
    3232
    3333  /* we use the image table to lock db access -- perhaps this is not necessary? */
    34   db.mode = dvo_catalog_catmode (CATMODE);
     34  db.mode   = dvo_catalog_catmode (CATMODE);
    3535  db.format = dvo_catalog_catformat (CATFORMAT);
    36   status = dvo_image_lock (&db, ImageCat, 3600.0, LCK_XCLD);
     36  status    = dvo_image_lock (&db, ImageCat, 3600.0, LCK_XCLD);
    3737  if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
    3838
    … …  
    9696    catalog.filename = skylist[0].filename[i];
    9797    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
    98     catalog.catflags = LOAD_AVES | LOAD_MEAS      | LOAD_MISS | LOAD_SECF;
     98    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    9999    if (options.update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
    100100

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

    r6674 r8361  
    77  pthread_t thread;
    88  DVO_DATA *dataset;
    9   // pthread_attr_t attr;
    109
    1110  options = ConfigInit (&argc, argv);
    … …  
    1817  VERBOSE = TRUE;
    1918
    20   /* if we separate the incoming data from db update, spawn db thread here */
    21   /* this needs to be launched with pthreads
    22    * we can probably launch multiple copies of dbthread */
    23 
    2419  InitDataset ();
    2520
    26   /* decide if we need an argument to dbthread */
     21  // launch thread to listen for client data
    2722  pthread_create (&thread, NULL, &ListenClients_Thread, NULL);
    2823
     24  // XXX need to watch for shutdown message
    2925  while (1) {
    30 
    31     /* need to watch for shutdown message */
    3226
    3327    dataset = PopDataset ();

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

    r7688 r8361  
    1111Stars *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars) {
    1212 
    13   int FilterSkip, TimeSkip;
    14   int Nstars, NSTARS, Nbyte, Nextra, Qentry;
     13  int Nstars, NSTARS, Nbyte, Nextra;
    1514  Stars *stars;
    1615  gzFile gf;
    17   char qc;
    1816  char *buffer;
    19   char *p, *q, *ptr, *tmp;
    20   double RA, DEC, M, dM;
     17  char *p, *q, *tmp;
     18  double RA, DEC;
    2119  double RA0, RA1, DEC0, DEC1;
    22   e_time time;
    2320
    2421  ALLOCATE (buffer, char, NBYTE);

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

    r7688 r8361  
    1212Stars *get2mass_AS_rawdata (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars) {
    1313 
    14   int FilterSkip, TimeSkip;
    15   int Nstars, NSTARS, Nbyte, Nextra, Qentry;
    16   int Noffset, dNoffset;
     14  int Nstars, NSTARS, Nbyte, Nextra;
    1715  Stars *stars;
    1816  FILE *f;
    19   char qc;
    2017  char *buffer;
    21   char *p, *q, *ptr, *tmp;
    22   double RA, DEC, M, dM;
     18  char *p, *q, *tmp;
     19  double RA, DEC;
    2320  double RA0, RA1, DEC0, DEC1;
    24   e_time time;
    2521
    2622  ALLOCATE (buffer, char, NBYTE);

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

    r5347 r8361  
    3737
    3838/* stars.found is set here to FALSE.
    39    gregion_stars uses this value as a boolean to decide if the star
    40      has been associated with a region.
    41    gregion_stars resets stars.found to -1
    4239   find_match_refstars uses stars.found to identify the seq number of the
    43      star which is found.  it requires an initial value of -1
     40   star which is found.  it requires an initial value of -1 XXX
    4441*/

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

    r8003 r8361  
    44
    55  FILE *f;
    6   int j, N, Nbytes, extend, naxis;
     6  int j, N, Nbytes, naxis;
    77  int itmp, hour, min;
    88  char *name, *c, photname[64], line[80];

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

    r7780 r8361  
    2929
    3030  get2mass_setup (-1);
    31 
    32   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    3331
    3432  ALLOCATE (buffer, char, NBYTE);
    … …  
    152150        verbose = VERBOSE;
    153151        VERBOSE = FALSE;
     152
    154153        // now we have all of the loaded stars in this catalog
    155154        catalog.filename = skylist[0].filename[0];
    156         load_pt_catalog (&catalog, skylist[0].regions[0]);
     155        catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
     156        catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
     157        catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     158        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     159
     160        // an error exit status here is a significant error
     161        if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
     162          fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", catalog.filename);
     163          exit (2);
     164        }
    157165
    158166        // assume no input star matches an existing star
    … …  
    160168        load2mass_catalog (&catalog, stars, Nstars);
    161169
    162         wcatalog (&catalog);
    163         unlock_catalog (&catalog);
     170        dvo_catalog_save (&catalog, VERBOSE);
     171        dvo_catalog_unlock (&catalog);
     172        dvo_catalog_free (&catalog);
    164173        // free (catalog.filename);
    165174        // XXX don't free this! it points to an element of the skytable

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

    r8002 r8361  
    44
    55  char *root, *ext, tmp;
    6   int i, N, Nbytes, Nrefcat, status;
     6  int i, Nbytes;
    77  SkyList *skylist;
    8   SkyTable *sky, *sky2mass;
     8  SkyTable *sky;
    99  AddstarClientOptions options;
    1010  Catalog incatalog, outcatalog;
    … …  
    2828    incatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
    2929
    30     // lock and open input catalog
    31     status = lock_catalog (&incatalog, LCK_XCLD);
    32     if (status != 1) {
    33         if (VERBOSE) fprintf (stderr, "skipping empty region\n");
    34         continue;
     30    // an error exit status here is a significant error
     31    if (!dvo_catalog_open (&incatalog, skylist[0].regions[i], VERBOSE, "r")) {
     32      fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", incatalog.filename);
     33      exit (2);
    3534    }
    36     gcatalog (&incatalog);
     35
     36    // Nave_disk == 0 implies an empty catalog file
     37    if ((incatalog.Nave_disk == 0) && options.only_match) {
     38      if (VERBOSE) fprintf (stderr, "skipping empty region\n");
     39      dvo_catalog_unlock (&incatalog);
     40      dvo_catalog_free (&incatalog);
     41      continue;
     42    }
    3743
    3844    // create output catalog filename
    39     // XXX make the output catalog optional
    4045    root = strstr (incatalog.filename, CATDIR);
    4146    if (root == NULL) Shutdown ("error with input catalog name");
    42 
    4347    ext = incatalog.filename + strlen(CATDIR);
    4448    while (*ext == '/') ext++;
    45 
    4649    Nbytes = snprintf (&tmp, 0, "%s/%s", argv[2], ext);
    4750    ALLOCATE (outcatalog.filename, char, Nbytes + 1);
    4851    snprintf (outcatalog.filename, Nbytes + 1, "%s/%s", argv[2], ext);
    4952
    50     if (!check_file_access (outcatalog.filename, TRUE, TRUE)) Shutdown ("can't create output directory");
     53    outcatalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
     54    outcatalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
     55    outcatalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     56    outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    5157
    52     status = lock_catalog (&outcatalog, LCK_XCLD);
    53     if (status != 2) Shutdown ("error: output catalog exists");
    54     mkcatalog (skylist[0].regions[i], &outcatalog); /* fills in new header info */
     58    // an error exit status here is a significant error
     59    if (!dvo_catalog_open (&outcatalog, skylist[0].regions[i], VERBOSE, "w")) {
     60      Shutdown ("ERROR: failure to open/create catalog file %s\n", outcatalog.filename);
     61    }
    5562
    5663    SEDfitCatalog (&outcatalog, &incatalog, sedtable);
    5764   
    58     wcatalog (&outcatalog);
    59     unlock_catalog (&outcatalog);
    60     free (outcatalog.filename);
    61     free_catalog (&outcatalog);
     65    dvo_catalog_save (&outcatalog, VERBOSE);
     66    dvo_catalog_unlock (&outcatalog);
     67    dvo_catalog_free (&outcatalog);
    6268
    63     unlock_catalog (&incatalog);
    64     free_catalog (&incatalog);
     69    dvo_catalog_unlock (&incatalog);
     70    dvo_catalog_free (&incatalog);
     71    // XXX free filename or not?
    6572  }
    66 
    6773  exit (0);
    6874} 
Note: See TracChangeset for help on using the changeset viewer.