Changeset 24470 for trunk/ppNoiseMap/src/ppNoiseMapLoop.c

Timestamp:

Jun 17, 2009, 8:39:13 PM (17 years ago)

Author:

eugene

Message:

updates to ppNoiseMap (now works)

Location:

trunk/ppNoiseMap/src

Files:

• . (modified) (1 prop)
• ppNoiseMapLoop.c (modified) (3 diffs)

trunk/ppNoiseMap/src/ppNoiseMapLoop.c

@@ -38 +38 @@
         }
 
+        // load all cells for this chip before generating output file fpa:
         pmCell *cell;                   // Cell from chip
         while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
@@ -70 +71 @@
                     continue;
                 }
+            }
+        }
 
-                // perform the noise analysis
-                // if (!ppNoiseMapReadout(config, view)) {
-                //     ESCAPE("Unable to detrend readout");
-                // }
-
+        if (!ppNoiseMapReadout(config, view)) {
+            ESCAPE("Unable to measure noise map for readout");
+        }
+        
+        // close the cells
+        while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
+            if (!cell->process || !cell->file_exists) {
+                continue;
             }
-
-            // Close cell
             if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
                 ESCAPE("save failure for Cell");
@@ -90 +94 @@
     }
 
-    // if (psTraceGetLevel("ppNoiseMap") >= 3) {
-    //     ppNoiseMapFileCheck(config);
-    // }
-
     // Output and Close FPA
     if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {