Changeset 9857

Timestamp:

Nov 3, 2006, 4:40:46 PM (20 years ago)

Author:

Paul Price

Message:

Adding fringe processing.

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (3 diffs)
• ppImageDetrendFringe.c (added)
• ppImageDetrendFringe.h (added)
• ppImageLoop.c (modified) (4 diffs)
• ppImageOptions.c (modified) (3 diffs)
• ppImageOptions.h (modified) (1 diff)
• ppImageParseCamera.c (modified) (5 diffs)
• ppImageParseDetrend.c (modified) (1 diff)

trunk/ppImage/src/Makefile.am

@@ -4 +4 @@
         ppImage.h \
         ppImageOptions.h \
+        ppImageDetrendFringe.h \
         ppMem.h
 
@@ -18 +19 @@
         ppImageDetrendBias.c \
         ppImageDetrendNonLinear.c \
+        ppImageDetrendFringe.c \
         ppImageRebinReadout.c \
         ppImageMosaic.c \
@@ -38 +40 @@
         ppImageDetrendBias.c \
         ppImageDetrendNonLinear.c \
+        ppImageDetrendFringe.c \
         ppImageRebinReadout.c \
         ppImageMosaic.c \

trunk/ppImage/src/ppImageLoop.c

@@ -5 +5 @@
 #include <ppStats.h>
 #include "ppImage.h"
+#include "ppImageDetrendFringe.h"
 
 bool ppImageLoop (pmConfig *config, ppImageOptions *options) {
@@ -44 +45 @@
         if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
 
+        const char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME"); // Name of chip
+        psArray *fringeRef = NULL;      // Array of array of fringe statistics for reference --- for each cell
+        psArray *fringeSci = NULL;      // Array of fringe statistics for science --- for each cell
+        if (options->doFringe) {
+            fringeRef = psArrayAlloc(chip->cells->n);
+            fringeSci = psArrayAlloc(chip->cells->n);
+        }
+
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
             psLogMsg ("ppImageLoop", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) { continue; }
             if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
+            const char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME"); // Name of cell
+
+            if (options->doFringe) {
+                pmFPAfile *fringeFile = psMetadataLookupPtr(&status, config->files, "PPIMAGE.FRINGE");
+                if (!status || !fringeFile) {
+                    psErrorStackPrint(stderr, "Can't find fringe data!\n");
+                    exit(EXIT_FAILURE);
+                }
+
+                psString fringeExt = NULL; // Fringe extension name
+                psStringAppend(&fringeExt, "FRINGE_%s_%s", chipName, cellName);
+                fringeRef->data[view->cell] = pmFringesReadFits(NULL, fringeFile->fits, fringeExt);
+                psFree(fringeExt);
+            }
 
             // process each of the readouts
@@ -57 +80 @@
                 if (!ppImageDetrendReadout (config, options, view)) return false;
 
+                if (options->doFringe) {
+                    ppImageDetrendFringeMeasure((pmFringeStats**)(&fringeSci->data[view->cell]),
+                                                fringeRef->data[view->cell], readout, options);
+                }
+            }
+        }
+
+        // Solve the fringe system
+        pmFringeScale *fringeSoln = NULL; // Solution for the fringes
+        if (options->doFringe) {
+            fringeSoln = ppImageDetrendFringeSolve(fringeSci, fringeRef, options);
+            psFree(fringeSci);
+            psFree(fringeRef);
+        }
+
+        // Go back over the cells to apply the fringe and do statistics
+        view->cell = view->readout = -1;
+        while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
+            if (!cell->process || !cell->file_exists) { continue; }
+
+            // Apply the fringe correction
+            psTrace("ppImage", 3, "Applying fringe correction...\n");
+            bool mdok;                          // Status of MD lookup
+            pmFPAfile *fringeFile = psMetadataLookupPtr(&mdok, config->files, "PPIMAGE.FRINGE");
+            pmCell *fringeCell = pmFPAviewThisCell(view, fringeFile->fpa);
+            psImage *fringe = ppImageDetrendFringeGenerate(cell, fringeCell, fringeSoln);
+            while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
+                if (!readout->data_exists) { continue; }
+
+                // XXX: Make generic, so subregions may be subtracted as well
+                psBinaryOp(readout->image, readout->image, "-", fringe);
+
                 if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
             }
