Changeset 41927 for branches/eam_branches/ipp-20211108

Timestamp:

Nov 23, 2021, 8:42:33 AM (5 years ago)

Author:

eugene

Message:

some verbosity on transparency calculation; skip missing elements which could segfault

Location:

branches/eam_branches/ipp-20211108/psModules/src

Files:

• astrom/pmAstrometryObjects.c (modified) (1 diff)
• imcombine/pmStack.c (modified) (3 diffs)
• objects/pmSourceMatch.c (modified) (1 diff)

branches/eam_branches/ipp-20211108/psModules/src/astrom/pmAstrometryObjects.c

@@ -41 +41 @@
 float psVectorSystematicError (psVector *residuals, psVector *errors, float clipFraction);
 float pmAstrom2DSystematics (psVector *xPos, psVector *yPos, psVector *value);
+float pmAstromSubsetSystematics (psVector *value);
 
 #define PM_ASTROMETRYOBJECTS_DEBUG 1

branches/eam_branches/ipp-20211108/psModules/src/imcombine/pmStack.c

@@ -1555 +1555 @@
     for (int i = 0; i < stackData->n; i++) {
         pmStackData *data = stackData->data[i]; // Stack data for this input
-        pmReadout *ro = data->readout;  // Readout of interest
-        stackReadouts->data[i] = psMemIncrRefCounter(ro);
-    }
-
+        stackReadouts->data[i] = NULL;
+        if (!data) continue;
+        pmReadout *ro = data->readout;  // Readout of interest
+        if (!ro) continue;
+        stackReadouts->data[i] = psMemIncrRefCounter(ro); // need to bump the counter since the free below will decrement
+    }
     if (!pmReadoutStackValidate(&minInputCols, &maxInputCols, &minInputRows, &maxInputRows, &xSize, &ySize, stackReadouts)) {
         psError(psErrorCodeLast(), false, "Input stack is not valid.");
@@ -1590 +1592 @@
 
                 pmStackData *data = stackData->data[i]; // Stack data for this input
+                if (!data) continue;
                 pmReadout *ro = data->readout;  // Readout of interest
+                if (!ro) continue;
 
                 psAssert (ro->mask,     "must must exist, but does not");
@@ -1718 +1722 @@
     psFree(pixelVariances);
     psFree(expTime);
+
     return (true);
 }

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

@@ -470 +470 @@
         }
         psTrace("psModules.objects", 3, "Transparency for image %d: %f\n", i, trans->data.F32[i]);
+        psLogMsg("psModules.objects", PS_LOG_INFO, "Transparency for image %d: %f\n", i, trans->data.F32[i]);
     }
     psFree(accum);