Changeset 35847

Timestamp:

Jul 22, 2013, 12:23:48 PM (13 years ago)

Author:

watersc1

Message:

Backport from trunk. 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.

Location:

tags/ipp-20130712

Files:

• ippconfig/gpc1/ppImage.config (modified) (20 diffs, 1 prop)
• ppImage/src/ppImageLoop.c (modified) (8 diffs)

tags/ipp-20130712/ippconfig/gpc1/ppImage.config

@@ -186 +186 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 END
 
@@ -216 +216 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 END
 
@@ -247 +247 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 
   DETREND.CONSTRAINTS  METADATA
@@ -304 +304 @@
    ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
    BACKGROUND         BOOL    TRUE            # Subtract background?
-   CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+   CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 
    DETREND.CONSTRAINTS  METADATA
@@ -357 +357 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 END
 
@@ -389 +389 @@
   ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND       BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL  TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL  FALSE           # Subtract model background?
 END
 
@@ -417 +417 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
   TILTYSTREAK.APPLY  BOOL    TRUE            # apply the 'tiltystreak' tool
   NOISEMAP           BOOL    TRUE            # Apply read noise map
@@ -447 +447 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
   TILTYSTREAK.APPLY  BOOL    FALSE           # apply the 'tiltystreak' tool
   NOISEMAP           BOOL    TRUE            # Apply read noise map
@@ -1141 +1141 @@
   ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND       BOOL    FALSE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL  TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL  FALSE           # Subtract model background?
 
   DETREND.CONSTRAINTS  METADATA
@@ -1196 +1196 @@
   ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND       BOOL    FALSE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL  TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL  FALSE           # Subtract model background?
 END
 
@@ -1224 +1224 @@
   ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND       BOOL    FALSE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL  TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL  FALSE            # Subtract model background?
 END
 
@@ -1257 +1257 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
   NO.COMPRESS        BOOL    TRUE            # turn off image compression
 END
@@ -1291 +1291 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    FALSE           # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 END
 
@@ -1323 +1323 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE           # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 END
 
@@ -1357 +1357 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    FALSE           # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
   NO.COMPRESS        BOOL    TRUE            # turn off image compression
 END
@@ -1389 +1389 @@
   ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND       BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL  TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL  FALSE           # Subtract model background?
 END
 
@@ -1417 +1417 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
   PATTERN.ROW        BOOL    TRUE           # Subtract pattern noise
   PATTERN.CELL       BOOL    FALSE           # Subtract pattern noise
@@ -1513 +1513 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 END
 
@@ -1544 +1544 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 END
 
@@ -1575 +1575 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
-  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
-END
-
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
+END
+

tags/ipp-20130712/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)) {