Changeset 17157 for branches/pap_branch_080320/ppMerge/src/ppMergeLoop.c

Timestamp:

Mar 27, 2008, 2:59:07 PM (18 years ago)

Author:

Paul Price

Message:

Adding count and sigma files as outputs.

File:

• branches/pap_branch_080320/ppMerge/src/ppMergeLoop.c (modified) (2 diffs)

branches/pap_branch_080320/ppMerge/src/ppMergeLoop.c

@@ -49 +49 @@
     int fringeSmoothY = psMetadataLookupS32(NULL, arguments, "FRINGE.YSMOOTH"); // Smoothing regions in y
 
-    // Shutter parameters
-    int shutterIter = psMetadataLookupS32(NULL, arguments, "SHUTTER.ITER"); // Number of shutter iterations
-    float shutterRej = psMetadataLookupF32(NULL, arguments, "SHUTTER.REJ"); // Rejection limit for shutter
-
     pmCombineParams *combination = pmCombineParamsAlloc(combineStat); // Combination parameters
     combination->maskVal = maskVal;
@@ -152 +148 @@
             }
 
-            if (type == PPMERGE_TYPE_MASK) {
-                psAbort("Can't do masks yet.");
-#if 0
-                ppMergeMask(readouts, config);
-#endif
-            } else {
-                float shutterRef = NAN;     // Reference shutter correction
-                if (type == PPMERGE_TYPE_SHUTTER) {
-                    shutterRef = pmShutterCorrectionReference(shutters->data[cellNum]);
-                }
-
-                // Read convolutions by chunks
-                bool more = true;               // More to read?
-                for (int numChunk = 0; more; numChunk++) {
-                    psTrace("ppStack", 2, "Initial stack of chunk %d....\n", numChunk);
-                    for (int i = 0; i < numFiles; i++) {
-                        pmReadout *inRO = readouts->data[i]; // Input readout
-
-                        // Read a chunk from a file
-                        #define READ_CHUNK(NAME,TYPE) { \
-                            pmFPAfile *file = pmFPAfileSelectSingle(config->files, NAME, i); \
-                            if (!pmReadoutReadChunk##TYPE(inRO, file->fits, 0, rows, 0)) { \
-                                psError(PS_ERR_IO, false, "Unable to read chunk %d for file %s %d", \
-                                        numChunk, NAME, i); \
-                                psFree(readouts); \
-                                psFree(outRO); \
-                                psFree(view); \
-                                return false; \
-                            } \
-                        }
-
-                        READ_CHUNK("PPMERGE.INPUT", /* Blank */);
-                        if (haveMasks) {
-                            READ_CHUNK("PPMERGE.INPUT.MASK", Mask);
-                        }
-                        if (haveWeights) {
-                            READ_CHUNK("PPMERGE.INPUT.WEIGHT", Weight);
-                        }
-                    }
-
-                    switch (type) {
-                      case PPMERGE_TYPE_SHUTTER:
-                        pmShutterCorrectionGenerate(outRO, NULL, readouts, shutterRef,
-                                                    shutters->data[cellNum], shutterIter, shutterRej,
-                                                    maskVal);
-                        break;
-                      case PPMERGE_TYPE_DARK:
-                        pmDarkCombine(outCell, readouts, darkOrdinates, darkNorm, iter, rej, maskVal);
-                        break;
-                      case PPMERGE_TYPE_BIAS:
-                      case PPMERGE_TYPE_FLAT:
-                      case PPMERGE_TYPE_FRINGE:
-                        pmReadoutCombine(outRO, readouts, zeros, scales, combination);
-                        break;
-                      default:
-                        psAbort("Should never get here.");
-                    }
-
-
-                    for (int i = 0; i < numFiles && more; i++) {
-                        pmReadout *inRO = readouts->data[i];
-
-                        // Check to see if there's more chunks to read
-                        #define MORE_CHUNK(NAME,TYPE) { \
-                            pmFPAfile *file = pmFPAfileSelectSingle(config->files, NAME, i); \
-                            more &= pmReadoutMore##TYPE(inRO, file->fits, 0, rows); \
-                        }
-
-                        MORE_CHUNK("PPMERGE.INPUT", /* Blank */);
-                        if (haveMasks) {
-                            MORE_CHUNK("PPMERGE.INPUT.MASK", Mask);
-                        }
-                        if (haveWeights) {
-                            MORE_CHUNK("PPMERGE.INPUT.WEIGHT", Weight);
-                        }
+            float shutterRef = NAN;     // Reference shutter correction
+            if (type == PPMERGE_TYPE_SHUTTER) {
+                shutterRef = pmShutterCorrectionReference(shutters->data[cellNum]);
+            }
+
+            // Read convolutions by chunks
+            bool more = true;               // More to read?
+            for (int numChunk = 0; more; numChunk++) {
+                psTrace("ppStack", 2, "Initial stack of chunk %d....\n", numChunk);
+                for (int i = 0; i < numFiles; i++) {
+                    pmReadout *inRO = readouts->data[i]; // Input readout
+
+                    // Read a chunk from a file
+                    #define READ_CHUNK(NAME,TYPE) { \
+                        pmFPAfile *file = pmFPAfileSelectSingle(config->files, NAME, i); \
+                        if (!pmReadoutReadChunk##TYPE(inRO, file->fits, 0, rows, 0)) { \
+                            psError(PS_ERR_IO, false, "Unable to read chunk %d for file %s %d", \
+                                    numChunk, NAME, i); \
+                            psFree(readouts); \
+                            psFree(outRO); \
+                            psFree(view); \
+                            return false; \
+                        } \
+                    }
+
+                    READ_CHUNK("PPMERGE.INPUT", /* Blank */);
+                    if (haveMasks) {
+                        READ_CHUNK("PPMERGE.INPUT.MASK", Mask);
+                    }
+                    if (haveWeights) {
+                        READ_CHUNK("PPMERGE.INPUT.WEIGHT", Weight);
+                    }
+                }
+
+                switch (type) {
+                  case PPMERGE_TYPE_SHUTTER:
+                    pmShutterCorrectionGenerate(outRO, NULL, readouts, shutterRef,
+                                                shutters->data[cellNum], iter, rej,
+                                                maskVal);
+                    break;
+                  case PPMERGE_TYPE_DARK:
+                    pmDarkCombine(outCell, readouts, darkOrdinates, darkNorm, iter, rej, maskVal);
+                    break;
+                  case PPMERGE_TYPE_BIAS:
+                  case PPMERGE_TYPE_FLAT:
+                  case PPMERGE_TYPE_FRINGE:
+                    pmReadoutCombine(outRO, readouts, zeros, scales, combination);
+                    break;
+                  default:
+                    psAbort("Should never get here.");
+                }
+
+
+                for (int i = 0; i < numFiles && more; i++) {
+                    pmReadout *inRO = readouts->data[i];
+
+                    // Check to see if there's more chunks to read
+                    #define MORE_CHUNK(NAME,TYPE) { \
+                        pmFPAfile *file = pmFPAfileSelectSingle(config->files, NAME, i); \
+                        more &= pmReadoutMore##TYPE(inRO, file->fits, 0, rows); \
+                    }
+
+                    MORE_CHUNK("PPMERGE.INPUT", /* Blank */);
+                    if (haveMasks) {
+                        MORE_CHUNK("PPMERGE.INPUT.MASK", Mask);
+                    }
+                    if (haveWeights) {
+                        MORE_CHUNK("PPMERGE.INPUT.WEIGHT", Weight);
                     }
                 }
             }
             psFree(readouts);
