Changeset 9463 for trunk/ppMerge/src/ppMergeScaleZero.c

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.

File:

• trunk/ppMerge/src/ppMergeScaleZero.c (modified) (4 diffs)

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);
         }
     }