Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/psModules/src/config

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/config/pmConfig.c (modified) (1 diff)
• psModules/src/config/pmConfigCamera.c (modified) (2 diffs)
• psModules/src/config/pmConfigMask.c (modified) (1 diff)
• psModules/src/config/pmConfigRun.c (modified) (4 diffs)
• psModules/src/config/pmConfigRun.h (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfig.c

@@ -806 +806 @@
     pmConfigLoadRecipeOptions(argc, argv, config, "-Df");
     pmConfigLoadRecipeOptions(argc, argv, config, "-Db");
+
+    if (!pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CL)) {
+        psError(PS_ERR_IO, false, "Failed to read recipes from command-line");
+        psFree(config);
+        return NULL;
+    }
 
     // Look for command-line options for files to replace

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigCamera.c

@@ -159 +159 @@
 // Don't update these skycell concepts; last one MUST be 0 (i.e., NULL).
 const static char *skycellConceptsCell[] = { "CELL.BIASSEC", "CELL.TRIMSEC", "CELL.READDIR", "CELL.XPARITY",
-                                             "CELL.YPARITY", "CELL.X0", "CELL.Y0", 0 };
+                                             "CELL.YPARITY", "CELL.X0", "CELL.Y0", "CELL.TIMESYS", 0 };
 const static char *skycellConceptsChip[] = { "CHIP.XPARITY", "CHIP.YPARITY", 0 };
-const static char *skycellConceptsFPA[] = { 0 };
+const static char *skycellConceptsFPA[] = { "FPA.TIMESYS" };
 
 // What do we call the skycell concept in the FITS header?
@@ -332 +332 @@
         psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.X0", 0, NULL, 0);
         psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.READDIR", 0, "Read direction (rows)", 1);
+        psMetadataAddStr(defaults, PS_LIST_TAIL, "CELL.TIMESYS", 0, "Time system", "TAI");
+        psMetadataAddStr(defaults, PS_LIST_TAIL, "FPA.TIMESYS", 0, "Time system", "TAI");
 
         psMetadataAddMetadata(format, PS_LIST_TAIL, "DEFAULTS", 0, "Default values for concepts", defaults);

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigMask.c

@@ -10 +10 @@
 
 static pmConfigMaskInfo masks[] = {
-    { "DETECTOR",  NULL,       0x00, true  },   // Something is wrong with the detector
-    { "DARK",      "DETECTOR", 0x00, true  },   // Pixel doesn't dark-subtract properly
-    { "FLAT",      "DETECTOR", 0x01, true  },   // Pixel doesn't flat-field properly
-    { "BLANK",     "DETECTOR", 0x01, true  },   // Pixel doesn't contain valid data
-    { "RANGE",     NULL,       0x00, true  },   // Pixel is out-of-range of linearity
-    { "SAT",       "RANGE",    0x01, true  },   // Pixel is saturated
-    { "BAD",       "RANGE",    0x01, true  },   // Pixel is low
-    { "BAD.WARP",  NULL,       0x01, true  },   // Pixel is bad after convolution with a bad pixel
-    { "CR",        NULL,       0x00, true  },   // Pixel contains a cosmic ray
-    { "GHOST",     NULL,       0x00, true  },   // Pixel contains an optical ghost
-    { "POOR.WARP", NULL,       0x00, false },   // Pixel is poor after convolution with a bad pixel
-    // "LOW"  Pixel is low
-    // "CONV" Pixel is bad after convolution with a bad pixel
+    // Features of the detector
+    { "DETECTOR",  NULL,       0x01, true  }, // Something is wrong with the detector
+    { "FLAT",      "DETECTOR", 0x01, true  }, // Pixel doesn't flat-field properly
+    { "DARK",      "DETECTOR", 0x01, true  }, // Pixel doesn't dark-subtract properly
+    { "BLANK",     "DETECTOR", 0x01, true  }, // Pixel doesn't contain valid data
+    { "CTE",       "DETECTOR", 0x01, true  }, // Pixel has poor CTE
+    // Invalid signal ranges
+    { "SAT",       NULL,       0x02, true  }, // Pixel is saturated or non-linear
+    { "LOW",       "SAT",      0x02, true  }, // Pixel is low
+    { "SUSPECT",   NULL,       0x04, false }, // Pixel is suspected of being bad
+    // Non-astronomical structures
+    { "CR",        NULL,       0x08, true  }, // Pixel contains a cosmic ray
+    { "SPIKE",     NULL,       0x08, true  }, // Pixel contains a diffraction spike
+    { "GHOST",     NULL,       0x08, true  }, // Pixel contains an optical ghost
+    { "STREAK",    NULL,       0x08, true  }, // Pixel contains streak data
+    { "STARCORE",  NULL,       0x08, true  }, // Pixel contains a bright star core
+    // Effects of convolution and interpolation
+    { "CONV.BAD",  NULL,       0x02, true  }, // Pixel is bad after convolution with a bad pixel
+    { "CONV.POOR", NULL,       0x04, false }, // Pixel is poor after convolution with a bad pixel
 };
 

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigRun.c

