diff --git a/core/base/CbmTrackingDetectorInterfaceBase.h b/core/base/CbmTrackingDetectorInterfaceBase.h index e78c7f2146a73cc0637407d530529c21d0d35324..ceb1d6a88a6341bf9acdd5ccf32d5030471ab6b4 100644 --- a/core/base/CbmTrackingDetectorInterfaceBase.h +++ b/core/base/CbmTrackingDetectorInterfaceBase.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-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/core/detectors/much/CbmMuchTrackingInterface.cxx b/core/detectors/much/CbmMuchTrackingInterface.cxx index 3aca722b249b9a89e02abda97c690409b7038405..72fd41dda3694d4f0d73b728efe184eb65908b10 100644 --- a/core/detectors/much/CbmMuchTrackingInterface.cxx +++ b/core/detectors/much/CbmMuchTrackingInterface.cxx @@ -1,24 +1,23 @@ -/* Copyright (C) 2016-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] */ /*************************************************************************************************** * @file CbmMuchTrackingInterface.cxx - * @brief Input data and parameters interface from STS subsystem used in L1 tracker (definition) + * @brief Input data and parameters interface from MuCh subsystem used in L1 tracker (definition) * @since 31.05.2022 * @author S.Zharko <s.zharko@gsi.de> ***************************************************************************************************/ #include "CbmMuchTrackingInterface.h" - #include "FairDetector.h" #include "FairRunAna.h" #include <FairLogger.h> ClassImp(CbmMuchTrackingInterface) -CbmMuchTrackingInterface* CbmMuchTrackingInterface::fpInstance = nullptr; + CbmMuchTrackingInterface* CbmMuchTrackingInterface::fpInstance = nullptr; //------------------------------------------------------------------------------------------------------------------------------------- // diff --git a/core/detectors/much/CbmMuchTrackingInterface.h b/core/detectors/much/CbmMuchTrackingInterface.h index ed1658aae0b6fe859eb08819574b6eac4e6ab67e..ea49fc092fa02e0e8f1b608266fb393a3ed08d1c 100644 --- a/core/detectors/much/CbmMuchTrackingInterface.h +++ b/core/detectors/much/CbmMuchTrackingInterface.h @@ -1,10 +1,10 @@ -/* Copyright (C) 2016-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] */ /*************************************************************************************************** * @file CbmMuchTrackingInterface.h - * @brief Input data and parameters interface from MVD subsystem used in L1 tracker (declaration) + * @brief Input data and parameters interface from MuCh subsystem used in L1 tracker (declaration) * @since 31.05.2022 * @author S.Zharko <s.zharko@gsi.de> ***************************************************************************************************/ @@ -13,12 +13,14 @@ #define CbmMuchTrackingInterface_h 1 #include "CbmMuchGeoScheme.h" -#include "CbmTrackingDetectorInterfaceBase.h" #include "CbmMuchModuleGem.h" #include "CbmMuchPad.h" #include "CbmMuchStation.h" -#include "TMath.h" +#include "CbmTrackingDetectorInterfaceBase.h" + #include "FairTask.h" + +#include "TMath.h" #include "TString.h" #include <iostream> @@ -54,12 +56,12 @@ public: /// Gets station radiation length /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Radiation length [cm] - double GetRadLength(int /*stationId*/) const { return 0; } // TODO: Replace with correct value + double GetRadLength(int /*stationId*/) const { return 0; } // TODO: Replace with correct value /// Gets size of outer radius of station /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Size of station outer radius [cm] - double GetRmax(int /*stationId*/) const { return 100.; } + double GetRmax(int /*stationId*/) const { return 100.; } /// Gets size of inner radius of station /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) @@ -133,7 +135,7 @@ private: { return fGeoScheme->GetLayer(GetMuchStationId(stationId), GetMuchLayerId(stationId)); } - + /// Calculates MuCh layer ID from tracker station ID __attribute__((always_inline)) int GetMuchLayerId(int stationId) const { return stationId % 3; } diff --git a/core/detectors/sts/CbmStsTrackingInterface.cxx b/core/detectors/sts/CbmStsTrackingInterface.cxx index 904e476f3e99c9b5bc0b69ae05b007d4b0ef4add..3fc81ac48d371445a91f750b0e21206176a446f9 100644 --- a/core/detectors/sts/CbmStsTrackingInterface.cxx +++ b/core/detectors/sts/CbmStsTrackingInterface.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-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] */ @@ -17,7 +17,7 @@ ClassImp(CbmStsTrackingInterface) -CbmStsTrackingInterface* CbmStsTrackingInterface::fpInstance = nullptr; + CbmStsTrackingInterface* CbmStsTrackingInterface::fpInstance = nullptr; //------------------------------------------------------------------------------------------------------------------------------------- // diff --git a/core/detectors/sts/CbmStsTrackingInterface.h b/core/detectors/sts/CbmStsTrackingInterface.h index 789a855e4b187b0e5e7ebebf6a520540713bba71..a105e1f8d37c86343cc200335610ee2956558e28 100644 --- a/core/detectors/sts/CbmStsTrackingInterface.h +++ b/core/detectors/sts/CbmStsTrackingInterface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-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] */ @@ -20,6 +20,7 @@ #include "CbmTrackingDetectorInterfaceBase.h" #include "FairTask.h" + #include "TMath.h" #include <iostream> @@ -47,7 +48,7 @@ public: /// Gets actual number of the tracking stations, provided by the current geometry setup int GetNtrackingStations() const { return CbmStsSetup::Instance()->GetNofStations(); } - + /// Gets station radiation length /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Radiation length [cm] @@ -57,28 +58,28 @@ public: /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Size of station outer radius [cm] double GetRmax(int stationId) const - { - return GetXmax(stationId) > GetYmax(stationId) ? GetXmax(stationId) : GetYmax(stationId); + { + return GetXmax(stationId) > GetYmax(stationId) ? GetXmax(stationId) : GetYmax(stationId); } /// Gets size of inner radius of station /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Size of station inner radius [cm] double GetRmin(int /*stationId*/) const { return 0.; } - + /// Gets spatial resolution (RMS) for back strips /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Spatial resolution (RMS) for front strips [cm] - double GetStripsSpatialRmsBack(int stationId) const - { + double GetStripsSpatialRmsBack(int stationId) const + { return GetStsStation(stationId)->GetSensorPitch(0) / TMath::Sqrt(12.); } - + /// Gets spatial resolution (RMS) for front strips /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Spatial resolution (RMS) for front strips [cm] double GetStripsSpatialRmsFront(int stationId) const - { + { return GetStsStation(stationId)->GetSensorPitch(0) / TMath::Sqrt(12.); } @@ -90,8 +91,8 @@ public: /// Gets front strips stereo angle /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Absolute stereo angle for front strips [rad] - double GetStripsStereoAngleFront(int stationId) const; - + double GetStripsStereoAngleFront(int stationId) const; + /// Gets station thickness along the Z-axis /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Station thickness [cm] diff --git a/core/detectors/trd/CbmTrdTrackingInterface.cxx b/core/detectors/trd/CbmTrdTrackingInterface.cxx index 71b4de4ddc43d3caad4ee6e690fdbfe1e9efe45f..4d044b4474c016cd64ea829ea316cb10eb77da5a 100644 --- a/core/detectors/trd/CbmTrdTrackingInterface.cxx +++ b/core/detectors/trd/CbmTrdTrackingInterface.cxx @@ -1,10 +1,10 @@ -/* Copyright (C) 2016-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] */ /*************************************************************************************************** * @file CbmTrdTrackingInterface.cxx - * @brief Input data and parameters interface from STS subsystem used in L1 tracker (definition) + * @brief Input data and parameters interface from TRD subsystem used in L1 tracker (definition) * @since 31.05.2022 * @author S.Zharko <s.zharko@gsi.de> ***************************************************************************************************/ @@ -14,6 +14,7 @@ #include "FairDetector.h" #include "FairRunAna.h" #include <FairLogger.h> + #include "TGeoManager.h" #include "TString.h" diff --git a/core/detectors/trd/CbmTrdTrackingInterface.h b/core/detectors/trd/CbmTrdTrackingInterface.h index 0799a005880225be8727cd1414963ddae85d34b5..1291540a1151482583122cd1979581c667d5d186 100644 --- a/core/detectors/trd/CbmTrdTrackingInterface.h +++ b/core/detectors/trd/CbmTrdTrackingInterface.h @@ -1,10 +1,10 @@ -/* Copyright (C) 2016-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] */ /*************************************************************************************************** * @file CbmTrdTrackingInterface.h - * @brief Input data and parameters interface from MVD subsystem used in L1 tracker (declaration) + * @brief Input data and parameters interface from TRD subsystem used in L1 tracker (declaration) * @since 31.05.2022 * @author S.Zharko <s.zharko@gsi.de> ***************************************************************************************************/ @@ -15,7 +15,9 @@ #include "CbmTrackingDetectorInterfaceBase.h" #include "CbmTrdParModDigi.h" #include "CbmTrdParSetDigi.h" + #include "FairTask.h" + #include "TMath.h" #include <iostream> @@ -105,7 +107,7 @@ public: /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Z position of station [cm] double GetZ(int stationId) const { return GetTrdModulePar(stationId)->GetZ(); } - + /// Check if station provides time measurements /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Flag: true - station provides time measurements, false - station does not provide time measurements diff --git a/macro/L1/run_reco_L1global.C b/macro/L1/run_reco_L1global.C index 90c4b250175baa84e58ab9ade89d4a49593e51c3..9162f7cbe34e858338ad9026c0e178e124b5b108 100644 --- a/macro/L1/run_reco_L1global.C +++ b/macro/L1/run_reco_L1global.C @@ -37,9 +37,9 @@ #include "CbmStsTrackFinder.h" #include "CbmTaskBuildRawEvents.h" #include "CbmTofSimpClusterizer.h" +#include "CbmTrackingDetectorInterfaceInit.h" #include "CbmTrdClusterFinder.h" #include "CbmTrdHitProducer.h" -#include "CbmTrackingDetectorInterfaceInit.h" #include <FairFileSource.h> #include <FairMonitor.h> diff --git a/macro/analysis/opencharm/PairSelection.C b/macro/analysis/opencharm/PairSelection.C index 7e710ce4b01a05956742f20480b1d812066047ac..745cd14f77136c1fa5690136087d5a1fb201cd7d 100644 --- a/macro/analysis/opencharm/PairSelection.C +++ b/macro/analysis/opencharm/PairSelection.C @@ -156,7 +156,7 @@ void PairSelection(Int_t nEvents = 10, Int_t ProcID = 1, bool PileUp = false, In // ------------------------------------------------------------------------- fRun->AddTask(new CbmTrackingDetectorInterfaceInit()); - + CbmKF* KF = new CbmKF(); fRun->AddTask(KF); diff --git a/macro/dilept/CbmDileptRecUrqmdOmegaEe.C b/macro/dilept/CbmDileptRecUrqmdOmegaEe.C index 5c6ef108a501ab81075cba4b5addc3f81fab676f..c7cb85517b211df853e55fddee643d46b8f618b7 100644 --- a/macro/dilept/CbmDileptRecUrqmdOmegaEe.C +++ b/macro/dilept/CbmDileptRecUrqmdOmegaEe.C @@ -85,7 +85,7 @@ // ------------------------------------------------------------------------ // --- Now choose concrete engines for the different tasks ------------- - auto* trackingDet = new CbmTrackingDetectorInterfaceInit(); + auto* trackingDet = new CbmTrackingDetectorInterfaceInit(); CbmKF* kalman = new CbmKF(); CbmL1* l1 = new CbmL1(); CbmStsTrackFinder* stsTrackFinder = new CbmL1StsTrackFinder(); diff --git a/macro/rich/geotest/legacy/TransPMT/Run_Reco_GeoOpt_Batch.C b/macro/rich/geotest/legacy/TransPMT/Run_Reco_GeoOpt_Batch.C index bbec38f59b9d788b7699084b6a4a3b7bd322cfcb..353bc1f16427abafd56e63e099b395d02b272998 100644 --- a/macro/rich/geotest/legacy/TransPMT/Run_Reco_GeoOpt_Batch.C +++ b/macro/rich/geotest/legacy/TransPMT/Run_Reco_GeoOpt_Batch.C @@ -71,7 +71,7 @@ void Run_Reco_GeoOpt_Batch(Int_t nEvents = 10, int PMTtransY = 0, int PMTtransZ run->SetOutputFile(RecFile); run->AddTask(new CbmTrackingDetectorInterfaceInit()); - + CbmKF* kalman = new CbmKF(); run->AddTask(kalman); diff --git a/macro/run/run_reco.C b/macro/run/run_reco.C index 0959142ead4d1932285c7ade73f310ce52badfd0..7a242c6c889c20a191c791c4d7ef3df699c6a96f 100644 --- a/macro/run/run_reco.C +++ b/macro/run/run_reco.C @@ -369,7 +369,7 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice = // ----- Track finding in STS (+ MVD) -------------------------------- if (useMvd || useSts) { - run->AddTask(new CbmTrackingDetectorInterfaceInit()); // Geometry interface initializer for tracker + run->AddTask(new CbmTrackingDetectorInterfaceInit()); // Geometry interface initializer for tracker // Kalman filter auto kalman = new CbmKF(); diff --git a/mvd/CbmMvdTrackingInterface.cxx b/mvd/CbmMvdTrackingInterface.cxx index 50410b3c0d69158740039beae09710c11ba80e15..c7fb9961da6ee339307ff6a4c76dfba713ef8467 100644 --- a/mvd/CbmMvdTrackingInterface.cxx +++ b/mvd/CbmMvdTrackingInterface.cxx @@ -1,24 +1,23 @@ -/* Copyright (C) 2016-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] */ /*************************************************************************************************** * @file CbmMvdTrackingInterface.cxx - * @brief Input data and parameters interface from STS subsystem used in L1 tracker (definition) + * @brief Input data and parameters interface from MVD subsystem used in L1 tracker (definition) * @since 31.05.2022 * @author S.Zharko <s.zharko@gsi.de> ***************************************************************************************************/ #include "CbmMvdTrackingInterface.h" - #include "FairDetector.h" #include "FairRunAna.h" #include <FairLogger.h> ClassImp(CbmMvdTrackingInterface) -CbmMvdTrackingInterface* CbmMvdTrackingInterface::fpInstance = nullptr; + CbmMvdTrackingInterface* CbmMvdTrackingInterface::fpInstance = nullptr; //------------------------------------------------------------------------------------------------------------------------------------- // diff --git a/mvd/CbmMvdTrackingInterface.h b/mvd/CbmMvdTrackingInterface.h index cf481138dc458c017f02c43adde7a6d0266758b3..6868e1a0396bd51ee4511f90142a9850fcced63f 100644 --- a/mvd/CbmMvdTrackingInterface.h +++ b/mvd/CbmMvdTrackingInterface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-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] */ @@ -12,13 +12,14 @@ #ifndef CbmMvdTrackingInterface_h #define CbmMvdTrackingInterface_h 1 -#include "CbmTrackingDetectorInterfaceBase.h" #include "CbmMvdDetector.h" #include "CbmMvdStationPar.h" -#include "TMath.h" +#include "CbmTrackingDetectorInterfaceBase.h" #include "FairTask.h" +#include "TMath.h" + #include <iostream> #include <vector> @@ -48,15 +49,15 @@ public: /// Gets the tracking station radiation length /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Radiation length [cm] - double GetRadLength(int stationId) const - { - return fMvdStationPar->GetZThickness(stationId) / (10. * fMvdStationPar->GetZRadThickness(stationId)); + double GetRadLength(int stationId) const + { + return fMvdStationPar->GetZThickness(stationId) / (10. * fMvdStationPar->GetZRadThickness(stationId)); } /// Gets size of outer radius of a tracking station /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Size of station outer radius [cm] - double GetRmax(int stationId) const + double GetRmax(int stationId) const { return std::max(fMvdStationPar->GetHeight(stationId), fMvdStationPar->GetWidth(stationId)); } @@ -64,9 +65,9 @@ public: /// Gets size of inner radius of a tracking station /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Size of station inner radius [cm] - double GetRmin(int stationId) const - { - return std::min(fMvdStationPar->GetBeamHeight(stationId), fMvdStationPar->GetBeamWidth(stationId)); + double GetRmin(int stationId) const + { + return std::min(fMvdStationPar->GetBeamHeight(stationId), fMvdStationPar->GetBeamWidth(stationId)); } /// Gets spatial resolution (RMS) for back strips @@ -88,14 +89,11 @@ public: /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Absolute stereo angle for front strips [rad] double GetStripsStereoAngleFront(int /*stationId*/) const { return 0.; } - + /// Gets the tracking station thickness along the Z-axis /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) /// \return Station thickness [cm] - double GetThickness(int stationId) const - { - return fMvdStationPar->GetZThickness(stationId); - } + double GetThickness(int stationId) const { return fMvdStationPar->GetZThickness(stationId); } /// Gets time resolution for a tracking station /// \param stationId Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1]) diff --git a/reco/KF/CbmKF.cxx b/reco/KF/CbmKF.cxx index 03db33dff134f7bd7c3f72136b9db42988968e9f..000627f1c6968c36f855840e185c5e1ae29209db 100644 --- a/reco/KF/CbmKF.cxx +++ b/reco/KF/CbmKF.cxx @@ -80,7 +80,6 @@ CbmKF::CbmKF(const char* name, Int_t iVerbose) , fMaterialID2IndexMap() { if (!fInstance) fInstance = this; - } CbmKF::~CbmKF() { fInstance = 0; } @@ -98,9 +97,10 @@ InitStatus CbmKF::ReInit() { return Init(); } InitStatus CbmKF::Init() { if (!CbmTrackingDetectorInterfaceInit::Instance()) { - LOG(fatal) << "CbmKF::Init(): CbmTrackingDetectorInterfaceInit instance was not found. Please, add it as a task to your " - "reco macro before the KF and L1 tasks:\n" - << "\033[1;30mrun->AddTask(new CbmTrackingDetectorInterfaceInit());\033[0m"; + LOG(fatal) + << "CbmKF::Init(): CbmTrackingDetectorInterfaceInit instance was not found. Please, add it as a task to your " + "reco macro before the KF and L1 tasks:\n" + << "\033[1;30mrun->AddTask(new CbmTrackingDetectorInterfaceInit());\033[0m"; } fMagneticField = 0; diff --git a/reco/KF/CbmTrackingDetectorInterfaceInit.cxx b/reco/KF/CbmTrackingDetectorInterfaceInit.cxx index d6b89c08bc0c47cbe2072d46e3cad04819e724b3..8ee39c2367d3d1c6b6f8791430bd8d7127351ab1 100644 --- a/reco/KF/CbmTrackingDetectorInterfaceInit.cxx +++ b/reco/KF/CbmTrackingDetectorInterfaceInit.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-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/KF/CbmTrackingDetectorInterfaceInit.h b/reco/KF/CbmTrackingDetectorInterfaceInit.h index 70431151c9d0d574c141e4b804d04696b7bc6f05..80026259af3122dfb3c97941978c695b7f56194e 100644 --- a/reco/KF/CbmTrackingDetectorInterfaceInit.h +++ b/reco/KF/CbmTrackingDetectorInterfaceInit.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-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/L1Assert.h b/reco/L1/L1Algo/L1Assert.h index b91eacf34c67ff161f3a4727223db2f80561d453..9b3dc672575af68d60a40f115ddaeff8eff22cec 100644 --- a/reco/L1/L1Algo/L1Assert.h +++ b/reco/L1/L1Algo/L1Assert.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 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/L1BaseStationInfo.cxx b/reco/L1/L1Algo/L1BaseStationInfo.cxx index 9c44b64eed8f5f4d7b46545238647188cf998c7d..8b70495d31ea239177661be2b8cbc07611af6726 100644 --- a/reco/L1/L1Algo/L1BaseStationInfo.cxx +++ b/reco/L1/L1Algo/L1BaseStationInfo.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2021 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/L1BaseStationInfo.h b/reco/L1/L1Algo/L1BaseStationInfo.h index 21d631f5f21daea966e24c35aa11ed95bbf9d08f..caf3e36130d49112a516371b82697aeabfeb9189 100644 --- a/reco/L1/L1Algo/L1BaseStationInfo.h +++ b/reco/L1/L1Algo/L1BaseStationInfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2021-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/L1Constants.h b/reco/L1/L1Algo/L1Constants.h index e6744d88cc858e9e64d40eb3c0464b34f8e02a63..3137ead7cacad207ae7b42c6b3906574468b7668 100644 --- a/reco/L1/L1Algo/L1Constants.h +++ b/reco/L1/L1Algo/L1Constants.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2021 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/L1Field.cxx b/reco/L1/L1Algo/L1Field.cxx index ad8730296c462d1f8b89f9aab3a31079efefdf23..1dd1e163f7724888dc9d663326b6eda0fc51a190 100644 --- a/reco/L1/L1Algo/L1Field.cxx +++ b/reco/L1/L1Algo/L1Field.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-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/L1Field.h b/reco/L1/L1Algo/L1Field.h index 28b684548978d20716c480746dd2232926fac57e..a74328f436f1cedbc954880b80c2e7c0d5e135d3 100644 --- a/reco/L1/L1Algo/L1Field.h +++ b/reco/L1/L1Algo/L1Field.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2007-2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only - Authors: Sergey Gorbunov [committer], Igor Kulakov, Maksym Zyzak */ + Authors: Sergey Gorbunov [committer], Igor Kulakov, Maksym Zyzak, Sergei Zharko */ #ifndef L1Field_h #define L1Field_h 1 diff --git a/reco/L1/L1Algo/L1InitManager.cxx b/reco/L1/L1Algo/L1InitManager.cxx index 4685b84292a23629a76ca8870bcd514eafabaf78..84dc651a2e43f5cd794a3d2860c7123228b7bd40 100644 --- a/reco/L1/L1Algo/L1InitManager.cxx +++ b/reco/L1/L1Algo/L1InitManager.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2021 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/L1InitManager.h b/reco/L1/L1Algo/L1InitManager.h index 3b7924708f31252b2ad06308786aa5c7f1c4fc7f..9a4a91f05e529bbf617539998f048509f3642215 100644 --- a/reco/L1/L1Algo/L1InitManager.h +++ b/reco/L1/L1Algo/L1InitManager.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2021-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/L1MaterialInfo.cxx b/reco/L1/L1Algo/L1MaterialInfo.cxx index e7c864f3b4a3e4695fac4f99ea357ae98afa24fd..bf3fea863074ce76dc98c26f9236861ae0753b17 100644 --- a/reco/L1/L1Algo/L1MaterialInfo.cxx +++ b/reco/L1/L1Algo/L1MaterialInfo.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-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/L1MaterialInfo.h b/reco/L1/L1Algo/L1MaterialInfo.h index 22824be9c441e25488fbd2b4ce860bcdcbd3fe4f..9d8818a3b33e8ad0f518ae5f947cbd2d2d60c62d 100644 --- a/reco/L1/L1Algo/L1MaterialInfo.h +++ b/reco/L1/L1Algo/L1MaterialInfo.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2007-2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only - Authors: Igor Kulakov, Sergey Gorbunov [committer], Andrey Lebedev */ + Authors: Igor Kulakov, Sergey Gorbunov [committer], Andrey Lebedev, Sergei Zharko */ #ifndef L1MaterialInfo_h #define L1MaterialInfo_h diff --git a/reco/L1/L1Algo/L1ObjectInitController.h b/reco/L1/L1Algo/L1ObjectInitController.h index bff4f21211e1ec18ad92c1ddace84ef87b89ba0b..353ca0a2f251ea411b26ae6cb47794c70a3fcfa2 100644 --- a/reco/L1/L1Algo/L1ObjectInitController.h +++ b/reco/L1/L1Algo/L1ObjectInitController.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 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/L1Parameters.cxx b/reco/L1/L1Algo/L1Parameters.cxx index 24e3348cedfff3ed65ed5a0cb615c3ae736c27a4..c070ae1d4e16d53dd9326276169b3c3a8726e509 100644 --- a/reco/L1/L1Algo/L1Parameters.cxx +++ b/reco/L1/L1Algo/L1Parameters.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2022-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/L1Parameters.h b/reco/L1/L1Algo/L1Parameters.h index a659d4a67db3bbfa3b5787a82631125ce54adba9..a7a69d198179006bab9ed6624203c68bc6591360 100644 --- a/reco/L1/L1Algo/L1Parameters.h +++ b/reco/L1/L1Algo/L1Parameters.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2021-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.cxx b/reco/L1/L1Algo/L1Station.cxx index 6d316cea36f695f900e038b3c463228976a17fd4..18b30f67eb963bef461c2efaf9493466a07e6b47 100644 --- a/reco/L1/L1Algo/L1Station.cxx +++ b/reco/L1/L1Algo/L1Station.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-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 ac7762f7278a57d9b527a668b1486a210a644939..e21d21cfd97d6ade96e12bfb14f596e538a32b5c 100644 --- a/reco/L1/L1Algo/L1Station.h +++ b/reco/L1/L1Algo/L1Station.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2007-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2007-2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only - Authors: Sergey Gorbunov [committer], Igor Kulakov */ + Authors: Sergey Gorbunov [committer], Igor Kulakov, Sergei Zharko */ #ifndef L1Station_h #define L1Station_h 1 diff --git a/reco/L1/L1Algo/L1UMeasurementInfo.cxx b/reco/L1/L1Algo/L1UMeasurementInfo.cxx index f0c94375e0b48b2964f3b9570f48a061d938ed16..3d86cffba4eca85e7fbdbdb263fb6ad177a9af0e 100644 --- a/reco/L1/L1Algo/L1UMeasurementInfo.cxx +++ b/reco/L1/L1Algo/L1UMeasurementInfo.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-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/L1UMeasurementInfo.h b/reco/L1/L1Algo/L1UMeasurementInfo.h index 7452c60de075f9c27097997eafd73198579d5480..4a8a6076ec12a06e7654a2e8be0301110194532b 100644 --- a/reco/L1/L1Algo/L1UMeasurementInfo.h +++ b/reco/L1/L1Algo/L1UMeasurementInfo.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2007-2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only - Authors: Sergey Gorbunov [committer], Igor Kulakov */ + Authors: Sergey Gorbunov [committer], Igor Kulakov, Sergei Zharko */ #ifndef L1UMeasurementInfo_h #define L1UMeasurementInfo_h 1 diff --git a/reco/L1/L1Algo/L1Utils.h b/reco/L1/L1Algo/L1Utils.h index 10f0b6f89213a38a099e96b309870670799ced5e..37256872c6a937330e7a3c9f4f0e6526e662db2b 100644 --- a/reco/L1/L1Algo/L1Utils.h +++ b/reco/L1/L1Algo/L1Utils.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-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/L1XYMeasurementInfo.cxx b/reco/L1/L1Algo/L1XYMeasurementInfo.cxx index 7549f80c691dfb2ba4dcd893a16c4a9634ddb08a..1eb9a7ef0d53490262036924f6ca5b0bdf05f877 100644 --- a/reco/L1/L1Algo/L1XYMeasurementInfo.cxx +++ b/reco/L1/L1Algo/L1XYMeasurementInfo.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-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/L1XYMeasurementInfo.h b/reco/L1/L1Algo/L1XYMeasurementInfo.h index e0b933e106ce1bdfda1e55b65994f3ded3a890e1..57ef4b4d6ef0dd8750c3fc837b403902e4a3516d 100644 --- a/reco/L1/L1Algo/L1XYMeasurementInfo.h +++ b/reco/L1/L1Algo/L1XYMeasurementInfo.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2007-2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only - Authors: Sergey Gorbunov [committer] */ + Authors: Sergey Gorbunov [committer], Sergei Zharko */ #ifndef L1XYMeasurementInfo_h #define L1XYMeasurementInfo_h 1