Commit 30ae7a91 authored by Vikas Singhal's avatar Vikas Singhal
Browse files

Updated formatting with clang.

parent 2dff2cb7
...@@ -56,7 +56,7 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28, ...@@ -56,7 +56,7 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
// MC file // MC file
TString srcDir = gSystem->Getenv("VMCWORKDIR"); TString srcDir = gSystem->Getenv("VMCWORKDIR");
TString paramDir = srcDir + "/macro/beamtime/mcbm2020/"; TString paramDir = srcDir + "/macro/beamtime/mcbm2020/";
// ----- Timer -------------------------------------------------------- // ----- Timer --------------------------------------------------------
TStopwatch timer; TStopwatch timer;
...@@ -157,7 +157,7 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28, ...@@ -157,7 +157,7 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
fRun->AddTask(eventBuilder); fRun->AddTask(eventBuilder);
// ----- Parameter database -------------------------------------------- // ----- Parameter database --------------------------------------------
TString parFileIn = TString parFileIn =
Form("/lustre/cbm/users/ploizeau/mcbm2020/unp_evt_data_7f229b3f_20201103/" Form("/lustre/cbm/users/ploizeau/mcbm2020/unp_evt_data_7f229b3f_20201103/"
"unp_mcbm_params_%i.root", "unp_mcbm_params_%i.root",
...@@ -167,7 +167,7 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28, ...@@ -167,7 +167,7 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
FairRuntimeDb* rtdb = fRun->GetRuntimeDb(); FairRuntimeDb* rtdb = fRun->GetRuntimeDb();
FairParRootFileIo* parIo1 = new FairParRootFileIo(); FairParRootFileIo* parIo1 = new FairParRootFileIo();
FairParRootFileIo* parIo3 = new FairParRootFileIo(); FairParRootFileIo* parIo3 = new FairParRootFileIo();
parIo1->open(parFileIn.Data(), "READ"); parIo1->open(parFileIn.Data(), "READ");
parIo3->open(parFileOut.Data(), "RECREATE"); parIo3->open(parFileOut.Data(), "RECREATE");
rtdb->setFirstInput(parIo1); rtdb->setFirstInput(parIo1);
...@@ -176,9 +176,8 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28, ...@@ -176,9 +176,8 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
//----------------------------------Reconstruction------------------------------------- //----------------------------------Reconstruction-------------------------------------
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
TString geoFileSts = paramDir + "mcbm2020_reco.geo.root"; TString geoFileSts = paramDir + "mcbm2020_reco.geo.root";
//TString geoFileSts = //TString geoFileSts =
// "/lustre/cbm/users/alberica/cbmroot/macro/beamtime/mcbm2020/data/test.geo.root"; // to be created by a simulation run // "/lustre/cbm/users/alberica/cbmroot/macro/beamtime/mcbm2020/data/test.geo.root"; // to be created by a simulation run
fRun->SetGeomFile(geoFileSts); fRun->SetGeomFile(geoFileSts);
...@@ -226,9 +225,12 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28, ...@@ -226,9 +225,12 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
// ----- Local reconstruction in MUCH --------------------------------- // ----- Local reconstruction in MUCH ---------------------------------
Int_t flag = 1; Int_t flag = 1;
TString parDir = TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters"); TString parDir =
TString muchDigiFile(parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
CbmMuchFindHitsGem* muchFindHits = new CbmMuchFindHitsGem(muchDigiFile.Data(), flag); TString muchDigiFile(
parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
CbmMuchFindHitsGem* muchFindHits =
new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
muchFindHits->SetBeamTimeDigi(kTRUE); muchFindHits->SetBeamTimeDigi(kTRUE);
fRun->AddTask(muchFindHits); fRun->AddTask(muchFindHits);
std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl; std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl;
...@@ -236,7 +238,6 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28, ...@@ -236,7 +238,6 @@ void mcbm_build_and_reco_kronos(UInt_t uRunIdx = 28,
//-------------------------------------------------------- //--------------------------------------------------------
// ----- Intialise and run -------------------------------------------- // ----- Intialise and run --------------------------------------------
fRun->Init(); fRun->Init();
......
...@@ -14,8 +14,8 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) { ...@@ -14,8 +14,8 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) {
// ----- Environment -------------------------------------------------- // ----- Environment --------------------------------------------------
TString myName = "mcbm_reco"; // this macro's name for screen output TString myName = "mcbm_reco"; // this macro's name for screen output
TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory
TString paramDir = srcDir + "/macro/beamtime/mcbm2020/"; TString paramDir = srcDir + "/macro/beamtime/mcbm2020/";
// TString srcDir1 = gSystem->Getenv("SLURM_INDEX"); // ------------------------------------------------------------------------ // TString srcDir1 = gSystem->Getenv("SLURM_INDEX"); // ------------------------------------------------------------------------
...@@ -29,8 +29,10 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) { ...@@ -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 parDir =
TString muchDigiFile(parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
TString muchDigiFile(
parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
// ----- Timer -------------------------------------------------------- // ----- Timer --------------------------------------------------------
TStopwatch timer; TStopwatch timer;
...@@ -66,7 +68,7 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) { ...@@ -66,7 +68,7 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) {
//--------------------event builder-------------------// //--------------------event builder-------------------//
CbmMcbm2018EventBuilder* eventBuilder = new CbmMcbm2018EventBuilder(); CbmMcbm2018EventBuilder* eventBuilder = new CbmMcbm2018EventBuilder();
// eventBuilder->SetEventBuilderAlgo(EventBuilderAlgo::MaximumTimeGap); // eventBuilder->SetEventBuilderAlgo(EventBuilderAlgo::MaximumTimeGap);
//eventBuilder->SetMaximumTimeGap(50.); //eventBuilder->SetMaximumTimeGap(50.);
eventBuilder->SetEventBuilderAlgo(EventBuilderAlgo::FixedTimeWindow); eventBuilder->SetEventBuilderAlgo(EventBuilderAlgo::FixedTimeWindow);
eventBuilder->SetFixedTimeWindow(200.); eventBuilder->SetFixedTimeWindow(200.);
eventBuilder->SetTriggerMinNumberT0(1); eventBuilder->SetTriggerMinNumberT0(1);
...@@ -79,8 +81,9 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) { ...@@ -79,8 +81,9 @@ void mcbm_event_reco(Int_t runId = 831, Int_t nTimeslices = 300) {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
Int_t flag = 1; Int_t flag = 1;
CbmMuchFindHitsGem* muchFindHits = new CbmMuchFindHitsGem(muchDigiFile.Data(), flag); CbmMuchFindHitsGem* muchFindHits =
muchFindHits->SetBeamTimeDigi(kTRUE); new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
muchFindHits->SetBeamTimeDigi(kTRUE);
run->AddTask(muchFindHits); run->AddTask(muchFindHits);
std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl; std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl;
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
......
...@@ -65,9 +65,12 @@ void mcbm_reco(Int_t runId = 831, Int_t nTimeslices = 0) { ...@@ -65,9 +65,12 @@ void mcbm_reco(Int_t runId = 831, Int_t nTimeslices = 0) {
// ----- Local reconstruction in MUCH --------------------------------- // ----- Local reconstruction in MUCH ---------------------------------
Int_t flag = 1; Int_t flag = 1;
TString parDir = TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters"); TString parDir =
TString muchDigiFile(parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
CbmMuchFindHitsGem* muchFindHits = new CbmMuchFindHitsGem(muchDigiFile.Data(), flag); TString muchDigiFile(
parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
CbmMuchFindHitsGem* muchFindHits =
new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
muchFindHits->SetBeamTimeDigi(kTRUE); muchFindHits->SetBeamTimeDigi(kTRUE);
run->AddTask(muchFindHits); run->AddTask(muchFindHits);
std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl; std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl;
......
...@@ -14,10 +14,10 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) { ...@@ -14,10 +14,10 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) {
// ----- Environment -------------------------------------------------- // ----- Environment --------------------------------------------------
TString myName = "mcbm_reco"; // this macro's name for screen output TString myName = "mcbm_reco"; // this macro's name for screen output
TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory TString srcDir = gSystem->Getenv("VMCWORKDIR"); // top source directory
TString paramDir = srcDir + "/macro/beamtime/mcbm2020/"; 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) { ...@@ -71,9 +71,12 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) {
// ----- Local reconstruction in MUCH --------------------------------- // ----- Local reconstruction in MUCH ---------------------------------
Int_t flag = 1; Int_t flag = 1;
TString parDir = TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters"); TString parDir =
TString muchDigiFile(parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file TString(gSystem->Getenv("VMCWORKDIR")) + TString("/parameters");
CbmMuchFindHitsGem* muchFindHits = new CbmMuchFindHitsGem(muchDigiFile.Data(), flag); TString muchDigiFile(
parDir + "/much/much_v19c_mcbm_digi_sector.root"); // MUCH digi file
CbmMuchFindHitsGem* muchFindHits =
new CbmMuchFindHitsGem(muchDigiFile.Data(), flag);
muchFindHits->SetBeamTimeDigi(kTRUE); muchFindHits->SetBeamTimeDigi(kTRUE);
run->AddTask(muchFindHits); run->AddTask(muchFindHits);
std::cout << "-I- : Added task " << muchFindHits->GetName() << std::endl; 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) { ...@@ -119,8 +122,6 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// ----- Local reconstruction in TRD ---------------------------------- // ----- Local reconstruction in TRD ----------------------------------
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
...@@ -159,7 +160,7 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) { ...@@ -159,7 +160,7 @@ void mcbm_reco_kronos(Int_t runId = 831, Int_t nTimeslices = 0) {
FairParAsciiFileIo* parIo2 = new FairParAsciiFileIo(); FairParAsciiFileIo* parIo2 = new FairParAsciiFileIo();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
FairParRootFileIo* parIo3 = new FairParRootFileIo(); FairParRootFileIo* parIo3 = new FairParRootFileIo();
parIo1->open(parFileIn.Data(), "READ"); parIo1->open(parFileIn.Data(), "READ");
parIo3->open(parFileOut.Data(), "RECREATE"); parIo3->open(parFileOut.Data(), "RECREATE");
rtdb->setFirstInput(parIo1); rtdb->setFirstInput(parIo1);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment