From c9d11754f7df2661caca624f55752301aad4ecd7 Mon Sep 17 00:00:00 2001
From: "s.zharko@gsi.de" <s.zharko@gsi.de>
Date: Thu, 23 Jun 2022 11:49:20 +0200
Subject: [PATCH] L1: minor cosmetic changes
---
reco/L1/CbmL1.cxx | 3 ++-
reco/L1/CbmL1.h | 2 +-
reco/L1/L1Algo/L1Constants.h | 12 ++++++++++++
reco/L1/L1Algo/L1Extrapolation.h | 6 +++---
reco/L1/L1Algo/L1Fit.h | 9 +++++----
reco/L1/L1Algo/L1Hit.h | 24 ++++++++++++------------
reco/L1/L1Algo/L1Parameters.cxx | 2 +-
reco/L1/L1Algo/L1Station.h | 2 +-
reco/L1/L1AlgoInputData.h | 13 ++++++++++---
9 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index d4b8fccad2..833a97b038 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -1041,8 +1041,9 @@ void CbmL1::Reconstruct(CbmEvent* event)
if (fPerformance) {
HitMatch();
// calculate the max number of Hits\mcPoints on continuous(consecutive) stations
- for (L1Vector<CbmL1MCTrack>::iterator it = vMCTracks.begin(); it != vMCTracks.end(); ++it)
+ for (auto it = vMCTracks.begin(); it != vMCTracks.end(); ++it) {
it->Init();
+ }
}
if (fSTAPDataMode % 2 == 1) { // 1,3
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index ec00fbcb89..97d3e23f9c 100644
--- a/reco/L1/CbmL1.h
+++ b/reco/L1/CbmL1.h
@@ -301,7 +301,7 @@ private:
/// \param TsStart Reference to the timeslice start time
/// \param TsLength Reference to the timeslice length
/// \param TsOverlap Reference to the timeslice overlap length (does not used at the moment)
- /// \param FstHitinTs Index of the first hit in the time-lice
+ /// \param FstHitinTs Index of the first hit in the time-slice
/// \param areDataLeft Flag: true - data were left after reading the sub-timeslice
/// \param event Pointer to the current CbmEvent object
void ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength, float& TsOverlap, int& FstHitinTs,
diff --git a/reco/L1/L1Algo/L1Constants.h b/reco/L1/L1Algo/L1Constants.h
index fcf4d51a74..ad695f2e15 100644
--- a/reco/L1/L1Algo/L1Constants.h
+++ b/reco/L1/L1Algo/L1Constants.h
@@ -12,6 +12,8 @@
#ifndef L1Constants_h
#define L1Constants_h 1
+#include "L1NaN.h"
+
/// Namespace contains compile-time constants definition for the L1 tracking algorithm
namespace L1Constants
{
@@ -72,6 +74,16 @@ namespace L1Constants
constexpr int kAssertionLevel {0}; ///< Assertion level
constexpr int kAlignment {16};
} // end namespace misc
+
+ /// NoInit constants (aliasses)
+ namespace noin
+ {
+ constexpr float kF { L1NaN::SetNaN<float>() };
+ constexpr double kD { L1NaN::SetNaN<double>() };
+ constexpr int k32I { L1NaN::SetNaN<int>() };
+ constexpr unsigned int k32U { L1NaN::SetNaN<unsigned int>() };
+ }
+
} // end namespace L1Constants
diff --git a/reco/L1/L1Algo/L1Extrapolation.h b/reco/L1/L1Algo/L1Extrapolation.h
index cda2a58b63..ce60235c5d 100644
--- a/reco/L1/L1Algo/L1Extrapolation.h
+++ b/reco/L1/L1Algo/L1Extrapolation.h
@@ -598,9 +598,9 @@ inline void L1Extrapolate // extrapolates track parameters and returns jacobian
}
#endif //ANALYTICEXTRAPOLATION
-inline void L1Extrapolate0(L1TrackPar& T, // input track parameters (x,y,tx,ty,Q/p) and cov.matrix
- fvec z_out, // extrapolate to this z position
- L1FieldRegion& F)
+inline void L1Extrapolate0(L1TrackPar& T, // input track parameters (x,y,tx,ty,Q/p) and cov.matrix
+ fvec z_out, // extrapolate to this z position
+ L1FieldRegion& F) // magneti
{
//
// Part of the analytic extrapolation formula with error (c_light*B*dz)^4/4!
diff --git a/reco/L1/L1Algo/L1Fit.h b/reco/L1/L1Algo/L1Fit.h
index c56928f343..f600a632d6 100644
--- a/reco/L1/L1Algo/L1Fit.h
+++ b/reco/L1/L1Algo/L1Fit.h
@@ -13,6 +13,7 @@
#include "L1Def.h"
#include "L1MaterialInfo.h"
#include "L1TrackPar.h"
+#include "L1Constants.h"
///
/// A collection of fit routines used by the CA tracker
@@ -75,12 +76,12 @@ public:
void L1AddTargetMaterial(L1TrackPar& T, fvec qp0, fvec w);
- const fvec PipeRadThick = 7.87e-3f; // 0.7 mm Aluminium
- const fvec TargetRadThick = 3.73e-2f * 2; // 250 mum Gold
+ const fvec PipeRadThick = 7.87e-3f; // 0.7 mm Aluminium // TODO: !
+ const fvec TargetRadThick = 3.73e-2f * 2; // 250 mum Gold // TODO: !
private:
- fvec fMass = 0.10565800; // muon mass by default (pion 0.13957000f )
- fvec fMass2 = fMass * fMass;
+ fvec fMass {L1Constants::phys::kMuonMass}; // muon mass by default
+ fvec fMass2 {fMass * fMass};
//ClassDefNV(L1Fit, 0)
};
diff --git a/reco/L1/L1Algo/L1Hit.h b/reco/L1/L1Algo/L1Hit.h
index 77988fa1a2..949f86d7a4 100644
--- a/reco/L1/L1Algo/L1Hit.h
+++ b/reco/L1/L1Algo/L1Hit.h
@@ -12,8 +12,8 @@
#ifndef L1Hit_h
#define L1Hit_h
-using L1HitIndex_t = unsigned /*short*/ int; ///> Index of L1Hit
-using L1StripIndex_t = unsigned /*short*/ int; ///> Index of the station strip
+using L1HitIndex_t = unsigned /*short*/ int; ///< Index of L1Hit
+using L1StripIndex_t = unsigned /*short*/ int; ///< Index of the station strip
/// TODO: replace typedef with using (C++11) (S.Zharko)
/// TODO: change naming: THitI -> L1HitIndex_t, TStripI -> L1StripIndex_t (S.Zharko)
@@ -23,16 +23,16 @@ using L1StripIndex_t = unsigned /*short*/ int; ///> Index of the station strip
/// L1Hit class describes a generic hit for CA tracker
///
struct L1Hit {
- L1StripIndex_t f {0}; ///> front strip index
- L1StripIndex_t b {0}; ///> back strip index
- float u {0.f}; ///> measured U coordinate
- float v {0.f}; ///> measured V coordinate
- float t {0.f}; ///> measured time
- float z {0.f}; ///> fixed Z coordinate
- float du {0.f}; ///> mean squared error of u
- float dv {0.f}; ///> mean squared error of v
- float dt {0.f}; ///> mean squared error of t
- int ID {0}; ///> TODO: check if this ID is redundant
+ L1StripIndex_t f {0}; ///< front strip index
+ L1StripIndex_t b {0}; ///< back strip index
+ float u {0.f}; ///< measured U coordinate
+ float v {0.f}; ///< measured V coordinate
+ float t {0.f}; ///< measured time
+ float z {0.f}; ///< fixed Z coordinate
+ float du {0.f}; ///< mean squared error of u
+ float dv {0.f}; ///< mean squared error of v
+ float dt {0.f}; ///< mean squared error of t
+ int ID {0}; ///< TODO: check if this ID is redundant
};
#endif
diff --git a/reco/L1/L1Algo/L1Parameters.cxx b/reco/L1/L1Algo/L1Parameters.cxx
index 49a5435c5c..d11d43fd33 100644
--- a/reco/L1/L1Algo/L1Parameters.cxx
+++ b/reco/L1/L1Algo/L1Parameters.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022-2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
Authors: Sergey Gorbunov, Sergei Zharko [committer] */
diff --git a/reco/L1/L1Algo/L1Station.h b/reco/L1/L1Algo/L1Station.h
index 803153a8e9..083c5a35ba 100644
--- a/reco/L1/L1Algo/L1Station.h
+++ b/reco/L1/L1Algo/L1Station.h
@@ -21,7 +21,7 @@ class L1Station {
public:
int type {L1NaN::SetNaN<decltype(type)>()};
int timeInfo {L1NaN::SetNaN<decltype(timeInfo)>()}; ///< flag: if time information can be used
- int fieldStatus {L1NaN::SetNaN<decltype(fieldStatus)>()}; ///< flag: 1 - station is INSIDE the field, 0 - station is OUTSIDE the field
+ int fieldStatus {L1NaN::SetNaN<decltype(fieldStatus)>()}; ///< flag: 1 - station is INSIDE the field, 0 - station is OUTSIDE the field (replace with enum)
fvec z {L1NaN::SetNaN<decltype(z)>()}; ///< z position of station [cm]
fvec Rmin {L1NaN::SetNaN<decltype(Rmin)>()}; ///< min radius of the station [cm]
fvec Rmax {L1NaN::SetNaN<decltype(Rmax)>()}; ///< max radius of the station [cm]
diff --git a/reco/L1/L1AlgoInputData.h b/reco/L1/L1AlgoInputData.h
index b5254392c7..cee3944be1 100644
--- a/reco/L1/L1AlgoInputData.h
+++ b/reco/L1/L1AlgoInputData.h
@@ -26,18 +26,21 @@ struct L1AlgoInputData {
/// Default constructor
L1AlgoInputData() = default;
+
/// Default destructor
~L1AlgoInputData() = default;
/// Resets the object
/// For all the vectors the clear method is called, all other fields are set to zero
void Clear();
+
/// Gets number of the station strips
int GetNstrips() const { return fNstrips; }
/// Gives an access to the underlying vector of L1Hit objects
L1Vector<L1Hit>& GetHits() { return vHits; }
/// Gives an access to the vector of the strip flags
L1Vector<unsigned char>& GetSFlag() { return fStripFlag; }
+
/// Gets an access of the start indexes for different stations
/// \return pointer to the first element of the array over the stations
const L1HitIndex_t* GetHitsStartIndex() const { return HitsStartIndex; }
@@ -54,9 +57,6 @@ struct L1AlgoInputData {
/// true - data was read and stored into this object
/// false - data was not read for some reason
bool ReadHitsFromFile(const char work_dir[100], const int maxNEvent, const int iVerbose);
- // TODO: Is there any reason to pass string as an array of chars? It is dangerous, because if one can pass a
- // string containing more then 100 symbols and thus cast a segmentation violation. So, I'd change it
- // to const char*, if there are no any specific reasons to keep the current signature. (S.Zharko)
// void PrintHits();
@@ -65,20 +65,27 @@ struct L1AlgoInputData {
//
/// Placement new operator for single element
void* operator new(size_t size, void* ptr) { return ::operator new(size, ptr); }
+
/// Placement new operator for multiple elements
void* operator new[](size_t size, void* ptr) { return ::operator new(size, ptr); }
+
/// New operator for single element
void* operator new(size_t size) { return _mm_malloc(size, 16); }
+
/// New operator for multiple elements
void* operator new[](size_t size) { return _mm_malloc(size, 16); }
+
/// Delete operator for single element
void operator delete(void* ptr, size_t) { _mm_free(ptr); }
+
/// Delete operator for multiple elements
void operator delete[](void* ptr, size_t) { _mm_free(ptr); }
// TODO: Where are the definitions? (S.Zharko)
+
/// Copy constructor
L1AlgoInputData(const L1AlgoInputData& a);
+
/// Copy assignment operator
const L1AlgoInputData& operator=(const L1AlgoInputData& a);
--
GitLab