Changeset 14475

Timestamp:

Aug 13, 2007, 2:17:40 PM (19 years ago)

Author:

Paul Price

Message:

Adding option to output concepts for skycells in ordinary header keywords (as opposed to, e.g., 'HIERARCH FPA.AIRMASS'). This is necessary in order for DVO to read the photometry files generated from skycells.

Location:

trunk/psModules/src/config

Files:

• pmConfigCamera.c (modified) (8 diffs)
• pmConfigCamera.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfigCamera.c

@@ -25 +25 @@
 // Generate the skycell version of a named camera configuration
 bool pmConfigCameraSkycellVersion(psMetadata *site, // The site configuration
-                           const char *name // Name of the un-mosaicked camera
-                           )
+                                  const char *name // Name of the un-mosaicked camera
+                                  )
 {
     PS_ASSERT_METADATA_NON_NULL(site, false);
@@ -37 +37 @@
         return false;
     }
-    if (!pmConfigGenerateSkycellVersion(cameras, cameras, name)) {
+    if (!pmConfigGenerateSkycellVersion(cameras, cameras, name, site)) {
         psError(PS_ERR_UNKNOWN, true, "Failed to build skycell camera description for %s\n", name);
         return false;
@@ -61 +61 @@
     while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) {
         assert(camerasItem->type == PS_DATA_METADATA); // Only metadata are allowed here!
-        if (!pmConfigGenerateSkycellVersion(cameras, new, camerasItem->name)) {
+        if (!pmConfigGenerateSkycellVersion(cameras, new, camerasItem->name, site)) {
             psError(PS_ERR_UNKNOWN, true, "Failed to build skycell camera description for %s\n",
                     camerasItem->name);
@@ -86 +86 @@
 const static char *skycellConceptsCell[] = { "CELL.BIASSEC", "CELL.TRIMSEC", "CELL.READDIR", "CELL.XPARITY",
                                              "CELL.YPARITY", "CELL.XWINDOW", "CELL.YWINDOW", "CELL.X0",
-                                             "CELL.Y0", "CELL.XSIZE", "CELL.YSIZE", 0 };
+                                             "CELL.Y0", "CELL.XSIZE", "CELL.YSIZE", "CELL.EXPOSURE",
+                                             "CELL.TIME", 0 };
 const static char *skycellConceptsChip[] = { "CHIP.XPARITY", "CHIP.YPARITY", "CHIP.XSIZE", "CHIP.YSIZE", 0 };
-
-// Do we update a particular concept?
+const static char *skycellConceptsFPA[] = { "FPA.EXPOSURE", "FPA.TIME", 0 };
+
+// Do we update a particular concept for a skycell?
 static bool updateConcept(const char *name, // Name of concept
                           const char **concepts // List of concepts NOT to update
-    )
+                          )
 {
     for (int i = 0; concepts[i]; i++) {
@@ -102 +104 @@
 }
 
+// What do we call the skycell concept in the FITS header?
+static const char* skycellConceptName(const char *name, // Name of concept
+                                      const psMetadata *site // Site configuration
+                                      )
+{
+    if (!site) {
+        return name;
+    }
+    bool mdok;                          // Status of MD lookup
+    psMetadata *skycells = psMetadataLookupMetadata(&mdok, site, "SKYCELLS"); // Skycell concept headers
+    if (!skycells) {
+        return name;
+    }
+    const char *keyword = psMetadataLookupStr(&mdok, skycells, name); // Keyword to use for this concept
+    if (!mdok || !keyword || strlen(keyword) == 0) {
+        return name;
+    }
+    return keyword;
+}
+
+
 // Generate a skycell version of a camera configuration
 bool pmConfigGenerateSkycellVersion(psMetadata *oldCameras, // Old list of camera configurations
                                     psMetadata *newCameras, // New list of camera configurations
-                                    const char *name // Name of original camera configuration
+                                    const char *name, // Name of original camera configuration
+                                    const psMetadata *site // Site configuration
                                     )
 {
@@ -201 +225 @@
         while ((name = psListGetAndIncrement(iter))) {
             psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, name);
+            if (updateConcept(name, skycellConceptsFPA)) {
+                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, skycellConceptName(name, site));
+            }
         }
         psFree(iter);
@@ -209 +236 @@
         while ((name = psListGetAndIncrement(iter))) {
             if (updateConcept(name, skycellConceptsChip)) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, name);
+                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, skycellConceptName(name, site));
             }
         }
@@ -219 +246 @@
         while ((name = psListGetAndIncrement(iter))) {
             if (updateConcept(name, skycellConceptsCell)) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, name);
+                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, skycellConceptName(name, site));
             }
         }

trunk/psModules/src/config/pmConfigCamera.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-06-08 00:31:50 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-14 00:17:40 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -19 +19 @@
 bool pmConfigGenerateSkycellVersion(psMetadata *oldCameras, // Old list of camera configurations
                                     psMetadata *newCameras, // New list of camera configurations
-                                    const char *name // Name of original camera configuration
+                                    const char *name, // Name of original camera configuration
+                                    const psMetadata *site // The site configuration
     );
 
 /// Generate the skycell version of a particular camera configuration
 bool pmConfigCameraSkycellVersion(psMetadata *site, // The site configuration
-                           const char *name // Name of the un-mosaicked camera
+                                  const char *name // Name of the un-mosaicked camera
     );