Changeset 12988 for trunk/psModules/src/detrend/pmShutterCorrection.c

Timestamp:

Apr 24, 2007, 11:17:19 AM (19 years ago)

Author:

Paul Price

Message:

Changing pmShutterCorrectionMeasure to act on a readout, rather than return an image, so that it can update the 'concepts' as well.

File:

• trunk/psModules/src/detrend/pmShutterCorrection.c (modified) (4 diffs)

trunk/psModules/src/detrend/pmShutterCorrection.c

@@ -12 +12 @@
 #include "pmHDUUtils.h"
 #include "psVectorBracket.h"
+#include "pmConceptsAverage.h"
+
 #include "pmShutterCorrection.h"
 
@@ -347 +349 @@
 #define MEASURE_SAMPLES 4
 
-psImage *pmShutterCorrectionMeasure(const psArray *readouts, int size, psStatsOptions meanStat,
-                                    psStatsOptions stdevStat, int nIter, float rej, psMaskType maskVal)
+bool pmShutterCorrectionMeasure(pmReadout *output, const psArray *readouts, int size, psStatsOptions meanStat,
+                                psStatsOptions stdevStat, int nIter, float rej, psMaskType maskVal)
 {
     PS_ASSERT_ARRAY_NON_NULL(readouts, NULL);
@@ -591 +593 @@
 
     if (psTraceGetLevel("psModules.detrend") > 5) {
-        psFits *fits = psFitsOpen("pattern.fits", "w");
-        psFitsWriteImage(fits, NULL, pattern, 0, NULL);
-        psFitsClose(fits);
+        psFits *fits = psFitsOpen("pattern.fits", "w");
+        psFitsWriteImage(fits, NULL, pattern, 0, NULL);
+        psFitsClose(fits);
     }
     psFree(pattern);
 
-    return shutter;
+    output->image = shutter;
+
+    // Update the "concepts"
+    psList *inputCells = psListAlloc(NULL); // List of cells
+    for (long i = 0; i < readouts->n; i++) {
+        pmReadout *readout = readouts->data[i]; // Readout of interest
+        psListAdd(inputCells, PS_LIST_TAIL, readout->parent);
+    }
+    bool success = pmConceptsAverageCells(output->parent, inputCells, NULL, NULL, true);
+    psFree(inputCells);
+
+    // Correct the exposure times --- they don't make sense any more.
+    psMetadataItem *item = psMetadataLookup(output->parent->concepts, "CELL.EXPOSURE");
+    item->data.F32 = NAN;
+    item = psMetadataLookup(output->parent->concepts, "CELL.DARKTIME");
+    item->data.F32 = NAN;
+
+    return success;
 
 
@@ -611 +630 @@
     psFree(samplesMean);
     psFree(samplesStdev);
-    return NULL;
+    return false;
 }