Changeset dd514ae in git for modules/BTagging.cc

Timestamp:

Jun 10, 2015, 4:04:47 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8707eeb

Parents:

6ec8d18 (diff), 9c491e1 (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:

resolve conflict in DelphesClasses.h

File:

• modules/BTagging.cc (modified) (3 diffs)

modules/BTagging.cc

@@ -171 +171 @@
 {
   Candidate *jet, *parton;
-  Double_t pt, eta, phi;
+  Double_t pt, eta, phi, e;
   TObjArray *partonArray;
   map< Int_t, DelphesFormula * >::iterator itEfficiencyMap;
@@ -194 +194 @@
     phi = jetMomentum.Phi();
     pt = jetMomentum.Pt();
-
+    e = jetMomentum.E();
+    
     // loop over all input partons
     itPartonArray.Reset();
@@ -218 +219 @@
 
     // apply an efficency formula
-    jet->BTag |= (gRandom->Uniform() <= formula->Eval(pt, eta)) << fBitNumber;
-  }
-}
-
-//------------------------------------------------------------------------------
+    jet->BTag |= (gRandom->Uniform() <= formula->Eval(pt, eta, phi, e)) << fBitNumber;
+  }
+}
+
+//------------------------------------------------------------------------------