From 4a67f0133273a7443c4959ad338d1120e1369553 Mon Sep 17 00:00:00 2001 From: Norbert Herrmann <n.herrmann@physi.uni-heidelberg.de> Date: Fri, 14 Aug 2020 13:21:32 +0200 Subject: [PATCH] macro updare --- macro/beamtime/mcbm2020/ana_digi_cal.C | 2 +- macro/beamtime/mcbm2020/ana_trks.C | 5 +++-- macro/beamtime/mcbm2020/trk_cal_digi.sh | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/macro/beamtime/mcbm2020/ana_digi_cal.C b/macro/beamtime/mcbm2020/ana_digi_cal.C index ed77e780cb..0c36e57b24 100644 --- a/macro/beamtime/mcbm2020/ana_digi_cal.C +++ b/macro/beamtime/mcbm2020/ana_digi_cal.C @@ -109,7 +109,7 @@ void ana_digi_cal(Int_t nEvents = 10000000, // tofClust->SetTimePeriod(25600.); // ignore coarse time // tofClust->SetCorMode(iBugCor); // correct missing hits //tofClust->SetIdMode(0); // calibrate on counter level - tofClust->SetIdMode(1); // calibrate on module level + tofClust->SetIdMode(1); // calibrate on module level // tofClust->SetDeadStrips(15,23); // declare dead strip for T0M3,Rpc0,Strip 23 //tofClust->SetDeadStrips(25,16); // declare non-existant diamond strip (#5) dead diff --git a/macro/beamtime/mcbm2020/ana_trks.C b/macro/beamtime/mcbm2020/ana_trks.C index 34e89924e7..8dcff37820 100644 --- a/macro/beamtime/mcbm2020/ana_trks.C +++ b/macro/beamtime/mcbm2020/ana_trks.C @@ -269,7 +269,7 @@ void ana_trks(Int_t nEvents = 10000, case 2: iMinNofHits = 3; iNStations = 28; - iNReqStations = 4; + iNReqStations = 3; tofFindTracks->SetStation(0, 0, 2, 2); tofFindTracks->SetStation(1, 0, 0, 2); tofFindTracks->SetStation(2, 0, 1, 2); @@ -677,7 +677,7 @@ void ana_trks(Int_t nEvents = 10000, gROOT->LoadMacro("pl_over_trk.C"); gROOT->LoadMacro("pl_calib_trk.C"); gROOT->LoadMacro("pl_XY_trk.C"); - //gROOT->LoadMacro("pl_vert_trk.C"); + gROOT->LoadMacro("pl_vert_trk.C"); gROOT->LoadMacro("pl_pull_trk.C"); gROOT->LoadMacro("pl_all_Track2D.C"); gROOT->LoadMacro("pl_TIS.C"); @@ -695,6 +695,7 @@ void ana_trks(Int_t nEvents = 10000, //gInterpreter->ProcessLine("pl_TIR()"); //gInterpreter->ProcessLine("pl_eff_XY()"); gInterpreter->ProcessLine("pl_calib_trk()"); + gInterpreter->ProcessLine("pl_vert_trk()"); gInterpreter->ProcessLine("pl_all_Track2D(1)"); gInterpreter->ProcessLine("pl_all_Track2D(2)"); diff --git a/macro/beamtime/mcbm2020/trk_cal_digi.sh b/macro/beamtime/mcbm2020/trk_cal_digi.sh index 552727ac87..56240b1c0c 100755 --- a/macro/beamtime/mcbm2020/trk_cal_digi.sh +++ b/macro/beamtime/mcbm2020/trk_cal_digi.sh @@ -104,7 +104,6 @@ rm -v TCalib.res nEvtMax=0 (( nEvtMax = nEvt*10 )) iTraSetup=1 - #frange1 limits DT spectrum range fRange1=3. # frange2 limits chi2 @@ -189,4 +188,4 @@ root -b -q '../ana_digi_cal.C(-1,93,1,'$iRef',1,"'$cRun'",'$iCalSet',1,'$iSel2', cd .. -mv -v slurm-${SLURM_JOB_ID}.out ${outdir}/TrkCalDigi_${cRun}_${iCalSet}_${iSel2}_${CalIdMode}.out +mv -v slurm-${SLURM_JOB_ID}.out ${outdir}/TrkCalDigi_${cRun}_${iCalSet}_${iSel2}_${iCalIdMode}.out -- GitLab