From f90e27f6276800094c9ded13f439eb398c865b40 Mon Sep 17 00:00:00 2001
From: sergeizharko <zharkosergey94@yandex.ru>
Date: Thu, 23 Dec 2021 21:48:14 +0100
Subject: [PATCH] COMMIT FROM 23.12.2021 -
cbmroot/reco/L1/L1Algo/L1BaseStationInfo.h: > a prototype of
user-friendly interface to L1Station and other geometry inputs to L1Algo
(experimental) > added setters and getters for L1Station data fields
> added calculation of hidden L1Station properties > added Print() method
- cbmroot/reco/L1/L1Algo/L1Parameters.h: > add new compile time
constants: kMaxNFieldApproxCoefficients, kStationBits, kThreadBits,
kTripletBits, kMaxNstations, kMaxNthreads, kMaxNtriplets > add new
runtime "constants": fMaxDoubletsPerSinglet, fMaxTripletPerDoublets > add
Print() method - cbmroot/reco/L1/L1Algo/L1Algo.h: > modifications
according to the constants transfer to the L1Parameters class (example:
fkMaxNthreads ==> L1Parameters::kMaxNthreads) -
cbmroot/reco/L1/L1Algo/L1Algo.cxx: > add L1Parameters::Print() call from
L1Algo::Init() > modifications according to the constants transfer to the
L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
- cbmroot/reco/L1/L1Algo/L1CATrackFinder.cxx: > modifications according
to the constants transfer to the L1Parameters class (example: fkMaxNthreads
==> L1Parameters::kMaxNthreads) - cbmroot/reco/L1/L1Algo/L1TrackFitter.cxx:
> modifications according to the constants transfer to the L1Parameters
class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads) -
cbmroot/reco/L1/L1Algo/L1Field.h: > magic constant '21' changed to
L1Parameters::kMaxNFieldApproxCoefficients (compile time) -
cmbroot/reco/L1/CbmL1.h: > add a L1Paramters class field (currently ptr
to address in the heap) to CbmL1 > add getter for the L1Parameters class
field to CbmL1 - cbmroot/reco/L1/CbmL1.cxx: > add transfer of the
L1Parameters data from CbmL1 to L1Algo > modifications according to the
constants transfer to the L1Parameters class (example: fkMaxNthreads ==>
L1Parameters::kMaxNthreads) - cbmroot/macro/run/run_reco.C: > add
example of L1Algo runtime constants modification
---
reco/L1/L1Algo/L1BaseStationInfo.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/reco/L1/L1Algo/L1BaseStationInfo.h b/reco/L1/L1Algo/L1BaseStationInfo.h
index 897ef629df..fd6f0f79cd 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.h
+++ b/reco/L1/L1Algo/L1BaseStationInfo.h
@@ -26,11 +26,14 @@
#include <bitset>
#include <iomanip>
//#include <cmath>
+
+/// A base class which provides interface to L1Algo station geometry
+
class L1BaseStationInfo {
private:
enum { // Here we list all the fields, which must be initialized by user
- /// v Basic fields initialization
- /// v L1Station initialization
+ // Basic fields initialization
+ // L1Station initialization
kEtype,
kEtimeInfo,
kEz,
@@ -43,7 +46,7 @@ class L1BaseStationInfo {
kEstripsFrontSigma,
kEstripsBackPhi,
kEstripsBackSigma,
- /// v The last item is equal to the number of bits in fInitFlags
+ // The last item is equal to the number of bits in fInitFlags
kEND
};
public:
@@ -207,7 +210,6 @@ class L1BaseStationInfo {
/// Gets array of the coefficients for the field z-component approximation
const fvec * GetFieldSliceCz() const { return fL1Station.fieldSlice.cz; }
-<<<<<<< HEAD
//-------------------------------------------------------------------------------------------------------//
// Other methods //
--
GitLab