Merge pull request #22 from cerati/mk-build-improve

Mk build improve

benchmark-fit.sh

@@ -1,14 +1,14 @@
 #! /bin/bash
 
-sed -i 's/constexpr int nTracks = 20000/constexpr int nTracks = 20000/g' Config.h 
+sed -i 's/constexpr int nTracks = 20000/constexpr int nTracks = 1000000/g' Config.h 
 
 make clean
 make -j 8
 
 for nth in 1 3 7 21
 do
 echo nth=${nth}
-./mkFit/mkFit --fit-std-only --num-thr ${nth} >& log_host_10x20k_FIT_NVU8_NTH${nth}.txt
+./mkFit/mkFit --fit-std-only --num-thr ${nth} >& log_host_10x1M_FIT_NVU8_NTH${nth}.txt
 done
 
 sed -i 's/define MPT_SIZE 8/define MPT_SIZE XX/g' Config.h
@@ -18,13 +18,13 @@ echo nvu=${nvu}
 sed -i "s/define MPT_SIZE XX/define MPT_SIZE ${nvu} \/\/tmp/g" Config.h
 make clean
 make -j 8
-./mkFit/mkFit --fit-std-only --num-thr 1 >& log_host_10x20k_FIT_NVU${nvu}_NTH1.txt
+./mkFit/mkFit --fit-std-only --num-thr 1 >& log_host_10x1M_FIT_NVU${nvu}_NTH1.txt
 sed -i "s/define MPT_SIZE ${nvu} \/\/tmp/define MPT_SIZE XX/g" Config.h
 done
 
 sed -i "s/define MPT_SIZE XX/define MPT_SIZE 8/g" Config.h
 
-sed -i 's/constexpr int nTracks = 20000/constexpr int nTracks = 20000/g' Config.h 
+sed -i 's/constexpr int nTracks = 1000000/constexpr int nTracks = 20000/g' Config.h 
 
 make clean
 make -j 8

benchmark-mic-fit.sh

@@ -1,13 +1,13 @@
 #! /bin/bash
 
-sed -i 's/constexpr int nTracks = 20000/constexpr int nTracks = 20000/g' Config.h 
+sed -i 's/constexpr int nTracks = 20000/constexpr int nTracks = 500000/g' Config.h 
 
 make clean
 make -j 8
 for nth in 1 3 7 21 42 63 84 105 126 147 168 189 210
 do
 echo nth=${nth}
-ssh mic0 ./mkFit-mic --fit-std-only --num-thr ${nth} >& log_mic_10x20k_FIT_NVU16int_NTH${nth}.txt
+ssh mic0 ./mkFit-mic --fit-std-only --num-thr ${nth} >& log_mic_10x500k_FIT_NVU16int_NTH${nth}.txt
 done
 
 sed -i 's/# USE_INTRINSICS := -DMPT_SIZE=1/USE_INTRINSICS := -DMPT_SIZE=XX/g' Makefile.config
@@ -17,12 +17,12 @@ sed -i "s/MPT_SIZE=XX/MPT_SIZE=${nvu}/g" Makefile.config
 make clean
 make -j 8
 echo nvu=${nvu}
-ssh mic0 ./mkFit-mic --fit-std-only --num-thr 1 >& log_mic_10x20k_FIT_NVU${nvu}_NTH1.txt
+ssh mic0 ./mkFit-mic --fit-std-only --num-thr 1 >& log_mic_10x500k_FIT_NVU${nvu}_NTH1.txt
 sed -i "s/MPT_SIZE=${nvu}/MPT_SIZE=XX/g" Makefile.config
 done
 sed -i 's/USE_INTRINSICS := -DMPT_SIZE=XX/# USE_INTRINSICS := -DMPT_SIZE=1/g' Makefile.config
 
-sed -i 's/constexpr int nTracks = 20000/constexpr int nTracks = 20000/g' Config.h 
+sed -i 's/constexpr int nTracks = 500000/constexpr int nTracks = 20000/g' Config.h 
 
 make clean
 make -j 8

benchmark-mic.sh

@@ -5,12 +5,13 @@ sed -i 's/\/\/\#define PRINTOUTS_FOR_PLOTS/\#define PRINTOUTS_FOR_PLOTS/g' mkFit
 make clean
 make -j 8
 
-for nth in 1 3 7 21 #42 63 84 105 126 147 168 189 210
+for nth in 1 3 7 21 42 63 84 105 126 147 168 189 210
 do
 echo nth=${nth}
