From 9a0c055070f07db223418052c10b64c5a9fb5a3e Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Tue, 8 Nov 2022 15:06:53 +0000
Subject: [PATCH] L1: remove beam pipe material from the fit, as it is not
correctly implemented
---
reco/L1/L1Algo/L1CATrackFinder.cxx | 8 ++++----
reco/L1/L1Algo/L1TrackFitter.cxx | 28 ++++++++++++++--------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/reco/L1/L1Algo/L1CATrackFinder.cxx b/reco/L1/L1Algo/L1CATrackFinder.cxx
index b565926ac3..5facd7a142 100644
--- a/reco/L1/L1Algo/L1CATrackFinder.cxx
+++ b/reco/L1/L1Algo/L1CATrackFinder.cxx
@@ -354,9 +354,9 @@ inline void L1Algo::findSingletsStep1( /// input 1st stage of singlet search
else {
fit.L1AddMaterial(T, stal.materialInfo, fMaxInvMom, fvec::One());
}
- if ((istam >= fNstationsBeforePipe) && (istal <= fNstationsBeforePipe - 1)) {
- fit.L1AddPipeMaterial(T, fMaxInvMom, fvec::One());
- }
+ //if ((istam >= fNstationsBeforePipe) && (istal <= fNstationsBeforePipe - 1)) {
+ //fit.L1AddPipeMaterial(T, fMaxInvMom, fvec::One());
+ //}
//assert(T.IsConsistent(true, -1));
@@ -705,7 +705,7 @@ inline void L1Algo::findTripletsStep0( // input
else {
fit.L1AddMaterial(T2, stam.materialInfo, T2.qp, fvec::One());
}
- if ((istar >= fNstationsBeforePipe) && (istam <= fNstationsBeforePipe - 1)) { fit.L1AddPipeMaterial(T2, T2.qp, 1); }
+ //if ((istar >= fNstationsBeforePipe) && (istam <= fNstationsBeforePipe - 1)) { fit.L1AddPipeMaterial(T2, T2.qp, 1); }
// assert(T2.IsConsistent(true, n2_4));
diff --git a/reco/L1/L1Algo/L1TrackFitter.cxx b/reco/L1/L1Algo/L1TrackFitter.cxx
index bfcc7d40fa..8a9a07ccf3 100644
--- a/reco/L1/L1Algo/L1TrackFitter.cxx
+++ b/reco/L1/L1Algo/L1TrackFitter.cxx
@@ -539,10 +539,10 @@ void L1Algo::L1KFTrackFitter()
fit.Extrapolate(z[ista], qp01, fld1, wExtr);
- if (ista == fNstationsBeforePipe - 1) {
- fit.AddPipeMaterial(qp01, wExtr);
- fit.EnergyLossCorrection(fit.fPipeRadThick, qp01, fvec(1.f), wExtr);
- }
+ //if (ista == fNstationsBeforePipe - 1) {
+ //fit.AddPipeMaterial(qp01, wExtr);
+ //fit.EnergyLossCorrection(fit.fPipeRadThick, qp01, fvec(1.f), wExtr);
+ //}
if constexpr (L1Constants::control::kIfUseRadLengthTable) {
fit.AddMaterial(fParameters.GetMaterialThickness(ista, tr.x, tr.y), qp01, wExtr);
fit.EnergyLossCorrection(fParameters.GetMaterialThickness(ista, tr.x, tr.y), qp01, fvec(1.f), wExtr);
@@ -696,10 +696,10 @@ void L1Algo::L1KFTrackFitter()
fit.Extrapolate(z[ista], qp01, fld, w1);
- if (ista == fNstationsBeforePipe) {
- fit.AddPipeMaterial(qp01, wExtr);
- fit.EnergyLossCorrection(fit.fPipeRadThick, qp01, fvec(-1.f), wExtr);
- }
+ //if (ista == fNstationsBeforePipe) {
+ //fit.AddPipeMaterial(qp01, wExtr);
+ //fit.EnergyLossCorrection(fit.fPipeRadThick, qp01, fvec(-1.f), wExtr);
+ //}
if constexpr (L1Constants::control::kIfUseRadLengthTable) {
fit.AddMaterial(fParameters.GetMaterialThickness(ista, tr.x, tr.y), qp01, wExtr);
fit.EnergyLossCorrection(fParameters.GetMaterialThickness(ista, tr.x, tr.y), qp01, fvec(-1.f), wExtr);
@@ -996,13 +996,13 @@ void L1Algo::L1KFTrackFitterMuch()
T1.Extrapolate(z[i], qp01, fld, w1);
- if (i == fNstationsBeforePipe) {
- fit.L1AddPipeMaterial(T, qp0, wIn);
- fit.EnergyLossCorrection(T, fit.PipeRadThick, qp0, fvec(-1.f), wIn);
+ //if (i == fNstationsBeforePipe) {
+ //fit.L1AddPipeMaterial(T, qp0, wIn);
+ //fit.EnergyLossCorrection(T, fit.PipeRadThick, qp0, fvec(-1.f), wIn);
- T1.AddPipeMaterial(qp01, wIn);
- T1.EnergyLossCorrection(fit.PipeRadThick, qp01, fvec(-1.f), wIn);
- }
+ //T1.AddPipeMaterial(qp01, wIn);
+ //T1.EnergyLossCorrection(fit.PipeRadThick, qp01, fvec(-1.f), wIn);
+ //}
fldB2 = fldB1;
fldZ2 = fldZ1;
--
GitLab