From 6eba20d5f3ced3879fbf269f61a05a0dcfe770b3 Mon Sep 17 00:00:00 2001 From: "s.zharko@gsi.de" <s.zharko@gsi.de> Date: Wed, 1 Jun 2022 10:28:32 +0200 Subject: [PATCH] Renamed TrackerIF classes --- reco/L1/CMakeLists.txt | 8 +-- reco/L1/CbmL1.cxx | 10 ++-- ...erInterfaceMvd.cxx => CbmMvdTrackerIF.cxx} | 50 +++++++++--------- ...rackerInterfaceMvd.h => CbmMvdTrackerIF.h} | 32 ++++++------ ...erInterfaceSts.cxx => CbmStsTrackerIF.cxx} | 52 +++++++++---------- ...rackerInterfaceSts.h => CbmStsTrackerIF.h} | 32 ++++++------ reco/L1/CbmTrackerDetInitializer.cxx | 8 +-- reco/L1/L1LinkDef.h | 4 +- 8 files changed, 98 insertions(+), 98 deletions(-) rename reco/L1/{CbmTrackerInterfaceMvd.cxx => CbmMvdTrackerIF.cxx} (74%) rename reco/L1/{CbmTrackerInterfaceMvd.h => CbmMvdTrackerIF.h} (83%) rename reco/L1/{CbmTrackerInterfaceSts.cxx => CbmStsTrackerIF.cxx} (77%) rename reco/L1/{CbmTrackerInterfaceSts.h => CbmStsTrackerIF.h} (83%) diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt index 0548e07af4..1288268fe7 100644 --- a/reco/L1/CMakeLists.txt +++ b/reco/L1/CMakeLists.txt @@ -110,8 +110,8 @@ CbmL1.cxx #CbmL1TrdTrackFinderSts.cxx CbmL1TrackMerger.cxx CbmL1TofMerger.cxx -CbmTrackerInterfaceSts.cxx # TMP: Should be placed to the detector directory! -CbmTrackerInterfaceMvd.cxx # TMP: Should be placed to the detector directory! +CbmStsTrackerIF.cxx # TMP: Should be placed to the detector directory! +CbmMvdTrackerIF.cxx # TMP: Should be placed to the detector directory! CbmTrackerDetInitializer.cxx L1AlgoInputData.cxx OffLineInterface/CbmL1RichENNRingFinder.cxx @@ -175,8 +175,8 @@ CbmL1TrackPar.h CbmL1TrdHit.h #CbmL1TrdTrackFinderSts.h L1TrackerInterfaceBase.h # TMP: Should be placed to the detector directory! -CbmTrackerInterfaceSts.h # TMP: Should be placed to the detector directory! -CbmTrackerInterfaceMvd.h # TMP: Should be placed to the detector directory! +CbmStsTrackerIF.h # TMP: Should be placed to the detector directory! +CbmMvdTrackerIF.h # TMP: Should be placed to the detector directory! CbmTrackerDetInitializer.h CbmL1TrdTracklet4.h CbmL1TrdTracklet.h diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx index 31eb759454..8dbde85736 100644 --- a/reco/L1/CbmL1.cxx +++ b/reco/L1/CbmL1.cxx @@ -30,9 +30,9 @@ #include "CbmMuchStation.h" #include "CbmMvdDetector.h" #include "CbmMvdStationPar.h" -#include "CbmSetup.h" // TODO: To be replaced to the CbmTrackerInterfaceSts !! (S.Zharko) -#include "CbmTrackerInterfaceMvd.h" -#include "CbmTrackerInterfaceSts.h" +#include "CbmSetup.h" // TODO: To be replaced to the CbmStsTrackerIF !! (S.Zharko) +#include "CbmMvdTrackerIF.h" +#include "CbmStsTrackerIF.h" #include <boost/filesystem.hpp> // TODO: include of CbmSetup.h creates problems on Mac @@ -508,8 +508,8 @@ InitStatus CbmL1::Init() } //NStsStationsGeom = (fUseSTS) ? CbmStsSetup::Instance()->GetNofStations() : 0; - auto mvdInterface = CbmTrackerInterfaceMvd::Instance(); - auto stsInterface = CbmTrackerInterfaceSts::Instance(); + auto mvdInterface = CbmMvdTrackerIF::Instance(); + auto stsInterface = CbmStsTrackerIF::Instance(); //NMvdStationsGeom = mvdInterface->GetNstations(); NStsStationsGeom = stsInterface->GetNstations(); diff --git a/reco/L1/CbmTrackerInterfaceMvd.cxx b/reco/L1/CbmMvdTrackerIF.cxx similarity index 74% rename from reco/L1/CbmTrackerInterfaceMvd.cxx rename to reco/L1/CbmMvdTrackerIF.cxx index bfcee604cf..d465dd58d0 100644 --- a/reco/L1/CbmTrackerInterfaceMvd.cxx +++ b/reco/L1/CbmMvdTrackerIF.cxx @@ -3,13 +3,13 @@ Authors: Sergey Gorbunov, Sergei Zharko [committer] */ /*************************************************************************************************** - * @file CbmTrackerInterfaceMvd.cxx + * @file CbmMvdTrackerIF.cxx * @brief Input data and parameters interface from STS subsystem used in L1 tracker (definition) * @since 31.05.2022 * @author S.Zharko <s.zharko@gsi.de> ***************************************************************************************************/ -#include "CbmTrackerInterfaceMvd.h" +#include "CbmMvdTrackerIF.h" #include "CbmKF.h" #include "CbmKFMaterial.h" // for CbmKFTube #include "CbmMvdDetector.h" @@ -20,101 +20,101 @@ #include "TMath.h" #include "L1Def.h" -ClassImp(CbmTrackerInterfaceMvd) +ClassImp(CbmMvdTrackerIF) -CbmTrackerInterfaceMvd* CbmTrackerInterfaceMvd::fpInstance = nullptr; +CbmMvdTrackerIF* CbmMvdTrackerIF::fpInstance = nullptr; //------------------------------------------------------------------------------------------------------------------------------------- // -CbmTrackerInterfaceMvd::CbmTrackerInterfaceMvd() : FairTask("CbmTrackerInterfaceMvd") +CbmMvdTrackerIF::CbmMvdTrackerIF() : FairTask("CbmMvdTrackerIF") { if (!fpInstance) { fpInstance = this; } } //------------------------------------------------------------------------------------------------------------------------------------- // -CbmTrackerInterfaceMvd::~CbmTrackerInterfaceMvd() +CbmMvdTrackerIF::~CbmMvdTrackerIF() { if (fpInstance == this) { fpInstance = nullptr; } } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetTimeResolution(int /*stationId*/) const { return 1000.; } +double CbmMvdTrackerIF::GetTimeResolution(int /*stationId*/) const { return 1000.; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetZ(int stationId) const +double CbmMvdTrackerIF::GetZ(int stationId) const { return (fMvdMaterial->at(stationId)).z; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetXmax(int stationId) const +double CbmMvdTrackerIF::GetXmax(int stationId) const { return (fMvdMaterial->at(stationId)).R; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetYmax(int stationId) const +double CbmMvdTrackerIF::GetYmax(int stationId) const { return (fMvdMaterial->at(stationId)).R; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetRmin(int stationId) const +double CbmMvdTrackerIF::GetRmin(int stationId) const { return (fMvdMaterial->at(stationId)).r; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetRmax(int stationId) const +double CbmMvdTrackerIF::GetRmax(int stationId) const { return (fMvdMaterial->at(stationId)).R; } //------------------------------------------------------------------------------------------------------------------------------------- // -int CbmTrackerInterfaceMvd::GetNstations() const +int CbmMvdTrackerIF::GetNstations() const { return fMvdMaterial->size(); } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetThickness(int stationId) const +double CbmMvdTrackerIF::GetThickness(int stationId) const { return (fMvdMaterial->at(stationId)).dz; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetRadLength(int stationId) const +double CbmMvdTrackerIF::GetRadLength(int stationId) const { return (fMvdMaterial->at(stationId)).RadLength; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetStripsStereoAngleFront(int /*stationId*/) const +double CbmMvdTrackerIF::GetStripsStereoAngleFront(int /*stationId*/) const { return 0.; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetStripsStereoAngleBack(int /*stationId*/) const +double CbmMvdTrackerIF::GetStripsStereoAngleBack(int /*stationId*/) const { return TMath::Pi() / 2.; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetStripsSpatialRmsFront(int stationId) const +double CbmMvdTrackerIF::GetStripsSpatialRmsFront(int stationId) const { return fMvdStationPar->GetXRes(stationId) / 10000.; } @@ -122,21 +122,21 @@ double CbmTrackerInterfaceMvd::GetStripsSpatialRmsFront(int stationId) const //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceMvd::GetStripsSpatialRmsBack(int stationId) const +double CbmMvdTrackerIF::GetStripsSpatialRmsBack(int stationId) const { return fMvdStationPar->GetYRes(stationId) / 10000.; } //------------------------------------------------------------------------------------------------------------------------------------- // -bool CbmTrackerInterfaceMvd::IsTimeInfoProvided(int /*stationId*/) const { return false; } +bool CbmMvdTrackerIF::IsTimeInfoProvided(int /*stationId*/) const { return false; } //------------------------------------------------------------------------------------------------------------------------------------- // -InitStatus CbmTrackerInterfaceMvd::Init() +InitStatus CbmMvdTrackerIF::Init() { - LOG(info) << "\033[1;33mCALL CbmTrackerInterfaceMvd::Init()\033[0m"; + LOG(info) << "\033[1;33mCALL CbmMvdTrackerIF::Init()\033[0m"; fMvdMaterial = &(CbmKF::Instance()->vMvdMaterial); fMvdStationPar = CbmMvdDetector::Instance()->GetParameterFile(); @@ -149,16 +149,16 @@ InitStatus CbmTrackerInterfaceMvd::Init() //------------------------------------------------------------------------------------------------------------------------------------- // -InitStatus CbmTrackerInterfaceMvd::ReInit() +InitStatus CbmMvdTrackerIF::ReInit() { - LOG(info) << "\033[1;33mCALL CbmTrackerInterfaceMvd::ReInit()\033[0m"; + LOG(info) << "\033[1;33mCALL CbmMvdTrackerIF::ReInit()\033[0m"; this->SetParContainers(); return Init(); } //------------------------------------------------------------------------------------------------------------------------------------- // -void CbmTrackerInterfaceMvd::SetParContainers() +void CbmMvdTrackerIF::SetParContainers() { } diff --git a/reco/L1/CbmTrackerInterfaceMvd.h b/reco/L1/CbmMvdTrackerIF.h similarity index 83% rename from reco/L1/CbmTrackerInterfaceMvd.h rename to reco/L1/CbmMvdTrackerIF.h index 1f3416df14..327297579d 100644 --- a/reco/L1/CbmTrackerInterfaceMvd.h +++ b/reco/L1/CbmMvdTrackerIF.h @@ -3,14 +3,14 @@ Authors: Sergey Gorbunov, Sergei Zharko [committer] */ /*************************************************************************************************** - * @file CbmTrackerInterfaceMvd.h + * @file CbmMvdTrackerIF.h * @brief Input data and parameters interface from MVD subsystem used in L1 tracker (declaration) * @since 31.05.2022 * @author S.Zharko <s.zharko@gsi.de> ***************************************************************************************************/ -#ifndef CbmTrackerInterfaceMvd_h -#define CbmTrackerInterfaceMvd_h 1 +#ifndef CbmMvdTrackerIF_h +#define CbmMvdTrackerIF_h 1 #include "L1TrackerInterfaceBase.h" #include "FairTask.h" @@ -23,16 +23,16 @@ class CbmMvdDetector; class CbmMvdStationPar; class CbmKFTube; -/// Class CbmTrackerInterfaceMvd is a CbmL1 subtask, which provides necessary methods for L1 tracker +/// Class CbmMvdTrackerIF is a CbmL1 subtask, which provides necessary methods for L1 tracker /// to access the geometry and dataflow settings. /// -class CbmTrackerInterfaceMvd: public FairTask, public L1TrackerInterfaceBase { +class CbmMvdTrackerIF: public FairTask, public L1TrackerInterfaceBase { public: /// Default constructor - CbmTrackerInterfaceMvd(); + CbmMvdTrackerIF(); /// Destructor - ~CbmTrackerInterfaceMvd(); + ~CbmMvdTrackerIF(); /// FairTask: Init method InitStatus Init(); @@ -40,8 +40,8 @@ public: /// FairTask: ReInit method InitStatus ReInit(); - /// Gets pointer to the instance of the CbmTrackerInterfaceMvd - static CbmTrackerInterfaceMvd* Instance() { return fpInstance; } + /// Gets pointer to the instance of the CbmMvdTrackerIF + static CbmMvdTrackerIF* Instance() { return fpInstance; } /// Gets actual number of stations, provided by the current geometry setup int GetNstations() const; @@ -115,18 +115,18 @@ public: void SetParContainers(); /// Copy and move constructers and assign operators are prohibited - CbmTrackerInterfaceMvd(const CbmTrackerInterfaceMvd&) = delete; - CbmTrackerInterfaceMvd(CbmTrackerInterfaceMvd&&) = delete; - CbmTrackerInterfaceMvd& operator=(const CbmTrackerInterfaceMvd&) = delete; - CbmTrackerInterfaceMvd& operator=(CbmTrackerInterfaceMvd&&) = delete; + CbmMvdTrackerIF(const CbmMvdTrackerIF&) = delete; + CbmMvdTrackerIF(CbmMvdTrackerIF&&) = delete; + CbmMvdTrackerIF& operator=(const CbmMvdTrackerIF&) = delete; + CbmMvdTrackerIF& operator=(CbmMvdTrackerIF&&) = delete; private: - static CbmTrackerInterfaceMvd* fpInstance; ///< Instance of the class + static CbmMvdTrackerIF* fpInstance; ///< Instance of the class const std::vector<CbmKFTube> * fMvdMaterial {nullptr}; ///< Pointer to the MVD vector of CbmKFTube objects (owner: CbmKF) const CbmMvdStationPar * fMvdStationPar {nullptr}; ///< Pointer to the Mvd station parameters file - ClassDef(CbmTrackerInterfaceMvd, 0); + ClassDef(CbmMvdTrackerIF, 0); }; -#endif // CbmTrackerInterfaceMvd +#endif // CbmMvdTrackerIF diff --git a/reco/L1/CbmTrackerInterfaceSts.cxx b/reco/L1/CbmStsTrackerIF.cxx similarity index 77% rename from reco/L1/CbmTrackerInterfaceSts.cxx rename to reco/L1/CbmStsTrackerIF.cxx index c66a31ca9b..61120a4a1f 100644 --- a/reco/L1/CbmTrackerInterfaceSts.cxx +++ b/reco/L1/CbmStsTrackerIF.cxx @@ -3,13 +3,13 @@ Authors: Sergey Gorbunov, Sergei Zharko [committer] */ /*************************************************************************************************** - * @file CbmTrackerInterfaceSts.cxx + * @file CbmStsTrackerIF.cxx * @brief Input data and parameters interface from STS subsystem used in L1 tracker (definition) * @since 27.05.2022 * @author S.Zharko <s.zharko@gsi.de> ***************************************************************************************************/ -#include "CbmTrackerInterfaceSts.h" +#include "CbmStsTrackerIF.h" #include "CbmStsStation.h" #include "FairDetector.h" #include "FairRunAna.h" @@ -17,84 +17,84 @@ #include "TMath.h" #include "L1Def.h" -ClassImp(CbmTrackerInterfaceSts) +ClassImp(CbmStsTrackerIF) -CbmTrackerInterfaceSts* CbmTrackerInterfaceSts::fpInstance = nullptr; +CbmStsTrackerIF* CbmStsTrackerIF::fpInstance = nullptr; //------------------------------------------------------------------------------------------------------------------------------------- // -CbmTrackerInterfaceSts::CbmTrackerInterfaceSts() : FairTask("CbmTrackerInterfaceSts") +CbmStsTrackerIF::CbmStsTrackerIF() : FairTask("CbmStsTrackerIF") { if (!fpInstance) { fpInstance = this; } } //------------------------------------------------------------------------------------------------------------------------------------- // -CbmTrackerInterfaceSts::~CbmTrackerInterfaceSts() +CbmStsTrackerIF::~CbmStsTrackerIF() { if (fpInstance == this) { fpInstance = nullptr; } } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetTimeResolution(int /*stationId*/) const { return 5.; } +double CbmStsTrackerIF::GetTimeResolution(int /*stationId*/) const { return 5.; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetZ(int stationId) const +double CbmStsTrackerIF::GetZ(int stationId) const { return CbmStsSetup::Instance()->GetStation(stationId)->GetZ(); } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetXmax(int stationId) const +double CbmStsTrackerIF::GetXmax(int stationId) const { return CbmStsSetup::Instance()->GetStation(stationId)->GetXmax(); } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetYmax(int stationId) const +double CbmStsTrackerIF::GetYmax(int stationId) const { return CbmStsSetup::Instance()->GetStation(stationId)->GetYmax(); } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetRmin(int /*stationId*/) const { return 0.; } +double CbmStsTrackerIF::GetRmin(int /*stationId*/) const { return 0.; } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetRmax(int stationId) const +double CbmStsTrackerIF::GetRmax(int stationId) const { return GetXmax(stationId) > GetYmax(stationId) ? GetXmax(stationId) : GetYmax(stationId); } //------------------------------------------------------------------------------------------------------------------------------------- // -int CbmTrackerInterfaceSts::GetNstations() const +int CbmStsTrackerIF::GetNstations() const { return CbmStsSetup::Instance()->GetNofStations(); } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetThickness(int stationId) const +double CbmStsTrackerIF::GetThickness(int stationId) const { return CbmStsSetup::Instance()->GetStation(stationId)->GetSensorD(); } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetRadLength(int stationId) const +double CbmStsTrackerIF::GetRadLength(int stationId) const { return CbmStsSetup::Instance()->GetStation(stationId)->GetRadLength(); } //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetStripsStereoAngleFront(int stationId) const +double CbmStsTrackerIF::GetStripsStereoAngleFront(int stationId) const { auto station = CbmStsSetup::Instance()->GetStation(stationId); return station->GetSensorRotation() + station->GetSensorStereoAngle(0) * TMath::Pi() / 180.; @@ -102,7 +102,7 @@ double CbmTrackerInterfaceSts::GetStripsStereoAngleFront(int stationId) const //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetStripsStereoAngleBack(int stationId) const +double CbmStsTrackerIF::GetStripsStereoAngleBack(int stationId) const { auto station = CbmStsSetup::Instance()->GetStation(stationId); return station->GetSensorRotation() + station->GetSensorStereoAngle(1) * TMath::Pi() / 180.; @@ -110,7 +110,7 @@ double CbmTrackerInterfaceSts::GetStripsStereoAngleBack(int stationId) const //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetStripsSpatialRmsFront(int stationId) const +double CbmStsTrackerIF::GetStripsSpatialRmsFront(int stationId) const { auto station = CbmStsSetup::Instance()->GetStation(stationId); return station->GetSensorPitch(0) / TMath::Sqrt(12.); @@ -119,7 +119,7 @@ double CbmTrackerInterfaceSts::GetStripsSpatialRmsFront(int stationId) const //------------------------------------------------------------------------------------------------------------------------------------- // -double CbmTrackerInterfaceSts::GetStripsSpatialRmsBack(int stationId) const +double CbmStsTrackerIF::GetStripsSpatialRmsBack(int stationId) const { auto station = CbmStsSetup::Instance()->GetStation(stationId); return station->GetSensorPitch(0) / TMath::Sqrt(12.); @@ -127,14 +127,14 @@ double CbmTrackerInterfaceSts::GetStripsSpatialRmsBack(int stationId) const //------------------------------------------------------------------------------------------------------------------------------------- // -bool CbmTrackerInterfaceSts::IsTimeInfoProvided(int /*stationId*/) const { return true; } +bool CbmStsTrackerIF::IsTimeInfoProvided(int /*stationId*/) const { return true; } //------------------------------------------------------------------------------------------------------------------------------------- // -InitStatus CbmTrackerInterfaceSts::Init() +InitStatus CbmStsTrackerIF::Init() { - LOG(info) << "\033[1;33mCALL CbmTrackerInterfaceSts::Init()\033[0m"; + LOG(info) << "\033[1;33mCALL CbmStsTrackerIF::Init()\033[0m"; // Check, if all the necessary parameter containers were found if (!fStsParSetModule) { return kFATAL; } @@ -153,18 +153,18 @@ InitStatus CbmTrackerInterfaceSts::Init() //------------------------------------------------------------------------------------------------------------------------------------- // -InitStatus CbmTrackerInterfaceSts::ReInit() +InitStatus CbmStsTrackerIF::ReInit() { - LOG(info) << "\033[1;33mCALL CbmTrackerInterfaceSts::ReInit()\033[0m"; + LOG(info) << "\033[1;33mCALL CbmStsTrackerIF::ReInit()\033[0m"; this->SetParContainers(); return Init(); } //------------------------------------------------------------------------------------------------------------------------------------- // -void CbmTrackerInterfaceSts::SetParContainers() +void CbmStsTrackerIF::SetParContainers() { - LOG(info) << "\033[1;33mCALL CbmTrackerInterfaceSts::SetParContainer()\033[0m"; + LOG(info) << "\033[1;33mCALL CbmStsTrackerIF::SetParContainer()\033[0m"; auto runtimeDb = FairRunAna::Instance()->GetRuntimeDb(); fStsParSetModule = dynamic_cast<CbmStsParSetModule*>(runtimeDb->getContainer("CbmStsParSetModule")); fStsParSetSensor = dynamic_cast<CbmStsParSetSensor*>(runtimeDb->getContainer("CbmStsParSetSensor")); diff --git a/reco/L1/CbmTrackerInterfaceSts.h b/reco/L1/CbmStsTrackerIF.h similarity index 83% rename from reco/L1/CbmTrackerInterfaceSts.h rename to reco/L1/CbmStsTrackerIF.h index cbf59deaad..21d44e0a23 100644 --- a/reco/L1/CbmTrackerInterfaceSts.h +++ b/reco/L1/CbmStsTrackerIF.h @@ -3,14 +3,14 @@ Authors: Sergey Gorbunov, Sergei Zharko [committer] */ /*************************************************************************************************** - * @file CbmTrackerInterfaceSts.h + * @file CbmStsTrackerIF.h * @brief Input data and parameters interface from STS subsystem used in L1 tracker (declaration) * @since 27.05.2022 * @author S.Zharko <s.zharko@gsi.de> ***************************************************************************************************/ -#ifndef CbmTrackerInterfaceSts_h -#define CbmTrackerInterfaceSts_h 1 +#ifndef CbmStsTrackerIF_h +#define CbmStsTrackerIF_h 1 #include "CbmStsParSetModule.h" #include "CbmStsParSetSensor.h" @@ -22,16 +22,16 @@ #include <iostream> -/// Class CbmTrackerInterfaceSts is a CbmL1 subtask, which provides necessary methods for L1 tracker +/// Class CbmStsTrackerIF is a CbmL1 subtask, which provides necessary methods for L1 tracker /// to access the geometry and dataflow settings. /// -class CbmTrackerInterfaceSts: public FairTask, public L1TrackerInterfaceBase { +class CbmStsTrackerIF: public FairTask, public L1TrackerInterfaceBase { public: /// Default constructor - CbmTrackerInterfaceSts(); + CbmStsTrackerIF(); /// Destructor - ~CbmTrackerInterfaceSts(); + ~CbmStsTrackerIF(); /// FairTask: Init method InitStatus Init(); @@ -39,8 +39,8 @@ public: /// FairTask: ReInit method InitStatus ReInit(); - /// Gets pointer to the instance of the CbmTrackerInterfaceSts class - static CbmTrackerInterfaceSts* Instance() { return fpInstance; } + /// Gets pointer to the instance of the CbmStsTrackerIF class + static CbmStsTrackerIF* Instance() { return fpInstance; } /// Gets actual number of stations, provided by the current geometry setup int GetNstations() const; @@ -114,21 +114,21 @@ public: void SetParContainers(); /// Copy and move constructers and assign operators are forbidden - CbmTrackerInterfaceSts(const CbmTrackerInterfaceSts&) = delete; - CbmTrackerInterfaceSts(CbmTrackerInterfaceSts&&) = delete; - CbmTrackerInterfaceSts& operator=(const CbmTrackerInterfaceSts&) = delete; - CbmTrackerInterfaceSts& operator=(CbmTrackerInterfaceSts&&) = delete; + CbmStsTrackerIF(const CbmStsTrackerIF&) = delete; + CbmStsTrackerIF(CbmStsTrackerIF&&) = delete; + CbmStsTrackerIF& operator=(const CbmStsTrackerIF&) = delete; + CbmStsTrackerIF& operator=(CbmStsTrackerIF&&) = delete; private: - static CbmTrackerInterfaceSts* fpInstance; + static CbmStsTrackerIF* fpInstance; CbmStsParSetSensor* fStsParSetSensor {nullptr}; ///< CbmStsParSetSensorCond* fStsParSetSensorCond {nullptr}; ///< CbmStsParSetModule* fStsParSetModule {nullptr}; ///< - ClassDef(CbmTrackerInterfaceSts, 0); + ClassDef(CbmStsTrackerIF, 0); }; -#endif // CbmTrackerInterfaceSts +#endif // CbmStsTrackerIF diff --git a/reco/L1/CbmTrackerDetInitializer.cxx b/reco/L1/CbmTrackerDetInitializer.cxx index a5da98cd82..404de9049b 100644 --- a/reco/L1/CbmTrackerDetInitializer.cxx +++ b/reco/L1/CbmTrackerDetInitializer.cxx @@ -11,8 +11,8 @@ #include "FairTask.h" #include "CbmTrackerDetInitializer.h" -#include "CbmTrackerInterfaceSts.h" -#include "CbmTrackerInterfaceMvd.h" +#include "CbmStsTrackerIF.h" +#include "CbmMvdTrackerIF.h" #include <FairLogger.h> ClassImp(CbmTrackerDetInitializer) @@ -27,8 +27,8 @@ CbmTrackerDetInitializer::CbmTrackerDetInitializer(): FairTask("CbmTrackerDetIni fpInstance = this; /** Add subtasks - tracker detector interfaces **/ - this->Add(new CbmTrackerInterfaceMvd()); - this->Add(new CbmTrackerInterfaceSts()); + this->Add(new CbmMvdTrackerIF()); + this->Add(new CbmStsTrackerIF()); } } diff --git a/reco/L1/L1LinkDef.h b/reco/L1/L1LinkDef.h index 3e554a2d09..0c93d9b192 100644 --- a/reco/L1/L1LinkDef.h +++ b/reco/L1/L1LinkDef.h @@ -31,7 +31,7 @@ //#pragma link C++ class CbmL1SttTrack+; #pragma link C++ class CbmTrackerInputQaTrd + ; #pragma link C++ class CbmTrackerDetInitializer + ; -#pragma link C++ class CbmTrackerInterfaceMvd + ; -#pragma link C++ class CbmTrackerInterfaceSts + ; +#pragma link C++ class CbmMvdTrackerIF + ; +#pragma link C++ class CbmStsTrackerIF + ; #endif -- GitLab