diff --git a/macro/C2F/c2f_transport.C b/macro/C2F/c2f_transport.C
index ea09f80147cca99d2e7553052348677c0a168b97..bb66f66e16a0acf2fb8b602bcf51642e3a1593c5 100644
--- a/macro/C2F/c2f_transport.C
+++ b/macro/C2F/c2f_transport.C
@@ -48,7 +48,8 @@ void c2f_transport(Int_t nEvents = 2, const char* setupName = "sis100_electron",
std::cout << std::endl;
TString defaultInputFile = srcDir + "/input/urqmd.auau.10gev.centr.root";
TString inFile;
- if (strcmp(inputFile, "") == 0) inFile = defaultInputFile;
+ if (strcmp(inputFile, "") == 0)
+ inFile = defaultInputFile;
else
inFile = inputFile;
std::cout << "-I- " << myName << ": Using input file " << inFile << std::endl;
@@ -189,7 +190,9 @@ void c2f_transport(Int_t nEvents = 2, const char* setupName = "sis100_electron",
std::cout << "-I- " << myName << ": Registering event generators" << std::endl;
FairPrimaryGenerator* primGen = new FairPrimaryGenerator();
// --- Uniform distribution of event plane angle
- if (randomEventPlane) { primGen->SetEventPlane(0., 2. * TMath::Pi()); }
+ if (randomEventPlane) {
+ primGen->SetEventPlane(0., 2. * TMath::Pi());
+ }
// --- Get target parameters
TVector3 targetPos(0., 0., 0.);
Double_t tDz = 0.;
diff --git a/macro/beamtime/mcbm2022/ListSpills.C b/macro/beamtime/mcbm2022/ListSpills.C
index 426319c27df3028901d5ee0884a6067a8afe6aa6..efdc6a3b12f815d2007d28223b343b2bffa50d36 100644
--- a/macro/beamtime/mcbm2022/ListSpills.C
+++ b/macro/beamtime/mcbm2022/ListSpills.C
@@ -69,7 +69,7 @@ void ListSpills(std::string sDateTimeStart, std::string sDateTimStop,
std::tm datetimeStart = {};
std::istringstream issStart(sDateTimeStart);
issStart >> std::get_time(&datetimeStart, "%Y-%m-%d %H:%M:%S");
- std::chrono::time_point<std::chrono::system_clock> timeStart {std::chrono::seconds(std::mktime(&datetimeStart))};
+ std::chrono::time_point<std::chrono::system_clock> timeStart{std::chrono::seconds(std::mktime(&datetimeStart))};
std::cout << "Start time: " << timeStart.time_since_epoch().count() << std::endl;
if (timeStart.time_since_epoch().count() < vAllEvtsBuff[0].GetTime()) {
@@ -81,7 +81,7 @@ void ListSpills(std::string sDateTimeStart, std::string sDateTimStop,
std::tm datetimeStop = {};
std::istringstream issStop(sDateTimStop);
issStop >> std::get_time(&datetimeStop, "%Y-%m-%d %H:%M:%S");
- std::chrono::time_point<std::chrono::system_clock> timeStop {std::chrono::seconds(std::mktime(&datetimeStop))};
+ std::chrono::time_point<std::chrono::system_clock> timeStop{std::chrono::seconds(std::mktime(&datetimeStop))};
std::cout << "Stop time: " << timeStop.time_since_epoch().count() << std::endl;
if (timeStop.time_since_epoch().count() > vAllEvtsBuff[vAllEvtsBuff.size() - 1].GetTime()) {
diff --git a/macro/beamtime/mcbm2022/MonitorMuchBinning.C b/macro/beamtime/mcbm2022/MonitorMuchBinning.C
index 934c9bfd9e46efeb2ec92519a8944d7604f7e9d9..aeac59f55c2bf4ba8c7f35baffab0562c90c8760 100644
--- a/macro/beamtime/mcbm2022/MonitorMuchBinning.C
+++ b/macro/beamtime/mcbm2022/MonitorMuchBinning.C
@@ -71,7 +71,9 @@ void MonitorMuchBinning(TString inFile = "", TString sHostname = "en02", Int_t n
// --- Source task
CbmMcbm2018Source* source = new CbmMcbm2018Source();
- if ("" != inFile) { source->SetFileName(inFile); } // if( "" != inFile )
+ if ("" != inFile) {
+ source->SetFileName(inFile);
+ } // if( "" != inFile )
else {
source->SetHostName(sHostname);
} // else of if( "" != inFile )
diff --git a/macro/beamtime/mcbm2022/ana_digi_cal_evt.C b/macro/beamtime/mcbm2022/ana_digi_cal_evt.C
index d4371d256141e1183263f0ea3bca3f1573ee626d..9faf8f220e5d67d87da7b1d2a5592828b8e46842 100644
--- a/macro/beamtime/mcbm2022/ana_digi_cal_evt.C
+++ b/macro/beamtime/mcbm2022/ana_digi_cal_evt.C
@@ -49,20 +49,35 @@ void ana_digi_cal_evt(Int_t nEvents = 10000000, Int_t calMode = 93, Int_t calSel
Int_t iRun = cRun.Atoi();
cout << "FileId " << cFileId << ", Run " << iRun << endl;
TString TofGeo = "";
- if (iRun < 690) TofGeo = "v20a_mcbm";
+ if (iRun < 690)
+ TofGeo = "v20a_mcbm";
else {
- if (iRun < 1112) { TofGeo = "v21a_mcbm"; }
- if (iRun < 1400) { TofGeo = "v21b_mcbm"; }
+ if (iRun < 1112) {
+ TofGeo = "v21a_mcbm";
+ }
+ if (iRun < 1400) {
+ TofGeo = "v21b_mcbm";
+ }
else {
- if (iRun < 1400) { TofGeo = "v21b_mcbm"; }
+ if (iRun < 1400) {
+ TofGeo = "v21b_mcbm";
+ }
else {
- if (iRun < 2000) { TofGeo = "v21d_mcbm"; }
+ if (iRun < 2000) {
+ TofGeo = "v21d_mcbm";
+ }
else {
- if (iRun < 2100) { TofGeo = "v21e_mcbm"; }
+ if (iRun < 2100) {
+ TofGeo = "v21e_mcbm";
+ }
else {
- if (iRun < 2176) { TofGeo = "v21f_mcbm"; }
+ if (iRun < 2176) {
+ TofGeo = "v21f_mcbm";
+ }
else {
- if (iRun < 2350) { TofGeo = "v21g_mcbm"; }
+ if (iRun < 2350) {
+ TofGeo = "v21g_mcbm";
+ }
else {
TofGeo = "v21h_mcbm";
}
diff --git a/macro/beamtime/mcbm2022/event_display_l1reco.C b/macro/beamtime/mcbm2022/event_display_l1reco.C
index 5df64f4df6ed5075d3b0889351d42240a18cc01f..a6108f7c5153e4605732698f065022ba24e15c6f 100644
--- a/macro/beamtime/mcbm2022/event_display_l1reco.C
+++ b/macro/beamtime/mcbm2022/event_display_l1reco.C
@@ -69,7 +69,7 @@ void event_display_l1reco(uint32_t uRunId, std::string sRecoFile, std::string sG
// Define the basic structure which needs to be filled with information
// This structure is stored in the output file and later passed to the
// FairRoot framework to do the (miss)alignment
- std::map<std::string, TGeoHMatrix>* matrices {nullptr};
+ std::map<std::string, TGeoHMatrix>* matrices{nullptr};
// read matrices from disk
TFile* misalignmentMatrixRootfile = new TFile(sAlignFile.data(), "READ");
@@ -82,7 +82,9 @@ void event_display_l1reco(uint32_t uRunId, std::string sRecoFile, std::string sG
return kFALSE;
}
- if (matrices) { fRun->AddAlignmentMatrices(*matrices); }
+ if (matrices) {
+ fRun->AddAlignmentMatrices(*matrices);
+ }
else {
LOG(error) << "Alignment required but no matrices found."
<< "\n Exiting";
diff --git a/macro/beamtime/mcbm2022/mcbm_digievent_reco.C b/macro/beamtime/mcbm2022/mcbm_digievent_reco.C
index 30d68d4d542395bf568484565c6a346a6c6340a8..f595b4d944b4f874bd6f5e8c1932524611d5d3ac 100644
--- a/macro/beamtime/mcbm2022/mcbm_digievent_reco.C
+++ b/macro/beamtime/mcbm2022/mcbm_digievent_reco.C
@@ -89,13 +89,13 @@ Bool_t mcbm_digievent_reco(UInt_t uRunId = 2365,
// ---------------------------------------------
// ----- EventBuilder Settings----------------
- const Int_t eb_TriggerMinNumberBmon {1};
- const Int_t eb_TriggerMaxNumberBmon {2};
- const Int_t eb_TriggerMinNumberSts {0};
- const Int_t eb_TriggerMinNumberMuch {0};
- const Int_t eb_TriggerMinNumberTof {16};
- const Int_t eb_TriggerMinNumberTofLayers {4};
- const Int_t eb_TriggerMinNumberRich {5};
+ const Int_t eb_TriggerMinNumberBmon{1};
+ const Int_t eb_TriggerMaxNumberBmon{2};
+ const Int_t eb_TriggerMinNumberSts{0};
+ const Int_t eb_TriggerMinNumberMuch{0};
+ const Int_t eb_TriggerMinNumberTof{16};
+ const Int_t eb_TriggerMinNumberTofLayers{4};
+ const Int_t eb_TriggerMinNumberRich{5};
// ----- TOF defaults ------------------------
// ----- Local selection variables --------------------------------------
@@ -212,7 +212,7 @@ Bool_t mcbm_digievent_reco(UInt_t uRunId = 2365,
run->SetGeomFile(geoFile);
// Define output file for FairMonitor histograms
- TString monitorFile {outFile};
+ TString monitorFile{outFile};
monitorFile.ReplaceAll("reco", "reco.monitor");
FairMonitor::GetMonitor()->EnableMonitor(kTRUE, monitorFile);
// ------------------------------------------------------------------------
@@ -237,7 +237,7 @@ Bool_t mcbm_digievent_reco(UInt_t uRunId = 2365,
// Define the basic structure which needs to be filled with information
// This structure is stored in the output file and later passed to the
// FairRoot framework to do the (miss)alignment
- std::map<std::string, TGeoHMatrix>* matrices {nullptr};
+ std::map<std::string, TGeoHMatrix>* matrices{nullptr};
// read matrices from disk
LOG(info) << "Filename: " << alignmentMatrixFileName;
@@ -251,7 +251,9 @@ Bool_t mcbm_digievent_reco(UInt_t uRunId = 2365,
exit(1);
}
- if (matrices) { run->AddAlignmentMatrices(*matrices); }
+ if (matrices) {
+ run->AddAlignmentMatrices(*matrices);
+ }
else {
LOG(error) << "Alignment required but no matrices found."
<< "\n Exiting";
@@ -545,7 +547,9 @@ Bool_t mcbm_digievent_reco(UInt_t uRunId = 2365,
// e.g for RICH:
CbmRichMCbmQaReal* qaTask = new CbmRichMCbmQaReal();
Int_t taskId = 1;
- if (taskId < 0) { qaTask->SetOutputDir(Form("result_run%d", uRunId)); }
+ if (taskId < 0) {
+ qaTask->SetOutputDir(Form("result_run%d", uRunId));
+ }
else {
qaTask->SetOutputDir(Form("result_run%d_%05d", uRunId, taskId));
}
diff --git a/macro/beamtime/mcbm2022/mcbm_event_reco.C b/macro/beamtime/mcbm2022/mcbm_event_reco.C
index 33f164fcd2c10cbe2dba77e511e917e9f840af20..e893e9b8f16c3247595743abfc4e178c34122db9 100644
--- a/macro/beamtime/mcbm2022/mcbm_event_reco.C
+++ b/macro/beamtime/mcbm2022/mcbm_event_reco.C
@@ -67,13 +67,13 @@ Bool_t mcbm_event_reco(UInt_t uRunId = 2391,
// ---------------------------------------------
// ----- EventBuilder Settings----------------
- const Int_t eb_TriggerMinNumberBmon {1};
- const Int_t eb_TriggerMaxNumberBmon {2};
- const Int_t eb_TriggerMinNumberSts {0};
- const Int_t eb_TriggerMinNumberMuch {0};
- const Int_t eb_TriggerMinNumberTof {16};
- const Int_t eb_TriggerMinNumberTofLayers {4};
- const Int_t eb_TriggerMinNumberRich {5};
+ const Int_t eb_TriggerMinNumberBmon{1};
+ const Int_t eb_TriggerMaxNumberBmon{2};
+ const Int_t eb_TriggerMinNumberSts{0};
+ const Int_t eb_TriggerMinNumberMuch{0};
+ const Int_t eb_TriggerMinNumberTof{16};
+ const Int_t eb_TriggerMinNumberTofLayers{4};
+ const Int_t eb_TriggerMinNumberRich{5};
// ----- TOF defaults ------------------------
Int_t calMode = 93;
@@ -192,7 +192,7 @@ Bool_t mcbm_event_reco(UInt_t uRunId = 2391,
run->SetGeomFile(geoFile);
// Define output file for FairMonitor histograms
- TString monitorFile {outFile};
+ TString monitorFile{outFile};
monitorFile.ReplaceAll("reco", "reco.monitor");
FairMonitor::GetMonitor()->EnableMonitor(kTRUE, monitorFile);
// ------------------------------------------------------------------------
@@ -218,7 +218,7 @@ Bool_t mcbm_event_reco(UInt_t uRunId = 2391,
// Define the basic structure which needs to be filled with information
// This structure is stored in the output file and later passed to the
// FairRoot framework to do the (miss)alignment
- std::map<std::string, TGeoHMatrix>* matrices {nullptr};
+ std::map<std::string, TGeoHMatrix>* matrices{nullptr};
// read matrices from disk
LOG(info) << "Filename: " << alignmentMatrixFileName;
@@ -232,7 +232,9 @@ Bool_t mcbm_event_reco(UInt_t uRunId = 2391,
exit(1);
}
- if (matrices) { run->AddAlignmentMatrices(*matrices); }
+ if (matrices) {
+ run->AddAlignmentMatrices(*matrices);
+ }
else {
LOG(error) << "Alignment required but no matrices found."
<< "\n Exiting";
diff --git a/macro/beamtime/mcbm2022/mcbm_reco.C b/macro/beamtime/mcbm2022/mcbm_reco.C
index cb1d14f36a10a3aba59c96492ce9e6a3af868a7b..b4ac8880139e5933726f4e5e48108bda7b6603db 100644
--- a/macro/beamtime/mcbm2022/mcbm_reco.C
+++ b/macro/beamtime/mcbm2022/mcbm_reco.C
@@ -41,8 +41,8 @@ Bool_t mcbm_reco(UInt_t uRunId = 2391,
/* clang-format on */
// --- Logger settings ----------------------------------------------------
- TString logLevel = "INFO"; //"INFO";
- TString logVerbosity = "LOW"; //"VERYLOW";
+ TString logLevel = "INFO"; //"INFO";
+ TString logVerbosity = "LOW"; //"VERYLOW";
// ------------------------------------------------------------------------
diff --git a/macro/beamtime/mcbm2022/mcbm_unp_event.C b/macro/beamtime/mcbm2022/mcbm_unp_event.C
index 36c7d77e8a5e4d495378d6fa57c8110caab450f1..cf696cad943af1c7e3b295e78bbcc1bf56a8bbd0 100644
--- a/macro/beamtime/mcbm2022/mcbm_unp_event.C
+++ b/macro/beamtime/mcbm2022/mcbm_unp_event.C
@@ -476,7 +476,9 @@ Bool_t mcbm_unp_event(std::string infile,
// std::cout << Form("Setting time-walk parameters for: module %x, ASIC %u\n", sensor, asic);
parAsic->SetWalkCoef({p0, p1, p2, p3});
- if (walkMap.find(sensor) == walkMap.end()) { walkMap[sensor] = CbmStsParModule(*parMod); }
+ if (walkMap.find(sensor) == walkMap.end()) {
+ walkMap[sensor] = CbmStsParModule(*parMod);
+ }
walkMap[sensor].SetAsic(asic, *parAsic);
// std::cout << Form("Done with time-walk parameters for: module %x, ASIC %u\n", sensor, asic);
}
@@ -582,7 +584,7 @@ Bool_t mcbm_unp_event(std::string infile,
map[i] = i;
if (uRunId <= 1588) {
const size_t nfasps = 12;
- uint8_t map21[] = {9, 2, 3, 11, 10, 7, 8, 0, 1, 4, 6, 5};
+ uint8_t map21[] = {9, 2, 3, 11, 10, 7, 8, 0, 1, 4, 6, 5};
for (uint32_t i(0); i < nfasps; i++)
map[i] = map21[i];
uint16_t crob_map21[] = {0x00f0, 0, 0, 0, 0};
@@ -801,7 +803,9 @@ Bool_t mcbm_unp_event(std::string infile,
evBuildRaw->ChangeMuchBeamtimeDigiFlag();
// Set Det type to find Bmon in TOF digis = Select storage of BMon digis
- if (bBmoninTof) { evBuildRaw->SetBmonInTofDetType(); }
+ if (bBmoninTof) {
+ evBuildRaw->SetBmonInTofDetType();
+ }
evBuildRaw->SetOutFilename(histosfilename);
// evBuildRaw->SetOutputBranchPersistent("CbmEvent", kFALSE);
diff --git a/macro/beamtime/mcbm2022/pulser_dt.C b/macro/beamtime/mcbm2022/pulser_dt.C
index 596a0920e126c5d8130c3d0134121c475e291240..5ce8cb40349f8dec7f2d2595a730a8f6252c34b9 100644
--- a/macro/beamtime/mcbm2022/pulser_dt.C
+++ b/macro/beamtime/mcbm2022/pulser_dt.C
@@ -14,17 +14,17 @@ void pulser_dt(TString filename = "1935.digi.root", uint32_t uNbTs = 0)
std::vector<CbmTofDigi>* vDigisTof = new std::vector<CbmTofDigi>();
std::vector<CbmRichDigi>* vDigisRich = new std::vector<CbmRichDigi>();
- std::vector<CbmStsDigi> vPulserDigisSts {};
- std::vector<CbmTrdDigi> vPulserDigisTrd1d {};
- std::vector<CbmTrdDigi> vPulserDigisTrd2d {};
- std::vector<CbmTofDigi> vPulserDigisTof {};
- std::vector<CbmRichDigi> vPulserDigisRich {};
-
- std::vector<CbmStsDigi> vNotPulserDigisSts {};
- std::vector<CbmTrdDigi> vNotPulserDigisTrd1d {};
- std::vector<CbmTrdDigi> vNotPulserDigisTrd2d {};
- std::vector<CbmTofDigi> vNotPulserDigisTof {};
- std::vector<CbmRichDigi> vNotPulserDigisRich {};
+ std::vector<CbmStsDigi> vPulserDigisSts{};
+ std::vector<CbmTrdDigi> vPulserDigisTrd1d{};
+ std::vector<CbmTrdDigi> vPulserDigisTrd2d{};
+ std::vector<CbmTofDigi> vPulserDigisTof{};
+ std::vector<CbmRichDigi> vPulserDigisRich{};
+
+ std::vector<CbmStsDigi> vNotPulserDigisSts{};
+ std::vector<CbmTrdDigi> vNotPulserDigisTrd1d{};
+ std::vector<CbmTrdDigi> vNotPulserDigisTrd2d{};
+ std::vector<CbmTofDigi> vNotPulserDigisTof{};
+ std::vector<CbmRichDigi> vNotPulserDigisRich{};
// tree->SetBranchAddress( "StsDigi", &vDigisSts );
tree->SetBranchAddress("StsDigiPulser", &vDigisSts);
diff --git a/macro/beamtime/mcbm2022/pulser_dt_full.C b/macro/beamtime/mcbm2022/pulser_dt_full.C
index f7d4cc6e2ee6faa0db1b5e1f864658df2a312984..29f9ba92ad73abaaa0be6064c4d0d4b517568976 100644
--- a/macro/beamtime/mcbm2022/pulser_dt_full.C
+++ b/macro/beamtime/mcbm2022/pulser_dt_full.C
@@ -17,21 +17,21 @@ void pulser_dt_full(TString filename = "1935.digi.root", uint32_t uNbTs = 10)
std::vector<CbmTofDigi>* vDigisTof = new std::vector<CbmTofDigi>();
std::vector<CbmRichDigi>* vDigisRich = new std::vector<CbmRichDigi>();
- std::vector<CbmTofDigi> vPulserDigisBmon {};
- std::vector<CbmStsDigi> vPulserDigisSts {};
- std::vector<CbmMuchDigi> vPulserDigisMuch {};
- std::vector<CbmTrdDigi> vPulserDigisTrd1d {};
- std::vector<CbmTrdDigi> vPulserDigisTrd2d {};
- std::vector<CbmTofDigi> vPulserDigisTof {};
- std::vector<CbmRichDigi> vPulserDigisRich {};
-
- std::vector<CbmTofDigi> vNotPulserDigisBmon {};
- std::vector<CbmStsDigi> vNotPulserDigisSts {};
- std::vector<CbmMuchDigi> vNotPulserDigisMuch {};
- std::vector<CbmTrdDigi> vNotPulserDigisTrd1d {};
- std::vector<CbmTrdDigi> vNotPulserDigisTrd2d {};
- std::vector<CbmTofDigi> vNotPulserDigisTof {};
- std::vector<CbmRichDigi> vNotPulserDigisRich {};
+ std::vector<CbmTofDigi> vPulserDigisBmon{};
+ std::vector<CbmStsDigi> vPulserDigisSts{};
+ std::vector<CbmMuchDigi> vPulserDigisMuch{};
+ std::vector<CbmTrdDigi> vPulserDigisTrd1d{};
+ std::vector<CbmTrdDigi> vPulserDigisTrd2d{};
+ std::vector<CbmTofDigi> vPulserDigisTof{};
+ std::vector<CbmRichDigi> vPulserDigisRich{};
+
+ std::vector<CbmTofDigi> vNotPulserDigisBmon{};
+ std::vector<CbmStsDigi> vNotPulserDigisSts{};
+ std::vector<CbmMuchDigi> vNotPulserDigisMuch{};
+ std::vector<CbmTrdDigi> vNotPulserDigisTrd1d{};
+ std::vector<CbmTrdDigi> vNotPulserDigisTrd2d{};
+ std::vector<CbmTofDigi> vNotPulserDigisTof{};
+ std::vector<CbmRichDigi> vNotPulserDigisRich{};
tree->SetBranchAddress(CbmBmonDigi::GetBranchName(), &vDigisBmon);
tree->SetBranchAddress("StsDigi", &vDigisSts);
diff --git a/macro/mcbm/mcbm_check_materials.C b/macro/mcbm/mcbm_check_materials.C
index cca02aaa61012c8ad0378157a986ab081f3cfa86..64a2e51eeca3b93eec6df6e90dcabaef82967ee0 100644
--- a/macro/mcbm/mcbm_check_materials.C
+++ b/macro/mcbm/mcbm_check_materials.C
@@ -11,9 +11,9 @@
int loop_over_vector(std::vector<std::pair<TString, TString>>& MaterialList)
{
- int wrong_media {0};
- TGeoNode* node {nullptr};
- TString medName {""};
+ int wrong_media{0};
+ TGeoNode* node{nullptr};
+ TString medName{""};
std::cout << std::endl;
for (auto material : MaterialList) {
if (gGeoManager->cd(material.first)) {
@@ -172,9 +172,11 @@ void mcbm_check_materials(const char* dataset = "test")
gGeoManager = dynamic_cast<TGeoManager*>(f->Get("FAIRGeom"));
assert(gGeoManager);
- int wrong_media {0};
+ int wrong_media{0};
wrong_media = loop_over_vector(MaterialList);
- if (TString(dataset).Contains("2019_11")) { wrong_media += loop_over_vector(MaterialList_2019_11); }
+ if (TString(dataset).Contains("2019_11")) {
+ wrong_media += loop_over_vector(MaterialList_2019_11);
+ }
else if (TString(dataset).Contains("2019_03")) {
wrong_media += loop_over_vector(MaterialList_2019_03);
}
diff --git a/macro/mcbm/mcbm_digi_mixed.C b/macro/mcbm/mcbm_digi_mixed.C
index 3531b0bde6f989542a54cfa06096f89fb4432a66..6e11c856fa8248d756a84dd6adfab362eef8c0a1 100644
--- a/macro/mcbm/mcbm_digi_mixed.C
+++ b/macro/mcbm/mcbm_digi_mixed.C
@@ -11,7 +11,6 @@
// Includes needed for IDE
#if !defined(__CLING__)
#include "CbmDigitization.h"
-
#include "FairSystemInfo.h"
#endif
diff --git a/macro/mcbm/mcbm_display_event.C b/macro/mcbm/mcbm_display_event.C
index d5429fb58cc26bc3fac0cff6d2fd2dd6c1bbeec7..3245e8a5249106b7e9450788179a43603bf12a5d 100644
--- a/macro/mcbm/mcbm_display_event.C
+++ b/macro/mcbm/mcbm_display_event.C
@@ -241,8 +241,8 @@ void mcbm_display_event(Int_t nEvents = 3, TString dataset = "data/test", const
// ----- Track reconstruction ------------------------------------------
- Double_t beamWidthX = 0.1;
- Double_t beamWidthY = 0.1;
+ Double_t beamWidthX = 0.1;
+ Double_t beamWidthY = 0.1;
Int_t iGenCor = 1;
Double_t dScalFac = 1.;
Double_t dChi2Lim2 = 3.5;
diff --git a/macro/mcbm/mcbm_qa.C b/macro/mcbm/mcbm_qa.C
index 9ec0bc8e2d2c4443d22020eb5b0bd9c7c6eaac01..770afe903b37c41047061af23aefe92841212cd9 100644
--- a/macro/mcbm/mcbm_qa.C
+++ b/macro/mcbm/mcbm_qa.C
@@ -165,10 +165,10 @@ void mcbm_qa(Int_t nEvents = 0,
TString geoTag;
// - MUCH digitisation parameters
- TString muchParFile {};
+ TString muchParFile{};
if (setup->GetGeoTag(ECbmModuleId::kMuch, geoTag)) {
- bool mcbmFlag = geoTag.Contains("mcbm", TString::kIgnoreCase);
- muchParFile = srcDir + "/parameters/much/much_";
+ bool mcbmFlag = geoTag.Contains("mcbm", TString::kIgnoreCase);
+ muchParFile = srcDir + "/parameters/much/much_";
muchParFile += (mcbmFlag) ? geoTag : geoTag(0, 4);
muchParFile += "_digi_sector.root";
{ // init geometry from the file
@@ -225,7 +225,7 @@ void mcbm_qa(Int_t nEvents = 0,
FairRootFileSink* sink = new FairRootFileSink(sinkFile);
run->SetSink(sink);
- TString monitorFile {sinkFile};
+ TString monitorFile{sinkFile};
monitorFile.ReplaceAll("qa", "qa.monitor");
FairMonitor::GetMonitor()->EnableMonitor(kTRUE, monitorFile);
// ------------------------------------------------------------------------
diff --git a/macro/mcbm/mcbm_reco.C b/macro/mcbm/mcbm_reco.C
index 10b093f9ab051245b0ee80590f1484ce8dffae8b..e26aa4cb1a5b32bb32cb5451598a35a6e95dc4c7 100644
--- a/macro/mcbm/mcbm_reco.C
+++ b/macro/mcbm/mcbm_reco.C
@@ -238,7 +238,9 @@ void mcbm_reco(Int_t nEvents = 10, TString dataset = "data/test", TString sEvBui
// --- Initialization of the digi scheme
auto muchGeoScheme = CbmMuchGeoScheme::Instance();
- if (!muchGeoScheme->IsInitialized()) { muchGeoScheme->Init(parFile, muchFlag); }
+ if (!muchGeoScheme->IsInitialized()) {
+ muchGeoScheme->Init(parFile, muchFlag);
+ }
// --- Hit finder for GEMs
FairTask* muchHitGem = new CbmMuchFindHitsGem(parFile.Data(), muchFlag);
@@ -321,8 +323,8 @@ void mcbm_reco(Int_t nEvents = 10, TString dataset = "data/test", TString sEvBui
// ----- Track reconstruction ------------------------------------------
- Double_t beamWidthX = 0.1;
- Double_t beamWidthY = 0.1;
+ Double_t beamWidthX = 0.1;
+ Double_t beamWidthY = 0.1;
Int_t iGenCor = 1;
Double_t dScalFac = 1.;
Double_t dChi2Lim2 = 3.5;
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 74e4c5bed3caa1e72078277a60b325ff6c1711bf..443dee6eb306f018e2088529a5b40046f37c39c0 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -43,7 +43,9 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test",
// ------------------------------------------------------------------------
Int_t iTofCluMode = 1;
- if (debugWithMC) { Int_t iTrackMode = 1; }
+ if (debugWithMC) {
+ Int_t iTrackMode = 1;
+ }
// ----- Load the geometry setup -------------------------------------
std::cout << std::endl;
TString setupFile = srcDir + "/geometry/setup/setup_" + setupName + ".C";
@@ -103,7 +105,9 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test",
FairRunAna* run = new FairRunAna();
FairFileSource* inputSource = new FairFileSource(rawFile);
- if (debugWithMC) { inputSource->AddFriend(traFile); }
+ if (debugWithMC) {
+ inputSource->AddFriend(traFile);
+ }
run->SetSource(inputSource);
@@ -176,7 +180,9 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test",
// --- Initialization of the digi scheme
auto muchGeoScheme = CbmMuchGeoScheme::Instance();
- if (!muchGeoScheme->IsInitialized()) { muchGeoScheme->Init(parFile, muchFlag); }
+ if (!muchGeoScheme->IsInitialized()) {
+ muchGeoScheme->Init(parFile, muchFlag);
+ }
// --- Hit finder for GEMs
FairTask* muchHitGem = new CbmMuchFindHitsGem(parFile.Data(), muchFlag);
diff --git a/macro/mcbm/mcbm_reco_event_tb_nh.C b/macro/mcbm/mcbm_reco_event_tb_nh.C
index b8d6619e5d346a60ecb286c1128df99a04fdf774..455a7cae6d4ffc32fe4ace9fdb87944bc3d71f6c 100644
--- a/macro/mcbm/mcbm_reco_event_tb_nh.C
+++ b/macro/mcbm/mcbm_reco_event_tb_nh.C
@@ -183,7 +183,8 @@ void mcbm_reco_event_tb_nh(Int_t nEvents = 10, TString RunId = "test", TString I
<< "building using ``Real2019'' option. Terminating macro." << std::endl;
return;
} // Set STS or Tof as reference detector
- if (!useTof) evBuildRaw->SetReferenceDetector(kRawEventBuilderDetSts);
+ if (!useTof)
+ evBuildRaw->SetReferenceDetector(kRawEventBuilderDetSts);
else
evBuildRaw->SetReferenceDetector(kRawEventBuilderDetTof);
@@ -465,8 +466,8 @@ void mcbm_reco_event_tb_nh(Int_t nEvents = 10, TString RunId = "test", TString I
// ----- Track reconstruction ------------------------------------------
- Double_t beamWidthX = 0.1;
- Double_t beamWidthY = 0.1;
+ Double_t beamWidthX = 0.1;
+ Double_t beamWidthY = 0.1;
Int_t iGenCor = 1;
Double_t dScalFac = 1.;
Double_t dChi2Lim2 = 3.5;
diff --git a/macro/mcbm/mcbm_transport28.C b/macro/mcbm/mcbm_transport28.C
index 3177018c7fc80c97b07d142fa2032c48d880f833..28a8a86e3d4fd6c4c98d798f29996feb841ddc4f 100644
--- a/macro/mcbm/mcbm_transport28.C
+++ b/macro/mcbm/mcbm_transport28.C
@@ -70,7 +70,8 @@ void mcbm_transport28(Int_t nEvents = 10, const char* setupName = "mcbm28_beam_2
std::cout << std::endl;
TString defaultInputFile = srcDir + "/input/urqmd.agag.1.65gev.centr.00001.root";
TString inFile;
- if (strcmp(inputFile, "") == 0) inFile = defaultInputFile;
+ if (strcmp(inputFile, "") == 0)
+ inFile = defaultInputFile;
else
inFile = inputFile;
std::cout << "-I- " << myName << ": Using input file " << inFile << std::endl;
diff --git a/macro/mcbm/mcbm_transport_beam.C b/macro/mcbm/mcbm_transport_beam.C
index 670c34d61b505f6ed2e6206fe6a62757915cff45..7e4d6d88d545723f272504d8166915b84c693891 100644
--- a/macro/mcbm/mcbm_transport_beam.C
+++ b/macro/mcbm/mcbm_transport_beam.C
@@ -12,10 +12,8 @@
#if !defined(__CLING__)
#include "CbmFieldConst.h"
#include "CbmTransport.h"
-
#include "FairIonGenerator.h"
#include "FairSystemInfo.h"
-
#include "TStopwatch.h"
#include "TString.h"
diff --git a/macro/mcbm/mcbm_transport_nh.C b/macro/mcbm/mcbm_transport_nh.C
index c5d1d3f3b434c0334e3bffd164cd80146eb579e0..a0bea178311bd0c849ed3971ce2fea47eaae91f7 100644
--- a/macro/mcbm/mcbm_transport_nh.C
+++ b/macro/mcbm/mcbm_transport_nh.C
@@ -18,9 +18,7 @@
// Includes needed for IDE
#if !defined(__CLING__)
#include "CbmTransport.h"
-
#include "FairSystemInfo.h"
-
#include "TStopwatch.h"
#endif
@@ -59,9 +57,12 @@ void mcbm_transport_nh(Int_t nEvents = 10, const char* setupName = "mcbm_beam_20
TString targetElement = "Gold";
TString Output(output);
if (!Output.Contains("auau")) {
- if (Output.Contains("nini")) targetElement = "Nickel";
+ if (Output.Contains("nini"))
+ targetElement = "Nickel";
else {
- if (Output.Contains("lam")) { std::cout << "Lambda signal simulation " << std::endl; }
+ if (Output.Contains("lam")) {
+ std::cout << "Lambda signal simulation " << std::endl;
+ }
else {
std::cout << "Collision system " << Output << " not known." << std::endl;
exit(1);
@@ -125,7 +126,8 @@ void mcbm_transport_nh(Int_t nEvents = 10, const char* setupName = "mcbm_beam_20
std::cout << "-I- " << myName << ": Generate Lambda " << std::endl;
}
else {
- if (strcmp(inputFile, "") == 0) inFile = defaultInputFile;
+ if (strcmp(inputFile, "") == 0)
+ inFile = defaultInputFile;
else
inFile = inputFile;
std::cout << "-I- " << myName << ": Using input file " << inFile << std::endl;
diff --git a/macro/mcbm/pl_lambda.C b/macro/mcbm/pl_lambda.C
index 70f129cc9cb9319c3a920f98bf2fbc6988510404..cf48f96f329ca6b346cbe885046b271efda7fec1 100644
--- a/macro/mcbm/pl_lambda.C
+++ b/macro/mcbm/pl_lambda.C
@@ -265,7 +265,8 @@ void pl_lambda(Double_t sf = 0.)
cout << "Significance: " << Signif << endl;
cout << "Acc * eff = " << dSignal / dNLamPrim << endl;
TH2* h2 = (TH2*) gROOT->FindObjectAny("mul_b_gen");
- if (h2 != NULL) cout << "Total number of events " << h2->GetEntries() << endl;
+ if (h2 != NULL)
+ cout << "Total number of events " << h2->GetEntries() << endl;
else
cout << "Total number of input events not available" << endl;
}