Changeset 39926 for trunk/psastro/src/psastroAstromGuess.c

Timestamp:

Jan 6, 2017, 11:30:10 AM (10 years ago)

Author:

eugene

Message:

merging changes from czw dev branch (compare with r39924)

Location:

trunk

Files:

• . (modified) (1 prop)
• psastro/src/psastroAstromGuess.c (modified) (3 diffs)

trunk/psastro/src/psastroAstromGuess.c

@@ -75 +75 @@
     pmFPA *fpa = input->fpa;
 
-    if (DEBUG) psastroDumpCorners ("corners.up.guess1.dat", "corners.dn.guess1.dat", fpa);
+    // this call only works if we have loaded a model : seg fault if not
+    if (DEBUG && useModel) psastroDumpCorners ("corners.up.guess1.dat", "corners.dn.guess1.dat", fpa);
 
     // load mosaic-level astrometry?
@@ -91 +92 @@
             if (!psastroAstromGuessSetChip (fpa, chip, view, pixelScale, bilevelAstrometry)) continue;
         }
+
+        if (!chip->toFPA || !chip->fromFPA) {
+          char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
+          fprintf (stderr, "no astrom model for %s, skipping\n", name);
+          continue;
+        }
 
         if (newFPA) {
@@ -312 +319 @@
     while ((chip = pmFPAviewNextChip (view, fpa, 1)) != NULL) {
         if (!chip->process || !chip->file_exists || !chip->data_exists) { continue; }
+
+        if (!chip->toFPA || !chip->fromFPA) {
+          char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
+          fprintf (stderr, "no astrom model for %s, skipping\n", name);
+          continue;
+        }
 
         // XXX we are currently inconsistent with marking the good vs the bad data