-ssh mic0 ./mkFit-mic --build-bh --num-thr ${nth} >& log_mic_10x20k_BH_NVU16int_NTH${nth}.txt
-ssh mic0 ./mkFit-mic --build-ce --num-thr ${nth} >& log_mic_10x20k_CE_NVU16int_NTH${nth}.txt
-ssh mic0 ./mkFit-mic --build-ce --num-thr ${nth} --cloner-single-thread >& log_mic_10x20k_CEST_NVU16int_NTH${nth}.txt
+ssh mic0 ./mkFit-mic --build-bh  --num-thr ${nth} >& log_mic_10x20k_BH_NVU16int_NTH${nth}.txt
+ssh mic0 ./mkFit-mic --build-std --num-thr ${nth} >& log_mic_10x20k_ST_NVU16int_NTH${nth}.txt
+ssh mic0 ./mkFit-mic --build-ce  --num-thr ${nth} >& log_mic_10x20k_CE_NVU16int_NTH${nth}.txt
+ssh mic0 ./mkFit-mic --build-ce  --num-thr ${nth} --cloner-single-thread >& log_mic_10x20k_CEST_NVU16int_NTH${nth}.txt
 done
 
 sed -i 's/# USE_INTRINSICS := -DMPT_SIZE=1/USE_INTRINSICS := -DMPT_SIZE=XX/g' Makefile.config
@@ -20,9 +21,10 @@ sed -i "s/MPT_SIZE=XX/MPT_SIZE=${nvu}/g" Makefile.config
 make clean
 make -j 8
 echo nvu=${nvu}
-ssh mic0 ./mkFit-mic --build-bh --num-thr 1 >& log_mic_10x20k_BH_NVU${nvu}_NTH1.txt
-ssh mic0 ./mkFit-mic --build-ce --num-thr 1 >& log_mic_10x20k_CE_NVU${nvu}_NTH1.txt
-ssh mic0 ./mkFit-mic --build-ce --num-thr 1 --cloner-single-thread >& log_mic_10x20k_CEST_NVU${nvu}_NTH1.txt
+ssh mic0 ./mkFit-mic --build-bh  --num-thr 1 >& log_mic_10x20k_BH_NVU${nvu}_NTH1.txt
+ssh mic0 ./mkFit-mic --build-std --num-thr 1 >& log_mic_10x20k_ST_NVU${nvu}_NTH1.txt
+ssh mic0 ./mkFit-mic --build-ce  --num-thr 1 >& log_mic_10x20k_CE_NVU${nvu}_NTH1.txt
+ssh mic0 ./mkFit-mic --build-ce  --num-thr 1 --cloner-single-thread >& log_mic_10x20k_CEST_NVU${nvu}_NTH1.txt
 sed -i "s/MPT_SIZE=${nvu}/MPT_SIZE=XX/g" Makefile.config
 done
 sed -i 's/USE_INTRINSICS := -DMPT_SIZE=XX/# USE_INTRINSICS := -DMPT_SIZE=1/g' Makefile.config

benchmark.sh

@@ -8,9 +8,10 @@ make -j 8
 for nth in 1 3 7 21
 do
 echo nth=${nth}
-./mkFit/mkFit --build-bh --num-thr ${nth} >& log_host_10x20k_BH_NVU8_NTH${nth}.txt
-./mkFit/mkFit --build-ce --num-thr ${nth} >& log_host_10x20k_CE_NVU8_NTH${nth}.txt
-./mkFit/mkFit --build-ce --num-thr ${nth} --cloner-single-thread >& log_host_10x20k_CEST_NVU8_NTH${nth}.txt
+./mkFit/mkFit --build-bh  --num-thr ${nth} >& log_host_10x20k_BH_NVU8_NTH${nth}.txt
+./mkFit/mkFit --build-std --num-thr ${nth} >& log_host_10x20k_ST_NVU8_NTH${nth}.txt
+./mkFit/mkFit --build-ce  --num-thr ${nth} >& log_host_10x20k_CE_NVU8_NTH${nth}.txt
+./mkFit/mkFit --build-ce  --num-thr ${nth} --cloner-single-thread >& log_host_10x20k_CEST_NVU8_NTH${nth}.txt
 done
 
 sed -i 's/define MPT_SIZE 8/define MPT_SIZE XX/g' Config.h
@@ -20,9 +21,10 @@ echo nvu=${nvu}
 sed -i "s/define MPT_SIZE XX/define MPT_SIZE ${nvu} \/\/tmp/g" Config.h
 make clean
 make -j 8
