Skip to content
Snippets Groups Projects
Commit e4abba4c authored by Sergei Zharko's avatar Sergei Zharko
Browse files

code-format + license fix

parent af9ffb65
No related branches found
No related tags found
1 merge request!849L1: Interfaces updates
Pipeline #17676 failed
Showing
with 65 additions and 63 deletions
/* 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] */
......
/* 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;
//-------------------------------------------------------------------------------------------------------------------------------------
//
......
/* 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; }
......
/* 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;
//-------------------------------------------------------------------------------------------------------------------------------------
//
......
/* 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]
......
/* 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"
......
/* 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
......
......@@ -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>
......
......@@ -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);
......
......@@ -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();
......
......@@ -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);
......
......@@ -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();
......
/* 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;
//-------------------------------------------------------------------------------------------------------------------------------------
//
......
/* 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])
......
......@@ -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;
......
/* 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] */
......
/* 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] */
......
/* 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] */
......
/* 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] */
......
/* 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] */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment