Skip to content
Snippets Groups Projects
Commit b7aaa34f authored by Sergey Gorbunov's avatar Sergey Gorbunov
Browse files

clang-format

parent 420f38dc
No related branches found
No related tags found
No related merge requests found
......@@ -13,10 +13,10 @@
#include "FairDetector.h"
#include "FairRunAna.h"
#include <Logger.h>
#include "TGeoPhysicalNode.h"
#include <Logger.h>
ClassImp(CbmStsTrackingInterface)
// ---------------------------------------------------------------------------------------------------------------------
......@@ -24,14 +24,18 @@ ClassImp(CbmStsTrackingInterface)
CbmStsTrackingInterface::CbmStsTrackingInterface()
: FairTask("CbmStsTrackingInterface")
{
if (!fpInstance) { fpInstance = this; }
if (!fpInstance) {
fpInstance = this;
}
}
// ---------------------------------------------------------------------------------------------------------------------
//
CbmStsTrackingInterface::~CbmStsTrackingInterface()
{
if (fpInstance == this) { fpInstance = nullptr; }
if (fpInstance == this) {
fpInstance = nullptr;
}
}
// ---------------------------------------------------------------------------------------------------------------------
......@@ -79,16 +83,30 @@ std::tuple<double, double> CbmStsTrackingInterface::GetStereoAnglesSensor(int ad
InitStatus CbmStsTrackingInterface::Init()
{
// Check, if all the necessary parameter containers were found
if (!fStsParSetModule) { return kFATAL; }
if (!fStsParSetSensor) { return kFATAL; }
if (!fStsParSetSensorCond) { return kFATAL; }
if (!fStsParSetModule) {
return kFATAL;
}
if (!fStsParSetSensor) {
return kFATAL;
}
if (!fStsParSetSensorCond) {
return kFATAL;
}
// Initialize CbmStsSetup instance
auto stsSetup = CbmStsSetup::Instance();
if (!stsSetup->IsInit()) { stsSetup->Init(nullptr); }
if (!stsSetup->IsModuleParsInit()) { stsSetup->SetModuleParameters(fStsParSetModule); }
if (!stsSetup->IsSensorParsInit()) { stsSetup->SetSensorParameters(fStsParSetSensor); }
if (!stsSetup->IsSensorCondInit()) { stsSetup->SetSensorConditions(fStsParSetSensorCond); }
if (!stsSetup->IsInit()) {
stsSetup->Init(nullptr);
}
if (!stsSetup->IsModuleParsInit()) {
stsSetup->SetModuleParameters(fStsParSetModule);
}
if (!stsSetup->IsSensorParsInit()) {
stsSetup->SetSensorParameters(fStsParSetSensor);
}
if (!stsSetup->IsSensorCondInit()) {
stsSetup->SetSensorConditions(fStsParSetSensorCond);
}
int nStations = CbmStsSetup::Instance()->GetNofStations();
fvStationFullVolume.clear();
......@@ -143,4 +161,3 @@ void CbmStsTrackingInterface::SetParContainers()
LOG(fatal) << "CbmStsTrackingInterface::SetParContainers: error accessing to CbmStsParSetSensorCond container";
}
}
......@@ -19,9 +19,7 @@
#include "CbmStsSetup.h"
#include "CbmStsStation.h"
#include "CbmTrackingDetectorInterfaceBase.h"
#include "FairTask.h"
#include "TMath.h"
#include <iostream>
......@@ -32,7 +30,7 @@
/// settings
///
class CbmStsTrackingInterface : public FairTask, public CbmTrackingDetectorInterfaceBase {
public:
public:
/// @brief Default constructor
CbmStsTrackingInterface();
......
......@@ -28,14 +28,18 @@ ClassImp(CbmTrdTrackingInterface)
CbmTrdTrackingInterface::CbmTrdTrackingInterface()
: FairTask("CbmTrdTrackingInterface")
{
if (!fpInstance) { fpInstance = this; }
if (!fpInstance) {
fpInstance = this;
}
}
// ---------------------------------------------------------------------------------------------------------------------
//
CbmTrdTrackingInterface::~CbmTrdTrackingInterface()
{
if (fpInstance == this) { fpInstance = nullptr; }
if (fpInstance == this) {
fpInstance = nullptr;
}
}
// ---------------------------------------------------------------------------------------------------------------------
......@@ -59,7 +63,9 @@ std::tuple<double, double> CbmTrdTrackingInterface::GetStereoAnglesSensor(int ad
std::tuple<double, double, double> CbmTrdTrackingInterface::GetHitRanges(const CbmPixelHit& hit) const
{
const CbmTrdHit* trdHit = dynamic_cast<const CbmTrdHit*>(&hit);
if (!trdHit) { LOG(fatal) << "CbmTrdTrackingInterface::GetHitRange: input hit is not of type CbmTrdHit"; }
if (!trdHit) {
LOG(fatal) << "CbmTrdTrackingInterface::GetHitRange: input hit is not of type CbmTrdHit";
}
const CbmTrdParModDigi* par = dynamic_cast<const CbmTrdParModDigi*>(fTrdDigiPar->GetModulePar(trdHit->GetAddress()));
auto [rangeX, rangeY, rangeT] = CbmTrackingDetectorInterfaceBase::GetHitRanges(hit);
......@@ -175,4 +181,3 @@ void CbmTrdTrackingInterface::SetParContainers()
LOG(fatal) << "CbmTrdTrackingInterface::SetParContainers: error accessing to CbmTrdParSetDigi container";
}
}
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