-./mkFit/mkFit --build-bh --num-thr 1 >& log_host_10x20k_BH_NVU${nvu}_NTH1.txt
-./mkFit/mkFit --build-ce --num-thr 1 >& log_host_10x20k_CE_NVU${nvu}_NTH1.txt
-./mkFit/mkFit --build-ce --num-thr 1 --cloner-single-thread >& log_host_10x20k_CEST_NVU${nvu}_NTH1.txt
+./mkFit/mkFit --build-bh  --num-thr 1 >& log_host_10x20k_BH_NVU${nvu}_NTH1.txt
+./mkFit/mkFit --build-std --num-thr 1 >& log_host_10x20k_ST_NVU${nvu}_NTH1.txt
+./mkFit/mkFit --build-ce  --num-thr 1 >& log_host_10x20k_CE_NVU${nvu}_NTH1.txt
+./mkFit/mkFit --build-ce  --num-thr 1 --cloner-single-thread >& log_host_10x20k_CEST_NVU${nvu}_NTH1.txt
 sed -i "s/define MPT_SIZE ${nvu} \/\/tmp/define MPT_SIZE XX/g" Config.h
 done
 

makeBenchmarkPlots.C

@@ -19,6 +19,7 @@
   TGraph* g_BH_VU = (TGraph*) f->Get("g_BH_VU");
   TGraph* g_CE_VU = (TGraph*) f->Get("g_CE_VU");
   TGraph* g_CEST_VU = (TGraph*) f->Get("g_CEST_VU");
+  TGraph* g_ST_VU = (TGraph*) f->Get("g_ST_VU");
   g_BH_VU->SetTitle("Vectorization benchmark on "+label);
   g_BH_VU->GetXaxis()->SetTitle("Vector Unit Utilization");
   g_BH_VU->GetYaxis()->SetTitle("Time for 10 events x 20k tracks [s]");
@@ -28,23 +29,29 @@
   g_BH_VU->SetLineWidth(2);
   g_CE_VU->SetLineWidth(2);
   g_CEST_VU->SetLineWidth(2);
+  g_ST_VU->SetLineWidth(2);
   g_BH_VU->SetLineColor(kBlue);
   g_CE_VU->SetLineColor(kRed);
   g_CEST_VU->SetLineColor(kMagenta);
+  g_ST_VU->SetLineColor(kGreen+4);
   g_BH_VU->SetMarkerStyle(kFullCircle);
   g_CE_VU->SetMarkerStyle(kFullCircle);
   g_CEST_VU->SetMarkerStyle(kFullCircle);
+  g_ST_VU->SetMarkerStyle(kFullCircle);
   g_BH_VU->SetMarkerColor(kBlue);
   g_CE_VU->SetMarkerColor(kRed);
   g_CEST_VU->SetMarkerColor(kMagenta);
+  g_ST_VU->SetMarkerColor(kGreen+4);
   g_BH_VU->Draw("ALP");
   g_CE_VU->Draw("LP");
   g_CEST_VU->Draw("LP");
+  g_ST_VU->Draw("LP");
   TLegend* leg_VU = new TLegend(0.60,0.60,0.85,0.85);
   leg_VU->SetBorderSize(0);
   leg_VU->AddEntry(g_BH_VU,"BestHit","LP");
   leg_VU->AddEntry(g_CE_VU,"CloneEngine","LP");
   leg_VU->AddEntry(g_CEST_VU,"CESingleThread","LP");
+  leg_VU->AddEntry(g_ST_VU,"NoCloneEngine","LP");
   leg_VU->Draw();
   c1.SetGridy();
   c1.Update();
@@ -54,6 +61,7 @@
   TGraph* g_BH_VU_speedup = (TGraph*) f->Get("g_BH_VU_speedup");
   TGraph* g_CE_VU_speedup = (TGraph*) f->Get("g_CE_VU_speedup");
   TGraph* g_CEST_VU_speedup = (TGraph*) f->Get("g_CEST_VU_speedup");
+  TGraph* g_ST_VU_speedup = (TGraph*) f->Get("g_ST_VU_speedup");
   g_BH_VU_speedup->SetTitle("Vectorization speedup on "+label);
   g_BH_VU_speedup->GetXaxis()->SetTitle("Vector Unit Utilization");
   g_BH_VU_speedup->GetYaxis()->SetTitle("Speedup");
