Changeset 1367 in svn for trunk/modules
- Timestamp:
- Apr 16, 2014, 4:08:33 PM (11 years ago)
- Location:
- trunk/modules
- Files:
-
- 4 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/modules/ModulesLinkDef.h
r1360 r1367 19 19 #include "modules/EnergySmearing.h" 20 20 #include "modules/MomentumSmearing.h" 21 #include "modules/ImpactParameterSmearing.h" 21 22 #include "modules/TimeSmearing.h" 22 23 #include "modules/Calorimeter.h" … … 24 25 #include "modules/EnergyScale.h" 25 26 #include "modules/UniqueObjectFinder.h" 27 #include "modules/TrackCountingBTagging.h" 26 28 #include "modules/BTagging.h" 27 29 #include "modules/TauTagging.h" … … 53 55 #pragma link C++ class EnergySmearing+; 54 56 #pragma link C++ class MomentumSmearing+; 57 #pragma link C++ class ImpactParameterSmearing+; 55 58 #pragma link C++ class TimeSmearing+; 56 59 #pragma link C++ class Calorimeter+; … … 58 61 #pragma link C++ class EnergyScale+; 59 62 #pragma link C++ class UniqueObjectFinder+; 63 #pragma link C++ class TrackCountingBTagging+; 60 64 #pragma link C++ class BTagging+; 61 65 #pragma link C++ class TauTagging+; -
trunk/modules/ParticlePropagator.cc
r1342 r1367 106 106 Double_t tmp, discr, discr2; 107 107 Double_t delta, gammam, omega, asinrho; 108 108 Double_t ang_mom, rcu, rc2, dxy, xd, yd, zd; 109 109 110 const Double_t c_light = 2.99792458E8; 110 111 … … 214 215 if(x_c < 0.0) phi += TMath::Pi(); 215 216 217 rcu = TMath::Abs(r); 218 rc2 = r_c*r_c; 219 220 // calculate coordinates of closest approach to track circle in transverse plane xd, yd, zd 221 xd = x_c*x_c*x_c - x_c*rcu*r_c + x_c*y_c*y_c; 222 xd = ( rc2 > 0.0 ) ? xd / rc2 : -999; 223 yd = y_c*(-rcu*r_c + rc2); 224 yd = ( rc2 > 0.0 ) ? yd / rc2 : -999; 225 zd = z + (TMath::Sqrt(xd*xd+yd*yd) - TMath::Sqrt(x*x+y*y))*pz/pt; 226 227 // calculate impact paramater 228 ang_mom = (xd*py - yd*px); 229 dxy = ang_mom/pt; 230 231 216 232 // 3. time evaluation t = TMath::Min(t_r, t_z) 217 233 // t_r : time to exit from the sides … … 267 283 268 284 candidate->Momentum = candidateMomentum; 269 candidate->AddCandidate(mother); 285 candidate->Xd = xd*1.0E3; 286 candidate->Yd = yd*1.0E3; 287 candidate->Zd = zd*1.0E3; 288 289 candidate->AddCandidate(mother); 270 290 271 291 fOutputArray->Add(candidate); … … 287 307 288 308 //------------------------------------------------------------------------------ 309 -
trunk/modules/TreeWriter.cc
r1366 r1367 277 277 entry->ZOuter = position.Z(); 278 278 entry->TOuter = position.T()*1.0E-3/c_light; 279 279 280 entry->Dxy = candidate->Dxy; 281 entry->SDxy = candidate->SDxy ; 282 entry->Xd = candidate -> Xd; 283 entry->Yd = candidate -> Yd; 284 entry->Zd = candidate -> Zd; 285 280 286 const TLorentzVector &momentum = candidate->Momentum; 281 287
Note:
See TracChangeset
for help on using the changeset viewer.