Changeset 12482

Timestamp:

11/09/11 22:48:17 (13 years ago)

Author:

lyard

Message:

display the average of all pixels in the pixel curve

File:

• trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc (modified) (3 diffs)

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -561 +561 @@
 void RawDataViewer::paintGL()
 {
+    //Should not be required, but apparently it helps when piping it through X forwarding
     glFinish();
     makeCurrent();
@@ -2212 +2213 @@
         return;
 
+//int currentPixel = pixel;
+int currentPixel = 0;
     for (int i=0;i<GLWindow->nRoi;i++)
+        yval[i] = 0;
+    for (int j=0;j<1440;j++) {
+        currentPixel = j;
+    for (int i=0;i<GLWindow->nRoi;i++)
     {
         xval[i] = i;
-#ifdef LOAD_RAW
-        yval[i] = eventsData[0][pixel][i];
-#else
-        yval[i] = GLWindow->eventData[GLWindow->nRoi*pixel + i];
-#endif
-    }
+        yval[i] += GLWindow->eventData[GLWindow->nRoi*currentPixel + i];
+    }
+    }
+    for (int i=0;i<GLWindow->nRoi;i++)
+        yval[i] /= 1440;
+
 int realNumSamples = GLWindow->nRoi;
     if (GLWindow->nRoiTM != 0)
@@ -2243 +2250 @@
                 yval[arrayIndex] = GLWindow->eventData[GLWindow->nRoi*1440 + GLWindow->nRoiTM*(40*crateId + 4*boardId + patchId) + i];
             }
- //           realNumSamples += GLWindow->nRoiTM - TMIndex;
-        }
-        cout << pixelIdInPatch << " " ;
+            realNumSamples += GLWindow->nRoiTM - TMIndex;
+        }
+      //  cout << pixelIdInPatch << " " ;
     }
 //cout << realNumSamples << endl;