Changeset 42363 for branches/eam_branches/ipp-20220316/ppSub/src/ppSubCamera.c

Timestamp:

Feb 4, 2023, 7:39:02 AM (3 years ago)

Author:

eugene

Message:

merge from trunk: correctly handle different camera diffs

File:

• branches/eam_branches/ipp-20220316/ppSub/src/ppSubCamera.c (modified) (9 diffs)

branches/eam_branches/ipp-20220316/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);
@@ -177 +186 @@
     altconfig->user   = psMemIncrRefCounter(config->user);   // inherit from primary camera
     altconfig->site   = psMemIncrRefCounter(config->site);   // inherit from primary camera
-    altconfig->system = psMemIncrRefCounter(config->system); // inherit from primary camera
+
+    psFree (altconfig->system);
+    altconfig->system = psMetadataCopy(NULL, config->system); // container for camera-specific recipe values (to be dropped)
 
     psFree (altconfig->files);
@@ -188 +199 @@
     altconfig->recipes = psMetadataCopy(NULL, config->recipes); // container for camera-specific recipe values (to be dropped)
 
-# if (0)
-    // XXX ppStack seems to work without removing PSCAMERA
-    // remove PSCAMERA entries from *-SKYCELL cameras
-    // XXX make this optional to force matching cameras if desired?
+    // remove PSCAMERA entries from *-SKYCELL cameras.  This allows skycell images from
+    // one camera to match those of another camera.  XXX Make this optional to force
+    // matching cameras if desired?
     bool mdok = false;
     psMetadata *cameras = psMetadataLookupMetadata(&mdok, altconfig->system, "CAMERAS");
@@ -229 +239 @@
       psMetadataRemoveKey (rule, "PSCAMERA"); // allow any camera skycell to match
     }
-# endif
+    psFree (camerasIter);
 
     return (altconfig);
+}
+
+bool ppSubCopyPSCamera (pmFPAfile *tgt, pmFPAfile *src) {
+
+    bool success;
+    psMetadata *ruleSrc = psMetadataLookupMetadata(&success, src->format, "RULE"); // one true format for skycells
+    psAssert (ruleSrc, "missing RULE in src->format");
+
+    psString pscameraSrc = psMetadataLookupStr(&success, ruleSrc, "PSCAMERA"); // one true format for skycells
+    psAssert (pscameraSrc, "missing PSCAMERA in src file"); 
+
+    psMetadata *ruleTgt = psMetadataLookupMetadata(&success, tgt->format, "RULE"); // one true format for skycells
+    psAssert (ruleTgt, "missing RULE in tgt->format");
+
+    psMetadataAddStr (ruleTgt, PS_LIST_TAIL, "PSCAMERA", PS_META_REPLACE, "", pscameraSrc);
+    return true;
 }
 
@@ -271 +297 @@
     // different camera than the input image.  NOTE: there is no check that these two
     // images match in terms of size, pixel scale, etc. That is up to the user.
+    // The temporary config structure has PSCAMERA entries removed from the SKYCELL rules
+    // to allow subtraction between cameras.
     
     pmConfig *refconfig = pmConfigMakeTemp(config);
 
-# if (0)
-    // EAM TEST: can we bind the ref to the input to force the right skycell format?
-    // Reference image
-    pmFPAfile *ref = defineInputFile(&success, config, input, "PPSUB.REF", "REF", PM_FPA_FILE_IMAGE);
-    if (!success) {
-        psError(psErrorCodeLast(), false, "Failed to build FPA from PPSUB.REF");
-        return false;
-    }
-# else
     // Reference image
     pmFPAfile *ref = defineInputFile(&success, refconfig, NULL, "PPSUB.REF", "REF", PM_FPA_FILE_IMAGE);
     if (!success) {
-        psError(psErrorCodeLast(), false, "Failed to build FPA from PPSUB.REF");
-        return false;
-    }
-# endif
-
+        psError(psErrorCodeLast(), false, "Failed to build FPA from PPSUB.REF");
+        return false;
+    }
+    // Reference mask
     defineInputFile(&success, refconfig, ref, "PPSUB.REF.MASK", "REF.MASK", PM_FPA_FILE_MASK);
     if (!success) {
@@ -296 +314 @@
         return false;
     }
-
+    // Reference variance
     pmFPAfile *refVar = defineInputFile(&success, refconfig, ref, "PPSUB.REF.VARIANCE", "REF.VARIANCE", PM_FPA_FILE_VARIANCE);
     if (!success) {
@@ -302 +320 @@
         return false;
     }
+    // copy ref->format(RULE) PSCAMERA from input->format(RULE)
+    ppSubCopyPSCamera (ref, input);
     psFree (refconfig);
 
@@ -308 +328 @@
     pmConfig *srcconfig = pmConfigMakeTemp(config);
 
-    defineInputFile(&success, srcconfig, NULL, "PPSUB.REF.SOURCES", "REF.SOURCES", PM_FPA_FILE_CMF);
-    if (!success) {
-        psError(psErrorCodeLast(), false, "Failed to build FPA from PPSUB.REF.SOURCES");
-        return false;
-    }
+    // Sources input file (CMF)
+    pmFPAfile *src = defineInputFile(&success, srcconfig, NULL, "PPSUB.REF.SOURCES", "REF.SOURCES", PM_FPA_FILE_CMF);
+    if (!success) {
+        psError(psErrorCodeLast(), false, "Failed to build FPA from PPSUB.REF.SOURCES");
+        return false;
+    }
+    // XXX do we need to copy the PSCAMERA across to src?  
+    ppSubCopyPSCamera (src, input);
     psFree (srcconfig);