Changeset 16841 for trunk/psModules/src/detrend/pmBias.c

Timestamp:

Mar 6, 2008, 10:47:50 AM (18 years ago)

Author:

Paul Price

Message:

Adding multi-darks --- fitting dark current with multi-dimensional polynomial. This allows the dark current to be a function of temperature, or time since PON. To do this, added new file type, DARK. A DARK file is just like an IMAGE, except that it has a table per FITS file that contains the parameters to use in applying the dark. It's kinda like a FRINGE, but there's only one table per file, instead of one table per extension.

File:

• trunk/psModules/src/detrend/pmBias.c (modified) (3 diffs)

trunk/psModules/src/detrend/pmBias.c

@@ -113 +113 @@
     }
     if (dark) {
+        psWarning("Dark processing is now available using pmDark --- perhaps you should use that instead?");
         PS_ASSERT_PTR_NON_NULL(view, false);
         PS_ASSERT_IMAGE_NON_NULL(dark->image, false);
@@ -121 +122 @@
 
     if (!pmOverscanSubtract (in, overscanOpts)) {
-        return false;
+        return false;
     }
 
@@ -148 +149 @@
         }
 
-        float darkNorm = 1.0;
+        float darkNorm = 1.0;
         float inNorm = pmFPADarkNorm(in->parent->parent->parent, view, inTime);
 
-        // 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 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(dark->parent->parent->parent, view, darkTime);
-        }
+        if (darkTime != 1.0) {
+            darkNorm = pmFPADarkNorm(dark->parent->parent->parent, view, darkTime);
+        }
 
-        if (isnan(inNorm) || isnan(darkNorm)) {
+        if (isnan(inNorm) || isnan(darkNorm)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to determine dark normalisations.");
             return false;