Changeset 42379 for trunk/psModules/src/detrend/pmOverscan.c

Timestamp:

Feb 8, 2023, 11:54:08 AM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. no_warn strncpy; avoid passing NULL to sprintf %s; add code for PATTERN_DEAD_CELLS; fix error in PSF residual image evaluation; drop detailed mask analysis for binned images (not actually used)

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/detrend/pmOverscan.c (modified) (4 diffs)

trunk/psModules/src/detrend/pmOverscan.c

@@ -38 +38 @@
     opts->order = order;
     opts->stat = psMemIncrRefCounter(stat);
+
+    opts->minValid = 0.0; // default value if not defined
+    opts->maxValid = (float) 0x10000; // default value if not defined
+    opts->maskVal = 0x0001; // default value if not defined
 
     // Smoothing
@@ -314 +318 @@
         psFree(reducedScalar);
 
+        // EAM 2022.03.29 : if the calculated overscan value is below the threshold,
+        // declare the readout dead and mask
+
+        if ((reduced < overscanOpts->minValid) || (reduced > overscanOpts->maxValid)) {
+            fprintf (stderr, "bad overscan (1) %f, masking readout\n", reduced);
+            psImage *mask = input->mask;
+            for (int y = 0; y < mask->numRows; y++) {
+                for (int x = 0; x < mask->numCols; x++) {
+                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= overscanOpts->maskVal;
+                }
+            }
+        }
+
         psFree(stats);
         return true;
@@ -371 +388 @@
         // generate stats of overscan vector for header
         { 
-          psString comment = NULL;    // Comment to add
-          psStats *vectorStats = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
-          if (!psVectorStats (vectorStats, reduced, NULL, NULL, 0)) {
-              psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
-              return false;
-          }
-          psStringAppend(&comment, "Mean Overscan value: %f", vectorStats->sampleMean);
-          psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, comment, "");
-          psFree(comment);
-
-          // write metadata header value
-          psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_VAL", PS_META_REPLACE, "Overscan mean", vectorStats->sampleMean);
-          psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_SIG", PS_META_REPLACE, "Overscan stdev", vectorStats->sampleStdev);
-          psFree (vectorStats);
+            psString comment = NULL;    // Comment to add
+            psStats *vectorStats = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
+            if (!psVectorStats (vectorStats, reduced, NULL, NULL, 0)) {
+                psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+                return false;
+            }
+            psStringAppend(&comment, "Mean Overscan value: %f", vectorStats->sampleMean);
+            psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, comment, "");
+            psFree(comment);
+
+            // write metadata header value
+            psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_VAL", PS_META_REPLACE, "Overscan mean", vectorStats->sampleMean);
+            psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_SIG", PS_META_REPLACE, "Overscan stdev", vectorStats->sampleStdev);
+
+            // EAM 2022.03.29 : if the calculated overscan value is below the threshold,
+            // declare the readout dead and mask
+          
+            if ((vectorStats->sampleMean < overscanOpts->minValid) || (vectorStats->sampleMean > overscanOpts->maxValid)) {
+                fprintf (stderr, "bad overscan (2) %f, masking readout\n", vectorStats->sampleMean);
+                psImage *mask = input->mask;
+                for (int y = 0; y < mask->numRows; y++) {
+                    for (int x = 0; x < mask->numCols; x++) {
+                        mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= overscanOpts->maskVal;
+                    }
+                }
+            }
+
+            psFree (vectorStats);
         }
 
@@ -469 +500 @@
           psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_VAL", PS_META_REPLACE, "Overscan mean", vectorStats->sampleMean);
           psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_SIG", PS_META_REPLACE, "Overscan stdev", vectorStats->sampleStdev);
+
+          // EAM 2022.03.29 : if the calculated overscan value is below the threshold,
+          // declare the readout dead and mask
+          
+          if ((vectorStats->sampleMean < overscanOpts->minValid) || (vectorStats->sampleMean > overscanOpts->maxValid)) {
+              fprintf (stderr, "bad overscan (3) %f, masking readout\n", vectorStats->sampleMean);
+              psImage *mask = input->mask;
+              for (int y = 0; y < mask->numRows; y++) {
+                  for (int x = 0; x < mask->numCols; x++) {
+                      mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= overscanOpts->maskVal;
+                  }
+              }
+          }
           psFree (vectorStats);
         }