Changeset 12300 for trunk/psModules/src/detrend/pmDetrendDB.h

Timestamp:

Mar 7, 2007, 3:22:17 PM (19 years ago)

Author:

Paul Price

Message:

Images in the detrend database may be in different formats.
Therefore, in order to get a detrend matching the appropriate level,
we need to place a restriction on the class_id (class identifier,
which can be 'fpa', 'ccd00', or even 'ccd00:cell01'). To do this, we
have "detselect -search" return the file level (fpa/chip/cell) for the
detrend, so that we can provide the correct constraint on the class_id
(using "detselect -select"). Introduced a new metadata in the camera
configuration ("CLASSID") that provides rules for the class_id (e.g.,
"{CHIP.NAME}:{CELL.NAME}") according to the file level string.

File:

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

trunk/psModules/src/detrend/pmDetrendDB.h

@@ -9 +9 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-02-18 21:03:20 $
+ * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-08 01:22:17 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -35 +35 @@
 } pmDetrendType;
 
-typedef struct
-{
-    char *camera;                       // name of camera
-    char *version;                      // optional version string
-    char *filter;                       // name of filter
-    char *dettype;                      // actual detrend type name
-    float exptime;                      // exposure time (for dark, maybe flat & fringe)
-    float airmass;                      // for fringe
-    float dettemp;                      // for fringe
-    float twilight;                     // hours (or seconds?) since/before nearest twilight
-    psTime time;                        // time of input data
-    pmDetrendType type;                 // type of detrend data
+typedef struct {
+    char *camera;                       // name of camera
+    char *version;                      // optional version string
+    char *filter;                       // name of filter
+    char *dettype;                      // actual detrend type name
+    float exptime;                      // exposure time (for dark, maybe flat & fringe)
+    float airmass;                      // for fringe
+    float dettemp;                      // for fringe
+    float twilight;                     // hours (or seconds?) since/before nearest twilight
+    psTime time;                        // time of input data
+    pmDetrendType type;                 // type of detrend data
 
     bool  exptimeSet;
@@ -52 +51 @@
     bool  dettempSet;
     bool  twilightSet;
-}
-pmDetrendSelectOptions;
+} pmDetrendSelectOptions;
 
-typedef struct
-{
-    char *detID;   // identifier of detrend run
-    pmFPALevel level;   // level in FPA hierarchy of individual file
-}
-pmDetrendSelectResults;
-
-typedef struct
-{
-    char *detID;   // identifier of detrend image
-    char *classID;   // level in FPA hierarchy of individual file
-}
-pmDetrendFileOptions;
+typedef struct {
+    char *detID;                        // identifier of detrend run
+    const char *level;                  // level in FPA hierarchy of individual file
+} pmDetrendSelectResults;
 
 psString pmDetrendTypeToString (pmDetrendType type);