Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeLoop.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppMerge/src (modified) (1 prop)
• ppMerge/src/ppMergeLoop.c (modified) (6 diffs)

branches/cnb_branches/cnb_branch_20090301/ppMerge/src

@@ -7 +7 @@
 stamp-h1
 .libs
+ppMergeVersionDefinitions.h

@@ -7 +7 @@
 stamp-h1
 .libs
+ppMergeVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeLoop.c

@@ -36 +36 @@
     bool mdok;                          ///< Status of MD lookup
     bool haveMasks = psMetadataLookupBool(&mdok, arguments, "INPUTS.MASKS"); // Do we have masks?
+    bool useMasks = psMetadataLookupBool(&mdok, arguments, "INPUTS.MASKS.USE"); // Do we have masks?
     bool haveVariances = psMetadataLookupBool(&mdok, arguments, "INPUTS.VARIANCES"); // Do we have variances?
 
@@ -73 +74 @@
 
     pmCombineParams *combination = pmCombineParamsAlloc(combineStat); ///< Combination parameters
-    combination->maskVal = maskVal;
+    combination->maskVal = useMasks ? maskVal : 0;
     combination->blank = pmConfigMaskGet("BLANK", config);
     combination->nKeep = nKeep;
@@ -149 +150 @@
         }
         pmCell *outCell;                ///< Cell of interest
+
+        // XXX TEST : force a single loop
+        // outCell = pmFPAviewNextCell(view, outFPA, 1); {
+
         while ((outCell = pmFPAviewNextCell(view, outFPA, 1))) {
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
@@ -164 +169 @@
                 pmHDU *hdu = pmHDUGetHighest(outFPA, outChip, outCell); // HDU for file
                 if (hdu && hdu != lastHDU) {
+                    if (!hdu->header) {
+                        hdu->header = psMetadataAlloc();
+                    }
                     ppMergeVersionHeader(hdu->header);
                     lastHDU = hdu;
@@ -229 +237 @@
                 psAssert (fileGroups->n > 0, "no valid file groups defined");
                 fileGroup = fileGroups->data[0];
-                if (!pmShutterCorrectionGeneratePrepare(outRO, pattern, fileGroup->readouts, maskVal)) {
+                if (!pmShutterCorrectionGeneratePrepare(outRO, pattern, fileGroup->readouts, combination->maskVal)) {
                     goto ERROR;
                 }
@@ -411 +419 @@
             }
 
-            // calculate CTEMASK after stats so stats reflect median image
+            // calculate CTEMASK after stats so stats reflect median image
             if (type == PPMERGE_TYPE_CTEMASK && outRO) {
-                // need to apply range cuts on the output image
-                psAssert (outRO->mask, "mask is not defined");
-                psAssert (outRO->mask->numCols == outRO->image->numCols, "mismatch between image and mask");
-                psAssert (outRO->mask->numRows == outRO->image->numRows, "mismatch between image and mask");
-
-                // CTEMASK parameters
-                float cteMin = psMetadataLookupF32(NULL, arguments, "CTE.MIN"); // Number of fringe points
-
-                char *cteMaskName = psMetadataLookupStr (&mdok, config->arguments, "MASK.SET.VALUE");
-                psImageMaskType cteMaskValue = pmConfigMaskGet(cteMaskName, config);
-
-                psF32 **outputImage = outRO->image->data.F32; 
-                psImageMaskType **outputMask = outRO->mask->data.PS_TYPE_IMAGE_MASK_DATA; 
-                for (int iy = 0; iy < outRO->image->numRows; iy++) {
-                    for (int ix = 0; ix < outRO->image->numCols; ix++) {
-                        if (outputImage[iy][ix] < cteMin) {
-                            outputMask[iy][ix] |= cteMaskValue;
-                        }
-                    }
+                // need to apply range cuts on the output image
+                psAssert (outRO->mask, "mask is not defined");
+                psAssert (outRO->mask->numCols == outRO->image->numCols, "mismatch between image and mask");
+                psAssert (outRO->mask->numRows == outRO->image->numRows, "mismatch between image and mask");
+
+                // CTEMASK parameters
+                float cteMin = psMetadataLookupF32(NULL, arguments, "CTE.MIN"); // Number of fringe points
+
+                char *cteMaskName = psMetadataLookupStr (&mdok, config->arguments, "MASK.SET.VALUE");
+                psImageMaskType cteMaskValue = pmConfigMaskGet(cteMaskName, config);
+
+                if (0) {
+                  psFits *fits = NULL;
+                  fits = psFitsOpen ("combine.fits", "w");
+                  psFitsWriteImage (fits, NULL, outRO->image, 0, NULL);
+                  psFitsClose (fits);
+
+                  fits = psFitsOpen ("inmask.fits", "w");
+                  psFitsWriteImage (fits, NULL, outRO->mask, 0, NULL);
+                  psFitsClose (fits);
                 }
+
+                psF32 **outputImage = outRO->image->data.F32;
+                psImageMaskType **outputMask = outRO->mask->data.PS_TYPE_IMAGE_MASK_DATA;
+                for (int iy = 0; iy < outRO->image->numRows; iy++) {
+                    for (int ix = 0; ix < outRO->image->numCols; ix++) {
+                        if (outputImage[iy][ix] < cteMin) {
+                            outputMask[iy][ix] |= cteMaskValue;
+                        }
+                    }
+                }
+
+                if (0) {
+                  psFits *fits = NULL;
+                  fits = psFitsOpen ("otmask.fits", "w");
+                  psFitsWriteImage (fits, NULL, outRO->mask, 0, NULL);
+                  psFitsClose (fits);
+                }
+
             }
 

@@ -7 +7 @@
 stamp-h1
 .libs
+ppMergeVersionDefinitions.h