Changeset 42295

Timestamp:

Oct 14, 2022, 4:50:00 PM (4 years ago)

Author:

eugene

Message:

if the subkernel listed in the input mdc file is missing or corrupt, regenerate it; added an option -require-subkernel to enable the old behavior of failing if the subkernel is missing

Location:

trunk/ppSub/src

Files:

• ppSubArguments.c (modified) (1 diff)
• ppSubCamera.c (modified) (2 diffs)

trunk/ppSub/src/ppSubArguments.c

@@ -104 +104 @@
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-visual", 0, "Show diagnostic plots", NULL);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-updatemode", 0, "update mode?", false);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-require-subkernel", 0, "do not regenerate subkernel if missing?", false);
 
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 2) {

trunk/ppSub/src/ppSubCamera.c

@@ -119 +119 @@
 
 
-// Define an output file that will be used in a calculation
-// This means it might already be available in the RUN metadata
+// Define an output file that will be used in a calculation. This means it might already be
+// available in the RUN metadata
+
+// EAM 2022.10.14 : If the file is not found, treat it as if it did not exist in the input
+// RUN metadata.  Currently, this is only used in this file to select
+// PPSUB.OUTPUT.KERNELS.
 static pmFPAfile *defineCalcFile(pmConfig *config, // Configuration
                                  pmFPAfile *bind,    // File to which to bind, or NULL
@@ -133 +137 @@
     pmFPAfile *file = pmFPAfileDefineFromRun(&status, NULL, config, filerule); // File to return
     if (!status) {
-        psError(psErrorCodeLast(), false, "Failed to load file definition for %s", filerule);
-        return NULL;
+      bool requireSubkernel = psMetadataLookupBool(NULL, config->arguments, "-require-subkernel");
+      if (requireSubkernel) {
+        psError(psErrorCodeLast(), false, "Failed to load file definition for %s", filerule);
+        return NULL;
+      } else {
+        psWarning("Failed to load file definition for %s, regenerate", filerule);
+      }
     }
     file = pmFPAfileBindFromArgs(&status, bind, config, filerule, argname);