Changeset 4af92f5 in git

Timestamp:

Jan 22, 2015, 12:04:15 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

b55dc12

Parents:

5ed71ed

Message:

add possibility to read multiple STDHEP files from stdin

File:

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

classes/DelphesSTDHEPReader.cc

@@ -77 +77 @@
   fInputFile = inputFile;
   xdrstdio_create(fInputXDR, inputFile, XDR_DECODE);
+
+  xdr_int(fInputXDR, &fBlockType);
+  if(fBlockType != FILEHEADER)
+  {
+    throw runtime_error("Header block not found. File is probably corrupted.");
+  }
+
+  SkipBytes(4);
+
   ReadFileHeader();
 }
@@ -107 +116 @@
   SkipBytes(4);
 
-  if(fBlockType == EVENTTABLE)
+  if(fBlockType == FILEHEADER)
+  {
+    ReadFileHeader();
+  }
+  else if(fBlockType == EVENTTABLE)
   {
     ReadEventTable();
@@ -177 +190 @@
   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