Changeset 17786 for trunk/psastro/src/psastroAnalysis.c

Timestamp:

May 23, 2008, 3:04:23 PM (18 years ago)

Author:

Paul Price

Message:

Stop with the misleading exit status --- if it failed, then give an exit status indicating failure.

File:

• trunk/psastro/src/psastroAnalysis.c (modified) (4 diffs)

trunk/psastro/src/psastroAnalysis.c

@@ -12 +12 @@
     psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSASTRO_RECIPE);
     if (!recipe) {
-        psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe");
-        return false;
+        psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe");
+        return false;
     }
 
     if (!psastroUseModel (config, recipe)) {
-        psError (PSASTRO_ERR_UNKNOWN, false, "failed to set model astrometry\n");
-        return false;
+        psError (PSASTRO_ERR_UNKNOWN, false, "failed to set model astrometry\n");
+        return false;
     }
 
@@ -24 +24 @@
     // apply the initial guess
     if (!psastroAstromGuess (&nStars, config)) {
-        psError (PSASTRO_ERR_UNKNOWN, false, "failed to determine initial astrometry guess\n");
-        return false;
+        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;
+        psLogMsg ("psastro", 2, "skipping astrometry analysis : no stars\n");
+        return false;
     }
 
@@ -35 +35 @@
     psArray *refs = psastroLoadRefstars(config);
     if (!refs) {
-        psError (PSASTRO_ERR_UNKNOWN, false, "failed to load reference data\n");
-        return false;
+        psError (PSASTRO_ERR_UNKNOWN, false, "failed to load reference data\n");
+        return false;
     }
     if (refs->n == 0) {
         psError(PSASTRO_ERR_REFSTARS, true, "no reference stars found");
         psFree(refs);
-        return NULL;
+        return false;
     }
 
     if (!psastroChooseRefstars (config, refs)) {
-        psError (PSASTRO_ERR_UNKNOWN, false, "failed to select reference data for chips\n");
+        psError (PSASTRO_ERR_UNKNOWN, false, "failed to select reference data for chips\n");
         psFree(refs);
-        return false;
+        return false;
     }
 
@@ -53 +53 @@
     bool chipastro = psMetadataLookupBool (&status, config->arguments, "PSASTRO.CHIP.MODE");
     if (!status) {
-        chipastro = psMetadataLookupBool (&status, recipe, "PSASTRO.CHIP.MODE");
+        chipastro = psMetadataLookupBool (&status, recipe, "PSASTRO.CHIP.MODE");
     }
     bool mosastro  = psMetadataLookupBool (&status, config->arguments, "PSASTRO.MOSAIC.MODE");
     if (!status) {
-        mosastro  = psMetadataLookupBool (&status, recipe, "PSASTRO.MOSAIC.MODE");
+        mosastro  = psMetadataLookupBool (&status, recipe, "PSASTRO.MOSAIC.MODE");
     }
     if (!chipastro && !mosastro) {
-        psLogMsg ("psastro", 3, "no astrometry mode selected, assuming chip astrometry\n");
-        chipastro = true;
+        psLogMsg ("psastro", 3, "no astrometry mode selected, assuming chip astrometry\n");
+        chipastro = true;
     }
 
     if (chipastro) {
-        if (!psastroChipAstrom (config)) {
-            psError (PSASTRO_ERR_UNKNOWN, false, "failed to perform single chip astrometry\n");
-            psFree(refs);
-            return false;
-        }
-    } 
+        if (!psastroChipAstrom (config)) {
+            psError (PSASTRO_ERR_UNKNOWN, false, "failed to perform single chip astrometry\n");
+            psFree(refs);
+            return false;
+        }
+    }
     if (mosastro) {
-        if (!psastroMosaicAstrom (config)) {
-            psError (PSASTRO_ERR_UNKNOWN, false, "failed to perform mosaic camera astrometry\n");
-            psFree(refs);
-            return false;
-        }
+        if (!psastroMosaicAstrom (config)) {
+            psError (PSASTRO_ERR_UNKNOWN, false, "failed to perform mosaic camera astrometry\n");
+            psFree(refs);
+            return false;
+        }
     }