Changeset 36071 for branches/eam_branches/ipp-20130711/ppImage/src

Timestamp:

Aug 30, 2013, 4:48:58 PM (13 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20130711/ppImage/src

Files:

• . (modified) (1 prop)
• ppImageDetrendReadout.c (modified) (2 diffs)
• ppImageLoop.c (modified) (8 diffs)

branches/eam_branches/ipp-20130711/ppImage/src/ppImageDetrendReadout.c

@@ -61 +61 @@
         psImageMaskType satMask = options->doMaskSat ? options->satMask : 0;
         psImageMaskType lowMask = options->doMaskLow ? options->lowMask : 0;
-        pmReadoutGenerateMask(input, satMask, lowMask);
+        if (!pmReadoutGenerateMask(input, satMask, lowMask)) {
+          psError(PS_ERR_UNKNOWN, false, "Unable to generate a mask.");
+          psFree(detview);
+          return false;
+        }
     }
     // apply the externally supplied mask to the input->mask pixels
@@ -208 +212 @@
         }
 
-        pmReadoutGenerateVariance(input, noiseImage, true);
+        if (!pmReadoutGenerateVariance(input, noiseImage, true)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to generate a variance image.");
+            psFree(detview);
+            return false;
+        }
         psFree (noiseImage);
     }

branches/eam_branches/ipp-20130711/ppImage/src/ppImageLoop.c

@@ -41 +41 @@
         ESCAPE("load failure for FPA");
     }
-    
+
     pmChip *chip;                       // Chip from FPA
     while ((chip = pmFPAviewNextChip(view, input->fpa, 1)) != NULL) {
@@ -134 +134 @@
                     ESCAPE("Unable to degrade MD image to 3pi");
                 }
+
             }
 
@@ -156 +157 @@
                 ESCAPE("Unable to free detrend images");
             }
+
         }
         // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
@@ -168 +170 @@
             }
         }
+
         // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
         if (!ppImageFringeFree (config, view)) {
@@ -218 +221 @@
           }
         }
-        
+
         // these may be used by ppImageSubtractBackground.
         // if these are defined as internal files, drop them here
@@ -232 +235 @@
 
         // binning (used for display) must take place after the background is replaced, if desired
-        if (!ppImageRebinChip(config, view, options, "PPIMAGE.BIN1")) {
+        if ((options->Bin1FITS)||(options->Bin1JPEG)||(options->FPA1FITS)) {
+          if (!ppImageRebinChip(config, view, options, "PPIMAGE.BIN1")) {
             ESCAPE("Unable to bin chip (level 1).");
-        }
-        if (!ppImageRebinChip(config, view, options, "PPIMAGE.BIN2")) {
+          }
+        }
+        if ((options->Bin2FITS)||(options->Bin2JPEG)||(options->FPA2FITS)) {
+          if (!ppImageRebinChip(config, view, options, "PPIMAGE.BIN2")) {
             ESCAPE("Unable to bin chip (level 2).");
-        }
+          }
+        }
+
         if (options->doBackgroundContinuity) {
           pmFPAfile *out = psMetadataLookupPtr(NULL, config->files, "PPIMAGE.BACKMDL");
           pmFPAfileCopyView(out->fpa,out->src,view);
         }
+
         // Close cells (XXX shouldn't pmFPAfileClose iterate down as needed?)
         view->cell = -1;
@@ -263 +272 @@
       ESCAPE("failure in Background Mosaic");
     }
-    
+
     // generate the full-scale FPA mosaic
-    if (!ppImageMosaicFPA(config, options, "PPIMAGE.OUTPUT.FPA1", "PPIMAGE.BIN1")) {
+    if ((options->FPA1FITS)||(options->Bin1JPEG)) {
+      if (!ppImageMosaicFPA(config, options, "PPIMAGE.OUTPUT.FPA1", "PPIMAGE.BIN1")) {
         ESCAPE("failure in FPA Mosaic (level 1)");
-    }
-    if (!ppImageMosaicFPA(config, options, "PPIMAGE.OUTPUT.FPA2", "PPIMAGE.BIN2")) {
+      }
+    }
+    if ((options->FPA2FITS)||(options->Bin2JPEG)) {
+      if (!ppImageMosaicFPA(config, options, "PPIMAGE.OUTPUT.FPA2", "PPIMAGE.BIN2")) {
         ESCAPE("failure in FPA Mosaic (level 2)");
+      }
     }
 
@@ -283 +296 @@
         ppImageFileCheck(config);
     }
-    
+
     // Calculate summary statistics from FPA Metadata
     if (!ppImageMetadataStats(config, stats, options)) {