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

Timestamp:

Oct 13, 2006, 5:10:34 PM (20 years ago)

Author:

eugene

Message:

all sorts of error handling fixes

File:

• trunk/psastro/src/psastroAstromGuess.c (modified) (5 diffs)

trunk/psastro/src/psastroAstromGuess.c

@@ -26 +26 @@
     psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, "PSASTRO");
     if (!recipe) {
-        psErrorStackPrint(stderr, "Can't find PSASTRO recipe!\n");
-        exit(EXIT_FAILURE);
+        psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe!");
+        return false;
     }
 
@@ -33 +33 @@
     pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
     if (!input) {
-        psErrorStackPrint(stderr, "Can't find input data!\n");
-        exit(EXIT_FAILURE);
+        psError(PSASTRO_ERR_CONFIG, true, "Can't find input data");
+        return false;
     }
 
@@ -45 +45 @@
 
     while ((chip = pmFPAviewNextChip (view, fpa, 1)) != NULL) {
-        psTrace (__func__, 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+        psTrace ("psastro", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
 
@@ -63 +63 @@
         // XXX should this go into a different function? this would separate WCS interpretation from application
         while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
-            psTrace (__func__, 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+            psTrace ("psastro", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) { continue; }
 
@@ -80 +80 @@
                     p_psDeproject (raw->sky, raw->TP, fpa->projection);
 
-                    if (i < 0) {
+                    if ((i < 10) && (psTraceGetLevel("psastro.guess") > 5)) {
                         fprintf (stderr, "up: %f,%f -> %f,%f -> %f,%f -> %f,%f\n",
                                  raw->chip->x, raw->chip->y,