Changeset 24782

Timestamp:

Jul 12, 2009, 5:44:35 PM (17 years ago)

Author:

eugene

Message:

various fringe fixes

Location:

trunk/ppMerge/src

Files:

• ppMergeCamera.c (modified) (1 diff)
• ppMergeFiles.c (modified) (1 diff)
• ppMergeLoop.c (modified) (4 diffs)
• ppMergeScaleZero.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeCamera.c

@@ -337 +337 @@
       case PPMERGE_TYPE_FRINGE:
         fileType = PM_FPA_FILE_FRINGE;
+        break;
       default:
         psAbort("Unknown frame type: %x", type);

trunk/ppMerge/src/ppMergeFiles.c

@@ -220 +220 @@
       case PPMERGE_TYPE_FRINGE:
         outSuffix = "FRINGE";
+        break;
       default:
         psAbort("Unknown frame type: %x", type);

trunk/ppMerge/src/ppMergeLoop.c

@@ -94 +94 @@
     psVector *scales = NULL, *zeros = NULL; ///< Scale and zeroes for combination
     psArray *shutters = NULL;           ///< Shutter correction data
+    psImage *zeroSet = NULL;
     switch (type) {
       case PPMERGE_TYPE_FRINGE:
-        zeros = psMetadataLookupPtr(NULL, arguments, "ZEROS");
-        if (!zeros) {
+        zeroSet = psMetadataLookupPtr(NULL, arguments, "ZEROS");
+        if (!zeroSet) {
             psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find ZEROS");
             goto ERROR;
         }
+        // the zeros vector is passed to pmReadoutCombine for each set of inputs per cell
+        zeros = psVectorAlloc(zeroSet->numRows, PS_TYPE_F32);
         // Flow through
       case PPMERGE_TYPE_FLAT:
@@ -140 +143 @@
     pmFPA *outFPA = output->fpa;        ///< Output FPA
     pmHDU *lastHDU = NULL;              // Last HDU that was updated
+
     int cellNum = 0;                    ///< Index of cell
     if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
@@ -194 +198 @@
             }
 
+            if (zeroSet) {
+              for (int i = 0; i < zeroSet->numRows; i++) {
+                zeros->data.F32[i] = zeroSet->data.F32[i][cellNum];
+              }
+            }
+
             ppMergeFileGroup *fileGroup = NULL;
             psArray *fileGroups = psArrayAlloc(nThreads + 1);
@@ -335 +345 @@
 
             psFree(fileGroups);
+            psFree(zeros);
 
             // XXX eventually need to keep both the shutter and the pattern, as we do with dark

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -87 +87 @@
                 }
 
+                // skip cells with video data
                 if (cell->readouts->n > 1) {
-                    psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                            "File %d chip %d cell %d contains more than one readout (%ld)",
-                            i, view->chip, view->cell, cell->readouts->n);
-                    goto ERROR;
+                  // psError(PS_ERR_BAD_PARAMETER_VALUE, true, "File %d chip %d cell %d contains more than one readout (%ld)", i, view->chip, view->cell, cell->readouts->n);
+                  // goto ERROR;
+                  psWarning("File %d chip %d cell %d contains more than one readout (%ld), skipping", i, view->chip, view->cell, cell->readouts->n);
+                  continue;
                 }
                 pmReadout *readout = cell->readouts->data[0]; ///< Readout of interest