Changeset 39282 for trunk

Timestamp:

Dec 17, 2015, 8:47:03 AM (11 years ago)

Author:

eugene

Message:

handle case of no data in the galaxy table

Location:

trunk/Ohana/src/addstar/src

Files:

• loadgalphot_readstars.c (modified) (2 diffs)
• loadgalphot_table.c (modified) (1 diff)

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

@@ -78 +78 @@
     int found = FALSE;
     int myHash = strhash (tmpname, 0xff);
-    fprintf (stderr, "model %s, hash: %d\n", tmpname, myHash);
+    if (VERBOSE == 2) fprintf (stderr, "model %s, hash: %d\n", tmpname, myHash);
     ModelTypeHash[i] = myHash;
     for (j = 0; (j < 3) && !found; j++) {
@@ -146 +146 @@
 
   ftable_xgal.header = &header_xgal;
+  if (header_xgal.Naxis[1] == 0) {
+    if (VERBOSE) fprintf (stderr, "no data in file %s, skipping\n", filename);
+    gfits_free_header (&header_xgal);
+    gfits_free_header (&PHU);
+    fclose (f);
+    return NULL;
+  }
 
   if (!gfits_fread_ftable_data (f, &ftable_xgal, FALSE)) {

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

@@ -7 +7 @@
 
   GalPhot_Stars *stars = loadgalphot_readstars (filename, &Nstars, options);
+  if (!stars) return FALSE;
 
   // sort the stars by RA