Changeset 1123 in svn for trunk

Timestamp:

May 26, 2013, 2:00:39 AM (12 years ago)

Author:

Pavel Demin

Message:

add Weight branch and Weighter module

Location:

trunk

Files:

• Makefile (modified) (5 diffs)
• classes/ClassesLinkDef.h (modified) (1 diff)
• classes/DelphesClasses.h (modified) (1 diff)
• modules/ModulesLinkDef.h (modified) (4 diffs)
• modules/TreeWriter.cc (modified) (2 diffs)
• modules/TreeWriter.h (modified) (1 diff)

trunk/Makefile

@@ -186 +186 @@
         modules/StatusPidFilter.h \
         modules/Cloner.h \
+        modules/Weighter.h \
         modules/ExampleModule.h
 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
@@ -396 +397 @@
         external/ExRootAnalysis/ExRootClassifier.h \
         external/ExRootAnalysis/ExRootTreeBranch.h
+tmp/modules/Weighter.$(ObjSuf): \
+        modules/Weighter.$(SrcSuf) \
+        modules/Weighter.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/Delphes.$(ObjSuf): \
         modules/Delphes.$(SrcSuf) \
@@ -763 +773 @@
         tmp/modules/BTagging.$(ObjSuf) \
         tmp/modules/TreeWriter.$(ObjSuf) \
+        tmp/modules/Weighter.$(ObjSuf) \
         tmp/modules/Delphes.$(ObjSuf) \
         tmp/modules/Calorimeter.$(ObjSuf) \
@@ -1022 +1033 @@
         @touch $@
 
+external/fastjet/Selector.hh: \
+        external/fastjet/PseudoJet.hh \
+        external/fastjet/RangeDefinition.hh
+        @touch $@
+
 modules/JetPileUpSubtractor.h: \
         classes/DelphesModule.h
-        @touch $@
-
-external/fastjet/Selector.hh: \
-        external/fastjet/PseudoJet.hh \
-        external/fastjet/RangeDefinition.hh
         @touch $@
 
@@ -1159 +1170 @@
 
 modules/BTagging.h: \
+        classes/DelphesModule.h
+        @touch $@
+
+modules/Weighter.h: \
         classes/DelphesModule.h
         @touch $@

trunk/classes/ClassesLinkDef.h

@@ -37 +37 @@
 #pragma link C++ class ScalarHT+;
 #pragma link C++ class Rho+;
+#pragma link C++ class Weight+;
 #pragma link C++ class Photon+;
 #pragma link C++ class Electron+;

trunk/classes/DelphesClasses.h

@@ -175 +175 @@
 //---------------------------------------------------------------------------
 
+class Weight: public TObject
+{
+public:
+  Float_t Weight; // weight for the event
+
+  ClassDef(Weight, 1)
+};
+
+//---------------------------------------------------------------------------
+
 class Photon: public SortableObject
 {

trunk/modules/ModulesLinkDef.h

@@ -7 +7 @@
  *  $Revision$
  *
- *  
+ *
  *  \author P. Demin - UCL, Louvain-la-Neuve
  *
@@ -13 +13 @@
 
 #include "modules/Delphes.h"
- 
+
 #include "modules/FastJetFinder.h"
 #include "modules/ParticlePropagator.h"
@@ -33 +33 @@
 #include "modules/StatusPidFilter.h"
 #include "modules/Cloner.h"
+#include "modules/Weighter.h"
 #include "modules/ExampleModule.h"
 
@@ -62 +63 @@
 #pragma link C++ class StatusPidFilter+;
 #pragma link C++ class Cloner+;
+#pragma link C++ class Weighter+;
 #pragma link C++ class ExampleModule+;
 

trunk/modules/TreeWriter.cc

@@ -65 +65 @@
   fClassMap[ScalarHT::Class()] = &TreeWriter::ProcessScalarHT;
   fClassMap[Rho::Class()] = &TreeWriter::ProcessRho;
+  fClassMap[Weight::Class()] = &TreeWriter::ProcessWeight;
 
   TBranchMap::iterator itBranchMap;
@@ -538 +539 @@
 //------------------------------------------------------------------------------
 
+void TreeWriter::ProcessWeight(ExRootTreeBranch *branch, TObjArray *array)
+{
+  Candidate *candidate = 0;
+  Weight *entry = 0;
+
+  // get the first entry
+  if((candidate = static_cast<Candidate*>(array->At(0))))
+  {
+    const TLorentzVector &momentum = candidate->Momentum;
+
+    entry = static_cast<Weight*>(branch->NewEntry());
+
+    entry->Weight = momentum.E();
+  }
+}
+
+//------------------------------------------------------------------------------
+
 void TreeWriter::Process()
 {

trunk/modules/TreeWriter.h

@@ -51 +51 @@
   void ProcessScalarHT(ExRootTreeBranch *branch, TObjArray *array);
   void ProcessRho(ExRootTreeBranch *branch, TObjArray *array);
+  void ProcessWeight(ExRootTreeBranch *branch, TObjArray *array);
 
 #ifndef __CINT__