Index: /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc
===================================================================
--- /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 12280)
+++ /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 12281)
@@ -1036,5 +1036,7 @@
 //    if (calibratedCheckBox->isChecked())
         DataCalib::Apply(eventData, rawEventData, startPix, nRoi);
-/*
+        CalibData::RemoveSpikes(eventData, nRoi);
+        /*
+
         for (int i=0;i<1440;i++)
             for (int j=0;j<nRoi;j++)
@@ -1216,5 +1218,8 @@
 //    if (GLWindow->calibratedCheckBox->isChecked())
     if (state)
+    {
         DataCalib::Apply(GLWindow->eventData, GLWindow->rawEventData, GLWindow->startPix, GLWindow->nRoi);
+        CalibData::RemoveSpikes(GLWindow->eventData, GLWindow->nRoi);
+    }
 
     GLWindow->updateGL();
@@ -2046,14 +2051,14 @@
     {
         /*
-        GLWindow->ss[0] = 0;
-        GLWindow->ss[1] = 0.25;
-        GLWindow->ss[2] = 0.5;
-        GLWindow->ss[3] = 0.75;
-        GLWindow->ss[4] = 1;
-        range0->setValue(GLWindow->ss[0]);
-        range1->setValue(GLWindow->ss[1]);
-        range2->setValue(GLWindow->ss[2]);
-        range3->setValue(GLWindow->ss[3]);
-        range4->setValue(GLWindow->ss[4]);
+        GLWindow->ss[0] = 0.496;
+        GLWindow->ss[1] = 0.507;
+        GLWindow->ss[2] = 0.518;
+        GLWindow->ss[3] = 0.529;
+        GLWindow->ss[4] = 0.540;;
+        colorRange0->setValue(GLWindow->ss[0]);
+        colorRange1->setValue(GLWindow->ss[1]);
+        colorRange2->setValue(GLWindow->ss[2]);
+        colorRange3->setValue(GLWindow->ss[3]);
+        colorRange4->setValue(GLWindow->ss[4]);
         */
         return;
@@ -2061,21 +2066,21 @@
     if (!GLWindow->nRoi)
         return;
-    int start, end;
-    if (entireCameraScale->isChecked())
-    {
-        start = 0;
-        end = 1440;
-    }
-    else
+
+    int start = 0;
+    int end   = 1440;
+
+    if (!entireCameraScale->isChecked())
     {
         start = GLWindow->selectedPixel;
-        end = GLWindow->selectedPixel+1;
-    }
-
-    int min = 100000; //real min = -2048, int_16 = -32768 to 32767
+        end   = GLWindow->selectedPixel+1;
+    }
+
+    int min =  100000; //real min = -2048, int_16 = -32768 to 32767
     int max = -100000; //real max = 2047
+
     long average = 0;
     long numSamples = 0;
     int errorDetected = -1;
+
     for (int i=start;i<end;i++)
     {