Changeset 28027d5 in git for classes/DelphesLHEFReader.h

Timestamp:

Jun 26, 2015, 3:13:55 PM (9 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f3c4047

Parents:

f53a4d2 (diff), fe0273c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #15 from delphes/mergeCMS

merge with the CMS code

File:

• classes/DelphesLHEFReader.h (modified) (3 diffs)

classes/DelphesLHEFReader.h

@@ -31 +31 @@
 
 #include <vector>
+#include <utility>
 
 class TObjArray;
@@ -58 +59 @@
     TStopwatch *readStopWatch, TStopwatch *procStopWatch);
 
-  void AnalyzeRwgt(ExRootTreeBranch *branch);
+  void AnalyzeWeight(ExRootTreeBranch *branch);
 
 private:
@@ -83 +84 @@
   double fPx, fPy, fPz, fE, fMass;
   
-  std::vector<double> fRwgtList;
+  std::vector< std::pair< int, double > > fWeightList;
 };