Changeset 16841

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

Files:

• camera/pmFPAfile.c (modified) (2 diffs)
• camera/pmFPAfile.h (modified) (2 diffs)
• camera/pmFPAfileFitsIO.c (modified) (3 diffs)
• camera/pmFPAfileFitsIO.h (modified) (3 diffs)
• camera/pmFPAfileIO.c (modified) (8 diffs)
• detrend/Makefile.am (modified) (2 diffs)
• detrend/pmBias.c (modified) (3 diffs)
• detrend/pmDark.c (modified) (6 diffs)
• detrend/pmDark.h (added)
• psmodules.h (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfile.c

@@ -435 +435 @@
   if (!strcasecmp (type, "FRINGE")) {
     return PM_FPA_FILE_FRINGE;
+  }
+  if (!strcasecmp (type, "DARK"))     {
+    return PM_FPA_FILE_DARK;
   }
   if (!strcasecmp (type, "HEADER"))     {
@@ -473 +476 @@
     case PM_FPA_FILE_FRINGE:
       return ("FRINGE");
+    case PM_FPA_FILE_DARK:
+      return("DARK");
     case PM_FPA_FILE_HEADER:
       return ("HEADER");

trunk/psModules/src/camera/pmFPAfile.h

@@ -4 +4 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-02-07 23:45:56 $
+ * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-03-06 20:47:50 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -28 +28 @@
     PM_FPA_FILE_RAW,
     PM_FPA_FILE_IMAGE,
+    PM_FPA_FILE_MASK,
+    PM_FPA_FILE_WEIGHT,
+    PM_FPA_FILE_FRINGE,
+    PM_FPA_FILE_DARK,
     PM_FPA_FILE_PSF,
     PM_FPA_FILE_JPEG,
     PM_FPA_FILE_KAPA,
-    PM_FPA_FILE_MASK,
-    PM_FPA_FILE_WEIGHT,
-    PM_FPA_FILE_FRINGE,
     PM_FPA_FILE_HEADER,
     PM_FPA_FILE_ASTROM,

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -20 +20 @@
 #include "pmFPACopy.h"
 #include "pmFPAConstruct.h"
+#include "pmDark.h"
 
 pmFPA *pmFPAfileSuitableFPA(const pmFPAfile *file, const pmFPAview *view, const pmConfig *config)
@@ -243 +244 @@
 }
 
+bool pmFPAviewReadFitsDark(const pmFPAview *view, pmFPAfile *file)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewReadFitsImage(view, file, pmFPAReadDark, pmChipReadDark, pmCellReadDark);
+}
+
 bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view, pmFPAfile *file)
 {
@@ -337 +345 @@
     PS_ASSERT_PTR_NON_NULL(file, false);
     return fpaViewWriteFitsImage(view, file, config, pmFPAWriteWeight, pmChipWriteWeight, pmCellWriteWeight);
+}
+
+bool pmFPAviewWriteFitsDark(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewWriteFitsImage(view, file, config, pmFPAWriteDark, pmChipWriteDark, pmCellWriteDark);
 }
 

trunk/psModules/src/camera/pmFPAfileFitsIO.h

@@ -5 +5 @@
  * @author PAP, IfA
  *
- * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-07-14 03:19:01 $
+ * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-03-06 20:47:50 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -30 +30 @@
                             );
 
+/// Read a dark into the current view
+bool pmFPAviewReadFitsDark(const pmFPAview *view,  ///< View specifying level of interest
+                           pmFPAfile *file ///< FPA file into which to read
+    );
+
 /// Read an image header into the current view
 bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view,  ///< View specifying level of interest
@@ -52 +57 @@
                               const pmConfig *config ///< Configuration
                              );
+
+/// Write the dark for the specified view
+bool pmFPAviewWriteFitsDark(const pmFPAview *view, ///< View specifying level of interest
+                            pmFPAfile *file, ///< FPA file to write
+                            const pmConfig *config ///< Configuration
+    );
 
 /// Write a PHU for a fits image if needed

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -174 +174 @@
         status = pmFPAviewReadFitsHeaderSet(view, file);
         break;
+      case PM_FPA_FILE_DARK:
+        status = pmFPAviewReadFitsDark(view, file);
+        break;
       case PM_FPA_FILE_FRINGE:
-        status = pmFPAviewReadFitsImage (view, file);
+        status = pmFPAviewReadFitsImage(view, file);
         if (status) {
             if (!pmFPAviewReadFitsTable(view, file, "FRINGE")) {
@@ -247 +250 @@
 
     switch (file->type) {
-    case PM_FPA_FILE_IMAGE:
-    case PM_FPA_FILE_MASK:
-    case PM_FPA_FILE_WEIGHT:
-    case PM_FPA_FILE_FRINGE: {
+      case PM_FPA_FILE_IMAGE:
+      case PM_FPA_FILE_MASK:
+      case PM_FPA_FILE_WEIGHT:
+      case PM_FPA_FILE_FRINGE:
+      case PM_FPA_FILE_DARK: {
             // create FPA structure component based on view
             psMetadata *format = file->format; // Camera format configuration
@@ -397 +401 @@
     fitsType |= (file->type == PM_FPA_FILE_HEADER);
     fitsType |= (file->type == PM_FPA_FILE_FRINGE);
+    fitsType |= (file->type == PM_FPA_FILE_DARK);
     fitsType |= (file->type == PM_FPA_FILE_CMP);
     fitsType |= (file->type == PM_FPA_FILE_CMF);
@@ -451 +456 @@
       case PM_FPA_FILE_HEADER:
         psAbort ("no HEADER write functions defined");
+        break;
+      case PM_FPA_FILE_DARK:
+        status = pmFPAviewWriteFitsDark(view, file, config);
         break;
       case PM_FPA_FILE_FRINGE:
@@ -532 +540 @@
       case PM_FPA_FILE_HEADER:
       case PM_FPA_FILE_FRINGE:
+      case PM_FPA_FILE_DARK:
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
@@ -593 +602 @@
       case PM_FPA_FILE_HEADER:
       case PM_FPA_FILE_FRINGE:
+      case PM_FPA_FILE_DARK:
         status = pmFPAviewFreeData(view, file);
         break;
@@ -736 +746 @@
       case PM_FPA_FILE_HEADER:
       case PM_FPA_FILE_FRINGE:
+      case PM_FPA_FILE_DARK:
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
@@ -882 +893 @@
       case PM_FPA_FILE_MASK:
       case PM_FPA_FILE_WEIGHT:
+      case PM_FPA_FILE_DARK:
       case PM_FPA_FILE_FRINGE:
         status = pmFPAviewFitsWritePHU (view, file, config);

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;

trunk/psModules/src/psmodules.h

@@ -68 +68 @@
 #include <pmShutterCorrection.h>
 // #include <pmSkySubtract.h>
+#include <pmDark.h>
 
 // the following headers are from psModule:astrom