Changeset 1265 in svn for trunk

Timestamp:

Aug 16, 2013, 4:29:25 PM (11 years ago)

Author:

Pavel Demin

Message:

read reweighting information from LHEF

Location:

trunk

Files:

• classes/DelphesLHEFReader.cc (modified) (8 diffs)
• readers/DelphesLHEF.cpp (modified) (3 diffs)

trunk/classes/DelphesLHEFReader.cc

@@ -41 +41 @@
 DelphesLHEFReader::DelphesLHEFReader() :
   fInputFile(0), fBuffer(0), fPDG(0),
-  fEventCounter(-1), fParticleCounter(-1)
+  fEventReady(kFALSE), fEventCounter(-1), fParticleCounter(-1)
 {
   fBuffer = new char[kBufferSize];
@@ -66 +66 @@
 void DelphesLHEFReader::Clear()
 {
+  fEventReady = kFALSE;
   fEventCounter = -1;
   fParticleCounter = -1;
+  fRwgtList.clear();
 }
 
@@ -74 +76 @@
 bool DelphesLHEFReader::EventReady()
 {
-  return (fEventCounter == 0) && (fParticleCounter == 0);
+  return fEventReady;
 }
 
@@ -85 +87 @@
 {
   int rc;
+  char *pch;
+  double weight;
 
   if(!fgets(fBuffer, kBufferSize, fInputFile)) return kFALSE;
-
-  DelphesStream bufferStream(fBuffer);
 
   if(strstr(fBuffer, "<event>"))
@@ -97 +99 @@
   else if(fEventCounter > 0)
   {
+    DelphesStream bufferStream(fBuffer);
+
     rc = bufferStream.ReadInt(fParticleCounter)
       && bufferStream.ReadInt(fProcessID)
@@ -114 +118 @@
   else if(fParticleCounter > 0)
   {
+    DelphesStream bufferStream(fBuffer);
+
     rc = bufferStream.ReadInt(fPID)
       && bufferStream.ReadInt(fStatus)
@@ -137 +143 @@
     --fParticleCounter;
   }
+  else if(strstr(fBuffer, "<wgt"))
+  {
+    pch = strstr(fBuffer, ">");
+    if(!pch)
+    {
+      cerr << "** ERROR: " << "invalid weight format" << endl;
+      return kFALSE;
+    }
+
+    DelphesStream bufferStream(pch + 1);
+    rc = bufferStream.ReadDbl(weight);
+
+    if(!rc)
+    {
+      cerr << "** ERROR: " << "invalid weight format" << endl;
+      return kFALSE;
+    }
+
+    fRwgtList.push_back(weight);
+  }
+  else if(strstr(fBuffer, "</event>"))
+  {
+    fEventReady = kTRUE;
+  }
 
   return kTRUE;
@@ -163 +193 @@
 //---------------------------------------------------------------------------
 
+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;
+  }
+}
+
+//---------------------------------------------------------------------------
+
 void DelphesLHEFReader::AnalyzeParticle(DelphesFactory *factory,
   TObjArray *allParticleOutputArray,

trunk/readers/DelphesLHEF.cpp

@@ -45 +45 @@
   TStopwatch readStopWatch, procStopWatch;
   ExRootTreeWriter *treeWriter = 0;
-  ExRootTreeBranch *branchEvent = 0;
+  ExRootTreeBranch *branchEvent = 0, *branchRwgt = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
@@ -85 +85 @@
 
     branchEvent = treeWriter->NewBranch("Event", LHEFEvent::Class());
+    branchRwgt = treeWriter->NewBranch("Rwgt", Weight::Class());
 
     confReader = new ExRootConfReader;
@@ -177 +178 @@
 
             reader->AnalyzeEvent(branchEvent, eventCounter, &readStopWatch, &procStopWatch);
+            reader->AnalyzeRwgt(branchRwgt);
 
             treeWriter->Fill();