Changeset 42820 for branches/eam_branches/ipp-20230313/ppMerge/src/ppMergeLoop.c

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)
• ppMerge/src/ppMergeLoop.c (modified) (13 diffs)

branches/eam_branches/ipp-20230313/ppMerge/src/ppMergeLoop.c

@@ -39 +39 @@
     bool haveVariances = psMetadataLookupBool(&mdok, arguments, "INPUTS.VARIANCES"); // Do we have variances?
 
-    psArray *inputs = ppMergeFileDataLevel(config, "PPMERGE.INPUT", PM_FPA_LEVEL_READOUT); // Input images
-    psArray *masks = NULL, *variances = NULL; // Input masks and variances
-    if (haveMasks) {
-        masks = ppMergeFileDataLevel(config, "PPMERGE.INPUT.MASK", PM_FPA_LEVEL_READOUT);
-    }
-    if (haveVariances) {
-        variances = ppMergeFileDataLevel(config, "PPMERGE.INPUT.VARIANCE", PM_FPA_LEVEL_READOUT);
-    }
+    psArray *inputs    = ppMergeFileDataLevel(config, "PPMERGE.INPUT"); // Input images
+    psArray *masks     = haveMasks ? ppMergeFileDataLevel(config, "PPMERGE.INPUT.MASK") : NULL; // Input masks 
+    psArray *variances = haveVariances ? ppMergeFileDataLevel(config, "PPMERGE.INPUT.VARIANCE") : NULL; // Input variances
 
     int nThreads = psMetadataLookupS32 (&mdok, arguments, "NTHREADS");
@@ -135 +130 @@
     psString darkNorm = psMetadataLookupStr(&mdok, arguments, "DARK.NORM"); ///< Dark normalisation
 
-
     if (!ppMergeFileActivate(config, PPMERGE_FILES_ALL, true)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to activate files.");
@@ -152 +146 @@
     }
 
-
     // Average concepts across inputs
     {
@@ -180 +173 @@
         {
             psList *inChips = psListAlloc(NULL);
-            for (int i=0; i < numFiles; i++) {
+            for (int i = 0; i < numFiles; i++) {
                 pmChip *chip = pmFPAviewThisChip(view, ((pmFPAfile *)inputs->data[i])->fpa);
                 psListAdd(inChips, PS_LIST_TAIL, chip);
@@ -193 +186 @@
 
         pmCell *outCell;                ///< Cell of interest
-
-        // XXX TEST : force a single loop
-        // outCell = pmFPAviewNextCell(view, outFPA, 1); {
 
         while ((outCell = pmFPAviewNextCell(view, outFPA, 1))) {
@@ -291 +281 @@
                 psAssert (fileGroups->n > 0, "no valid file groups defined");
                 fileGroup = fileGroups->data[0];
+
                 if (!pmDarkCombinePrepare(outCell, fileGroup->readouts, darkOrdinates, darkNorm)) {
                     goto ERROR;
@@ -305 +296 @@
                 psAbort("Should never get here.");
             }
+            fprintf (stderr, "after pmDarkCombinePrepare / pmReadoutCombinePrepare:\n");
+            psMemStats(true, NULL, NULL);
 
             // Read input data by chunks
@@ -349 +342 @@
                       psArrayAdd(job->args, 1, outCell);
                       psArrayAdd(job->args, 1, fileGroup);
-                      psArrayAdd(job->args, 1, psScalarAlloc(iter, PS_TYPE_S32));
-                      psArrayAdd(job->args, 1, psScalarAlloc(rej, PS_TYPE_F32));
-                      psArrayAdd(job->args, 1, psScalarAlloc(maskVal, PS_TYPE_IMAGE_MASK));
+                      
+                      // need to free the allocated scalars:
+                      { psScalar *tmpVal = psScalarAlloc(iter,    PS_TYPE_S32);        psArrayAdd(job->args, 1, tmpVal); psFree (tmpVal); }
+                      { psScalar *tmpVal = psScalarAlloc(rej,     PS_TYPE_F32);        psArrayAdd(job->args, 1, tmpVal); psFree (tmpVal); }
+                      { psScalar *tmpVal = psScalarAlloc(maskVal, PS_TYPE_IMAGE_MASK); psArrayAdd(job->args, 1, tmpVal); psFree (tmpVal); }
 
                       // call: pmDarkCombine(outCell, fileGroup->readouts, iter, rej, maskVal);
                       if (!psThreadJobAddPending(job)) {
-                        //                          goto ERROR;
-                        // continue; // I don't care.
+                        // CZW commented this out with a note that this was needed to allow ppMerge to work even if some inputs are invalid.
+                        // EAM thinks pmDarkCombine will only return FALSE if there is a programming or setup error (see pmDark.c:pmDarkCombine)
+                        // if so, we should raise an error here.
+                        // goto ERROR;
                       }
                       break;
@@ -398 +395 @@
 
             psFree(fileGroups);
-            //            psFree(zeros);
 
             // XXX eventually need to keep both the shutter and the pattern, as we do with dark
@@ -539 +535 @@
             }
 
+            // free the data used by the input files (we need to do the work ourselves)
+            for (int i = 0; i < numFiles; i++) {
+                if (!ppMergeFileFreeInput(config, view, i)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to open file %d", i);
+                    goto ERROR;
+                }
+            }
+
             psFree(outRO);
             cellNum++;
@@ -545 +549 @@
                 goto ERROR;
             }
+
+            // pmFPAfileIOList (config);
         }
 
@@ -562 +568 @@
     psFree(variances);
     psFree(stats);
+    psFree(zeros);
     return true;
 
@@ -571 +578 @@
     psFree(variances);
     psFree(stats);
+    psFree(zeros);
     return false;
 }