Changeset 19692 for trunk/FACT++

Timestamp:

09/27/19 20:10:05 (5 years ago)

Author:

tbretz

Message:

The average curve errorneously took into account empty channels.

File:

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

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

@@ -861 +861 @@
     for (vector<PixelMapEntry>::const_iterator it=fPixelMap.begin(); it!=fPixelMap.end(); it++)
     {
+        //if (it->index>=nPixels)
+        //    continue;
+
         Meanvalues[it->index]     = pixelStatsData[0*1440+it->hw()];
         RMSvalues[it->index]      = pixelStatsData[1*1440+it->hw()];
@@ -2029 +2032 @@
        for (int j=0;j<1440;j++) {
            currentPixel = j;
+           if (GLWindow->softwareMapping[j]>=GLWindow->nPixels)
+               continue;
            for (int i=0;i<GLWindow->nRoi;i++)
            {
@@ -2036 +2041 @@
        }
        for (int i=0;i<GLWindow->nRoi;i++)
-           yval[i] /= 1440;
+           yval[i] /= GLWindow->nPixels;
 #if QWT_VERSION < 0x060000
        pixelAverageCurveItem.setData(xval, yval, GLWindow->nRoi);