Changeset fbad4c7 in git for modules

Timestamp:

May 24, 2018, 9:12:31 PM (7 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4689481

Parents:

4fd4f01 (diff), 792092a (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 'master' into photonId

Conflicts:

cards/CMS_PhaseII/CMS_PhaseII_200PU_v03.tcl

Location:

modules

Files:

• StatusPidFilter.cc (modified) (1 diff)
• TauTagging.cc (modified) (2 diffs)
• TreeWriter.cc (modified) (1 diff)

modules/StatusPidFilter.cc

@@ -177 +177 @@
     pass = kFALSE;
 
+    // Store all SUSY particles
+    if(pdgCode >= 1000001 && pdgCode <= 1000039) pass = kTRUE;
+
     // hard scattering particles (first condition for Py6, second for Py8)
     if(status == 3) pass = kTRUE;

modules/TauTagging.cc

@@ -195 +195 @@
   Candidate *jet, *tau, *daughter;
   TLorentzVector tauMomentum;
-  Double_t pt, eta, phi, e;
+  Double_t pt, eta, phi, e, eff;
   TObjArray *tauArray;
   map< Int_t, DelphesFormula * >::iterator itEfficiencyMap;
@@ -255 +255 @@
 
     // apply an efficency formula
-    jet->TauTag |= (gRandom->Uniform() <= formula->Eval(pt, eta, phi, e)) << fBitNumber;
-    
+    eff = formula->Eval(pt, eta, phi, e);
+    jet->TauTag |= (gRandom->Uniform() <= eff) << fBitNumber;
+    jet->TauWeight = eff;     
+
     // set tau charge
     jet->Charge = charge;

modules/TreeWriter.cc

@@ -652 +652 @@
 
     entry->TauTag = candidate->TauTag;
+    entry->TauWeight = candidate->TauWeight;
 
     entry->Charge = candidate->Charge;