@@ -39 +39 @@
 }
 
-
-bool pmConfigRunFileAdd(pmConfig *config, const pmFPAfile *file)
+// Add a file to a nominated metadata in the RUN information
+static bool configRunFileAdd(pmConfig *config, // Configuration
+                             const pmFPAfile *file, // File to add
+                             const char *target // Name of metadata to which to add
+                             )
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -47 +50 @@
     psMetadata *run = configRun(config);// RUN information
     psAssert(run, "Require run-time information");
-    psMetadata *files = configElement(run, "FILES", "Filerules used during execution");
+    psMetadata *files = configElement(run, target, "Filerules used during execution");
     psAssert(files, "Require list of files");
 
@@ -71 +74 @@
 }
 
-psArray *pmConfigRunFileGet(pmConfig *config, const char *name)
+bool pmConfigRunFileAddRead(pmConfig *config, const pmFPAfile *file)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-    PS_ASSERT_STRING_NON_EMPTY(name, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
 
+    return configRunFileAdd(config, file, "FILES.INPUT");
+}
+
+bool pmConfigRunFileAddWrite(pmConfig *config, const pmFPAfile *file)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+
+    return configRunFileAdd(config, file, "FILES.OUTPUT");
+}
+
+// Get an array of filenames from the nominated RUN information
+static psArray *configRunFileGet(pmConfig *config, // Configuration
+                                 const char *name, // Name of file
+                                 const char *source // Source metadata for file
+                                 )
+{
     psMetadata *run = configRun(config);// RUN information
     psAssert(run, "Require run-time information");
-    psMetadata *files = configElement(run, "FILES", "Filerules used during execution");
+    psMetadata *files = configElement(run, source, "Filerules used during execution");
     psAssert(files, "Require list of files");
+
+    if (psListLength(files->list) == 0) {
+        // Can't find anything
+        return NULL;
+    }
 
     psList *list = psListAlloc(NULL);   // List of file names
@@ -104 +129 @@
 
     return array;
+}
+
+
+psArray *pmConfigRunFileGet(pmConfig *config, const char *name)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_STRING_NON_EMPTY(name, false);
+
+    // Try the input and output, in turn
+    psArray *files = configRunFileGet(config, name, "FILES.INPUT"); // Files from RUN metadata
+    if (!files) {
+        configRunFileGet(config, name, "FILES.OUTPUT");
+    }
+
+    return files;
 }
 

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigRun.h

@@ -6 +6 @@
 #include <pmFPAfile.h>
 
-/// Add a file to the list of files used in the run-time information
-bool pmConfigRunFileAdd(
+/// Add a file to the list of files read in the run-time information
+bool pmConfigRunFileAddRead(
+    pmConfig *config,                   ///< Configuration
+    const pmFPAfile *file               ///< File to add
+    );
+
+/// Add a file to the list of files written in the run-time information
+bool pmConfigRunFileAddWrite(
     pmConfig *config,                   ///< Configuration
     const pmFPAfile *file               ///< File to add