Changeset 12114 for trunk

Timestamp:

09/16/11 14:30:24 (13 years ago)

Author:

tbretz

Message:

Relaxed a bit the requirements for a vlid file.

File:

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

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

@@ -648 +648 @@
     entriesToCheck.push_back("NAXIS2");
     entriesToCheck.push_back("NROI");
-    entriesToCheck.push_back("NTMARK");
-    entriesToCheck.push_back("RUNTYPE");
     entriesToCheck.push_back("REVISION");
-    entriesToCheck.push_back("BLDVER");
     entriesToCheck.push_back("RUNID");
     entriesToCheck.push_back("NBOARD");
@@ -684 +681 @@
     nRoi = inputFile->GetInt("NROI");
     runNumber = inputFile->GetInt("RUNID");
-    nTM = inputFile->GetInt("NTMARK");
-    runType = inputFile->GetInt("RUNTYPE");
+    nTM = inputFile->HasKey("NTMARK") ? inputFile->GetInt("NTMARK") : 0;
+    runType = inputFile->HasKey("RUNTYPE") ? inputFile->GetInt("RUNTYPE") : -1;
     firstDataTime = inputFile->GetInt("TSTART");
     lastDataTime = inputFile->GetInt("TSTOP");
     nRoiTM = inputFile->GetInt("NROITM");
     revision = inputFile->GetInt("REVISION");
-    builderVersion = inputFile->GetInt("BLDVER");
+    builderVersion = inputFile->HasKey("BLDVER") ? inputFile->GetInt("BLDVER") : -1;
     nBoards = inputFile->GetInt("NBOARD");
     nPixels = inputFile->GetInt("NPIX");