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

Timestamp:

May 8, 2025, 4:10:23 PM (15 months ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20230313

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmFPA.c (modified) (3 diffs)
• psModules/src/camera/pmFPAConstruct.c (modified) (3 diffs)
• psModules/src/detrend/pmDark.c (modified) (5 diffs)

branches/eam_branches/ipp-20230313/psModules/src/camera/pmFPA.c

@@ -53 +53 @@
     }
     psTrace("psModules.camera", 9, "Freeing cell %zd\n", (size_t)cell);
+
     pmCellFreeReadouts(cell);
     psFree(cell->readouts);
-
     psFree(cell->concepts);
     psFree(cell->analysis);
@@ -166 +166 @@
     psFree(readout->variance);
     psFree(readout->covariance);
+    psFree(readout->analysis);
     psFree(readout->bias);
 
@@ -173 +174 @@
     readout->variance = NULL;
     readout->covariance = NULL;
+    readout->analysis = NULL;
     readout->mask = NULL;
-
-    readout->bias = psListAlloc(NULL);
+    readout->bias = NULL;
 
     readout->col0 = 0;

branches/eam_branches/ipp-20230313/psModules/src/camera/pmFPAConstruct.c

@@ -52 +52 @@
 
 // Parse a list of first:second:third pairs in a string
+// EAM : this function takes an input 'string' and attempts to parse out
+// groups of the form FIRST:SECOND:THIRD into the arrays (first, second, third).
+
+// The input string may have multiple entries of this form separated by spaces, commas, or
+// semi-colons.  The number of arrays which are supplied must match the string format or
+// an error will be raised.
+
+// e.g., the string could be CHIP:CELL:TYPE in which case all three arrays must exist
+// or, the string could be CHIP:CELL only, in which case the array 'third' must be NULL
+ 
 static int parseContent(psArray **first, // Array of the first values
                          psArray **second, // Array of the second values
@@ -83 +93 @@
     while ((value = psListGetAndIncrement(valuesIter))) {
         psArray *fst = psStringSplitArray(value, ":", true); // First, second, third
+        if (fst->n != numArrays) {
+          psError(PS_ERR_BAD_PARAMETER_VALUE, false, "string %s does not match expected format (%ld colon-separated items supplied, %d expected)", value, fst->n, numArrays);
+          return 0;
+        }
         switch (numArrays) {
           case 3:
@@ -1126 +1140 @@
     pmFPAview *view = pmFPAviewAlloc(0); // View, to be returned
     if (phuView) {
-        // Copy the view, for the case where we're given a view.
+        // Copy the view values, for the case where we're given a view.
         *view = *phuView;
     }

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

@@ -252 +252 @@
     }
 
+# if (PS_TRACE_ON)
     if (psTraceGetLevel("psModules.detrend") > 9) {
         for (int i = 0; i < inputs->n; i++) {
             psVector *val = values->data[i];
-            (void) val; // avoid unused variable message when tracing is compiled out
             for (int j = 0; j < ordinates->n; j++) {
                 psTrace("psModules.detrend", 9, "Image %d, ordinate %d: %f\n", i, j, val->data.F32[j]);
@@ -261 +261 @@
         }
     }
+# endif
 
     int numTerms = 1;                   // Number of terms in polynomial
@@ -292 +293 @@
         pmReadout *readout = output->readouts->data[i]; // Readout to update
         if (!readout) {
-            readout = output->readouts->data[i] = pmReadoutAlloc(output);
-        }
-
+            // pmReadoutAlloc places a reference to the readout on cell->readouts
+            // and returns a second mem reference to the readout
+            readout = pmReadoutAlloc(output);
+            psFree (readout); // free the extra mem reference returned by pmReadoutAlloc
+        }
         pmReadoutStackDefineOutput(readout, col0, row0, numCols, numRows, false, false, 0);
         psTrace("psModules.imcombine", 7, "Output minimum: %d,%d\n", col0, row0);
@@ -469 +472 @@
               for (int m = 0; m < poly->deviations->n; m++) {
                 logL->data.F64[k] += pow(poly->deviations->data.F32[m] / polySig->stdevFit,2);
-/*              if ((xOut == 20) && (yOut == 256)) { */
-/*                psTrace("psModules.detrend",3,"pmDarkCombine DEV: %d %d: input %d models: Norders: %d logL: %g value: %g\n", */
-/*                        xOut,yOut,m,k,logL->data.F64[k],poly->deviations->data.F32[m]); */
-/*              } */
               }
               if (k > 0) {
@@ -487 +486 @@
               k_best = 1;
             }
-/*          k_best = 1; */
+
             // Select the polynomial that seems best.
             psPolynomialMD *poly = poly_set->data[k_best];
               
-            //            for (int k = 0; k < poly->coeff->n; k++) {
             for (int k = 0; k < max_orders->n + 1; k++) { // There is one more coefficient than is stored here.
                 pmReadout *ro = output->readouts->data[k]; // Readout of interest
                 if (k < poly->coeff->n) {
                   ro->image->data.F32[yOut][xOut] = poly->coeff->data.F64[k];
-                }
-                else {
+                } else {
                   ro->image->data.F32[yOut][xOut] = 0.0;
                 }