Changeset 16841 for trunk/psModules/src/detrend

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.

Location:

trunk/psModules/src/detrend

Files:

• Makefile.am (modified) (2 diffs)
• pmBias.c (modified) (3 diffs)
• pmDark.c (modified) (6 diffs)
• pmDark.h (added)

trunk/psModules/src/detrend/Makefile.am

@@ -13 +13 @@
         pmDetrendDB.c \
         pmShutterCorrection.c \
-        pmShifts.c
+        pmShifts.c \
+        pmDark.c
 
 #       pmSkySubtract.c
@@ -27 +28 @@
         pmDetrendDB.h \
         pmShutterCorrection.h \
-        pmShifts.h
+        pmShifts.h \
+        pmDark.h
 
 #       pmSkySubtract.h

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;

trunk/psModules/src/detrend/pmDark.c

@@ -25 +25 @@
 static bool ordinateLookup(float *value, // Value of ordinate, to return
                            const char *name, // Name of ordinate (concept name)
+                           bool scale,  // Scale the value?
+                           float min, float max, // Minimum and maximum values for scaling
                            const pmReadout *ro // Readout of interest
                            )
@@ -60 +62 @@
         psWarning("Non-finite value (%f) of concept %s in readout", *value, name);
         return false;
+    }
+    if (scale) {
+        if (*value < min || *value > max) {
+            psWarning("Value of concept %s (%f) outside range (%f:%f)", name, *value, min, max);
+            return false;
+        }
+        *value = 2.0 * (*value - min) / (max - min) - 1.0;
     }
 
@@ -130 +139 @@
 
             float value = NAN;          // Value of ordinate
-            if (!ordinateLookup(&value, ord->name, ro)) {
+            if (!ordinateLookup(&value, ord->name, ord->scale, ord->min, ord->max, ro)) {
                 roMask->data.U8[j] = 0xff;
                 val->data.F32[i] = NAN;
                 numBadInputs++;
                 continue;
-            }
-            if (ord->scale) {
-                value = 2.0 * (value - ord->min) / (ord->max - ord->min) - 1.0;
             }
             val->data.F32[i] = value;
@@ -280 +286 @@
         return false;
     }
-    PS_ASSERT_ARRAYS_SIZE_EQUAL(dark->readouts, ordinates, false);
 
     int numOrdinates = ordinates->n;    // Number of ordinates
@@ -287 +292 @@
         pmDarkOrdinate *ord = ordinates->data[i]; // Ordinate of interest
         float value = NAN;              // Value for ordinate
-        if (!ordinateLookup(&value, ord->name, readout)) {
+        if (!ordinateLookup(&value, ord->name, ord->scale, ord->min, ord->max, readout)) {
             psError(PS_ERR_UNKNOWN, true, "Unable to find value for %s", ord->name);
             psFree(values);
@@ -317 +322 @@
             }
             float value = psPolynomialMDEval(poly, values); // Value of dark current
-            readout->image->data.F32[y][x] = value;
+            readout->image->data.F32[y][x] -= value;
             if (readout->mask && !isfinite(value)) {
                 readout->mask->data.PS_TYPE_MASK_DATA[y][x] = bad;