Changeset 35081 for trunk/ppImage

Timestamp:

Feb 1, 2013, 5:01:08 PM (13 years ago)

Author:

watersc1

Message:

Merging changes that implement FPA level background continuity.

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (1 diff)
• ppImage.h (modified) (3 diffs)
• ppImageLoop.c (modified) (3 diffs)
• ppImageMosaicBackground.c (added)
• ppImageOptions.c (modified) (2 diffs)
• ppImageParseCamera.c (modified) (3 diffs)

trunk/ppImage/src/Makefile.am

@@ -44 +44 @@
         ppImageRebinReadout.c \
         ppImageMosaic.c \
+        ppImageMosaicBackground.c \
         ppImageMaskStats.c \
         ppImagePhotom.c \

trunk/ppImage/src/ppImage.h

@@ -41 +41 @@
     bool doPatternCell;                 // Cell pattern correction
     bool doPatternContinuity;           // Cell continuity correction
+    bool doBackgroundContinuity;        // Do mosaic continuity correction
     bool doFringe;                      // Fringe subtraction
     bool doPhotom;                      // Source identification and photometry
@@ -50 +51 @@
     bool checkNoise;                    // measure cell-level variance
     bool applyParity;                   // Apply Cell parities
-
-  bool doMaskStats;                      // Calculate mask statistics
+    bool doMaskStats;                   // Calculate mask statistics
   
     bool doCrosstalkMeasure;            // measure crosstalk signal
@@ -183 +183 @@
 bool ppImageDetrendPatternApply(pmConfig *config, pmChip *chip, const pmFPAview *inputView, const ppImageOptions *options);
 
+// Do background continuity step
+bool ppImageMosaicBackground(pmConfig *config, const ppImageOptions *options);
+
 // Record which detrend file was used for the detrending
 bool ppImageDetrendRecord(

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) {
@@ -233 +233 @@
             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;
@@ -251 +254 @@
     }
 
+    // Do background model continuity updates
+    if (!ppImageMosaicBackground(config, options )) {
+      ESCAPE("failure in Background Mosaic");
+    }
+    
     // generate the full-scale FPA mosaic
     if (!ppImageMosaicFPA(config, options, "PPIMAGE.OUTPUT.FPA1", "PPIMAGE.BIN1")) {

trunk/ppImage/src/ppImageOptions.c

@@ -35 +35 @@
     options->doPatternCell   = false;   // Cell pattern correction
     options->doPatternContinuity = false; // Cell continuity correction
+    options->doBackgroundContinuity = false; // Chip level background continuity correction
     options->doFringe        = false;   // Fringe subtraction
     options->doPhotom        = false;   // Source identification and photometry
@@ -429 +430 @@
     }
 
+    // Option to enable the background continuity
+    options->doBackgroundContinuity = psMetadataLookupBool(NULL, recipe, "BACKGROUND.CONTINUITY");
+
 
     // Remnance options

trunk/ppImage/src/ppImageParseCamera.c

@@ -303 +303 @@
     }
 
+
     // chipImage    -> psphotInput  (pmFPAfileDefineFromFile)       : fpa is constructed
     // psphotInput  -> psphotOutput (pmFPAfileDefineOutputFromFile) : fpa is equated
@@ -387 +388 @@
     // the input data is the same as the outImage data : force the free levels to match
     input->freeLevel = PS_MIN(outImage->freeLevel, input->freeLevel);
+
+    // define the continuity corrected background model files
+    if (options->doBackgroundContinuity) {
+      pmFPAfile *bkgMosaicModel = pmFPAfileDefineFromFPA(config,input->fpa, 1, 1,  "PPIMAGE.BACKMDL");
+      if (!bkgMosaicModel) {
+        psError(PS_ERR_IO, false, _("Unable to generate new file from PPIMAGE.BACKMDL"));
+        psFree(options);
+        return NULL;
+      }
+      if (bkgMosaicModel->type != PM_FPA_FILE_IMAGE) {
+        psError(PS_ERR_IO, true, "PPIMAGE.BACKMDL is not of type IMAGE");
+        psFree(options);
+        return NULL;
+
+      }
+      bkgMosaicModel->save = options->doBackgroundContinuity;
+      //      bkgMosaicModel->freeLevel = PS_MIN(bkgMosaicModel->freeLevel, PM_FPA_LEVEL_FPA);
+      bkgMosaicModel->freeLevel = PM_FPA_LEVEL_FPA;
+      bkgMosaicModel->dataLevel = bkgMosaicModel->dataLevel;
+      bkgMosaicModel->fileLevel = PS_MIN(bkgMosaicModel->fileLevel, bkgMosaicModel->dataLevel);
+    }
 
     // define the binned target files (which may just be carriers for some camera configurations)
@@ -497 +519 @@
         chipVariance->save = false;
     }
-
+    
     if (psTraceGetLevel("ppImage.config") > 0) {
         // Get a look inside all the files.