Changeset 671 in svn for trunk

Timestamp:

Aug 9, 2012, 11:48:52 AM (12 years ago)

Author:

cp3-support

Message:

corrected b-tagging by a.mertens

File:

• trunk/src/SmearUtil.cc (modified) (3 diffs)

trunk/src/SmearUtil.cc

@@ -1382 +1382 @@
 ///// Attention : bug removed => CONERADIUS/2 -> CONERADIUS !!
 int RESOLution::Bjets(const TSimpleArray<TRootC::GenParticle> &subarray, const float& eta, const float& phi) {
-  float emax=0;
+  int flav_max=0;
   int Ppid=0;
   if(subarray.GetEntries()>0) {
       for(int i=0; i < subarray.GetEntries();i++) { // should have pt>PT_JETMIN and a small cone radius (r<CONE_JET)
-          float genDeltaR = DeltaR(subarray[i]->Phi,subarray[i]->Eta,phi,eta);
-          if(genDeltaR < JET_coneradius && subarray[i]->E > emax) {
-              emax=subarray[i]->E;
+      float genDeltaR = DeltaR(subarray[i]->Phi,subarray[i]->Eta,phi,eta);
+          if(genDeltaR < JET_coneradius && (abs( subarray[i]->PID) < 6 && abs(subarray[i]->PID) > flav_max)) {
+              flav_max=abs(subarray[i]->PID);
               Ppid=abs(subarray[i]->PID);
           }
       }
   }
-  return Ppid; 
-}
-
+  return Ppid;
+}
 
 //******************* Simulates the b-tagging efficiency for real bjet, or the misendentification for other jets****************
@@ -1406 +1405 @@
 
   // selects the correct formula
-  int jet_id = Bjets(subarray,JET.Eta(),JET.Phi()); // gets the particle id of the most energetic parton in the jet
+  int jet_id = Bjets(subarray,JET.Eta(),JET.Phi()); // gets the flavor of the jet
   switch (jet_id) {
-    case pB: efficiency_formula = BTAG_func_b; break;
-    case pC: efficiency_formula = BTAG_func_c; break;
-    case pGLUON: efficiency_formula = BTAG_func_g; break;
+    case 5: efficiency_formula = BTAG_func_b; break;
+    case 4: efficiency_formula = BTAG_func_c; break;
     default: efficiency_formula = BTAG_func_l; break;
   }
@@ -1417 +1415 @@
   float x = grandom->Uniform(); // randomisation
   tag = (x < efficiency.Eval(JET.Pt(),JET.Eta())) ? true : false;
-  //cout << "formula = " << efficiency_formula << "\t Pt = " << JET.Pt() 
-  //     << "\t value = " << efficiency.Eval(JET.Pt())  
-  //     << "\t x = " << x << "\t tag= " << tag << endl;
 
   return tag;