Changeset 13832

Timestamp:

Jun 14, 2007, 8:58:44 AM (19 years ago)

Author:

eugene

Message:

count total number of stars, skip astrometry if we have no stars

Location:

trunk/psastro/src

Files:

• psastro.h (modified) (1 diff)
• psastroAnalysis.c (modified) (1 diff)
• psastroAstromGuess.c (modified) (4 diffs)

trunk/psastro/src/psastro.h

@@ -30 +30 @@
 bool              psastroConvertReadout (pmReadout *readout, psMetadata *recipe);
 psArray          *pmSourceToAstromObj (psArray *sources);
-bool              psastroAstromGuess (pmConfig *config);
+bool              psastroAstromGuess (int *nStars, pmConfig *config);
 
 psPlaneDistort   *psPlaneDistortIdentity ();

trunk/psastro/src/psastroAnalysis.c

@@ -3 +3 @@
 bool psastroAnalysis (pmConfig *config) {
 
+    int nStars;
+
     // interpret the available initial astrometric information
     // apply the initial guess
-    if (!psastroAstromGuess (config)) {
+    if (!psastroAstromGuess (&nStars, config)) {
         psError (PSASTRO_ERR_UNKNOWN, false, "failed to determine initial astrometry guess\n");
         return false;
+    }
+    if (nStars == 0) {
+        psLogMsg ("psastro", 2, "skipping astrometry analysis : no stars\n");
+        return true;
     }
 

trunk/psastro/src/psastroAstromGuess.c

@@ -7 +7 @@
 // headers corresponding to the chips.
 
-bool psastroAstromGuess (pmConfig *config) {
+bool psastroAstromGuess (int *nStars, pmConfig *config) {
 
     bool newFPA = true;
@@ -22 +22 @@
     pmCell *cell = NULL;
     pmReadout *readout = NULL;
+
+    *nStars = 0;
 
     // select the current recipe
@@ -92 +94 @@
                 if (rawstars == NULL) { continue; }
 
+                *nStars += rawstars->n;
                 for (int i = 0; i < rawstars->n; i++) {
                     pmAstromObj *raw = rawstars->data[i];
@@ -122 +125 @@
     }
 
+    // how many total sources are available to us?
+    psMetadataAddS32 (recipe, PS_LIST_TAIL, "NTOTSTAR",  PS_META_REPLACE, "", *nStars);
+    if (*nStars == 0) {
+        psLogMsg ("psastro", 2, "no sources available for astrometry\n");
+        return true;
+    }
+
     psLogMsg ("psastro", 2, "loaded raw data from %f,%f to %f,%f\n", 
               DEG_RAD*RAmin, DEG_RAD*DECmin, 
               DEG_RAD*RAmax, DEG_RAD*DECmax);
 
-    psMetadataAdd (recipe, PS_LIST_TAIL, "RA_MIN",  PS_DATA_F32 | PS_META_REPLACE, "", RAmin);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "RA_MAX",  PS_DATA_F32 | PS_META_REPLACE, "", RAmax);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "DEC_MIN", PS_DATA_F32 | PS_META_REPLACE, "", DECmin);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "DEC_MAX", PS_DATA_F32 | PS_META_REPLACE, "", DECmax);
+    psMetadataAddF32 (recipe, PS_LIST_TAIL, "RA_MIN",  PS_META_REPLACE, "", RAmin);
+    psMetadataAddF32 (recipe, PS_LIST_TAIL, "RA_MAX",  PS_META_REPLACE, "", RAmax);
+    psMetadataAddF32 (recipe, PS_LIST_TAIL, "DEC_MIN", PS_META_REPLACE, "", DECmin);
+    psMetadataAddF32 (recipe, PS_LIST_TAIL, "DEC_MAX", PS_META_REPLACE, "", DECmax);
 
     psFree (view);