Changeset 19042

Timestamp:

Aug 12, 2008, 4:32:35 PM (18 years ago)

Author:

Paul Price

Message:

Allow additional cameras besides the one recorded in config->cameraName to survive culling. This is important for pswarp, where the skycell is of a different camera type (SIMPLE).

Location:

trunk/psModules/src/config

Files:

• pmConfigDump.c (modified) (2 diffs)
• pmConfigDump.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfigDump.c

@@ -60 +60 @@
 }
 
-bool pmConfigCamerasCull(pmConfig *config)
+bool pmConfigCamerasCull(pmConfig *config, const char *additional)
 {
       PS_ASSERT_PTR_NON_NULL(config, false);
@@ -70 +70 @@
       }
 
-      // Get names of the root camera and its derivatives
-      psArray *keep = psArrayAlloc(4);
-      keep->data[0] = pmConfigCameraRootName(config->cameraName);
-      keep->data[1] = pmConfigCameraChipName(config->cameraName);
-      keep->data[2] = pmConfigCameraFPAName(config->cameraName);
-      keep->data[3] = pmConfigCameraSkycellName(config->cameraName);
+      psArray *keep = NULL;             // List of cameras to keep
+      if (additional) {
+          keep = psStringSplitArray(additional, " ,;", false);
+      }
+      psArrayAdd(keep, 1, config->cameraName);
+
+      int numKeep = keep->n;            // Number of cameras to keep
+      for (int i = 0; i < numKeep; i++) {
+          psString orig = keep->data[i];// Original name
+          psString root = pmConfigCameraRootName(orig); // Camera root name
+          psString chip = pmConfigCameraChipName(config->cameraName); // Chip-mosaicked name
+          psString fpa  = pmConfigCameraFPAName(config->cameraName); // FPA-mosaicked name
+          psString sky  = pmConfigCameraSkycellName(config->cameraName); // Skycell name
+
+          // Just in case we weren't given the root name
+          psFree(keep->data[i]);
+          keep->data[i] = root;
+
+          psArrayAdd(keep, 1, chip);
+          psArrayAdd(keep, 1, fpa);
+          psArrayAdd(keep, 1, sky);
+
+          psFree(chip);
+          psFree(fpa);
+          psFree(sky);
+      }
 
       bool result = configCull(cameras, keep); // Result of culling

trunk/psModules/src/config/pmConfigDump.h

@@ -4 +4 @@
  *  @author Paul Price, IfA
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-05 02:16:06 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-13 02:32:35 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -24 +24 @@
 
 /// Cull cameras from the configuration file, apart from the one in use
-bool pmConfigCamerasCull(pmConfig *config ///< Configuration
+bool pmConfigCamerasCull(pmConfig *config, ///< Configuration
+                         const char *additional ///< List of additional cameras to save, comma-separated
     );