diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx index f1b0f7107a0b3dd1890966e3d1f9026b339531ca..2cee0aea396d8dfc16e559d77d2b269891ba3adb 100644 --- a/reco/L1/CbmL1.cxx +++ b/reco/L1/CbmL1.cxx @@ -137,6 +137,15 @@ InitStatus CbmL1::ReInit() return Init(); } +// --------------------------------------------------------------------------------------------------------------------- +// +void CbmL1::SetInputConfigName(const char* filename) +{ + LOG(info) << "Reading parameters from configuration file: " << filename; + LOG(warn) << "\033[1;31mParameters configuration for tracking is not finalized! To be used only for tests! \033[0m"; + fInitManager.SetInputConfigName(std::string(filename)); +} + // --------------------------------------------------------------------------------------------------------------------- // InitStatus CbmL1::Init() diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h index 21535b20544e43c501a1dd851687f09ed615af24..2d5393ec9cef995525add61f2bd49b7207d9c7e4 100644 --- a/reco/L1/CbmL1.h +++ b/reco/L1/CbmL1.h @@ -227,7 +227,7 @@ public: /// If the file is undefined, default tracking parameters will be used. Otherwise, the default parameters will be /// overridden with ones from the configuration file /// \param filename Name of the input tracking configuration file - void SetInputConfigName(const char* filename) { fInitManager.SetInputConfigName(std::string(filename)); } + void SetInputConfigName(const char* filename); /// \brief Sets a name for the output configuration file /// \param filename Name of the input tracking configuration file diff --git a/reco/L1/L1Algo/L1InitManager.cxx b/reco/L1/L1Algo/L1InitManager.cxx index 02c3c47d18ef9e7e91f95e931fcfb2102a9a9922..cacec55524ee6f86aa1441bd8c938bfa69f16971 100644 --- a/reco/L1/L1Algo/L1InitManager.cxx +++ b/reco/L1/L1Algo/L1InitManager.cxx @@ -147,7 +147,7 @@ void L1InitManager::ClearCAIterations() fParameters.fCAIterations.clear(); fCAIterationsNumberCrosscheck = -1; fInitController.SetFlag(EInitKey::kCAIterations, false); - fInitController.SetFlag(EInitKey::kStationsNumberCrosscheck, false); + fInitController.SetFlag(EInitKey::kCAIterationsNumberCrosscheck, false); } // ---------------------------------------------------------------------------------------------------------------------- diff --git a/reco/L1/L1Algo/L1Parameters.cxx b/reco/L1/L1Algo/L1Parameters.cxx index 851324bb17b48805e34156da86344950e928b8dd..129392dc4158d09a1e4d55530930f1dacd462c79 100644 --- a/reco/L1/L1Algo/L1Parameters.cxx +++ b/reco/L1/L1Algo/L1Parameters.cxx @@ -233,12 +233,10 @@ void L1Parameters::CheckConsistency() const LOG(info) << "Consistency test for L1 parameters object... \033[1;32mpassed\033[0m"; } - //---------------------------------------------------------------------------------------------------------------------- // void L1Parameters::Print(int /*verbosityLevel*/) const { - LOG(info) << "-------------- L1Algo parameters ---------------"; LOG(info) << ToString(); } @@ -289,7 +287,7 @@ std::string L1Parameters::ToString(int verbosity, int indentLevel) const } aStream << " | total = " << std::setw(2) << std::setfill(' ') << fNstationsActiveTotal; aStream << '\n'; - aStream << indent << indentChar << indentChar << "Active station indeces: "; + aStream << indent << indentChar << indentChar << "Active station indexes: "; for (int idx = 0; idx < *(fNstationsActive.end() - 1); ++idx) { aStream << std::setw(3) << std::setfill(' ') << fActiveStationGlobalIDs[idx] << ' '; }