Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImageLoop.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppImage (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• ppImage/src/ppImageLoop.c (modified) (6 diffs)

branches/cnb_branches/cnb_branch_20090301/ppImage/src

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImageLoop.c

@@ -13 +13 @@
 bool ppImageLoop(pmConfig *config, ppImageOptions *options)
 {
-    psMetadata *stats = options->doStats ? psMetadataAlloc() : NULL; // Statistics to output
+    psMetadata *stats = NULL;           // Statistics to output
     float timeDetrend = 0;              // Amount of time spent in detrend
     float timePhot = 0;                 // Amount of time spent in photometry
+
+    if (options->doStats) {
+        stats = psMetadataAlloc();
+        psMetadataAddS32(stats, PS_LIST_TAIL, "QUALITY", 0, "No problems", 0);
+    }
 
     bool status;                        // Status of MD lookup
@@ -46 +51 @@
         }
 
+        // crosstalk measurement needs to be done on the entire chip at once, and before
+        // signal levels are modified by the detrending.  If crosstalk measurement is
+        // requested, the read-level for the images is set to CHIP.
+        if (!ppImageMeasureCrosstalk(config, options, view)) {
+          ESCAPE("Unable to perform crosstalk correction");
+        }
+
+        // crosstalk correction needs to be done on the entire chip at once, and before
+        // signal levels are modified by the detrending.  If crosstalk correction is
+        // requested, the read-level for the images is set to CHIP.
+        if (!ppImageCorrectCrosstalk(config, options, view)) {
+          ESCAPE("Unable to perform crosstalk correction");
+        }
+
         psTimerStart(TIMER_DETREND);
         pmCell *cell;                   // Cell from chip
@@ -80 +99 @@
                 }
 
+                // perform the detrend analysis
+                if (!ppImageParityFlip(config, options, view)) {
+                    ESCAPE("Unable to detrend readout");
+                }
+
+                // XXX TEST:
+                // psphotSaveImage (NULL, readout->image, "test.image.fits");
+
                 // XXX set the options->*Mask values here (after the mask images have been loaded
                 // and before any of the value are used)
@@ -134 +161 @@
         psTimerStart(TIMER_PHOT);
         if (options->doPhotom) {
-            if (!ppImagePhotom(config, view)) {
+            if (!ppImagePhotom(stats, config, view)) {
                 ESCAPE("error running photometry.");
             }
@@ -195 +222 @@
     // this also performs the psastro file IO
     if (options->doAstromChip || options->doAstromMosaic) {
-        if (!ppImageAstrom(config)) {
+        if (!ppImageAstrom(config, stats)) {
             ESCAPE("error running astrometry.");
         }
@@ -218 +245 @@
     psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
     if (dump_file) {
-        pmConfigDump(config, input->fpa, dump_file);
+        pmConfigDump(config, dump_file);
     }
 

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h