Changeset 16949 for trunk/psModules/src/detrend/pmDark.h

Timestamp:

Mar 12, 2008, 10:49:46 AM (18 years ago)

Author:

Paul Price

Message:

Allow the new-style darks to generate old-style-like darks. We normalise the dark images by a nominated concept (typically CELL.DARKTIME) and fit that. Allow *no* ordinates to be fitted in which case a constant is simply fit (as you usually would for a dark); this isn't the most efficient way of doing this, because it's solving the full least-squares equation instead of doing a straight average, but it's flexible. If there's a problem with speed, we can put in a special case later.

File:

• trunk/psModules/src/detrend/pmDark.h (modified) (3 diffs)

trunk/psModules/src/detrend/pmDark.h

@@ -7 +7 @@
 
 #define PM_DARK_ANALYSIS_ORDINATES "DARK.ORDINATES" // Name for dark ordinates in the cell analysis metadata
+#define PM_DARK_ANALYSIS_NORM "DARK.NORM" // Name for dark normalisation concept in cell analysis metadata
+#define PM_DARK_HEADER_NORM "PSDRKNRM"  // Header keyword for dark normalisation concept
 
 // An ordinate for fitting darks
@@ -26 +28 @@
                    const psArray *inputs, // Input readouts for combination
                    psArray *ordinates,  // Ordinates for fitting
+                   const char *normConcept, // Concept name to use to divide input pixel values
                    int iter,            // Number of rejection iterations
                    float rej,           // Rejection threshold (standard deviations)
@@ -82 +85 @@
 // Write dark table to FITS file
 bool pmDarkWrite(psFits *fits,          // FITS file to which to write
-                 const psMetadata *header, // Header to write
-                 const psArray *ordinates // Dark ordinates to write
+                 psMetadata *header,    // Header to write
+                 const psArray *ordinates, // Dark ordinates to write
+                 const char *normConcept // Normalisation concept name
     );
 
 // Read dark table from FITS file
-psArray *pmDarkRead(psFits *fits        // FITS file to read
+psArray *pmDarkRead(psString *normConcept, // Normalisation concept name
+                    psFits *fits        // FITS file to read
     );