@@ -62,25 +70,31 @@
   g_BH_VU_speedup->SetLineWidth(2);
   g_CE_VU_speedup->SetLineWidth(2);
   g_CEST_VU_speedup->SetLineWidth(2);
+  g_ST_VU_speedup->SetLineWidth(2);
   g_BH_VU_speedup->SetLineColor(kBlue);
   g_CE_VU_speedup->SetLineColor(kRed);
   g_CEST_VU_speedup->SetLineColor(kMagenta);
+  g_ST_VU_speedup->SetLineColor(kGreen+4);
   g_BH_VU_speedup->SetMarkerStyle(kFullCircle);
   g_CE_VU_speedup->SetMarkerStyle(kFullCircle);
   g_CEST_VU_speedup->SetMarkerStyle(kFullCircle);
+  g_ST_VU_speedup->SetMarkerStyle(kFullCircle);
   g_BH_VU_speedup->SetMarkerColor(kBlue);
   g_CE_VU_speedup->SetMarkerColor(kRed);
   g_CEST_VU_speedup->SetMarkerColor(kMagenta);
+  g_ST_VU_speedup->SetMarkerColor(kGreen+4);
   g_BH_VU_speedup->Draw("ALP");
   g_CE_VU_speedup->Draw("LP");
   g_CEST_VU_speedup->Draw("LP");
+  g_ST_VU_speedup->Draw("LP");
   TLine lvu(1,1,maxvu,maxvu);
   lvu.Draw();
   TLegend* leg_VU_speedup = new TLegend(0.20,0.60,0.45,0.85);
   leg_VU_speedup->SetBorderSize(0);
   leg_VU_speedup->AddEntry(g_BH_VU_speedup,"BestHit","LP");
   leg_VU_speedup->AddEntry(g_CE_VU_speedup,"CloneEngine","LP");
   leg_VU_speedup->AddEntry(g_CEST_VU_speedup,"CESingleThread","LP");
+  leg_VU_speedup->AddEntry(g_ST_VU_speedup,"NoCloneEngine","LP");
   leg_VU_speedup->Draw();
   c2.SetGridy();
   c2.Update();
@@ -90,6 +104,7 @@
   TGraph* g_BH_TH = (TGraph*) f->Get("g_BH_TH");
   TGraph* g_CE_TH = (TGraph*) f->Get("g_CE_TH");
   TGraph* g_CEST_TH = (TGraph*) f->Get("g_CEST_TH");
+  TGraph* g_ST_TH = (TGraph*) f->Get("g_ST_TH");
   g_BH_TH->SetTitle("Parallelization benchmark on "+label);
   g_BH_TH->GetXaxis()->SetTitle("Number of Threads");
   g_BH_TH->GetYaxis()->SetTitle("Time for 10 events x 20k tracks [s]");
@@ -99,23 +114,29 @@
   g_BH_TH->SetLineWidth(2);
   g_CE_TH->SetLineWidth(2);
   g_CEST_TH->SetLineWidth(2);
+  g_ST_TH->SetLineWidth(2);
   g_BH_TH->SetLineColor(kBlue);
   g_CE_TH->SetLineColor(kRed);
   g_CEST_TH->SetLineColor(kMagenta);
+  g_ST_TH->SetLineColor(kGreen+4);
   g_BH_TH->SetMarkerStyle(kFullCircle);
   g_CE_TH->SetMarkerStyle(kFullCircle);
   g_CEST_TH->SetMarkerStyle(kFullCircle);
+  g_ST_TH->SetMarkerStyle(kFullCircle);
   g_BH_TH->SetMarkerColor(kBlue);
   g_CE_TH->SetMarkerColor(kRed);
   g_CEST_TH->SetMarkerColor(kMagenta);
+  g_ST_TH->SetMarkerColor(kGreen+4);
   g_BH_TH->Draw("ALP");
   g_CE_TH->Draw("LP");
   g_CEST_TH->Draw("LP");
+  g_ST_TH->Draw("LP");
   TLegend* leg_TH = new TLegend(0.60,0.60,0.85,0.85);
   leg_TH->SetBorderSize(0);
   leg_TH->AddEntry(g_BH_TH,"BestHit","LP");
   leg_TH->AddEntry(g_CE_TH,"CloneEngine","LP");
   leg_TH->AddEntry(g_CEST_TH,"CESingleThread","LP");
+  leg_TH->AddEntry(g_ST_TH,"NoCloneEngine","LP");
   leg_TH->Draw();
   c3.SetGridy();
   c3.Update();
