Changeset 11900 for trunk/FACT++/gui

Timestamp:

08/12/11 13:51:28 (13 years ago)

Author:

tbretz

Message:

Made the viewer work also with older raw data files.

File:

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

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

@@ -904 +904 @@
     entriesToCheck.push_back("CAMERA");
     entriesToCheck.push_back("DAQ");
-    entriesToCheck.push_back("ADCRANGE");
     entriesToCheck.push_back("TSTART");
     entriesToCheck.push_back("TSTOP");
-    entriesToCheck.push_back("NBEVTOK");
-    entriesToCheck.push_back("NBEVTREJ");
-    entriesToCheck.push_back("NBEVTBAD");
+    //entriesToCheck.push_back("ADCRANGE");
+    //entriesToCheck.push_back("NBEVTOK");
+    //entriesToCheck.push_back("NBEVTREJ");
+    //entriesToCheck.push_back("NBEVTBAD");
 
     for (vector<string>::const_iterator it=entriesToCheck.begin(); it != entriesToCheck.end(); it++)
@@ -934 +934 @@
     camera = inputFile->GetStr("CAMERA");
     daq = inputFile->GetStr("DAQ");
-    adcCount = inputFile->GetFloat("ADCRANGE");
-    nbOk = inputFile->GetInt("NBEVTOK");
-    nbRej = inputFile->GetInt("NBEVTREJ");
-    nbBad = inputFile->GetInt("NBEVTBAD");
+    adcCount = inputFile->HasKey("ADCRANGE") ? inputFile->GetFloat("ADCRANGE") : 2000;
+    nbOk = 0;//inputFile->GetInt("NBEVTOK");
+    nbRej = 0;//inputFile->GetInt("NBEVTREJ");
+    nbBad = 0;//inputFile->GetInt("NBEVTBAD");
 
     eventNum = 0;