+            psFree(fringe);
+
 
             // Perform statistics on the detrended cell
@@ -67 +124 @@
             if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
         }
+        psFree(fringeSoln);
 
         ppImageMosaicChip (config, view, "PPIMAGE.OUTPUT.CHIP", "PPIMAGE.OUTPUT");

trunk/ppImage/src/ppImageOptions.c

@@ -49 +49 @@
     // Overscan defaults
     options->overscan      = NULL;      // Overscan options
+
+    // Fringe defaults
+    options->fringeRej = NAN;
+    options->fringeIter = 0;
+    options->fringeKeep = 1.0;
 
     // Non-linearity default options
@@ -163 +168 @@
     options->doDark = psMetadataLookupBool(NULL, recipe, "DARK");
     options->doFlat = psMetadataLookupBool(NULL, recipe, "FLAT");
+    options->doFringe = psMetadataLookupBool(NULL, recipe, "FRINGE");
     options->doShutter = psMetadataLookupBool(NULL, recipe, "SHUTTER");
 
@@ -200 +206 @@
     }
 
+    // Fringe options
+    options->fringeRej = psMetadataLookupF32(NULL, recipe, "FRINGE.REJ");
+    options->fringeIter = psMetadataLookupS32(NULL, recipe, "FRINGE.ITER");
+    options->fringeKeep = psMetadataLookupF32(NULL, recipe, "FRINGE.KEEP");
+
     return options;
 }

trunk/ppImage/src/ppImageOptions.h

@@ -38 +38 @@
     int xBin2, yBin2;
 
+    float fringeRej;                    // Fringe rejection limit
+    int fringeIter;                     // Fringe iterations
+    float fringeKeep;                   // Fringe keep fraction
+
 } ppImageOptions;
 

trunk/ppImage/src/ppImageParseCamera.c

@@ -34 +34 @@
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.BIAS", input->fpa, PM_DETREND_TYPE_BIAS);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a bias image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a bias image source");
+            return NULL;
+        }
     }
     if (options->doDark) {
@@ -44 +44 @@
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.DARK", input->fpa, PM_DETREND_TYPE_DARK);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a dark image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a dark image source");
+            return NULL;
+        }
     }
     if (options->doMask) {
@@ -54 +54 @@
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.MASK", input->fpa, PM_DETREND_TYPE_MASK);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a mask image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a mask image source");
+            return NULL;
+        }
     }
     if (options->doShutter) {
@@ -62 +62 @@
         pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.SHUTTER", "SHUTTER");
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.SHUTTER");
-        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.SHUTTER", input->fpa, PM_DETREND_TYPE_FLAT);
+        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.SHUTTER", input->fpa, PM_DETREND_TYPE_SHUTTER);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a shutter image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a shutter image source");
+            return NULL;
+        }
     }
     if (options->doFlat) {
@@ -74 +74 @@
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FLAT", input->fpa, PM_DETREND_TYPE_FLAT);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a flat image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a flat image source");
+            return NULL;
+        }
+    }
+    if (options->doFringe) {
+        bool status = false;
+        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.FRINGE", "FRINGE");
+        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.FRINGE");
+        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FRINGE", input->fpa, PM_DETREND_TYPE_FRINGE_IMAGE);
+        if (!status) {
+            psError (PS_ERR_IO, false, "can't find a fringe image source");
+            return NULL;
+        }
     }
 

trunk/ppImage/src/ppImageParseDetrend.c

@@ -54 +54 @@
     }
 
+    if (options->doFringe) {
+        bool status = false;
+        pmFPAfileFromArgs (&status, config, "PPIMAGE.FRINGE", "FRINGE");
+        pmFPAfileFromConf (&status, config, "PPIMAGE.FRINGE", input->fpa);
+        if (!status) psAbort ("ppImageParseDetrend", "can't find a fringe image source");
+    }
+
     // the following files are output targets
     // XXX which of these are required?