From 30ae7a914712e268c3d195de9eec31f4ad15c773 Mon Sep 17 00:00:00 2001
From: Vikas Singhal <vikas@vecc.gov.in>
Date: Tue, 24 Nov 2020 16:43:01 +0530
Subject: [PATCH] Updated formatting with clang.
---
.../mcbm2020/mcbm_build_and_reco_kronos.C | 19 ++++++++++---------
macro/beamtime/mcbm2020/mcbm_event_reco.C | 17 ++++++++++-------
macro/beamtime/mcbm2020/mcbm_reco.C | 9 ++++++---
macro/beamtime/mcbm2020/mcbm_reco_kronos.C | 19 ++++++++++---------
4 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C b/macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C
index e0e939d60f..e585a1efbe 100644
--- a/macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C
+++ b/macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C
@@ -56,7 +56,7 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
// MC file
- TString srcDir = gSystem->Getenv("VMCWORKDIR");
+ TString srcDir = gSystem->Getenv("VMCWORKDIR");
TString paramDir = srcDir + "/macro/beamtime/mcbm2020/";
// ----- Timer --------------------------------------------------------
TStopwatch timer;
@@ -157,7 +157,7 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
fRun->AddTask(eventBuilder);
// ----- Parameter database --------------------------------------------
-
+
TString parFileIn =
Form("/lustre/cbm/users/ploizeau/mcbm2020/unp_evt_data_7f229b3f_20201103/"
"unp_mcbm_params_%i.root",
@@ -167,7 +167,7 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
FairRuntimeDb* rtdb = fRun->GetRuntimeDb();
FairParRootFileIo* parIo1 = new FairParRootFileIo();
- FairParRootFileIo* parIo3 = new FairParRootFileIo();
+ FairParRootFileIo* parIo3 = new FairParRootFileIo();
parIo1->open(parFileIn.Data(), "READ");
parIo3->open(parFileOut.Data(), "RECREATE");
rtdb->setFirstInput(parIo1);
@@ -176,9 +176,8 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
//----------------------------------Reconstruction-------------------------------------
-
// ------------------------------------------------------------------------
- TString geoFileSts = paramDir + "mcbm2020_reco.geo.root";
+ TString geoFileSts = paramDir + "mcbm2020_reco.geo.root";
//TString geoFileSts =
// "/lustre/cbm/users/alberica/cbmroot/macro/beamtime/mcbm2020/data/test.geo.root"; // to be created by a simulation run
fRun->SetGeomFile(geoFileSts);
@@ -226,9 +225,12 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
// ----- Local reconstruction in MUCH ---------------------------------
Int_t flag = 1;
- TString parDir = TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
- TString muchDigiFile(parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
- CbmMuchFindHitsGem* muchFindHits = new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
+ TString parDir =
+ TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
+ TString muchDigiFile(
+ parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
+ CbmMuchFindHitsGem* muchFindHits =
+ new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
muchFindHits->SetBeamTimeDigi(kTRUE);
fRun->AddTask(muchFindHits);
std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl;
@@ -236,7 +238,6 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
//--------------------------------------------------------
-
// ----- Intialise and run --------------------------------------------
fRun->Init();
diff --git a/macro/beamtime/mcbm2020/mcbm_event_reco.C b/macro/beamtime/mcbm2020/mcbm_event_reco.C
index 575e6ea955..c74da1f944 100644
--- a/macro/beamtime/mcbm2020/mcbm_event_reco.C
+++ b/macro/beamtime/mcbm2020/mcbm_event_reco.C
@@ -14,8 +14,8 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) {
// ----- Environment --------------------------------------------------
- TString myName = "mcbm_reco"; // this macro's name for screen output
- TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory
+ TString myName = "mcbm_reco"; // this macro's name for screen output
+ TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory
TString paramDir = srcDir + "/macro/beamtime/mcbm2020/";
// TString srcDir1 = gSystem->Getenv("SLURM_INDEX"); // ------------------------------------------------------------------------
@@ -29,8 +29,10 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) {
// ------------------------------------------------------------------------
- TString parDir = TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
- TString muchDigiFile(parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
+ TString parDir =
+ TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
+ TString muchDigiFile(
+ parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
// ----- Timer --------------------------------------------------------
TStopwatch timer;
@@ -66,7 +68,7 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) {
//--------------------event builder-------------------//
CbmMcbm2018EventBuilder* eventBuilder = new CbmMcbm2018EventBuilder();
// eventBuilder->SetEventBuilderAlgo(EventBuilderAlgo::MaximumTimeGap);
- //eventBuilder->SetMaximumTimeGap(50.);
+ //eventBuilder->SetMaximumTimeGap(50.);
eventBuilder->SetEventBuilderAlgo(EventBuilderAlgo::FixedTimeWindow);
eventBuilder->SetFixedTimeWindow(200.);
eventBuilder->SetTriggerMinNumberT0(1);
@@ -79,8 +81,9 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) {
// ------------------------------------------------------------------------
Int_t flag = 1;
- CbmMuchFindHitsGem* muchFindHits = new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
- muchFindHits->SetBeamTimeDigi(kTRUE);
+ CbmMuchFindHitsGem* muchFindHits =
+ new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
+ muchFindHits->SetBeamTimeDigi(kTRUE);
run->AddTask(muchFindHits);
std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl;
//-------------------------------------------------------------------------------
diff --git a/macro/beamtime/mcbm2020/mcbm_reco.C b/macro/beamtime/mcbm2020/mcbm_reco.C
index dae56157a6..67a450068f 100644
--- a/macro/beamtime/mcbm2020/mcbm_reco.C
+++ b/macro/beamtime/mcbm2020/mcbm_reco.C
@@ -65,9 +65,12 @@ void mcbm_reco(Int_t runId = 831, Int_t nTimeslices = 0) {
// ----- Local reconstruction in MUCH ---------------------------------
Int_t flag = 1;
- TString parDir = TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
- TString muchDigiFile(parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
- CbmMuchFindHitsGem* muchFindHits = new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
+ TString parDir =
+ TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
+ TString muchDigiFile(
+ parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
+ CbmMuchFindHitsGem* muchFindHits =
+ new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
muchFindHits->SetBeamTimeDigi(kTRUE);
run->AddTask(muchFindHits);
std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl;
diff --git a/macro/beamtime/mcbm2020/mcbm_reco_kronos.C b/macro/beamtime/mcbm2020/mcbm_reco_kronos.C
index 4543e66e1c..acfee88579 100644
--- a/macro/beamtime/mcbm2020/mcbm_reco_kronos.C
+++ b/macro/beamtime/mcbm2020/mcbm_reco_kronos.C
@@ -14,10 +14,10 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) {
// ----- Environment --------------------------------------------------
- TString myName = "mcbm_reco"; // this macro's name for screen output
- TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory
+ TString myName = "mcbm_reco"; // this macro's name for screen output
+ TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory
TString paramDir = srcDir + "/macro/beamtime/mcbm2020/";
- // TString srcDir1 = gSystem->Getenv("SLURM_INDEX");
+ // TString srcDir1 = gSystem->Getenv("SLURM_INDEX");
// ------------------------------------------------------------------------
@@ -71,9 +71,12 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) {
// ----- Local reconstruction in MUCH ---------------------------------
Int_t flag = 1;
- TString parDir = TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
- TString muchDigiFile(parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
- CbmMuchFindHitsGem* muchFindHits = new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
+ TString parDir =
+ TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
+ TString muchDigiFile(
+ parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
+ CbmMuchFindHitsGem* muchFindHits =
+ new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
muchFindHits->SetBeamTimeDigi(kTRUE);
run->AddTask(muchFindHits);
std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl;
@@ -119,8 +122,6 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) {
// ------------------------------------------------------------------------
-
-
// ----- Local reconstruction in TRD ----------------------------------
// ------------------------------------------------------------------------
@@ -159,7 +160,7 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) {
FairParAsciiFileIo* parIo2 = new FairParAsciiFileIo();
// ------------------------------------------------------------------------
- FairParRootFileIo* parIo3 = new FairParRootFileIo();
+ FairParRootFileIo* parIo3 = new FairParRootFileIo();
parIo1->open(parFileIn.Data(), "READ");
parIo3->open(parFileOut.Data(), "RECREATE");
rtdb->setFirstInput(parIo1);
--
GitLab