From 8aa5e096cd9deca2e0aaa126329971c00a18b65f Mon Sep 17 00:00:00 2001
From: "s.zharko@gsi.de" <s.zharko@gsi.de>
Date: Wed, 20 Jul 2022 01:12:28 +0200
Subject: [PATCH] L1: Prototype for L1 configuration (yaml) reader
---
reco/L1/L1Algo/L1CATrackFinder.cxx | 21 ++++++++++-----------
reco/L1/qa/CbmTrackingInputQaSts.h | 4 ++--
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/reco/L1/L1Algo/L1CATrackFinder.cxx b/reco/L1/L1Algo/L1CATrackFinder.cxx
index 0bd214f415..efe9cc2cba 100644
--- a/reco/L1/L1Algo/L1CATrackFinder.cxx
+++ b/reco/L1/L1Algo/L1CATrackFinder.cxx
@@ -754,7 +754,6 @@ inline void L1Algo::findTripletsStep0( // input
}
else if (kGlobal == fTrackingMode) {
fit.L1AddMaterial(T2, fParameters.GetMaterialThickness(istam, T2.x, T2.y), fMaxInvMom, 1);
- }
else {
fit.L1AddMaterial(T2, fParameters.GetMaterialThickness(istam, T2.x, T2.y), T2.qp, 1);
}
@@ -828,8 +827,6 @@ inline void L1Algo::findTripletsStep0( // input
int indR = HitsUnusedStartIndex[iStaR] + irh;
if (GetMcTrackIdForUnusedHit(indM) != GetMcTrackIdForUnusedHit(indR)) { continue; }
}
-
-#ifdef USE_EVENT_NUMBER // NOTE:
if ((T2.n[i2_4] != hitr.n)) continue;
#endif // USE_EVENT_NUMBER
const fscal zr = hitr.Z();
@@ -917,8 +914,6 @@ inline void L1Algo::findTripletsStep0( // input
continue; // chi2_triplet < CHI2_CUT
}
- //if (!T_cur.IsEntryConsistent(false, i2_4)) { continue; }
-
// pack triplet
L1TrackPar& T3 = T_3[n3_V];
@@ -926,14 +921,17 @@ inline void L1Algo::findTripletsStep0( // input
hitsm_3.push_back(hitsm_2_tmp[i2_4]);
hitsr_3.push_back(irh);
+
T3.SetOneEntry(n3_4, T2, i2_4);
u_front_3[n3_V][n3_4] = hitr.U();
u_back_3[n3_V][n3_4] = hitr.V();
- du_[n3_V][n3_4] = hitr.dU();
- dv_[n3_V][n3_4] = hitr.dV();
- z_Pos_3[n3_V][n3_4] = zr;
- timeR[n3_V][n3_4] = hitr.time;
- timeER[n3_V][n3_4] = hitr.timeEr;
+ //dx_[n3_V][n3_4] = hitr.dX();
+ // dy_[n3_V][n3_4] = hitr.dY();
+ du_[n3_V][n3_4] = hitr.dU();
+ dv_[n3_V][n3_4] = hitr.dV();
+ z_Pos_3[n3_V][n3_4] = zr;
+ timeR[n3_V][n3_4] = hitr.time;
+ timeER[n3_V][n3_4] = hitr.timeEr;
n3++;
Ntriplets++;
@@ -946,7 +944,8 @@ inline void L1Algo::findTripletsStep0( // input
u_front_3.push_back(fvec_0);
u_back_3.push_back(fvec_0);
z_Pos_3.push_back(fvec_0);
- // TODO: SG: use of fvec_1 here changes the results
+ // dx_.push_back(fvec_0);
+ // dy_.push_back(fvec_0);
du_.push_back(fvec_0);
dv_.push_back(fvec_0);
timeR.push_back(fvec_0);
diff --git a/reco/L1/qa/CbmTrackingInputQaSts.h b/reco/L1/qa/CbmTrackingInputQaSts.h
index e34532dbe1..d67c2daa85 100644
--- a/reco/L1/qa/CbmTrackingInputQaSts.h
+++ b/reco/L1/qa/CbmTrackingInputQaSts.h
@@ -156,8 +156,8 @@ private:
// *****************
// ** Flags and cuts **
- bool fIsMcPresent {
- false}; ///< Flag: true - all procedures involving MC will be processed, otherwise data will be processed only
+ /// Flag: true - all procedures involving MC will be processed, otherwise data will be processed only
+ bool fIsMcPresent {false};
bool fIsQaPassed {true}; ///< Flag: true - QA is successful, false - QA is failed
--
GitLab