Changeset 8458

Timestamp:

Aug 21, 2006, 4:00:28 PM (20 years ago)

Author:

eugene

Message:

adding some error checking, cleanups based on tests

Location:

trunk/Ohana/src/addstar/src

Files:

• Shutdown.c (modified) (1 diff)
• addstar.c (modified) (4 diffs)
• find_matches.c (modified) (2 diffs)
• find_matches_refstars.c (modified) (1 diff)
• getgsc.c (modified) (1 diff)
• gettycho.c (modified) (1 diff)
• gstars.c (modified) (2 diffs)

trunk/Ohana/src/addstar/src/Shutdown.c

@@ -12 +12 @@
   char *formatplus;
   
-  ALLOCATE (formatplus, char, strlen(format));
+  ALLOCATE (formatplus, char, strlen(format) + 2);
   strcpy (formatplus, format);
   strcat (formatplus, "\n");

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

@@ -94 +94 @@
     catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
     catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
-    catalog.filename = skylist[0].filename[i];
+    catalog.filename  = skylist[0].filename[i];
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     if (options.update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
 
@@ -104 +104 @@
       exit (2);
     }
-    dvo_catalog_test (&catalog, TRUE);
-
     // Nave_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
@@ -143 +141 @@
         break;
     }
-    dvo_catalog_test (&catalog, TRUE);
 
     // write out catalog, if appropriate
@@ -151 +148 @@
       SetProtect (FALSE);
     }
-    dvo_catalog_test (&catalog, TRUE);
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);

trunk/Ohana/src/addstar/src/find_matches.c

@@ -18 +18 @@
 
   /* photcode data - must by of type DEP, (PRI, SEC) - probably should restrict to DEP */
+  // XXX : rely on catalog[0].Nsecfilt or GetPhotcodeNsecfilt??
   Nsecfilt = GetPhotcodeNsecfilt ();
   Nsec = (code[0].type == PHOT_DEP) ? GetPhotcodeNsec (code[0].equiv) : GetPhotcodeNsec (code[0].code);
@@ -333 +334 @@
   }
       
-  free (catalog[0].found);
   REALLOCATE (catalog[0].average, Average, Nave);
   REALLOCATE (catalog[0].measure, Measure, Nmeas);

trunk/Ohana/src/addstar/src/find_matches_refstars.c

@@ -283 +283 @@
   free (catalog[0].found);
   REALLOCATE (catalog[0].average, Average, Nave);
-  REALLOCATE (catalog[0].measure, Measure, Nmeas);
 
   /* fix order of Measure (memory intensive, but fast) */

trunk/Ohana/src/addstar/src/getgsc.c

@@ -25 +25 @@
   
   for (i = 0; i < skylist[0].Nregions; i++) {
-    // XXX : get from table gsc = rd_gsc ((char *)skylist[0].regions[i][0].filename, &Ngsc);
+    gsc = rd_gsc (skylist[0].filename[i], &Ngsc);
 
     REALLOCATE (stars, Stars, MAX (1, Nstars + Ngsc));

trunk/Ohana/src/addstar/src/gettycho.c

@@ -34 +34 @@
     sprintf (filename, "%s/index.dat", TYCHO_DIR);
     tychoTable = SkyTableFromTychoIndex (filename, VERBOSE);
+    if (tychoTable == NULL) {
+      fprintf (stderr, "ERROR: problem loading tycho data\n");
+      exit (2);
+    }
   }
 

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

@@ -5 +5 @@
   FILE *f;
   int j, N, Nbytes, naxis;
-  int itmp, hour, min;
+  int itmp, hour, min, simple;
   char *name, *c, photname[64], line[80];
   double tmp, sec, dMs;
@@ -181 +181 @@
     naxis = 2;
     gfits_scan (&header, "NAXIS",  "%d", 1, &naxis);
-    if ((naxis == 0) && !TEXTMODE) {
+    gfits_scan (&header, "SIMPLE", "%t", 1, &simple);
+    if ((naxis == 0) && !TEXTMODE && simple) {
       Nbytes = gfits_matrix_size (&header);
       fseek (f, Nbytes, SEEK_CUR);