Changeset 37051

Timestamp:

Jul 17, 2014, 10:22:59 AM (12 years ago)

Author:

eugene

Message:

handle new cmf formats; add -photcode option to pmConfig

Location:

trunk/psModules/src

Files:

• config/pmConfig.c (modified) (1 diff)
• objects/pmSourceIO.c (modified) (5 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -965 +965 @@
                                   "Original replaced by -R option", newRule);
         }
+        psFree(camerasIter);
+    }
+
+    // Look for command-line options for files to replace
+    while ((argNum = psArgumentGet(*argc, argv, "-photcode-rule")) > 0) {
+        psArgumentRemove(argNum, argc, argv);
+        if (argNum >= *argc) {
+            psError(PM_ERR_CONFIG, true,
+                    "-photcode-rule provided without new rule.");
+            psFree(config);
+            return NULL;
+        }
+
+        psString newrule = psStringCopy(argv[argNum]); // The filerule, to be modified
+        psArgumentRemove(argNum, argc, argv);
+
+        psMetadata *cameras = psMetadataLookupMetadata(NULL, config->system, "CAMERAS"); // List of cameras
+        if (!cameras) {
+            psError(PM_ERR_CONFIG, false, "Unable to find CAMERAS in the site configuration.\n");
+            return false;
+        }
+
+        psMetadataIterator *camerasIter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator
+        psMetadataItem *cameraItem;     // Item from iteration
+        while ((cameraItem = psMetadataGetAndIncrement(camerasIter))) {
+            // Silently ignore problems --- they will be caught later, because if the user wants the nominated
+            // file and it's not available for that camera, then they will know.
+
+            if (cameraItem->type != PS_DATA_METADATA) {
+                psTrace("psModules.config", 2,
+                        "Entry %s in CAMERAS is not of type METADATA --- ignored.", cameraItem->name);
+                continue;
+            }
+            psMetadata *camera = cameraItem->data.md; // Camera configuration
+
+            psMetadataAddStr (camera, PS_LIST_TAIL, "PHOTCODE.RULE", PS_META_REPLACE, "original replaced by -photcode-rule option", newrule);
+        }
+        psFree(newrule);
         psFree(camerasIter);
     }

trunk/psModules/src/objects/pmSourceIO.c

@@ -1129 +1129 @@
             PM_SOURCES_READ_PSF("PS1_DV4",   CMF_PS1_DV4);
 
+            if (!sources) {
+                psError(PS_ERR_IO, false, "reading CMF data from %s with format %s\n", file->filename, exttype);
+                return false;
+            }
+
             long *sourceIndex = NULL;
             if (XSRC_OUTPUT || XFIT_OUTPUT || XRAD_OUTPUT || XGAL_OUTPUT) {
@@ -1406 +1411 @@
         PM_SOURCES_READ_XSRC("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XSRC("PS1_SV3",   CMF_PS1_SV3);
         PM_SOURCES_READ_XSRC("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XSRC("PS1_DV2",   CMF_PS1_DV2);
         PM_SOURCES_READ_XSRC("PS1_DV3",   CMF_PS1_DV3);
+        PM_SOURCES_READ_XSRC("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);
@@ -1446 +1453 @@
         PM_SOURCES_READ_XFIT("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XFIT("PS1_SV3",   CMF_PS1_SV3);
         PM_SOURCES_READ_XFIT("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XFIT("PS1_DV2",   CMF_PS1_DV2);
         PM_SOURCES_READ_XFIT("PS1_DV3",   CMF_PS1_DV3);
+        PM_SOURCES_READ_XFIT("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);
@@ -1485 +1494 @@
         PM_SOURCES_READ_XRAD("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XRAD("PS1_SV3",   CMF_PS1_SV3);
         PM_SOURCES_READ_XRAD("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XRAD("PS1_DV2",   CMF_PS1_DV2);
         PM_SOURCES_READ_XRAD("PS1_DV3",   CMF_PS1_DV3);
+        PM_SOURCES_READ_XRAD("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);
@@ -1524 +1535 @@
         PM_SOURCES_READ_XGAL("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XGAL("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XGAL("PS1_SV3",   CMF_PS1_SV3);
         PM_SOURCES_READ_XGAL("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XGAL("PS1_DV2",   CMF_PS1_DV2);
         PM_SOURCES_READ_XGAL("PS1_DV3",   CMF_PS1_DV3);
+        PM_SOURCES_READ_XGAL("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);