Changeset 3a105e5 in git
- Timestamp:
- Feb 24, 2022, 4:15:47 PM (3 years ago)
- Branches:
- master
- Children:
- 2a2f310
- Parents:
- 56fb0be
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
classes/DelphesClasses.cc
r56fb0be r3a105e5 230 230 Phi(0), ErrorPhi(0), 231 231 Xd(0), Yd(0), Zd(0), 232 XFirstHit(0), YFirstHit(0), ZFirstHit(0), 232 233 Nclusters(0.0), 233 234 dNdx(0.0), … … 409 410 object.Yd = Yd; 410 411 object.Zd = Zd; 412 object.XFirstHit = XFirstHit; 413 object.YFirstHit = YFirstHit; 414 object.ZFirstHit = ZFirstHit; 411 415 object.Nclusters = Nclusters; 412 416 object.dNdx = dNdx; … … 544 548 Yd = 0.0; 545 549 Zd = 0.0; 550 XFirstHit = 0.0; 551 YFirstHit = 0.0; 552 ZFirstHit = 0.0; 546 553 Nclusters = 0.0; 547 554 dNdx = 0.0; -
classes/DelphesClasses.h
r56fb0be r3a105e5 458 458 Float_t Zd; // Z coordinate of point of closest approach to vertex 459 459 460 Float_t XFirstHit; // X coordinate of point of closest approach to vertex 461 Float_t YFirstHit; // Y coordinate of point of closest approach to vertex 462 Float_t ZFirstHit; // Z coordinate of point of closest approach to vertex 463 460 464 Float_t L; // track path length 461 465 Float_t D0; // track transverse impact parameter … … 564 568 Float_t Yd; // Y coordinate of point of closest approach to vertex 565 569 Float_t Zd; // Z coordinate of point of closest approach to vertex 570 571 Float_t XFirstHit; // X coordinate of point of closest approach to vertex 572 Float_t YFirstHit; // Y coordinate of point of closest approach to vertex 573 Float_t ZFirstHit; // Z coordinate of point of closest approach to vertex 566 574 567 575 Float_t L; // track path length … … 708 716 Float_t Zd; 709 717 718 Float_t XFirstHit; 719 Float_t YFirstHit; 720 Float_t ZFirstHit; 721 710 722 // tracking resolution 711 723 -
external/TrackCovariance/ObsTrk.cc
r56fb0be r3a105e5 120 120 //if (pt > maxPt) std::cout << "Warning ObsTrk::GenToObsPar: pt " << pt << " is above grid range of " << maxPt << std::endl; 121 121 Double_t minAn = fGC->GetMinAng(); 122 //if (angd < minAn) std::cout << "Warning ObsTrk::GenToObsPar: angle " << angd 122 //if (angd < minAn) std::cout << "Warning ObsTrk::GenToObsPar: angle " << angd 123 123 // << " is below grid range of " << minAn << std::endl; 124 124 Double_t maxAn = fGC->GetMaxAng(); … … 137 137 Double_t Xfirst, Yfirst, Zfirst; 138 138 Int_t iLay = trk->FirstHit(Xfirst, Yfirst, Zfirst); 139 TVector3 fXfirst(Xfirst, Yfirst, Zfirst); 139 fXfirst = TVector3(Xfirst, Yfirst, Zfirst); 140 //std::cout<<"obs trk: "<<Xfirst<<","<<Yfirst<<","<<Zfirst<<std::endl; 141 140 142 if (inside) 141 143 { -
external/TrackCovariance/SolTrack.cc
r56fb0be r3a105e5 176 176 { 177 177 // 178 // Return lists of hits associated to a track including all scattering layers. 178 // Return lists of hits associated to a track including all scattering layers. 179 179 // Return value is the total number of measurement hits 180 180 // kmh = total number of measurement layers hit for given type … … 190 190 { 191 191 Double_t R; Double_t phi; Double_t zz; 192 if (HitLayer(i, R, phi, zz)) 192 if (HitLayer(i, R, phi, zz)) 193 193 { 194 194 zhh[kh] = zz; … … 207 207 { 208 208 // 209 // Return lists of hits associated to a track for all measurement layers. 209 // Return lists of hits associated to a track for all measurement layers. 210 210 // Return value is the total number of measurement hits 211 211 // kmh = total number of measurement layers hit for given type … … 236 236 Int_t SolTrack::FirstHit(Double_t &Xfirst, Double_t &Yfirst, Double_t &Zfirst) 237 237 { 238 Int_t iFirst = -1; 238 Int_t iFirst = -1; 239 239 Int_t iFirstLay = -1; // Default return with no hits 240 240 Xfirst = 0.; … … 249 249 Double_t *dh = new Double_t[Nmh]; 250 250 // 251 Int_t n = HitListXYZ(ih, Xh, Yh, Zh); 251 Int_t n = HitListXYZ(ih, Xh, Yh, Zh); 252 252 // 253 253 for(Int_t i=0; i<Nmh; i++){ 254 Double_t rr = TMath::Sqrt(Xh[i]*Xh[i]+Yh[i]*Yh[i]); // Hit radius 254 Double_t rr = TMath::Sqrt(Xh[i]*Xh[i]+Yh[i]*Yh[i]); // Hit radius 255 255 dh[i] = TMath::ASin(C() * TMath::Sqrt((rr * rr - D() * D()) / (1. + 2 * C() * D()))) / C(); // Arc length traveled 256 256 } … … 327 327 // 328 328 // 329 // Input flags: 329 // Input flags: 330 330 // Res = .TRUE. turn on resolution effects/Use standard resolutions 331 331 // .FALSE. set all resolutions to 0 … … 410 410 nz = 1.0; 411 411 } 412 Double_t corr = TMath::Abs(pxi*nx + pyi * ny + pzi * nz) / p(); 412 Double_t corr = TMath::Abs(pxi*nx + pyi * ny + pzi * nz) / p(); 413 413 Double_t Rlf = fG->lTh(i) / (corr*fG->lX0(i)); // Rad. length fraction 414 414 thms[ii] = 0.0136*TMath::Sqrt(Rlf)*(1.0 + 0.038*TMath::Log(Rlf)) / p(); // MS angle … … 438 438 Int_t ityp = fG->lTyp(i); // Layer type Barrel or Z 439 439 Int_t nmeai = fG->lND(i); // # measurements in layer 440 440 441 441 if (fG->isMeasure(i)) 442 442 { … … 470 470 Rm(im, 2) = csa * dRphi(2) - ssa * dRz(2); // C derivative 471 471 Rm(im, 3) = csa * dRphi(3) - ssa * dRz(3); // z0 derivative 472 Rm(im, 4) = csa * dRphi(4) - ssa * dRz(4); // cot(theta) derivative 472 Rm(im, 4) = csa * dRphi(4) - ssa * dRz(4); // cot(theta) derivative 473 473 } 474 474 if (ityp == 2) // Z type layer (Measure R-phi at const. Z) … … 531 531 { 532 532 Double_t strk = 0; 533 if (nmk + 1 == 1) strk = fG->lStU(k); // Stereo angle upper 533 if (nmk + 1 == 1) strk = fG->lStU(k); // Stereo angle upper 534 534 if (nmk + 1 == 2) strk = fG->lStL(k); // Stereo angle lower 535 535 //if (im == km && Res) Sm(im, km) += sig*sig; // Detector resolution on diagonal … … 542 542 // 543 543 // Loop on all layers below for MS contributions 544 for (Int_t jj = 0; jj < kk; jj++) 544 for (Int_t jj = 0; jj < kk; jj++) 545 545 { 546 546 Double_t di = dik(ii, jj); -
modules/TrackCovariance.cc
r56fb0be r3a105e5 121 121 const TLorentzVector &candidateMomentum = particle->Momentum; 122 122 123 123 124 Bool_t inside = TrkUtil::IsInside(candidatePosition.Vect(), Rin, ZinNeg, ZinPos); // Check if in inner box 124 125 Bool_t Accept = kTRUE; … … 130 131 131 132 ObsTrk track(candidatePosition.Vect(), candidateMomentum.Vect(), candidate->Charge, fCovariance, fGeometry); 133 132 134 133 135 mother = candidate; … … 150 152 candidate->Yd = track.GetObsX().Y()*1e03; 151 153 candidate->Zd = track.GetObsX().Z()*1e03; 154 155 candidate->XFirstHit = track.GetFirstHit().X()*1e03; 156 candidate->YFirstHit = track.GetFirstHit().Y()*1e03; 157 candidate->ZFirstHit = track.GetFirstHit().Z()*1e03; 152 158 153 159 candidate->D0 = track.GetObsPar()[0]*1e03; -
modules/TreeWriter.cc
r56fb0be r3a105e5 384 384 entry->Zd = candidate->Zd; 385 385 386 entry->XFirstHit = candidate->XFirstHit; 387 entry->YFirstHit = candidate->YFirstHit; 388 entry->ZFirstHit = candidate->ZFirstHit; 389 386 390 const TLorentzVector &momentum = candidate->Momentum; 387 391 … … 544 548 entry->Zd = candidate->Zd; 545 549 550 entry->XFirstHit = candidate->XFirstHit; 551 entry->YFirstHit = candidate->YFirstHit; 552 entry->ZFirstHit = candidate->ZFirstHit; 553 546 554 const TLorentzVector &momentum = candidate->Momentum; 547 555
Note:
See TracChangeset
for help on using the changeset viewer.