@@ -125,6 +146,7 @@
   TGraph* g_BH_TH_speedup = (TGraph*) f->Get("g_BH_TH_speedup");
   TGraph* g_CE_TH_speedup = (TGraph*) f->Get("g_CE_TH_speedup");
   TGraph* g_CEST_TH_speedup = (TGraph*) f->Get("g_CEST_TH_speedup");
+  TGraph* g_ST_TH_speedup = (TGraph*) f->Get("g_ST_TH_speedup");
   g_BH_TH_speedup->SetTitle("Parallelization speedup on "+label);
   g_BH_TH_speedup->GetXaxis()->SetTitle("Number of Threads");
   g_BH_TH_speedup->GetYaxis()->SetTitle("Speedup");
@@ -133,25 +155,31 @@
   g_BH_TH_speedup->SetLineWidth(2);
   g_CE_TH_speedup->SetLineWidth(2);
   g_CEST_TH_speedup->SetLineWidth(2);
+  g_ST_TH_speedup->SetLineWidth(2);
   g_BH_TH_speedup->SetLineColor(kBlue);
   g_CE_TH_speedup->SetLineColor(kRed);
   g_CEST_TH_speedup->SetLineColor(kMagenta);
+  g_ST_TH_speedup->SetLineColor(kGreen+4);
   g_BH_TH_speedup->SetMarkerStyle(kFullCircle);
   g_CE_TH_speedup->SetMarkerStyle(kFullCircle);
   g_CEST_TH_speedup->SetMarkerStyle(kFullCircle);
+  g_ST_TH_speedup->SetMarkerStyle(kFullCircle);
   g_BH_TH_speedup->SetMarkerColor(kBlue);
   g_CE_TH_speedup->SetMarkerColor(kRed);
   g_CEST_TH_speedup->SetMarkerColor(kMagenta);
+  g_ST_TH_speedup->SetMarkerColor(kGreen+4);
   g_BH_TH_speedup->Draw("ALP");
   g_CE_TH_speedup->Draw("LP");
   g_CEST_TH_speedup->Draw("LP");
+  g_ST_TH_speedup->Draw("LP");
   TLine lth(1,1,maxth,maxth);
   lth.Draw();
   TLegend* leg_TH_speedup = new TLegend(0.20,0.60,0.45,0.85);
   leg_TH_speedup->SetBorderSize(0);
   leg_TH_speedup->AddEntry(g_BH_TH_speedup,"BestHit","LP");
   leg_TH_speedup->AddEntry(g_CE_TH_speedup,"CloneEngine","LP");
   leg_TH_speedup->AddEntry(g_CEST_TH_speedup,"CESingleThread","LP");
+  leg_TH_speedup->AddEntry(g_ST_TH_speedup,"NoCloneEngine","LP");
   leg_TH_speedup->Draw();
   c4.SetGridy();
   c4.Update();

makeBenchmarkPlots.py

@@ -2,16 +2,24 @@
 import ROOT
 import array
 
-hORm = 'host'
-#hORm = 'mic'
+if len(sys.argv)!=2: exit
+
+hORm = sys.argv[1]
+
+if hORm!='host' and hORm!='mic': exit
 
 g = ROOT.TFile('benchmark_'+hORm+'.root',"recreate")
 
-for test in ['BH','CE','CEST','FIT']:
+for test in ['BH','CE','CEST','ST','FIT']:
     print test
     pos = 14
+    ntks = '20k'
     if 'BH' in test: pos = 8
-    if 'FIT' in test: pos = 3
+    if 'ST' == test: pos = 11
+    if 'FIT' in test: 
+        pos = 3
+        ntks = '1M'
+        if hORm == 'mic': ntks = '500k'
     g_VU = ROOT.TGraph(4)
     g_VU_speedup = ROOT.TGraph(4)
     point = 0
@@ -20,14 +28,14 @@
         vuvals.append('16')
         vuvals.append('16int')
     for vu in vuvals:
-        os.system('grep Matriplex log_'+hORm+'_10x20k_'+test+'_NVU'+vu+'_NTH1.txt >& log_'+hORm+'_10x20k_'+test+'_VU.txt')
+        os.system('grep Matriplex log_'+hORm+'_10x'+ntks+'_'+test+'_NVU'+vu+'_NTH1.txt >& log_'+hORm+'_10x'+ntks+'_'+test+'_VU.txt')
         if vu == '16int':
             xval = 16.0
         else:
             xval = float(vu)
         yval = 0.
         firstFound = False
