Changes in classes/DelphesSTDHEPReader.cc [b55dc12:cab38f6] in git

File:

• classes/DelphesSTDHEPReader.cc (modified) (3 diffs)

classes/DelphesSTDHEPReader.cc

@@ -77 +77 @@
   fInputFile = inputFile;
   xdrstdio_create(fInputXDR, inputFile, XDR_DECODE);
+  ReadFileHeader();
 }
 
@@ -106 +107 @@
   SkipBytes(4);
 
-  if(fBlockType == FILEHEADER)
-  {
-    ReadFileHeader();
-  }
-  else if(fBlockType == EVENTTABLE)
+  if(fBlockType == EVENTTABLE)
   {
     ReadEventTable();
@@ -180 +177 @@
   u_int i;
   enum STDHEPVersion {UNKNOWN, V1, V2, V21} version;
+
+  xdr_int(fInputXDR, &fBlockType);
+  if (fBlockType != FILEHEADER)
+  {
+    throw runtime_error("Header block not found. File is probably corrupted.");
+  }
+
+  SkipBytes(4);
 
   // version