From 37675b5cf7cf9c45d52a00ecc9211d7943d07499 Mon Sep 17 00:00:00 2001 From: "se.gorbunov" <se.gorbunov@gsi.de> Date: Wed, 12 Oct 2022 09:12:30 +0000 Subject: [PATCH] L1: remove obsolete debug option, bugfix in debug options --- reco/L1/L1Algo/L1CATrackFinder.cxx | 50 ++---------------------------- reco/L1/L1Algo/L1InitManager.cxx | 8 ++--- reco/L1/L1Algo/L1InitManager.h | 3 -- reco/L1/L1Algo/L1Parameters.cxx | 4 +-- reco/L1/L1Algo/L1Parameters.h | 10 ++---- 5 files changed, 11 insertions(+), 64 deletions(-) diff --git a/reco/L1/L1Algo/L1CATrackFinder.cxx b/reco/L1/L1Algo/L1CATrackFinder.cxx index 83d2865643..c2f2b94cce 100644 --- a/reco/L1/L1Algo/L1CATrackFinder.cxx +++ b/reco/L1/L1Algo/L1CATrackFinder.cxx @@ -106,7 +106,6 @@ inline void L1Algo::findSingletsStep0( // input L1HitPoint& hitl = Hits_l[ilh]; - HitTime_l[i1_V][i1_4] = hitl.time; HitTimeEr[i1_V][i1_4] = hitl.timeEr; @@ -236,50 +235,7 @@ inline void L1Algo::findSingletsStep1( /// input 1st stage of singlet search T.C44 = fMaxInvMom / fvec(3.) * fMaxInvMom / fvec(3.); T.C55 = timeEr * timeEr; - if (fParameters.DevIsFitSingletsFromTarget()) { // TODO: doesn't work. Why? - T.x = fTargX; - T.y = fTargY; - T.z = fTargZ; - T.C00 = TargetXYInfo.C00; - T.C10 = TargetXYInfo.C10; - T.C11 = TargetXYInfo.C11; - // extrapolate to left hit - - if (istal <= fNfieldStations) { L1Extrapolate0(T, zl, fld0); } - else { - L1ExtrapolateLine(T, zl); - } - - for (int ista = 0; ista <= istal - 1; ista++) { - if constexpr (L1Constants::control::kIfUseRadLengthTable) { - fit.L1AddMaterial(T, fParameters.GetMaterialThickness(ista, T.x, T.y), fMaxInvMom, fvec::One()); - } - else { - fit.L1AddMaterial(T, fParameters.GetStation(ista).materialInfo, fMaxInvMom, fvec::One()); - } - if (ista == fNstationsBeforePipe - 1) fit.L1AddPipeMaterial(T, fMaxInvMom, fvec::One()); - } - - // add left hit - L1UMeasurementInfo info = stal.frontInfo; - - if (fUseHitErrors) info.sigma2 = d_u[i1_V] * d_u[i1_V]; - - if (istal < fNfieldStations) L1Filter(T, info, u); - else { - L1FilterNoField(T, info, u); - } - - info = stal.backInfo; - - if (fUseHitErrors) { info.sigma2 = d_v[i1_V] * d_v[i1_V]; } - - if (istal < fNfieldStations) { L1Filter(T, info, v); } - else { - L1FilterNoField(T, info, v); - } - } - else { // not BEGIN_FROM_TARGET -- the best for now + { // add the target constraint T.x = xl; T.y = yl; T.z = zl; @@ -1226,9 +1182,7 @@ inline void L1Algo::findTripletsStep3( // input // TODO: SZh 04.10.2022: What does this number mean? fscal Cmax = 0.04 * fMaxInvMom[0]; // minimal momentum: 0.05 - 0.1 - if (Cqp > Cmax) { - Cqp = Cmax; - } + if (Cqp > Cmax) { Cqp = Cmax; } // TODO: SZh 04.10.2022: What does this number mean? Cqp += 0.05 * Cmax; // TODO: without this line the ghost ratio increases, why? } diff --git a/reco/L1/L1Algo/L1InitManager.cxx b/reco/L1/L1Algo/L1InitManager.cxx index 894e819922..154b411072 100644 --- a/reco/L1/L1Algo/L1InitManager.cxx +++ b/reco/L1/L1Algo/L1InitManager.cxx @@ -134,10 +134,10 @@ void L1InitManager::ClearSetupInfo() fInitController.SetFlag(EInitKey::kGhostSuppression, false); fInitController.SetFlag(EInitKey::kMomentumCutOff, false); - fParameters.fDevIsIgnoreHitSearchAreas = false; - fParameters.fDevIsFitSingletsFromTarget = false; - fParameters.fDevIsMatchDoubletsViaMc = false; - fParameters.fDevIsMatchTripletsViaMc = false; + fParameters.fDevIsIgnoreHitSearchAreas = false; + fParameters.fDevIsUseOfOriginalField = false; + fParameters.fDevIsMatchDoubletsViaMc = false; + fParameters.fDevIsMatchTripletsViaMc = false; } // ---------------------------------------------------------------------------------------------------------------------- diff --git a/reco/L1/L1Algo/L1InitManager.h b/reco/L1/L1Algo/L1InitManager.h index aff249d996..35eeb04f17 100644 --- a/reco/L1/L1Algo/L1InitManager.h +++ b/reco/L1/L1Algo/L1InitManager.h @@ -255,9 +255,6 @@ public: /// Force use of the original field (not approximated) void DevSetUseOfOriginalField(bool value = true) { fParameters.fDevIsUseOfOriginalField = value; } - /// Start singlets fit at the target - void DevSetFitSingletsFromTarget(bool value = true) { fParameters.fDevIsFitSingletsFromTarget = value; } - /// Flag to match doublets using MC information void DevSetIsMatchDoubletsViaMc(bool value = true) { fParameters.fDevIsMatchDoubletsViaMc = value; } diff --git a/reco/L1/L1Algo/L1Parameters.cxx b/reco/L1/L1Algo/L1Parameters.cxx index f3ec96511d..fba0587794 100644 --- a/reco/L1/L1Algo/L1Parameters.cxx +++ b/reco/L1/L1Algo/L1Parameters.cxx @@ -44,7 +44,7 @@ L1Parameters::L1Parameters(const L1Parameters& other) noexcept , fGhostSuppression(other.fGhostSuppression) , fMomentumCutOff(other.fMomentumCutOff) , fDevIsIgnoreHitSearchAreas(other.fDevIsIgnoreHitSearchAreas) - , fDevIsFitSingletsFromTarget(other.fDevIsFitSingletsFromTarget) + , fDevIsUseOfOriginalField(other.fDevIsUseOfOriginalField) , fDevIsMatchDoubletsViaMc(other.fDevIsMatchDoubletsViaMc) , fDevIsMatchTripletsViaMc(other.fDevIsMatchTripletsViaMc) { @@ -94,7 +94,7 @@ void L1Parameters::Swap(L1Parameters& other) noexcept std::swap(fGhostSuppression, other.fGhostSuppression); std::swap(fMomentumCutOff, other.fMomentumCutOff); std::swap(fDevIsIgnoreHitSearchAreas, other.fDevIsIgnoreHitSearchAreas); - std::swap(fDevIsFitSingletsFromTarget, other.fDevIsFitSingletsFromTarget); + std::swap(fDevIsUseOfOriginalField, other.fDevIsUseOfOriginalField); std::swap(fDevIsMatchDoubletsViaMc, other.fDevIsMatchDoubletsViaMc); std::swap(fDevIsMatchTripletsViaMc, other.fDevIsMatchTripletsViaMc); } diff --git a/reco/L1/L1Algo/L1Parameters.h b/reco/L1/L1Algo/L1Parameters.h index 6111eac003..3900a29305 100644 --- a/reco/L1/L1Algo/L1Parameters.h +++ b/reco/L1/L1Algo/L1Parameters.h @@ -192,9 +192,6 @@ public: /// Is original field must be used instead of the approximated one bool DevIsUseOfOriginalField() const { return fDevIsUseOfOriginalField; } - /// Is singlets fit starts at the target - bool DevIsFitSingletsFromTarget() const { return fDevIsFitSingletsFromTarget; } - /// Flag to match doublets using MC information bool DevIsMatchDoubletsViaMc() const { return fDevIsMatchDoubletsViaMc; } @@ -254,9 +251,8 @@ private: bool fDevIsIgnoreHitSearchAreas {false}; ///< Process all hits on the station ignoring hit search area bool fDevIsUseOfOriginalField {false}; ///< Force use of original field - bool fDevIsFitSingletsFromTarget {false}; ///< Fit singlet starting from the target with the KF - bool fDevIsMatchDoubletsViaMc {false}; ///< Flag to match doublets using MC information - bool fDevIsMatchTripletsViaMc {false}; ///< Flag to match triplets using Mc information + bool fDevIsMatchDoubletsViaMc {false}; ///< Flag to match doublets using MC information + bool fDevIsMatchTripletsViaMc {false}; ///< Flag to match triplets using Mc information /// Serialization function friend class boost::serialization::access; @@ -286,7 +282,7 @@ private: ar& fMomentumCutOff; ar& fDevIsIgnoreHitSearchAreas; - ar& fDevIsFitSingletsFromTarget; + ar& fDevIsUseOfOriginalField; ar& fDevIsMatchDoubletsViaMc; ar& fDevIsMatchTripletsViaMc; } -- GitLab