Changeset 36837 for trunk/psastro/src/psastroOneChipFit.c

Timestamp:

Jun 8, 2014, 9:27:56 AM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20140423: add Koppehoefer correction; make sure psastro failures are noted clearl in the output header; do not load the model if we choose skipastro

File:

• trunk/psastro/src/psastroOneChipFit.c (modified) (6 diffs)

trunk/psastro/src/psastroOneChipFit.c

@@ -62 +62 @@
         if (match == NULL) {
             psLogMsg ("psastro", 3, "failed to find radius-matched sources\n");
+            psastroChipFailureHeader (updates);
             return false;
         }
@@ -69 +70 @@
             if (!unique) {
                 psLogMsg ("psastro", 3, "failed to generate a uniq set of matched sources\n");
+                psastroChipFailureHeader (updates);
                 return false;
             }
@@ -99 +101 @@
             psLogMsg ("psastro", 3, "insufficient stars or invalid order: %ld stars", match->n);
             psFree (match);
+            psastroChipFailureHeader (updates);
             return false;
         }
@@ -126 +129 @@
             psFree (match);
             psFree (fitStats);
+            psastroChipFailureHeader (updates);
             return false;
         }
@@ -185 +189 @@
         psMetadataAddS32 (updates, PS_LIST_TAIL, "NASTRO",   PS_META_REPLACE, "number of astrometry stars", astNstar);
     } else {
-        psMetadataAddF32 (updates, PS_LIST_TAIL, "CPRECISE", PS_META_REPLACE, "astrometry precision (arcsec)", 0.0);
-        psMetadataAddS32 (updates, PS_LIST_TAIL, "NASTRO",   PS_META_REPLACE, "number of astrometry stars", 0);
+        psastroChipFailureHeader (updates);
     }
     psMetadataAddF32 (updates, PS_LIST_TAIL, "EQUINOX",  PS_META_REPLACE, "equinox of ref catalog", 2000.0); // XXX this is bogus: should be defined based on equinox of refstars
@@ -222 +225 @@
 }
 
+bool psastroChipFailureHeader (psMetadata *updates) {
+    psMetadataAddF32 (updates, PS_LIST_TAIL, "CPRECISE", PS_META_REPLACE, "astrometry precision (arcsec)", 0.0);
+    psMetadataAddS32 (updates, PS_LIST_TAIL, "NASTRO",   PS_META_REPLACE, "number of astrometry stars", 0);
+    return true;
+}
+
+
+
 // psastroWriteStars ("raw.1.dat", rawstars);
 // psastroWriteStars ("ref.1.dat", refstars);