Changeset 13489 for trunk/ppStack/src/ppStackLoop.c

Timestamp:

May 23, 2007, 12:41:52 PM (19 years ago)

Author:

Paul Price

Message:

Bug fixes and small improvements to get it working properly. Seems to work OK now, but hasn't been tested rigourously.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (5 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -30 +30 @@
     }
 
-    pmFPAfile *output = psMetadataLookupPtr(NULL, config->files, "PPSTACK.OUTPUT"); // Output file
-    if (!output) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Can't find output data!\n");
+    pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PPSTACK.INPUT"); // Token input file
+    if (!input) {
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Can't find input data!\n");
         return false;
     }
@@ -45 +45 @@
 
     pmChip *chip;                       // Chip of interest
-    while ((chip = pmFPAviewNextChip(view, output->fpa, 1)) != NULL) {
+    while ((chip = pmFPAviewNextChip(view, input->fpa, 1)) != NULL) {
         if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
             return false;
@@ -51 +51 @@
 
         pmCell *cell;                // Cell of interest
-        while ((cell = pmFPAviewNextCell(view, output->fpa, 1)) != NULL) {
+        while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                 return false;
@@ -67 +67 @@
 
             pmReadout *readout;         // Readout of interest
-            while ((readout = pmFPAviewNextReadout(view, output->fpa, 1))) {
+            while ((readout = pmFPAviewNextReadout(view, input->fpa, 1))) {
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                     return false;
@@ -85 +85 @@
             // Perform statistics on the cell
             if (stats) {
-                ppStats(stats, output->fpa, view, config);
+                ppStats(stats, input->fpa, view, config);
             }