Changeset 17157 for branches/pap_branch_080320/ppMerge/src/ppMergeScaleZero.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/ppMergeScaleZero.c (modified) (7 diffs)

branches/pap_branch_080320/ppMerge/src/ppMergeScaleZero.c

@@ -23 +23 @@
     psMaskType maskVal = psMetadataLookupU8(NULL, config->arguments, "MASKVAL"); // Value to mask
     int shutterSize = psMetadataLookupS32(NULL, config->arguments, "SHUTTER.SIZE"); // Size of shutter region
-    int sample = psMetadataLookupS32(NULL, config->arguments, "SAMPLE"); // Maximum size of sample
-    bool chipStats = false;             // Do statistics on full chip instead of cell?
 
     psVector *gains = NULL;             // Gains for each cell
@@ -47 +45 @@
         break;
       case PPMERGE_TYPE_MASK:
-        stats = psStatsAlloc(meanStat | stdevStat);
       default:
         break;
@@ -53 +50 @@
     psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0); // Random number generator
     pmFPAview *view = NULL;             // View into FPA
-
-    psVector *values = psVectorAlloc(sample, PS_TYPE_F32); // Values for statistics
 
     for (int i = 0; i < numInputs; i++) {
@@ -74 +69 @@
                 goto ERROR;
             }
-
-            int valueIndex = 0;         // Index into values vector
 
             pmCell *cell;               // Cell of interest
@@ -138 +131 @@
                       break;
                   }
-                  case PPMERGE_TYPE_MASK: {
-                      psImage *image = readout->image, *mask = readout->mask; // Image and mask
-                      int numCols = readout->image->numCols, numRows = readout->image->numRows; // Image size
-                      int numPix = numCols * numRows; // Number of pixels
-                      int numCells = chipStats ? readout->parent->parent->cells->n : 1; // Number of cells
-                      int num = PS_MIN(numPix, sample / numCells); // Number of values to add
-                      if (!chipStats) {
-                          valueIndex = 0;
-                      }
-                      for (int i = 0; i < num; i++) {
-                          int pixel = numPix * psRandomUniform(rng);
-                          int x = pixel % numCols;
-                          int y = pixel / numCols;
-                          if ((mask && (mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal)) ||
-                              !isfinite(image->data.F32[y][x])) {
-                              continue;
-                          }
-
-                          values->data.F32[valueIndex++] = image->data.F32[y][x];
-                      }
-
-                      if (!chipStats) {
-                          if (!psVectorStats(stats, values, NULL, NULL, 0)) {
-                              psError(PS_ERR_UNKNOWN, false, "Unable to do statistics on readout.");
-                              goto ERROR;
-                          }
-
-                          psMetadataAddF32(cell->analysis, PS_LIST_TAIL, PM_MASK_ANALYSIS_MEAN, 0,
-                                           "Mean value of readout", psStatsGetValue(stats, meanStat));
-                          psMetadataAddF32(cell->analysis, PS_LIST_TAIL, PM_MASK_ANALYSIS_STDEV, 0,
-                                           "Stdev value of readout", psStatsGetValue(stats, stdevStat));
-                      }
-                      break;
-                  }
+                  case PPMERGE_TYPE_MASK:
                   default:
                     psAbort("Should never get here.");
@@ -178 +138 @@
                 cellNum++;
 
-                if ((type != PPMERGE_TYPE_MASK || !chipStats) &&
-                    !pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+                if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
                     goto ERROR;
-                }
-            }
-
-            // Additional run through cells if we want chip-level statistics for masks
-            if (type == PPMERGE_TYPE_MASK && chipStats) {
-                if (!psVectorStats(stats, values, NULL, NULL, 0)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to do statistics on chip.");
-                    goto ERROR;
-                }
-                while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
-                    if (!cell->data_exists) {
-                        continue;
-                    }
-                    psMetadataAddF32(cell->analysis, PS_LIST_TAIL, PM_MASK_ANALYSIS_MEAN, 0,
-                                     "Mean value of chip", psStatsGetValue(stats, meanStat));
-                    psMetadataAddF32(cell->analysis, PS_LIST_TAIL, PM_MASK_ANALYSIS_STDEV, 0,
-                                     "Stdev value of chip", psStatsGetValue(stats, stdevStat));
-                    if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
-                        goto ERROR;
-                    }
                 }
             }
@@ -256 +195 @@
                            "Shutter data", shutters);
         break;
+      case PPMERGE_TYPE_MASK:
       default:
         psAbort("Should never get here.");