+
+            // Plug supplementary images into their own FPAs
+            {
+                pmCell *countsCell = pmFPAfileThisCell(config->files, view, "PPMERGE.OUTPUT.COUNT");
+                pmReadout *countsRO = pmReadoutAlloc(countsCell); // Readout with count of inputs per pixel
+                psImage *counts = psMetadataLookupPtr(NULL, outRO->analysis, PM_READOUT_STACK_ANALYSIS_COUNT);
+                countsRO->image = psImageCopy(countsRO->image, counts, PS_TYPE_F32);
+                psMetadataRemoveKey(outRO->analysis, PM_READOUT_STACK_ANALYSIS_COUNT);
+                countsRO->data_exists = countsCell->data_exists = countsCell->parent->data_exists = true;
+                psFree(countsRO);
+
+                pmCell *sigmaCell = pmFPAfileThisCell(config->files, view, "PPMERGE.OUTPUT.SIGMA");
+                pmReadout *sigmaRO = pmReadoutAlloc(sigmaCell); // Readout with stdev per pixel
+                psImage *sigma = psMetadataLookupPtr(NULL, outRO->analysis, PM_READOUT_STACK_ANALYSIS_SIGMA);
+                sigmaRO->image = psImageCopy(sigmaRO->image, sigma, PS_TYPE_F32);
+                psMetadataRemoveKey(outRO->analysis, PM_READOUT_STACK_ANALYSIS_SIGMA);
+                sigmaRO->data_exists = sigmaCell->data_exists = sigmaCell->parent->data_exists = true;
+                psFree(sigmaRO);
+            }
 
             // Measure the fringes for this cell