Changeset 1367 in svn for trunk/modules

Timestamp:

Apr 16, 2014, 4:08:33 PM (11 years ago)

Author:

Michele Selvaggi

Message:

track counting btagging

Location:

trunk/modules

Files:

• ImpactParameterSmearing.cc (added)
• ImpactParameterSmearing.h (added)
• ModulesLinkDef.h (modified) (4 diffs)
• ParticlePropagator.cc (modified) (4 diffs)
• TrackCountingBTagging.cc (added)
• TrackCountingBTagging.h (added)
• TreeWriter.cc (modified) (1 diff)

trunk/modules/ModulesLinkDef.h

@@ -19 +19 @@
 #include "modules/EnergySmearing.h"
 #include "modules/MomentumSmearing.h"
+#include "modules/ImpactParameterSmearing.h"
 #include "modules/TimeSmearing.h"
 #include "modules/Calorimeter.h"
@@ -24 +25 @@
 #include "modules/EnergyScale.h"
 #include "modules/UniqueObjectFinder.h"
+#include "modules/TrackCountingBTagging.h"
 #include "modules/BTagging.h"
 #include "modules/TauTagging.h"
@@ -53 +55 @@
 #pragma link C++ class EnergySmearing+;
 #pragma link C++ class MomentumSmearing+;
+#pragma link C++ class ImpactParameterSmearing+;
 #pragma link C++ class TimeSmearing+;
 #pragma link C++ class Calorimeter+;
@@ -58 +61 @@
 #pragma link C++ class EnergyScale+;
 #pragma link C++ class UniqueObjectFinder+;
+#pragma link C++ class TrackCountingBTagging+;
 #pragma link C++ class BTagging+;
 #pragma link C++ class TauTagging+;

trunk/modules/ParticlePropagator.cc

@@ -106 +106 @@
   Double_t tmp, discr, discr2;
   Double_t delta, gammam, omega, asinrho;
-
+  Double_t ang_mom, rcu, rc2, dxy, xd, yd, zd;
+  
   const Double_t c_light = 2.99792458E8;
 
@@ -214 +215 @@
       if(x_c < 0.0) phi += TMath::Pi();
 
+      rcu = TMath::Abs(r);
+      rc2 = r_c*r_c;
+     
+      // calculate coordinates of closest approach to track circle in transverse plane xd, yd, zd
+      xd = x_c*x_c*x_c - x_c*rcu*r_c + x_c*y_c*y_c; 
+      xd  = ( rc2 > 0.0 ) ? xd / rc2 : -999;
+      yd  = y_c*(-rcu*r_c + rc2);
+      yd  = ( rc2 > 0.0 ) ? yd / rc2 : -999;
+      zd  = z + (TMath::Sqrt(xd*xd+yd*yd) - TMath::Sqrt(x*x+y*y))*pz/pt;
+
+      // calculate impact paramater
+      ang_mom = (xd*py - yd*px);
+      dxy = ang_mom/pt;
+    
+         
       // 3. time evaluation t = TMath::Min(t_r, t_z)
       //    t_r : time to exit from the sides
@@ -267 +283 @@
 
         candidate->Momentum = candidateMomentum;
-        candidate->AddCandidate(mother);
+        candidate->Xd = xd*1.0E3; 
+        candidate->Yd = yd*1.0E3;
+        candidate->Zd = zd*1.0E3;
+        
+        candidate->AddCandidate(mother);
 
         fOutputArray->Add(candidate);
@@ -287 +307 @@
 
 //------------------------------------------------------------------------------
+

trunk/modules/TreeWriter.cc

@@ -277 +277 @@
     entry->ZOuter = position.Z();
     entry->TOuter = position.T()*1.0E-3/c_light;
-
+    
+    entry->Dxy = candidate->Dxy;
+    entry->SDxy = candidate->SDxy ;
+    entry->Xd = candidate -> Xd;
+    entry->Yd = candidate -> Yd;
+    entry->Zd = candidate -> Zd;
+   
     const TLorentzVector &momentum = candidate->Momentum;