Changeset 9463

Timestamp:

Oct 10, 2006, 10:59:09 AM (20 years ago)

Author:

Paul Price

Message:

Set CELL.DARKTIME and CELL.EXPOSURE when we've normalised by the dark time. Change options->exptime to options->darktime to properly indicate just what we're normalising by. Normalise by CELL.DARKTIME instead of CELL.EXPOSURE.

Location:

trunk/ppMerge/src

Files:

• ppMerge.c (modified) (1 diff)
• ppMergeCombine.c (modified) (1 diff)
• ppMergeOptions.c (modified) (5 diffs)
• ppMergeOptions.h (modified) (1 diff)
• ppMergeScaleZero.c (modified) (4 diffs)

trunk/ppMerge/src/ppMerge.c

@@ -71 +71 @@
     psFree(config);
 
-    psLibFinalize();
     pmConceptsDone();
     pmConfigDone();
+    psLibFinalize();
 
 //    ppMemCheck();

trunk/ppMerge/src/ppMergeCombine.c

@@ -258 +258 @@
                 }
 
+                // Set the dark time for the output image, since we normalised
+                if (options->darktime) {
+                    psMetadataItem *darkItem = psMetadataLookup(cell->concepts, "CELL.DARKTIME");
+                    darkItem->data.F32 = 1.0;
+                    psMetadataItem *expItem = psMetadataLookup(cell->concepts, "CELL.EXPOSURE");
+                    expItem->data.F32 = 1.0;
+                }
+
                 memCheck();
 #endif

trunk/ppMerge/src/ppMergeOptions.c

@@ -34 +34 @@
     options->zero = false;
     options->scale = false;
-    options->exptime = false;
+    options->darktime = false;
     options->shutter = false;
     options->sample = 1;
@@ -147 +147 @@
             options->zero = false;
             options->scale = false;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = false;
         } else if (strcasecmp(type, "DARK") == 0) {
             options->zero = false;
             options->scale = false;
-            options->exptime = true;
+            options->darktime = true;
             options->shutter = false;
         } else if (strcasecmp(type, "FLAT") == 0) {
             options->zero = false;
             options->scale = true;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = false;
         } else if (strcasecmp(type, "FRINGE") == 0) {
             options->zero = true;
             options->scale = true;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = false;
         } else if (strcasecmp(type, "SHUTTER") == 0) {
             options->zero = false;
             options->scale = false;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = true;
         } else {
@@ -173 +173 @@
             options->zero = false;
             options->scale = false;
-            options->exptime = false;
+            options->darktime = false;
             options->shutter = false;
         }
@@ -180 +180 @@
         options->zero = false;
         options->scale = false;
-        options->exptime = false;
+        options->darktime = false;
     }
 
@@ -186 +186 @@
 #if 0
     // Or you can set them individually
-    OPTION_PARSE(options->zero,    config->arguments, "-zero",    Bool);
-    OPTION_PARSE(options->scale,   config->arguments, "-scale",   Bool);
-    OPTION_PARSE(options->exptime, config->arguments, "-exptime", Bool);
+    OPTION_PARSE(options->zero,     config->arguments, "-zero",    Bool);
+    OPTION_PARSE(options->scale,    config->arguments, "-scale",   Bool);
+    OPTION_PARSE(options->darktime, config->arguments, "-exptime", Bool);
 #endif
 

trunk/ppMerge/src/ppMergeOptions.h

@@ -21 +21 @@
     bool zero;                          // Subtract background before combining?
     bool scale;                         // Scale by the background before combining?
-    bool exptime;                       // Normalise by the exposure time?
+    bool darktime;                      // Normalise by the dark time (time since flush)?
     bool shutter;                       // Generate shutter correction?
     unsigned int sample;                // Sampling factor for measuring the background

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -47 +47 @@
     assert(config);
 
-    if (!options->scale && !options->zero && !options->exptime) {
+    if (!options->scale && !options->zero && !options->darktime) {
         return true;                    // We did everything we were asked for
     }
@@ -161 +161 @@
     psStats *bgStats = psStatsAlloc(options->mean); // Statistic to measure the background
     psVector *gains = NULL;             // The gains for each cell
-    psImage *exptime = NULL;            // The exposure time for each integration of each cell
+    psImage *darktime = NULL;           // The dark time for each integration of each cell
     if (options->scale) {
         gains = psVectorAlloc(data->numCells, PS_TYPE_F32);
         gains->n = data->numCells;
     }
-    if (options->exptime) {
-        exptime = psImageAlloc(data->numCells, filenames->n, PS_TYPE_F32);
+    if (options->darktime) {
+        darktime = psImageAlloc(data->numCells, filenames->n, PS_TYPE_F32);
     }
 
@@ -199 +199 @@
 
                 // Normalising by the exposure time
-                if (options->exptime) {
-                    exptime->data.F32[i][cellNum] = psMetadataLookupF32(&mdok, cell->concepts,
-                                                                        "CELL.EXPOSURE");
-                    if (!mdok || isnan(exptime->data.F32[i][cellNum])) {
-                        psLogMsg(__func__, PS_LOG_WARN, "CELL.EXPOSURE for file %s chip %d cell %d is not "
+                if (options->darktime) {
+                    darktime->data.F32[i][cellNum] = psMetadataLookupF32(&mdok, cell->concepts,
+                                                                        "CELL.DARKTIME");
+                    if (!mdok || isnan(darktime->data.F32[i][cellNum])) {
+                        psLogMsg(__func__, PS_LOG_WARN, "CELL.DARKTIME for file %s chip %d cell %d is not "
                                  "set.\n", name, j, k);
-                        exptime->data.F32[i][cellNum] = NAN;
+                        darktime->data.F32[i][cellNum] = NAN;
                         status = false;
                     }
@@ -302 +302 @@
     }
 
-    if (options->exptime) {
+    if (options->darktime) {
         if (!options->scale) {
             // Copy over the exposure times
-            *scales = psImageCopy(*scales, exptime, PS_TYPE_F32);
+            *scales = psImageCopy(*scales, darktime, PS_TYPE_F32);
         } else {
-            *scales = (psImage*)psBinaryOp(*scales, *scales, "*", exptime);
+            *scales = (psImage*)psBinaryOp(*scales, *scales, "*", darktime);
         }
     }