Changeset 12300 for trunk/psModules/src/detrend

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.

Location:

trunk/psModules/src/detrend

Files:

• pmDetrendDB.c (modified) (5 diffs)
• pmDetrendDB.h (modified) (3 diffs)

trunk/psModules/src/detrend/pmDetrendDB.c

@@ -47 +47 @@
     options->version  = NULL;
     options->dettype  = NULL;
-    options->exptime  = 0.0; 
-    options->airmass  = 0.0; 
-    options->dettemp  = 0.0; 
-    options->twilight = 0.0; 
+    options->exptime  = 0.0;
+    options->airmass  = 0.0;
+    options->dettemp  = 0.0;
+    options->twilight = 0.0;
 
     options->exptimeSet  = false; // not selected
@@ -120 +120 @@
     char *type = NULL;
     if (options->dettype) {
-        type = psMemIncrRefCounter (options->dettype);
+        type = psMemIncrRefCounter (options->dettype);
     } else {
-        type = pmDetrendTypeToString (options->type);
+        type = pmDetrendTypeToString (options->type);
     }
     unsigned int nFail;
@@ -189 +189 @@
 
     bool mdstatus;
-    results->level = 0;
     int detID = psMetadataLookupS32 (&mdstatus, md, "det_id");
+    if (!mdstatus) {
+        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find det_id in output from detselect.");
+        psLogMsg ("psModule.detrend", PS_LOG_ERROR, "detselect response:\n %s\n", buffer->data);
+        goto failure;
+    }
     int iteration  = psMetadataLookupS32 (&mdstatus, md, "iteration");
+    if (!mdstatus) {
+        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find iteration in output from detselect.");
+        psLogMsg ("psModule.detrend", PS_LOG_ERROR, "detselect response:\n %s\n", buffer->data);
+        goto failure;
+    }
+    psString fileLevel = psMetadataLookupStr(&mdstatus, md, "file_level");
+    if (!mdstatus || !fileLevel || strlen(fileLevel) == 0) {
+        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find file_level in output from detselect.");
+        psLogMsg ("psModule.detrend", PS_LOG_ERROR, "detselect response:\n %s\n", buffer->data);
+        goto failure;
+    }
 
     results->detID = NULL; // it should be NULL already from the Alloc above
     psStringAppend (&results->detID, " -det_id %d -iteration %d ", detID, iteration);
+    results->level = psMemIncrRefCounter(fileLevel);
 
     psTrace("psModules.detrend", 5, "generated detID %s\n", results->detID);
@@ -225 +241 @@
 
     PS_ASSERT_PTR_NON_NULL(detID, NULL);
-    PS_ASSERT_PTR_NON_NULL(classID, NULL);
 
     bool status;
@@ -232 +247 @@
 
     // generate the detselect command
-    psStringAppend (&line, "detselect -select %s -class_id %s", detID, classID);
+    psStringAppend (&line, "detselect -select %s", detID);
+    if (classID && strlen(classID) > 0) {
+        psStringAppend(&line, " -class_id %s", classID);
+    }
     pmConfigDatabaseCommand(&line, config);
     pmConfigTraceCommand(&line);

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);