Changeset 13810 for trunk/psModules/src/camera/pmFPAfile.h

Timestamp:

Jun 13, 2007, 4:03:29 PM (19 years ago)

Author:

Paul Price

Message:

Adding dark normalisation. The idea is that the dark current is not always linear with the darktime, but may be described by a polynomial function of the darktime. We introduce in the camera configuration DARK.NORM, which is a filename within the search path (or it may be a metadata, which removes the need to read a file, but clutters the configuration file). This file is read in the usual course of configuration setup. When required, DARK.NORM.KEY (which is resolved in the usual way, so try, e.g., '{CHIP.NAME}') points at a metadata within the DARK.NORM that provides the polynomial for correcting the darktime. This means that the view must be passed in to pmBiasSubtract, so that the appropriate polynomial can be identified.

File:

• trunk/psModules/src/camera/pmFPAfile.h (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfile.h

@@ -4 +4 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-05-26 02:50:36 $
+ * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-14 02:03:29 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -53 +53 @@
 typedef struct
 {
-    pmFPAfileMode mode;                 // is this file read, written, or only used internally?
-    pmFPAfileType type;                 // what type of data is read from / written to disk?
-    pmFPAfileState state;               // have we opened the file, etc?
+    pmFPAfileMode mode;                 // is this file read, written, or only used internally?
+    pmFPAfileType type;                 // what type of data is read from / written to disk?
+    pmFPAfileState state;               // have we opened the file, etc?
 
-    pmFPALevel fileLevel;               // what level in the FPA hierarchy represents a unique file?
-    pmFPALevel dataLevel;               // at what level do we read/write the data segment? (request by user)
-    pmFPALevel freeLevel;               // at what level do we free the data segment? (set by program)
+    pmFPALevel fileLevel;               // what level in the FPA hierarchy represents a unique file?
+    pmFPALevel dataLevel;               // at what level do we read/write the data segment? (request by user)
+    pmFPALevel freeLevel;               // at what level do we free the data segment? (set by program)
     pmFPALevel mosaicLevel;             // at what level is the mosaic?
 
-    pmFPA *fpa;                         // for I/O files, we carry a pointer to the complete fpa
-    psFits *fits;                       // for I/O files of fits type (IMAGE, CMP, CMF), we carry a file handle
+    pmFPA *fpa;                         // for I/O files, we carry a pointer to the complete fpa
+    psFits *fits;                       // for I/O files of fits type (IMAGE, CMP, CMF), we carry a file handle
 
-    bool phu;                           // have we written a PHU for this file?
-    psMetadata *header;                 // pointer (view) to the current hdu header
+    bool phu;                           // have we written a PHU for this file?
+    psMetadata *header;                 // pointer (view) to the current hdu header
 
-    pmReadout *readout;                 // for internal files, we only carry a single readout
+    pmReadout *readout;                 // for internal files, we only carry a single readout
 
-    psMetadata *names;                  // filenames supplied by the cmdline or detdb are saved here
+    psMetadata *names;                  // filenames supplied by the cmdline or detdb are saved here
 
-    char *filerule;                     // rule for constructing a filename when needed
-    char *filesrc;                      // rule to find file in pmFPAfile->names list
+    char *filerule;                     // rule for constructing a filename when needed
+    char *filesrc;                      // rule to find file in pmFPAfile->names list
 
-    char *name;                         // the name of the rule (useful for debugging / tracing)
-    char *filename;                     // the current name of an active file
-    char *extname;                      // the current name of an active file extension
+    char *name;                         // the name of the rule (useful for debugging / tracing)
+    char *filename;                     // the current name of an active file
+    char *extname;                      // the current name of an active file extension
 
     pmDetrendSelectResults *detrend;    // Detrend information, from pmDetrendSelect
@@ -110 +110 @@
 
 // convert the rule to a name based on the current view
+psString pmFPANameFromRule(const char *rule, const pmFPA *fpa, const pmFPAview *view);
+
+// convert the rule to a name based on the current view
 psString pmFPAfileNameFromRule(const char *rule, const pmFPAfile *file, const pmFPAview *view);