Changeset 25197

Timestamp:

Aug 25, 2009, 3:25:40 PM (17 years ago)

Author:

bills

Message:

change ppstampMakeStamp() to return a program exit code.
This allows us to set the correct error for the job

Location:

trunk/pstamp/src

Files:

• ppstamp.c (modified) (1 diff)
• ppstamp.h (modified) (1 diff)
• ppstampMakeStamp.c (modified) (12 diffs)
• pstamp.h (modified) (1 diff)

trunk/pstamp/src/ppstamp.c

@@ -29 +29 @@
 
     // find the pixels that we need to copy, setup the output image
-    if (ppstampMakeStamp(config, options)) {
-        exitCode = 0;
-    } else {
-        exitCode = PS_EXIT_DATA_ERROR;
-    }
+    exitCode = ppstampMakeStamp(config, options);
 
     psLogMsg ("ppstamp", 3, "Complete ppstamp run: %f sec\n", psTimerMark(TIMERNAME));

trunk/pstamp/src/ppstamp.h

@@ -20 +20 @@
 bool ppstampParseCamera(pmConfig *config);
 
-bool ppstampMakeStamp(pmConfig *config, ppstampOptions *);
+int ppstampMakeStamp(pmConfig *config, ppstampOptions *);
 pmFPAfile * ppstampBuildMosaic(pmConfig *config, pmFPAfile *input, pmFPAview *view);
 

trunk/pstamp/src/ppstampMakeStamp.c

@@ -174 +174 @@
 static psImage *extractStamp(psImage *image, psRegion region, double value)
 {
-    int width  = region.x1 - region.x0;
-    int height = region.y1 - region.y0;
+    int width  = region.x1 - region.x0 + 0.5;
+    int height = region.y1 - region.y0 + 0.5;
 
     if (width < 0) {
@@ -252 +252 @@
 // Build the postage stamp output file
 
-static bool makeStamp(pmConfig *config, ppstampOptions *options, pmFPAfile *input,
+static int makeStamp(pmConfig *config, ppstampOptions *options, pmFPAfile *input,
                 pmChip *inChip, pmFPAview *view)
 {
@@ -260 +260 @@
     if (!output) {
         psError(PS_ERR_UNKNOWN, false, "Can't find output data\n");
-        return false;
+        return PS_EXIT_DATA_ERROR;
     }
     char *fpaName = psMetadataLookupStr(NULL, input->fpa->concepts, "FPA.OBS"); // Name of FPA
@@ -284 +284 @@
         pmFPAfile *mosaic = ppstampBuildMosaic(config, input, view);
         if (mosaic == NULL) {
-            return false;
+            return PS_EXIT_UNKNOWN_ERROR;
         }
         srcFile = mosaic;
@@ -362 +362 @@
         status = copyMetadata(output, input, inChip, options);
     }
-    return status;
+    return status ? PS_EXIT_SUCCESS : PS_EXIT_UNKNOWN_ERROR;
 }
 
@@ -574 +574 @@
 }
 
-bool ppstampMakeStamp (pmConfig *config, ppstampOptions *options)
+int ppstampMakeStamp (pmConfig *config, ppstampOptions *options)
 {
     bool        status = false;
-    bool        returnval = false;;
+    int        returnval = PS_EXIT_SUCCESS;;
     bool        foundOverlap = false;
 
@@ -583 +583 @@
     if (!status) {
         psError(PS_ERR_UNKNOWN, true, "Can't find input file!\n");
-        return false;
+        return PS_EXIT_DATA_ERROR;
     }
 
@@ -591 +591 @@
     } else if (astrom->camera != input->camera) {
         psError(PS_ERR_UNKNOWN, true, "Input camera and astrometry camera do not match");
-        return false;
+        return PS_EXIT_CONFIG_ERROR;
     }
 
@@ -600 +600 @@
         psError(PS_ERR_UNKNOWN, false, "Failed to load input.");
         psFree (view);
-        return false;
+        return PS_EXIT_DATA_ERROR;
     }
     bool bilevelAstrometry  = false;
@@ -614 +614 @@
             psError(PS_ERR_UNKNOWN, false, "Unable to read bilevel mosaic astrometry for input FPA.");
             psFree(view);
-            return false;
+            return PS_EXIT_DATA_ERROR;
         }
     }
@@ -647 +647 @@
             break;
         case PSTAMP_ERROR:
-            returnval = false;
+            returnval = PS_EXIT_UNKNOWN_ERROR;
             allDone = true;
             break;
@@ -667 +667 @@
     psFree(view);
 
-    if (!foundOverlap) {
+    if (!foundOverlap && (returnval == PS_EXIT_SUCCESS)) {
         fprintf(stderr, "ROI not found in input\n");
+        returnval = PSTAMP_NO_OVERLAP;
     }
 

trunk/pstamp/src/pstamp.h

@@ -42 +42 @@
         PSTAMP_NOT_AVAILABLE    = 25,
         PSTAMP_GONE             = 26,
-        PSTAMP_NO_JOBS_QUEUED   = 27
+        PSTAMP_NO_JOBS_QUEUED   = 27,
+        PSTAMP_NO_OVERLAP       = 28
 } pstampJobErrors;