Changeset 42631 for branches/eam_branches/ipp-20230313/ppSub/src/ppSubCamera.c

Timestamp:

Feb 20, 2024, 2:37:06 PM (2 years ago)

Author:

eugene

Message:

merge from trunk: ifdef-out the ppSubCamera fix until final tests

File:

• branches/eam_branches/ipp-20230313/ppSub/src/ppSubCamera.c (modified) (2 diffs)

branches/eam_branches/ipp-20230313/ppSub/src/ppSubCamera.c

@@ -570 +570 @@
     checkFileruleFileSave(jpeg3, config);
 
+# if (0)
+    // XXX NOTE EAM 20240209: This block of code attempts to correct the problem of missing
+    // PSCAMERA entries, in this case in the output kernel definition.  This seems to work, but
+    // there was a crash related to running psphot in update mode.  This block is probably not
+    // responsible for the crash, but is commented out for the moment
+
     // The reference sources may not be from the same origin as the reference image, so
     // use another temporary camera.
     pmConfig *kernel_config = pmConfigMakeTemp(config);
-
+    
     // Output subtraction kernel
     pmFPAfile *kernel = defineCalcFile(kernel_config, output, "PPSUB.OUTPUT.KERNELS", "KERNEL", PM_FPA_FILE_SUBKERNEL);
     if (!kernel) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to define file PPSUB.OUTPUT.KERNELS");
-        return false;
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to define file PPSUB.OUTPUT.KERNELS");
+        return false;
     }
 
@@ -584 +590 @@
     ppSubCopyPSCamera (kernel, input);
     psFree (kernel_config);
+# else
+    // XXX NOTE EAM 20240209: This block of code matches the older version used in ipp-ps1-20220906-gentoo
+
+    // Output subtraction kernel
+    pmFPAfile *kernel = defineCalcFile(config, output, "PPSUB.OUTPUT.KERNELS", "KERNEL", PM_FPA_FILE_SUBKERNEL);
+    if (!kernel) {
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to define file PPSUB.OUTPUT.KERNELS");
+        return false;
+    }
+# endif
 
     // psPhot input
     if (data->photometry || 1) {
-        psphotModelClassInit();        // load implementation-specific models
+        psphotModelClassInit();        // load implementation-specific models
 
         pmFPAfile *psphot = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");