Changeset 35846 for trunk/ppImage

Timestamp:

Jul 22, 2013, 12:21:11 PM (13 years ago)

Author:

watersc1

Message:

Speed improvements for the chip stage. Disable CROSSTALK.MEASURE for gpc1 (it's not used). Wrap ppImageRebinChip calls so that they are only performed when we need the rebinned images.

File:

• trunk/ppImage/src/ppImageLoop.c (modified) (8 diffs)

trunk/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) {
+      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) {
+      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)) {