-        with open('log_'+hORm+'_10x20k_'+test+'_VU.txt') as f:
+        with open('log_'+hORm+'_10x'+ntks+'_'+test+'_VU.txt') as f:
             for line in f:
                 if 'Matriplex' not in line: continue
                 if 'Total' in line: continue
@@ -65,15 +73,15 @@
     nvu = '8'
     if hORm == 'mic': nvu = '16int'
     thvals = [1,3,7,21]
-    if hORm == 'mic' and 'FIT' in test: thvals = [1,3,7,21,42,63,84,105,126,147,168,189,210]
+    if hORm == 'mic': thvals = [1,3,7,21,42,63,84,105,126,147,168,189,210]
     g_TH = ROOT.TGraph(len(thvals))
     g_TH_speedup = ROOT.TGraph(len(thvals))
     for th in thvals:
-        os.system('grep Matriplex log_'+hORm+'_10x20k_'+test+'_NVU'+nvu+'_NTH'+str(th)+'.txt >& log_'+hORm+'_10x20k_'+test+'_TH.txt')
+        os.system('grep Matriplex log_'+hORm+'_10x'+ntks+'_'+test+'_NVU'+nvu+'_NTH'+str(th)+'.txt >& log_'+hORm+'_10x'+ntks+'_'+test+'_TH.txt')
         xval = float(th)
         yval = 0.
         firstFound = False
-        with open('log_'+hORm+'_10x20k_'+test+'_TH.txt') as f:
+        with open('log_'+hORm+'_10x'+ntks+'_'+test+'_TH.txt') as f:
             for line in f:
                 if 'Matriplex' not in line: continue
                 if 'Total' in line: continue

makeBenchmarkPlotsFit.C

@@ -8,6 +8,9 @@
   TString label = "Xeon";
   if (isMic) label+=" Phi";
 
+  TString ntrk = "1M";
+  if (isMic) ntrk+="500k";
+
   float maxvu = 8;
   if (isMic) maxvu = 16;
   float maxth = 21;
@@ -19,11 +22,10 @@
   TGraph* g_FIT_VU = (TGraph*) f->Get("g_FIT_VU");
   g_FIT_VU->SetTitle("Vectorization benchmark on "+label);
   g_FIT_VU->GetXaxis()->SetTitle("Vector Unit Utilization");
-  g_FIT_VU->GetYaxis()->SetTitle("Time for 20k tracks [s]");
+  g_FIT_VU->GetYaxis()->SetTitle("Time for "+ntrk+" tracks [s]");
   g_FIT_VU->GetYaxis()->SetTitleOffset(1.25);
   g_FIT_VU->GetXaxis()->SetRangeUser(1,maxvu);
-  g_FIT_VU->GetYaxis()->SetRangeUser(0,0.2);
-  if (isMic) g_FIT_VU->GetYaxis()->SetRangeUser(0,1);
+  g_FIT_VU->GetYaxis()->SetRangeUser(0,1.2*g_FIT_VU->GetY()[0]);
   g_FIT_VU->SetLineWidth(2);
   g_FIT_VU->SetLineColor(kBlue);
   g_FIT_VU->SetMarkerStyle(kFullCircle);
@@ -63,11 +65,10 @@
   TGraph* g_FIT_TH = (TGraph*) f->Get("g_FIT_TH");
   g_FIT_TH->SetTitle("Parallelization benchmark on "+label);
   g_FIT_TH->GetXaxis()->SetTitle("Number of Threads");
-  g_FIT_TH->GetYaxis()->SetTitle("Time for 20k tracks [s]");
+  g_FIT_TH->GetYaxis()->SetTitle("Time for "+ntrk+" tracks [s]");
   g_FIT_TH->GetYaxis()->SetTitleOffset(1.25);
   g_FIT_TH->GetXaxis()->SetRangeUser(1,maxth);
-  g_FIT_TH->GetYaxis()->SetRangeUser(0,0.04);
-  if (isMic) g_FIT_TH->GetYaxis()->SetRangeUser(0,0.14);
+  g_FIT_TH->GetYaxis()->SetRangeUser(0,1.2*g_FIT_TH->GetY()[0]);
   g_FIT_TH->SetLineWidth(2);
   g_FIT_TH->SetLineColor(kBlue);
   g_FIT_TH->SetMarkerStyle(kFullCircle);