Changeset 13814

Timestamp:

Jun 13, 2007, 4:46:25 PM (19 years ago)

Author:

Paul Price

Message:

Using pmFPADarkNorm to apply polynomial correction to the darktime.

File:

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

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -146 +146 @@
     }
 
+    pmFPAview *view = pmFPAviewAlloc(0);
+
     bool status = true;                 // Status of getting the scale and zero --- did everything go right?
     for (int i = 0; i < filenames->n; i++) {
@@ -176 +178 @@
                 // Normalising by the exposure time
                 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);
-                        darktime->data.F32[i][cellNum] = NAN;
+                    darktime->data.F32[i][cellNum] = psMetadataLookupF32(NULL, cell->concepts,
+                                                                         "CELL.DARKTIME");
+                    if (isnan(darktime->data.F32[i][cellNum])) {
+                        psWarning("CELL.DARKTIME for file %s chip %d cell %d is not set.\n", name, j, k);
                         status = false;
+                    } else {
+                        view->chip = j;
+                        view->cell = k;
+                        darktime->data.F32[i][cellNum] = pmFPADarkNorm(fpa, view,
+                                                                       darktime->data.F32[i][cellNum]);
+                        if (isnan(darktime->data.F32[i][cellNum])) {
+                            psWarning("Cannot get dark normalisation for file %s chip %d cell %d.\n",
+                                      name, j, k);
+                            status = false;
+                        }
                     }
                 }
@@ -237 +247 @@
                     }
                     status = psVectorStats(bgStats, sample, sampleMask, NULL, options->combine->maskVal);
-                    if (!status) {
-                      psTrace("ppMerge", 3, "failed to get stats for for %s, cell %d is %f\n", name, cellNum,
-                              background->data.F32[i][cellNum]);
-                      psErrorClear();
-                    }
+                    if (!status) {
+                      psTrace("ppMerge", 3, "failed to get stats for for %s, cell %d is %f\n", name, cellNum,
+                              background->data.F32[i][cellNum]);
+                      psErrorClear();
+                    }
                     psFree(sample);
                     psFree(sampleMask);
@@ -256 +266 @@
     }
     psFree(bgStats);
+    psFree(view);
 
     if (options->scale) {