Changeset 24d005f in git

Timestamp:

Jan 3, 2014, 4:41:28 PM (11 years ago)

Author:

mselvaggi <mselvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

54b6dfc

Parents:

22dc7fd

Message:

added PileUpJetID module from Seth Senz

Files:

• Makefile (modified) (4 diffs)
• classes/DelphesClasses.cc (modified) (4 diffs)
• classes/DelphesClasses.h (modified) (2 diffs)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/PileUpJetID.cc (added)
• modules/PileUpJetID.h (added)
• modules/TrackPileUpSubtractor.cc (modified) (1 diff)
• modules/TreeWriter.cc (modified) (1 diff)

Makefile

@@ -327 +327 @@
         modules/JetPileUpSubtractor.h \
         modules/TrackPileUpSubtractor.h \
+        modules/PileUpJetID.h \
         modules/ConstituentFilter.h \
         modules/StatusPidFilter.h \
@@ -511 +512 @@
         modules/EnergyScale.$(SrcSuf) \
         modules/EnergyScale.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/PileUpJetID.$(ObjSuf): \
+        modules/PileUpJetID.$(SrcSuf) \
+        modules/PileUpJetID.h \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -948 +958 @@
         tmp/modules/ExampleModule.$(ObjSuf) \
         tmp/modules/EnergyScale.$(ObjSuf) \
+        tmp/modules/PileUpJetID.$(ObjSuf) \
         tmp/modules/Cloner.$(ObjSuf) \
         tmp/modules/TreeWriter.$(ObjSuf) \
@@ -1296 +1307 @@
         @touch $@
 
+modules/PileUpJetID.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 external/fastjet/version.hh: \
         external/fastjet/config.h

classes/DelphesClasses.cc

@@ -112 +112 @@
   Area(0.0, 0.0, 0.0, 0.0),
   fFactory(0),
-  fArray(0)
+  fArray(0),
+  NCharged(0),
+  NNeutrals(0),
+  Beta(0),
+  BetaStar(0),
+  MeanSqDeltaR(0),
+  PTD(0)
 {
   Edges[0] = 0.0;
@@ -118 +124 @@
   Edges[2] = 0.0;
   Edges[3] = 0.0;
+  FracPt[0] = 0.0;
+  FracPt[1] = 0.0;
+  FracPt[2] = 0.0;
+  FracPt[3] = 0.0;
+  FracPt[4] = 0.0;
 }
 
@@ -206 +217 @@
   object.Area = Area;
 
+  object.NCharged = NCharged;
+  object.NNeutrals = NNeutrals;
+  object.Beta = Beta;
+  object.BetaStar = BetaStar;
+  object.MeanSqDeltaR = MeanSqDeltaR;
+  object.PTD = PTD;
+  object.FracPt[0] = FracPt[0];
+  object.FracPt[1] = FracPt[1];
+  object.FracPt[2] = FracPt[2];
+  object.FracPt[3] = FracPt[3];
+  object.FracPt[4] = FracPt[4];
+
   object.fFactory = fFactory;
   object.fArray = 0;
@@ -246 +269 @@
   Position.SetXYZT(0.0, 0.0, 0.0, 0.0);
   Area.SetXYZT(0.0, 0.0, 0.0, 0.0);
+
+  NCharged = 0;
+  NNeutrals = 0;
+  Beta = 0.0;
+  BetaStar = 0.0;
+  MeanSqDeltaR = 0.0;
+  PTD = 0.0;
+  FracPt[0] = 0.0;
+  FracPt[1] = 0.0;
+  FracPt[2] = 0.0;
+  FracPt[3] = 0.0;
+  FracPt[4] = 0.0;
+
   fArray = 0;
 }

classes/DelphesClasses.h

@@ -308 +308 @@
   TLorentzVector P4();
 
+  // -- PileUpJetID variables ---
+
+  Int_t    NCharged;
+  Int_t    NNeutrals;
+  Float_t  Beta;
+  Float_t  BetaStar;
+  Float_t  MeanSqDeltaR;
+  Float_t  PTD;
+  Float_t  FracPt[5];
+
+
+
   ClassDef(Jet, 2)
 };
@@ -421 +433 @@
   virtual void Clear(Option_t* option = "");
 
+// -- PileUpJetID variables ---
+
+  Int_t    NCharged;
+  Int_t    NNeutrals;
+  Float_t  Beta;
+  Float_t  BetaStar;
+  Float_t  MeanSqDeltaR;
+  Float_t  PTD;
+  Float_t  FracPt[5];
+
 private:
   DelphesFactory *fFactory; //!

modules/ModulesLinkDef.h

@@ -32 +32 @@
 #include "modules/JetPileUpSubtractor.h"
 #include "modules/TrackPileUpSubtractor.h"
+#include "modules/PileUpJetID.h"
 #include "modules/ConstituentFilter.h"
 #include "modules/StatusPidFilter.h"
@@ -64 +65 @@
 #pragma link C++ class JetPileUpSubtractor+;
 #pragma link C++ class TrackPileUpSubtractor+;
+#pragma link C++ class PileUpJetID+;
 #pragma link C++ class ConstituentFilter+;
 #pragma link C++ class StatusPidFilter+;

modules/TrackPileUpSubtractor.cc

@@ -102 +102 @@
   TIterator *iterator;
   TObjArray *array;
-  Double_t z, zvtx;
+  Double_t z, zvtx=0;
 
   

modules/TreeWriter.cc

@@ -533 +533 @@
 
     entry->EhadOverEem = ecalEnergy > 0.0 ? hcalEnergy/ecalEnergy : 999.9;
+  
+    //---   Pile-Up Jet ID variables ----
+
+    entry->NCharged = candidate->NCharged;
+    entry->NNeutrals = candidate->NNeutrals;
+    entry->Beta = candidate->Beta;
+    entry->BetaStar = candidate->BetaStar;
+    entry->MeanSqDeltaR = candidate->MeanSqDeltaR;
+    entry->PTD = candidate->PTD;
+    entry->FracPt[0] = candidate->FracPt[0];
+    entry->FracPt[1] = candidate->FracPt[1];
+    entry->FracPt[2] = candidate->FracPt[2];
+    entry->FracPt[3] = candidate->FracPt[3];
+    entry->FracPt[4] = candidate->FracPt[4];
 
     FillParticles(candidate, &entry->Particles);