Changeset 42528 for branches/eam_branches/ipp-20230313/psModules

Timestamp:

Aug 17, 2023, 4:39:42 PM (3 years ago)

Author:

eugene

Message:

merging from trunk

Location:

branches/eam_branches/ipp-20230313/psModules

Files:

• . (modified) (1 prop)
• src/detrend/pmNewNonLinear.c (modified) (1 diff)
• src/imcombine/pmSubtractionKernels.c (modified) (1 diff)
• src/objects/pmSourceMatch.c (modified) (1 diff)

branches/eam_branches/ipp-20230313/psModules/src/detrend/pmNewNonLinear.c

@@ -39 +39 @@
             // Calculate correction factor contribution for this pixel.
             psF32 flux = image->data.F32[i][j];
-            psF32 lFlux = log10(flux);
+            psF32 lFlux = (flux > 1.0) ? log10(flux) : 0.0; // do not introduce NANs for negative flux
             
             psF32 factor = psSpline1DEval (model, lFlux);

branches/eam_branches/ipp-20230313/psModules/src/imcombine/pmSubtractionKernels.c

@@ -1361 +1361 @@
     }
 
-    return pmSubtractionKernelsGenerate(type, size, spatialOrder, fwhms, orders, inner, binning,
-                                        ringsOrder, penalty, bounds, mode);
+    pmSubtractionKernels *outKernel = pmSubtractionKernelsGenerate(type, size, spatialOrder,
+                                                                  fwhms, orders, inner, binning,
+                                                                  ringsOrder, penalty, bounds, mode);
+    psFree (fwhms);
+    psFree (orders);
+
+    return outKernel;
 }
 

branches/eam_branches/ipp-20230313/psModules/src/objects/pmSourceMatch.c

@@ -219 +219 @@
                                       sources); // Number of sources
 
+        // an input image with only poor detections can cause trouble, remove it
+        if (!numSources) continue;
+
         if (!boundsMaster) {
             // First run through --- can just copy