Changeset 1d9c62a in git

Timestamp:

Aug 24, 2018, 4:19:20 PM (6 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

538edc4, 6bc0fd3

Parents:

01f9722

Message:

fix DelphesLHEFReader.cc compilation under Ubuntu 14.04

File:

• classes/DelphesLHEFReader.cc (modified) (4 diffs)

classes/DelphesLHEFReader.cc

@@ -31 +31 @@
 #include <iostream>
 #include <sstream>
-#include <string>
 
 #include <stdio.h>
@@ -103 +102 @@
   int rc, id;
   char *pch;
-  double weight;
+  double weight, xsec;
 
   if(!fgets(fBuffer, kBufferSize, fInputFile)) return kFALSE;
 
-  // read cross section string from LHE file header (meant to work on Wizard output only)
-  if(strstr(fBuffer, "<xsecinfo ") && fEventCounter < 0)
-  {
-    DelphesStream bufferStream(fBuffer);
-
-    string buf = fBuffer;    
-    string xsecstr="totxsec";
-    
-    if (buf.find(xsecstr) != string::npos)
-    {
-        buf = buf.substr(buf.find(xsecstr) + xsecstr.length()+1);
-        unsigned first = buf.find_first_of("\"")+1;
-        unsigned last = buf.find_last_of("\"");
-        xsecstr = buf.substr(first,last-first);
-        fCrossSection = stod(xsecstr);
-    }  
-  }
-  
   if(strstr(fBuffer, "<event>"))
   {
@@ -130 +111 @@
     fEventCounter = 1;
   }
-  
   else if(fEventCounter > 0)
   {
@@ -207 +187 @@
     fWeightList.push_back(make_pair(id, weight));
   }
+  else if(strstr(fBuffer, "<xsecinfo"))
+  {
+    pch = strstr(fBuffer, "totxsec");
+    if(!pch)
+    {
+      cerr << "** ERROR: " << "invalid cross section format" << endl;
+      return kFALSE;
+    }
+
+    pch = strpbrk(pch + 1, "\"'");
+    if(!pch)
+    {
+      cerr << "** ERROR: " << "invalid cross section format" << endl;
+      return kFALSE;
+    }
+
+    DelphesStream xsecStream(pch + 1);
+    rc = xsecStream.ReadDbl(xsec);
+
+    if(!rc)
+    {
+      cerr << "** ERROR: " << "invalid cross section format" << endl;
+      return kFALSE;
+    }
+
+    fCrossSection = xsec;
+  }
   else if(strstr(fBuffer, "</event>"))
   {