Changeset 13956

Timestamp:

Jun 22, 2007, 1:25:59 PM (19 years ago)

Author:

magnier

Message:

do not divide by darkNorm is DARKTIME is 1.0 (ie, if master is normalized)

File:

• trunk/psModules/src/detrend/pmBias.c (modified) (1 diff)

trunk/psModules/src/detrend/pmBias.c

@@ -487 +487 @@
         }
 
+        float darkNorm = 1.0;
         float inNorm = pmFPADarkNorm(inRO->parent->parent->parent, view, inTime);
-        float darkNorm = pmFPADarkNorm(darkRO->parent->parent->parent, view, darkTime);
-        if (isnan(inNorm) || isnan(darkNorm)) {
+
+        // if we have a normalized dark exposure, we simply multiply the master by inNorm.  if
+        // we do not have a normalized exposure, we have to scale the master as well.  XXX do
+        // we need to explicitly identify the master as normalized?
+
+        if (darkTime != 1.0) {
+            darkNorm = pmFPADarkNorm(darkRO->parent->parent->parent, view, darkTime);
+        }
+
+        if (isnan(inNorm) || isnan(darkNorm)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to determine dark normalisations.");
             return false;