From 13ca9fd42c7ceeaf47f6d580fdd3823d0d141bf0 Mon Sep 17 00:00:00 2001 From: alberica toia <a.toia@gsi.de> Date: Mon, 9 Nov 2020 23:01:25 +0100 Subject: [PATCH] fixed clang format --- .../mcbm2020/build_event_win_kronos.C | 40 ++++++++++--------- macro/beamtime/mcbm2020/mcbm_reco_kronos.C | 17 ++++---- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/macro/beamtime/mcbm2020/build_event_win_kronos.C b/macro/beamtime/mcbm2020/build_event_win_kronos.C index 909bdc2421..831c9c92e6 100644 --- a/macro/beamtime/mcbm2020/build_event_win_kronos.C +++ b/macro/beamtime/mcbm2020/build_event_win_kronos.C @@ -24,10 +24,11 @@ void build_event_win_kronos(UInt_t uRunIdx = 0, */ }; if (vuListRunId.size() <= uRunIdx) return kFALSE; - uRunId = vuListRunId[uRunIdx]; + uRunId = vuListRunId[uRunIdx]; //fileName = Form("data/unp_mcbm_%03u.root", uRunId); - fileName = Form("/lustre/cbm/users/ploizeau/mcbm2020/unp_evt_data_7f229b3f_20201103/unp_mcbm_%i.root", - uRunId); + fileName = Form("/lustre/cbm/users/ploizeau/mcbm2020/" + "unp_evt_data_7f229b3f_20201103/unp_mcbm_%i.root", + uRunId); } // if( 99999 != uRunIdx ) if (uRunId < 692 && 0 != uRunId) return kFALSE; @@ -105,18 +106,20 @@ void build_event_win_kronos(UInt_t uRunIdx = 0, fRun->AddTask(eventBuilder); - // ----- Parameter database -------------------------------------------- + // ----- Parameter database -------------------------------------------- TString parFile = - Form("/lustre/cbm/users/ploizeau/mcbm2020/unp_evt_data_7f229b3f_20201103/unp_mcbm_params_%i.root", - uRunId); - FairRuntimeDb* rtdb = fRun->GetRuntimeDb(); + Form("/lustre/cbm/users/ploizeau/mcbm2020/unp_evt_data_7f229b3f_20201103/" + "unp_mcbm_params_%i.root", + uRunId); + FairRuntimeDb* rtdb = fRun->GetRuntimeDb(); FairParRootFileIo* parIo1 = new FairParRootFileIo(); - parIo1->open(parFile.Data(),"UPDATE"); + parIo1->open(parFile.Data(), "UPDATE"); rtdb->setFirstInput(parIo1); // ------------------------------------------------------------------------ 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); // ----- Local reconstruction in STS ---------------------------------- @@ -125,16 +128,17 @@ void build_event_win_kronos(UInt_t uRunIdx = 0, //recoSts->SetTimeCutDigisAbs( 20 );// cluster finder: time cut in ns //recoSts->SetTimeCutClustersAbs(20.); // hit finder: time cut in ns - + // ASIC params: #ADC channels, dyn. range, threshold, time resol., dead time, // noise RMS, zero-threshold crossing rate - auto parAsic = new CbmStsParAsic(32, 75000., 3000., 5., 800., 1000., 3.9789e-3); - + auto parAsic = + new CbmStsParAsic(32, 75000., 3000., 5., 800., 1000., 3.9789e-3); + // Module params: number of channels, number of channels per ASIC auto parMod = new CbmStsParModule(2048, 128); parMod->SetAllAsics(*parAsic); recoSts->UseModulePar(parMod); - + // Sensor params auto sensorPar = new CbmStsParSensor(CbmStsSensorClass::kDssdStereo); sensorPar->SetPar(0, 6.2092); // Extension in x @@ -143,18 +147,18 @@ void build_event_win_kronos(UInt_t uRunIdx = 0, sensorPar->SetPar(3, 5.9692); // Active size in y sensorPar->SetPar(4, 1024.); // Number of strips front side sensorPar->SetPar(5, 1024.); // Number of strips back side - sensorPar->SetPar(6, 0.0058); // Strip pitch front side + sensorPar->SetPar(6, 0.0058); // Strip pitch front side sensorPar->SetPar(7, 0.0058); // Strip pitch back side - sensorPar->SetPar(8, 7.5); // Stereo angle front side + sensorPar->SetPar(8, 7.5); // Stereo angle front side sensorPar->SetPar(9, 0.0); // Stereo angle back side recoSts->UseSensorPar(sensorPar); - + // Sensor conditions: full depletion voltage, bias voltage, temperature, // coupling capacitance, inter-strip capacitance auto sensorCond = new CbmStsParSensorCond(70., 140., 268., 17.5, 1.); recoSts->UseSensorCond(sensorCond); - - fRun->AddTask(recoSts); + + fRun->AddTask(recoSts); std::cout << "-I- : Added task " << recoSts->GetName() << std::endl; // ------------------------------------------------------------------------ diff --git a/macro/beamtime/mcbm2020/mcbm_reco_kronos.C b/macro/beamtime/mcbm2020/mcbm_reco_kronos.C index 1f6a281506..d099499513 100644 --- a/macro/beamtime/mcbm2020/mcbm_reco_kronos.C +++ b/macro/beamtime/mcbm2020/mcbm_reco_kronos.C @@ -21,15 +21,18 @@ void mcbm_reco(Int_t runId = 812, Int_t nTimeslices = 0) { // ----- In- and output file names ------------------------------------ TString inFile = Form("/lustre/cbm/users/ploizeau/mcbm2020/" - "unp_evt_data_7f229b3f_20201103/unp_mcbm_%i.root", - runId); + "unp_evt_data_7f229b3f_20201103/unp_mcbm_%i.root", + runId); TString parFile = - Form("/lustre/cbm/users/ploizeau/mcbm2020/unp_evt_data_7f229b3f_20201103/unp_mcbm_params_%i.root", - runId); + Form("/lustre/cbm/users/ploizeau/mcbm2020/unp_evt_data_7f229b3f_20201103/" + "unp_mcbm_params_%i.root", + runId); TString geoFile = - "/lustre/cbm/users/alberica/cbmroot/macro/beamtime/mcbm2020/data/test.geo.root"; // to be created by a simulation run - TString outFile = - Form("/lustre/cbm/users/ploizeau/mcbm2020/unp_evt_data_7f229b3f_20201103/reco_mcbm_%i.root", runId); + "/lustre/cbm/users/alberica/cbmroot/macro/beamtime/mcbm2020/data/" + "test.geo.root"; // to be created by a simulation run + TString outFile = Form("/lustre/cbm/users/ploizeau/mcbm2020/" + "unp_evt_data_7f229b3f_20201103/reco_mcbm_%i.root", + runId); // ------------------------------------------------------------------------ -- GitLab