Index: /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc
===================================================================
--- /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 11896)
+++ /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 11897)
@@ -682,6 +682,8 @@
         delete inputFile;
     }
-    if (eventData != NULL)
+    if (eventData != NULL) {
         delete[] eventData;
+        delete[] rawEventData;
+    }
 }
 /************************************************************
@@ -902,5 +904,5 @@
     entriesToCheck.push_back("CAMERA");
     entriesToCheck.push_back("DAQ");
-    entriesToCheck.push_back("ADCCOUNT");
+    entriesToCheck.push_back("ADCRANGE");
     entriesToCheck.push_back("TSTART");
     entriesToCheck.push_back("TSTOP");
@@ -932,5 +934,5 @@
     camera = inputFile->GetStr("CAMERA");
     daq = inputFile->GetStr("DAQ");
-    adcCount = inputFile->GetFloat("ADCCOUNT");
+    adcCount = inputFile->GetFloat("ADCRANGE");
     nbOk = inputFile->GetInt("NBEVTOK");
     nbRej = inputFile->GetInt("NBEVTREJ");
@@ -943,8 +945,11 @@
 #endif
 
-    if (eventData != NULL)
+    if (eventData != NULL) {
         delete[] eventData;
-    eventData = new int16_t[(1440+160)*nRoi];
-    if (!inputFile->SetPtrAddress("Data", eventData)){
+        delete[] rawEventData;
+    }
+    eventData = new float[(1440+160)*nRoi];
+    rawEventData = new int16_t[(1440+160)*nRoi];
+    if (!inputFile->SetPtrAddress("Data", rawEventData)){
         cout << "Missing column " << "Data" << " Aborting load..." << endl;
         nRoi = nRows = 0;return;}
@@ -1001,4 +1006,8 @@
     calibInputFile->GetNextRow();
 
+    for (int i=0;i<1024;i++)
+        cout << gainMean[i] << " ";
+    cout << endl << endl;
+
     delete calibInputFile;
 
@@ -1048,14 +1057,17 @@
         return;
     inputFile->GetRow(rowNum);
+    for (int i=0;i<(1440+160)*nRoi;i++)
+        eventData[i] = (float)rawEventData[i];
 #endif
 
-    if (drawCalibrationLoaded)
+    if (drawCalibrationLoaded && calibrationLoaded)
     {
         for (int i=0;i<1440;i++)
             for (int j=0;j<nRoi;j++)
             {
-                eventData[i*1024+j] /= 2;
+                eventData[i*1024+j] *= 2000.f/4096.f;
                 eventData[i*1024+j] -= (baseLineMean[i*1024+j]+triggerOffsetMean[i*1024+j]);
                 eventData[i*1024+j] /= gainMean[i*1024+j];
+                eventData[i*1024+j] *= (50000.f/65536.f) * 2500.f;
             }
     }
@@ -1136,7 +1148,11 @@
                 for (int j=0;j<viewer->nRoi;j++)
                 {
-                    viewer->eventData[i*1024+j] /= 2;
+//                    cout << "start value: " << viewer->eventData[i*1024+j] << " baseline: " << viewer->baseLineMean[i*1024+j];
+//                    cout << " triggerOffset: " << viewer->triggerOffsetMean[i*1024+j] << " gain: " << viewer->gainMean[i*1024+j];
+                    viewer->eventData[i*1024+j] *= 2000.f/4096.f;
                     viewer->eventData[i*1024+j] -= (viewer->baseLineMean[i*1024+j]+viewer->triggerOffsetMean[i*1024+j]);
                     viewer->eventData[i*1024+j] /= viewer->gainMean[i*1024+j];
+                    viewer->eventData[i*1024+j] *= (50000.f/65536.f) * 2500.f;
+//                    cout << " end value: " << viewer->eventData[i*1024+j] << endl;
                 }
             viewer->updateGL();
@@ -1155,7 +1171,9 @@
                 for (int j=0;j<viewer->nRoi;j++)
                 {
+
+                    viewer->eventData[i*1024+j] /= (50000.f/65536.f) * 2500.f;
                     viewer->eventData[i*1024+j] *= viewer->gainMean[i*1024+j];
                     viewer->eventData[i*1024+j] += (viewer->baseLineMean[i*1024+j]+viewer->triggerOffsetMean[i*1024+j]);
-                    viewer->eventData[i*1024+j] *= 2;
+                    viewer->eventData[i*1024+j] /= 2000.f/4096.f;
                }
             viewer->updateGL();
@@ -2069,4 +2087,7 @@
     }
 }
+
+
+
 void PrintHelp()
 {
@@ -2370,2 +2391,3 @@
     return app.exec();
 }
+