Changes in classes/DelphesLHEFReader.cc [1e8afcc:cab38f6] in git

File:

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

classes/DelphesLHEFReader.cc

@@ -82 +82 @@
   fEventCounter = -1;
   fParticleCounter = -1;
-  fWeightList.clear();
+  fRwgtList.clear();
 }
 
@@ -99 +99 @@
   TObjArray *partonOutputArray)
 {
-  int rc, id;
+  int rc;
   char *pch;
   double weight;
@@ -158 +158 @@
   else if(strstr(fBuffer, "<wgt"))
   {
-    pch = strpbrk(fBuffer, "\"'");
+    pch = strstr(fBuffer, ">");
     if(!pch)
     {
@@ -165 +165 @@
     }
 
-    DelphesStream idStream(pch + 1);
-    rc = idStream.ReadInt(id);
-
-    pch = strchr(fBuffer, '>');
-    if(!pch)
+    DelphesStream bufferStream(pch + 1);
+    rc = bufferStream.ReadDbl(weight);
+
+    if(!rc)
     {
       cerr << "** ERROR: " << "invalid weight format" << endl;
@@ -175 +174 @@
     }
 
-    DelphesStream weightStream(pch + 1);
-    rc = weightStream.ReadDbl(weight);
-
-    if(!rc)
-    {
-      cerr << "** ERROR: " << "invalid weight format" << endl;
-      return kFALSE;
-    }
-
-    fWeightList.push_back(make_pair(id, weight));
+    fRwgtList.push_back(weight);
   }
   else if(strstr(fBuffer, "</event>"))
@@ -216 +206 @@
 //---------------------------------------------------------------------------
 
-void DelphesLHEFReader::AnalyzeWeight(ExRootTreeBranch *branch)
-{
-  LHEFWeight *element;
-  vector< pair< int, double > >::const_iterator itWeightList;
-
-  for(itWeightList = fWeightList.begin(); itWeightList != fWeightList.end(); ++itWeightList)
-  {
-    element = static_cast<LHEFWeight *>(branch->NewEntry());
-
-    element->ID = itWeightList->first;
-    element->Weight = itWeightList->second;
+void DelphesLHEFReader::AnalyzeRwgt(ExRootTreeBranch *branch)
+{
+  Weight *element;
+  vector<double>::const_iterator itRwgtList;
+
+  for(itRwgtList = fRwgtList.begin(); itRwgtList != fRwgtList.end(); ++itRwgtList)
+  {
+    element = static_cast<Weight *>(branch->NewEntry());
+
+    element->Weight = *itRwgtList;
   }
 }