Changeset f59b6d75 in git

Timestamp:

Apr 22, 2014, 12:11:37 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

33689ef

Parents:

7e4da42

Message:

adapt DelphesSTDHEPReader to new versions of Event Header and Event Table

Location:

classes

Files:

• DelphesSTDHEPReader.cc (modified) (11 diffs)
• DelphesSTDHEPReader.h (modified) (1 diff)

classes/DelphesSTDHEPReader.cc

@@ -88 +88 @@
   TObjArray *partonOutputArray)
 {
-  bool skipNTuples = false;
-
   if(feof(fInputFile)) return kFALSE;
 
@@ -96 +94 @@
   SkipBytes(4);
 
-  xdr_string(fInputXDR, &fBuffer, 100);
-  if(strncmp(fBuffer, "2.00", 4) == 0)
-  {
-    skipNTuples = true;
-  }
-
   if(fBlockType == EVENTTABLE)
   {
@@ -108 +100 @@
   else if(fBlockType == EVENTHEADER)
   {
-    ReadSTDHEPHeader(skipNTuples);
+    ReadEventHeader();
   }
   else if(fBlockType == MCFIO_STDHEPBEG ||
@@ -189 +181 @@
   else version = UNKNOWN;
 
-  if (version == UNKNOWN)
+  if(version == UNKNOWN)
   {
     throw runtime_error("Unknown file format version.");
@@ -198 +190 @@
   SkipArray(1);
 
-  if (version == V21)
+  if(version == V21)
   {
     SkipArray(1);
@@ -243 +235 @@
 void DelphesSTDHEPReader::ReadEventTable()
 {
-  SkipBytes(8);
-
-  SkipArray(4);
-  SkipArray(4);
-  SkipArray(4);
-  SkipArray(4);
-  SkipArray(4);
-}
-
-//---------------------------------------------------------------------------
-
-void DelphesSTDHEPReader::ReadSTDHEPHeader(bool skipNTuples)
-{
+  // version
+  xdr_string(fInputXDR, &fBuffer, 100);
+  if(strncmp(fBuffer, "1.00", 4) == 0)
+  {
+    SkipBytes(8);
+
+    SkipArray(4);
+    SkipArray(4);
+    SkipArray(4);
+    SkipArray(4);
+    SkipArray(4);
+  }
+  else if(strncmp(fBuffer, "2.00", 4) == 0)
+  {
+    SkipBytes(12);
+
+    SkipArray(4);
+    SkipArray(4);
+    SkipArray(4);
+    SkipArray(4);
+    SkipArray(8);
+  }
+}
+
+//---------------------------------------------------------------------------
+
+void DelphesSTDHEPReader::ReadEventHeader()
+{
+  bool skipNTuples = false;
+  u_int skipSize = 4;
+
+  // version
+  xdr_string(fInputXDR, &fBuffer, 100);
+  if(strncmp(fBuffer, "2.00", 4) == 0)
+  {
+    skipNTuples = true;
+  }
+  else if(strncmp(fBuffer, "3.00", 4) == 0)
+  {
+    skipNTuples = true;
+    skipSize = 8;
+  }
+
   SkipBytes(20);
 
@@ -272 +294 @@
   {
     SkipArray(4);
-    SkipArray(4);
+    SkipArray(skipSize);
   }
 
@@ -279 +301 @@
   {
     SkipArray(4);
-    SkipArray(4);
+    SkipArray(skipSize);
   }
 }
@@ -287 +309 @@
 void DelphesSTDHEPReader::ReadSTDCM1()
 {
+  // version
+  xdr_string(fInputXDR, &fBuffer, 100);
+
   // skip 5*4 + 2*8 = 36 bytes
   SkipBytes(36);
@@ -313 +338 @@
 {
   u_int idhepSize, isthepSize, jmohepSize, jdahepSize, phepSize, vhepSize;
+
+  // version
+  xdr_string(fInputXDR, &fBuffer, 100);
 
   // Extracting the event number
@@ -357 +385 @@
 {
   u_int number;
+
+  // version
+  xdr_string(fInputXDR, &fBuffer, 100);
 
   // Extracting the event weight

classes/DelphesSTDHEPReader.h

@@ -68 +68 @@
   void ReadFileHeader();
   void ReadEventTable();
-  void ReadSTDHEPHeader(bool skipNTuples);
+  void ReadEventHeader();
   void ReadSTDCM1();
   void ReadSTDHEP();