Changeset 18905

Timestamp:

Aug 4, 2008, 4:16:06 PM (18 years ago)

Author:

Paul Price

Message:

Adding functions to dump configuration to an MDC file on disk, so we can record what parameters we used.

Location:

trunk/psModules/src

Files:

• camera/pmFPAview.c (modified) (2 diffs)
• camera/pmFPAview.h (modified) (2 diffs)
• config/Makefile.am (modified) (1 diff)
• config/pmConfig.c (modified) (4 diffs)
• config/pmConfig.h (modified) (4 diffs)
• config/pmConfigDump.c (added)
• config/pmConfigDump.h (added)
• psmodules.h (modified) (1 diff)

trunk/psModules/src/camera/pmFPAview.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-02 20:33:14 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-05 02:16:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -374 +374 @@
 }
 
+pmFPAview *pmFPAviewTop(const pmFPA *fpa)
+{
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+
+    pmFPAview *view = pmFPAviewAlloc(0);// View to top
+
+    int numChips = 0;                   // Number of active chips
+    psArray *chips = fpa->chips;        // Chips of interest
+    for (int i = 0; i < chips->n; i++) {
+        pmChip *chip = chips->data[i];  // Chip of interest
+        if (!chip || !chip->file_exists) {
+            continue;
+        }
+        numChips++;
+        view->chip = i;
+
+        int numCells = 0;               // Number of active cells
+        psArray *cells = chip->cells;   // Cells of interest
+        for (int j = 0; j < cells->n; j++) {
+            pmCell *cell = cells->data[j]; // Cell of interest
+            if (!cell || !cell->file_exists) {
+                continue;
+            }
+            numCells++;
+            view->cell = j;
+        }
+
+        if (numCells > 1) {
+            if (numCells != cells->n) {
+                psWarning("More than one, but not all cells are active.");
+            }
+            view->cell = -1;
+        }
+    }
+
+    if (numChips > 1) {
+        if (numChips != chips->n) {
+            psWarning("More than one, but not all chips are active.");
+        }
+        view->chip = -1;
+        view->cell = -1;
+    }
+
+    return view;
+}
+

trunk/psModules/src/camera/pmFPAview.h

@@ -4 +4 @@
  * @author Eugene Magnier, IfA
  *
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-01-02 20:33:14 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-08-05 02:16:06 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -124 +124 @@
 
 
+/// Determine the view suitable for the top level of the provided FPA
+pmFPAview *pmFPAviewTop(const pmFPA *fpa ///< FPA of interest
+    );
+
 /// @}
 #endif

trunk/psModules/src/config/Makefile.am

@@ -4 +4 @@
 libpsmodulesconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
 libpsmodulesconfig_la_SOURCES  = \
-    pmConfig.c \
-    pmConfigRecipes.c \
-    pmConfigCamera.c \
-    pmConfigCommand.c \
-    pmConfigMask.c \
-    pmVersion.c \
-    pmErrorCodes.c
+        pmConfig.c \
+        pmConfigRecipes.c \
+        pmConfigCamera.c \
+        pmConfigCommand.c \
+        pmConfigMask.c \
+        pmConfigDump.c \
+        pmVersion.c \
+        pmErrorCodes.c
 
 pkginclude_HEADERS = \
-    pmConfig.h \
-    pmConfigRecipes.h \
-    pmConfigCamera.h \
-    pmConfigCommand.h \
-    pmConfigMask.h \
-    pmVersion.h \
-    pmErrorCodes.h
+        pmConfig.h \
+        pmConfigRecipes.h \
+        pmConfigCamera.h \
+        pmConfigCommand.h \
+        pmConfigMask.h \
+        pmConfigDump.h \
+        pmVersion.h \
+        pmErrorCodes.h
 
 # Error codes.

trunk/psModules/src/config/pmConfig.c

@@ -68 +68 @@
     psFree(config->arguments);
     psFree(config->database);
+    psFree(config->program);
 
     // Close log and trace files
@@ -150 +151 @@
     config->database = NULL;
     config->defaultRecipe = NULL;
+    config->program = NULL;
 
     config->traceFD = DEFAULT_TRACE;
@@ -442 +444 @@
 
     pmConfig *config = pmConfigAlloc(); // The configuration, containing site, camera and recipes
+    config->program = psStringCopy(argv[0]);
     config->defaultRecipe = defaultRecipe;
 
@@ -1745 +1748 @@
 }
 
-
-#if 0
-bool pmConfigDump(const pmConfig *config, const pmFPA *source, const char *outroot)
-{
-    PS_ASSERT_PTR_NON_NULL(config, false);
-    PS_ASSERT_STRING_NON_EMPTY(outroot, false);
-
-    pmFPAview *view = source ? pmFPAviewTop(source) : pmFPAviewAlloc(0);// View to top level
-    if (!view) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to determine top view for FPA.");
-        return false;
-    }
-
-    psMetadata *dumpRules = psMetadataLookupMetadata(NULL, config->system, "CONFIG.RULES"); // Name rules
-    if (!dumpRules) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to find CONFIG.RULES in system configuration");
-        psFree(view);
-        return false;
-    }
-
-    const char *name =
-#endif

trunk/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-06-10 21:53:09 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-05 02:16:06 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -37 +37 @@
 /// command-line arguments, the pmFPAfiles used, and the database handle.
 typedef struct {
-    psMetadata *user;                   ///< User configuration
-    psMetadata *site;                   ///< Site configuration
-    psMetadata *system;                 ///< System configuration
+    psMetadata *user;                   ///< User configuration
+    psMetadata *site;                   ///< Site configuration
+    psMetadata *system;                 ///< System configuration
     psMetadata *complete;               ///< Full merged configuration
     psMetadata *camera;                 ///< Camera specification
@@ -51 +51 @@
     psDB *database;                     ///< Database handle
     const char *defaultRecipe;          ///< name of top-level recipe for this program
+    psString program;                   ///< Name of program
     // Private members
     pmRecipeSource recipesRead;         ///< Which recipe sources have been read
@@ -108 +109 @@
 /// configuration.  The accepted format is returned.
 psMetadata *pmConfigCameraFormatFromHeader(psMetadata **camera, // selected camera (or meta-camera)
-                                           psString *formatName, // selected format name
-                                           pmConfig *config, ///< The configuration
+                                           psString *formatName, // selected format name
+                                           pmConfig *config, ///< The configuration
                                            const psMetadata *header, ///< The FITS header
                                            bool readRecipes ///< optionally read the recipes as well as the format

trunk/psModules/src/psmodules.h

@@ -26 +26 @@
 #include <pmConfigCommand.h>
 #include <pmConfigMask.h>
+#include <pmConfigDump.h>
 #include <pmVersion.h>