Changeset 84a1f7d in git

Timestamp:

May 30, 2013, 12:47:35 AM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

7b461f6

Parents:

ded7435

Message:

use xdr_opaque when reading pipe

Location:

classes

Files:

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

classes/DelphesSTDHEPReader.cc

@@ -20 +20 @@
 
 #include <stdio.h>
+#include <errno.h>
 #include <rpc/types.h>
 #include <rpc/xdr.h>
@@ -87 +88 @@
   TObjArray *partonOutputArray)
 {
+  bool skipNTuples = false;
+
   if(feof(fInputFile)) return kFALSE;
 
@@ -94 +97 @@
 
   xdr_string(fInputXDR, &fBuffer, 100);
+  if(strncmp(fBuffer, "2.00", 4) == 0)
+  {
+    skipNTuples = true;
+  }
 
   if(fBlockType == EVENTTABLE)
@@ -101 +108 @@
   else if(fBlockType == EVENTHEADER)
   {
-    ReadSTDHEPHeader();
+    ReadSTDHEPHeader(skipNTuples);
   }
   else if(fBlockType == MCFIO_STDHEPBEG ||
@@ -116 +123 @@
   else if(fBlockType == MCFIO_STDHEP4)
   {
-    ReadSTDHEP4();
+    ReadSTDHEP();
     AnalyzeParticles(factory, allParticleOutputArray,
       stableParticleOutputArray, partonOutputArray);
+    ReadSTDHEP4();
   }
   else
@@ -132 +140 @@
 void DelphesSTDHEPReader::SkipBytes(u_int size)
 {
+  int rc;
   u_int rndup;
+
   rndup = size % 4;
   if(rndup > 0)
@@ -139 +149 @@
   }
 
-  fseek(fInputFile, size + rndup, SEEK_CUR);
+  rc = fseek(fInputFile, size + rndup, SEEK_CUR);
+
+  if(rc != 0 && errno == ESPIPE)
+  {
+    xdr_opaque(fInputXDR, fBuffer, size);
+  }
 }
 
@@ -239 +254 @@
 //---------------------------------------------------------------------------
 
-void DelphesSTDHEPReader::ReadSTDHEPHeader()
+void DelphesSTDHEPReader::ReadSTDHEPHeader(bool skipNTuples)
 {
   SkipBytes(20);
@@ -247 +262 @@
 
   u_int dimNTuples = 0;
-  if(strncmp(fBuffer, "2.00", 4) == 0)
+  if(skipNTuples)
   {
     SkipBytes(4);
@@ -261 +276 @@
 
   // Processing blocks extraction
-  if(dimNTuples > 0 && strncmp(fBuffer, "2.00", 4) == 0)
+  if(skipNTuples && dimNTuples > 0)
   {
     SkipArray(4);
@@ -342 +357 @@
 {
   u_int number;
-
-  ReadSTDHEP();
 
   // Extracting the event weight

classes/DelphesSTDHEPReader.h

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