Changeset 11269

Timestamp:

Jan 24, 2007, 12:24:44 PM (19 years ago)

Author:

eugene

Message:

fixed error handling issues

Location:

trunk/psastro/src

Files:

• psastro.c (modified) (2 diffs)
• psastroDataSave.c (modified) (1 diff)
• psastroErrorCodes.dat (modified) (1 diff)
• psastroLuminosityFunction.c (modified) (1 diff)

trunk/psastro/src/psastro.c

@@ -54 +54 @@
 
     bool chipastro = psMetadataLookupBool (NULL, config->arguments, "PSASTRO.CHIP.MODE");
+    bool mosastro  = psMetadataLookupBool (NULL, config->arguments, "PSASTRO.MOSAIC.MODE");
+    if (!chipastro && !mosastro) {
+        psLogMsg ("psastro", 3, "no astrometry mode selected, assuming chip mode\n");
+        chipastro= true;
+    }
+
     if (chipastro) {
         if (!psastroChipAstrom (config, refs)) {
@@ -61 +67 @@
     }
 
-    bool mosastro = psMetadataLookupBool (NULL, config->arguments, "PSASTRO.MOSAIC.MODE");
     if (mosastro) {
         if (!psastroMosaicAstrom (config, refs)) {

trunk/psastro/src/psastroDataSave.c

@@ -19 +19 @@
     pmFPAfile *output = psMetadataLookupPtr (NULL, config->files, "PSASTRO.OUTPUT");
     if (!output) {
-        psError(PSASTRO_ERR_CONFIG, true, "Can't find output data!\n");
+        psError(PSASTRO_ERR_CONFIG, true, "Can't find or interpret output file rule PSASTRO.OUTPUT!\n");
         return false;
     }

trunk/psastro/src/psastroErrorCodes.dat

@@ -2 +2 @@
 # This file is used to generate pmErrorClasses.h
 #
-BASE = 600              First value we use; lower values belong to psLib
+BASE = 300              First value we use; lower values belong to psLib
 UNKNOWN                 Unknown PM error code
 NOT_IMPLEMENTED         Desired feature is not yet implemented

trunk/psastro/src/psastroLuminosityFunction.c

@@ -49 +49 @@
   for (int i = 0; i < stars->n; i++) {
     star = stars->data[i];
+    if (!isfinite(star->Mag)) continue;
     int bin = (star->Mag - mMin) / dMag;
+    if (bin < 0) psAbort ("psastro", "bin cannot be negative!");
+    if (bin >= nBin) psAbort ("psastro", "bin cannot be > %d!", nBin);
     nMags->data.F32[bin] += 1.0;
   }