Changeset 4689481 in git for modules

Timestamp:

May 25, 2018, 8:28:31 PM (7 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f37555a

Parents:

c3547ed (diff), fbad4c7 (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 branch 'photonId'

Location:

modules

Files:

• ModulesLinkDef.h (modified) (2 diffs)
• PhotonID.cc (added)
• PhotonID.h (added)
• TreeWriter.cc (modified) (3 diffs)

modules/ModulesLinkDef.h

@@ -57 +57 @@
 #include "modules/TaggingParticlesSkimmer.h"
 #include "modules/PileUpJetID.h"
+#include "modules/PhotonID.h"
 #include "modules/ConstituentFilter.h"
 #include "modules/StatusPidFilter.h"
@@ -109 +110 @@
 #pragma link C++ class TaggingParticlesSkimmer+;
 #pragma link C++ class PileUpJetID+;
+#pragma link C++ class PhotonID+;
 #pragma link C++ class ConstituentFilter+;
 #pragma link C++ class StatusPidFilter+;

modules/TreeWriter.cc

@@ -463 +463 @@
     const TLorentzVector &position = candidate->Position;
 
-
     pt = momentum.Pt();
     cosTheta = TMath::Abs(momentum.CosTheta());
@@ -476 +475 @@
     entry->PT = pt;
     entry->E = momentum.E();
-
     entry->T = position.T()*1.0E-3/c_light;
 
@@ -489 +487 @@
 
     entry->EhadOverEem = candidate->Eem > 0.0 ? candidate->Ehad/candidate->Eem : 999.9;
+
+    // 1: prompt -- 2: non prompt -- 3: fake
+    entry->Status = candidate->Status;
 
     FillParticles(candidate, &entry->Particles);