Changeset 30835

Timestamp:

Mar 9, 2011, 11:57:26 AM (15 years ago)

Author:

watersc1

Message:

prevent multiple applications of PATTERN.ROW and PATTERN.CELL

File:

• trunk/ppImage/src/ppImageDetrendPattern.c (modified) (4 diffs)

trunk/ppImage/src/ppImageDetrendPattern.c

@@ -25 +25 @@
     if (options->doPatternRow) {
         bool status;
-        pmFPAfile *input = psMetadataLookupPtr(&status, config->files, "PPIMAGE.INPUT");
-        pmFPAview *view = pmFPAviewAlloc(0); // View for local processing
-        *view = *inputView;
-        while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
+        pmHDU *hdu = pmHDUFromChip(chip);
+        if (psMetadataLookupBool(NULL,hdu->header,"PTRN_ROW")) {
+          psLogMsg("ppImage", PS_LOG_INFO, "Not performing row pattern correction as it has already been done.");
+        }
+        else {
+          pmFPAfile *input = psMetadataLookupPtr(&status, config->files, "PPIMAGE.INPUT");
+          pmFPAview *view = pmFPAviewAlloc(0); // View for local processing
+          *view = *inputView;
+          while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
             if (!cell->process || !cell->file_exists) {
-                continue;
+              continue;
             }
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
               ESCAPE(false, "load failure for Cell");
             }
-
+            
             if (!cell->data_exists) {
                 continue;
@@ -74 +79 @@
                 }
             }
-        }
-        psFree(view);
+
+          }
+          psMetadataAddBool(hdu->header, PS_LIST_TAIL, "PTRN_ROW",PS_META_REPLACE,"PATTERN.ROW correction applied",true);
+          psFree(view);
+        }
     }
 
@@ -83 +91 @@
         pmFPAview *view = pmFPAviewAlloc(0); // View for local processing
         *view = *inputView;
-        for (int i = 0; i < chip->cells->n; i++) {
+
+        pmHDU *hdu = pmHDUFromCell(cell);
+        if (psMetadataLookupBool(NULL,hdu->header,"PTRN_CEL")) {
+          psLogMsg("ppImage", PS_LOG_INFO, "Not performing cell pattern correction as it has already been done.");
+        }
+        else {
+          for (int i = 0; i < chip->cells->n; i++) {
             view->cell = i;
 
             pmCell *cell = chip->cells->data[i]; // Cell of interest
+
             if (cell->readouts->n > 1) {
                 psLogMsg("ppImage", PS_LOG_INFO, "Not performing cell pattern correction on video cell.");
@@ -99 +114 @@
                 tweak->data.U8[i] = 0xFF;
             }
-        }
 
-        // Tweak the cells
-        if (!pmPatternCell(chip, tweak, options->patternCellBG, options->patternCellMean,
-                           options->maskValue, options->darkMask)) {
-            psFree(tweak);
-            psFree(view);
-            return false;
-        }
-        psFree(tweak);
-        psFree(view);
+          }
+
+          // Tweak the cells
+          if (!pmPatternCell(chip, tweak, options->patternCellBG, options->patternCellMean,
+                             options->maskValue, options->darkMask)) {
+              psFree(tweak);
+              psFree(view);
+              return false;
+          }
+          psFree(tweak);
+          psFree(view);
+
+          psMetadataAddBool(hdu->header, PS_LIST_TAIL, "PTRN_CEL",PS_META_REPLACE,"PATTERN.CELL correction applied",true);
+        }
     }