Changeset 12670 for trunk/FACT++/gui

Timestamp:

11/29/11 16:36:30 (13 years ago)

Author:

lyard

Message:

viewer bugfix

File:

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

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

@@ -717 +717 @@
         if (!inputFile->HasKey(*it)){
             cout << "Warning: header keyword " << *it << " missing." << endl;
-            return;}
+            }
         }
         catch (std::runtime_error e)
@@ -1156 +1156 @@
         fDrsCalib.Apply(eventData, rawEventData, startPix, nRoi);
         DrsCalibrate::RemoveSpikes(eventData, nRoi);
-        for (int i=0;i<1024;i++)
-            eventData[i] = eventData[i+1024];
+//        for (int i=0;i<1024;i++)
+//            eventData[i] = eventData[i+1024];
         //TODO apply calibration to the Time markers
     }
@@ -2365 +2365 @@
     for (int i=start;i<end;i++)
     {
+        if (i==863)//keep crazy pixel out of the autoscale
+            continue;
         for (int j=10;j<GLWindow->nRoi-50;j++)
         {
@@ -2390 +2392 @@
     }
 //    cout << "min: " << min << " max: " << max << " average: " << average << endl;
-    double minRange = (double)(min+(VALUES_SPAN/2))/(double)VALUES_SPAN;
-    double maxRange = (double)(max+(VALUES_SPAN/2))/(double)VALUES_SPAN;
-    double midRange = (double)(average+(VALUES_SPAN/2))/(double)VALUES_SPAN;
+    double minRange = (double)(min+(VALUES_SPAN/2))/(double)(VALUES_SPAN-1);
+    double maxRange = (double)(max+(VALUES_SPAN/2))/(double)(VALUES_SPAN-1);
+    double midRange = (double)(average+(VALUES_SPAN/2))/(double)(VALUES_SPAN-1);
     if (GLWindow->logScale)
     {