cosmetics for TDR macros

diff --git a/TPC/Upgrade/macros/SCdistortionsForPerformanceNote.C b/TPC/Upgrade/macros/SCdistortionsForPerformanceNote.C
index d788e3d8889366d4ec95ba67f6673e29d5a40204..ef58912e4c9c9ce034a9e0948591ce07728079fa 100644 (file)
--- a/TPC/Upgrade/macros/SCdistortionsForPerformanceNote.C
+++ b/TPC/Upgrade/macros/SCdistortionsForPerformanceNote.C
@@ -20,11 +20,12 @@ void SCdistortionsForPerformanceNote(Double_t radiusScale=1.5, Int_t epsScale=1,
   const Int_t nEps = 2;
   Int_t eps[nEps] = {20,10};
   Int_t col[nEps] = {kBlack,kRed};
+  Int_t sty[nEps] = {1,2};
 
   const Int_t nOmegaTau = 1;
   Double_t omegaTau[nOmegaTau] = {0.32};
   TString tGas[nOmegaTau] = {"NeCO2_2"}; 
-  TString sGas[nOmegaTau] = {"Ne/CO_{2}/N_{2} (90-10-5)"};
+  TString sGas[nOmegaTau] = {"Ne-CO_{2}-N_{2} (90-10-5)"};
   TF1 * fdiffR[nEps];
   TF1 * fdiffPhiR[nEps];
   TH1F * hdiffR[nEps];
@@ -34,8 +35,7 @@ void SCdistortionsForPerformanceNote(Double_t radiusScale=1.5, Int_t epsScale=1,
   //use always the integrate option here
   Double_t integrateStep = 1.;
 
-  TCanvas *cMap = new TCanvas("cMap","cMap",1200,500);
-  cMap->Divide(2,1);
+  TCanvas *cMap[nEps];
 
   TCanvas *cOmegaTau = new TCanvas("cOmegaTau","cOmegaTau",1200,500);
   cOmegaTau->Divide(2,1);
@@ -49,7 +49,8 @@ void SCdistortionsForPerformanceNote(Double_t radiusScale=1.5, Int_t epsScale=1,
   //loop over epsilons
   for(Int_t iEps = 0; iEps < nEps; ++iEps){
 
-    cMap->cd(iEps+1)->SetPhi(150);
+    cMap[iEps] = new TCanvas(Form("cMap%d",iEps),Form("cMap%d",iEps),600,500);
+    cMap[iEps]->SetPhi(150);
     
     // select gas 
     // 0 = NeCO2N2 
@@ -84,7 +85,7 @@ void SCdistortionsForPerformanceNote(Double_t radiusScale=1.5, Int_t epsScale=1,
     hMap[iEps]->SetTitleSize(0.05,"XYZ");
     hMap[iEps]->SetTitleOffset(1.5,"XY");
     hMap[iEps]->SetTitleOffset(0.9,"Z");
-    hMap[iEps]->SetTitle(Form("%s: 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
+    hMap[iEps]->SetTitle(Form("%s: 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
     hMap[iEps]->DrawCopy("surf2fb");
     
     
@@ -125,6 +126,9 @@ void SCdistortionsForPerformanceNote(Double_t radiusScale=1.5, Int_t epsScale=1,
     
     hdiffR[iEps]->SetLineColor(col[iEps]);
     hdiffPhiR[iEps]->SetLineColor(col[iEps]);
+
+    hdiffR[iEps]->SetLineStyle(sty[iEps]);
+    hdiffPhiR[iEps]->SetLineStyle(sty[iEps]);
     
     hdiffR[iEps]->SetFillColor(col[iEps]);
     hdiffPhiR[iEps]->SetFillColor(col[iEps]);
@@ -132,7 +136,7 @@ void SCdistortionsForPerformanceNote(Double_t radiusScale=1.5, Int_t epsScale=1,
     hdiffR[iEps]->SetTitleSize(0.05,"XYZ");
     hdiffPhiR[iEps]->SetTitleSize(0.05,"XYZ");
     
-    legend->AddEntry(hdiffR[iEps],Form("#epsilon = %d",eps[iEps]),"lp");
+    legend->AddEntry(hdiffR[iEps],Form("#varepsilon = %d",eps[iEps]),"lp");
     
     cOmegaTau->cd(1);
     if(iEps==0)
@@ -150,9 +154,10 @@ void SCdistortionsForPerformanceNote(Double_t radiusScale=1.5, Int_t epsScale=1,
     }
   }
   
-  
-  cMap->SaveAs(Form("%s_SC_performanceNote.eps",outfilename.Data()));
-  cMap->SaveAs(Form("%s_SC_performanceNote.pdf",outfilename.Data()));
+  for(Int_t iEps = 0; iEps < nEps; iEps++){
+    cMap[iEps]->SaveAs(Form("%s_epsilon%d_SC_performanceNote.eps",outfilename.Data(),eps[iEps]));
+    cMap[iEps]->SaveAs(Form("%s_epsilon%d_SC_performanceNote.pdf",outfilename.Data(),eps[iEps]));
+  }
   cOmegaTau->SaveAs(Form("%s_Distortions_performanceNote.eps",outfilename.Data()));
   cOmegaTau->SaveAs(Form("%s_Distortions_performanceNote.pdf",outfilename.Data()));
 }

diff --git a/TPC/Upgrade/macros/SCdistortionsForTDRfinal.C b/TPC/Upgrade/macros/SCdistortionsForTDRfinal.C
index 855a32881b33043fd0f4916306b2637e487103b6..bb6fa8dee18fe9ded2d926b5adb0bd0d5ad47b77 100644 (file)
--- a/TPC/Upgrade/macros/SCdistortionsForTDRfinal.C
+++ b/TPC/Upgrade/macros/SCdistortionsForTDRfinal.C
@@ -26,7 +26,7 @@ void SCdistortionsForTDRfinal(Double_t radiusScale=1.5, Int_t epsScale=1,Int_t i
   const Int_t nOmegaTau = 5;
   Double_t omegaTau[nOmegaTau] = {0.34,0.32,0.43,1.77,1.84};
   TString tGas[nOmegaTau] = {"NeCO2","NeCO2_2","ArCO2","NeCF4","NeCF4_2"}; // CF4 is the same as CO2 here, but different omegaTau
-  TString sGas[nOmegaTau] = {"NeCO_{2} (90-10)","Ne/CO_{2}/N_{2} (90-10-5)","ArCO_{2} (90-10)","NeCF_{4} (90-10)","NeCF_{4} (80-20)"};
+  TString sGas[nOmegaTau] = {"Ne-CO_{2} (90-10)","Ne-CO_{2}-N_{2} (90-10-5)","Ar-CO_{2} (90-10)","Ne-CF_{4} (90-10)","Ne-CF_{4} (80-20)"};
   TF2 * fdiffR[nEps];
   TF2 * fdiffPhiR[nEps];
   TH2F * hdiffR[nEps];
@@ -125,7 +125,7 @@ void SCdistortionsForTDRfinal(Double_t radiusScale=1.5, Int_t epsScale=1,Int_t i
   hMap[iEps]->SetTitleSize(0.05,"XYZ");
   //hMap[iEps]->SetTitleOffset(1.5,"XY");
   //hMap[iEps]->SetTitleOffset(0.9,"Z");
-  hMap[iEps]->SetTitle(Form("#rho_{SC} (fC/cm^{3}) for %s, 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
+  hMap[iEps]->SetTitle(Form("#rho_{SC} (fC/cm^{3}) for %s, 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
   hMap[iEps]->DrawCopy("colz");
 
   // draw the distortion maps
@@ -139,7 +139,7 @@ void SCdistortionsForTDRfinal(Double_t radiusScale=1.5, Int_t epsScale=1,Int_t i
   hDistRMap[iEps]->SetTitleSize(0.05,"XYZ");
   //hDistRMap[iEps]->SetTitleOffset(1.5,"XY");
   //hDistRMap[iEps]->SetTitleOffset(0.9,"Z");
-  hDistRMap[iEps]->SetTitle(Form("dr (cm) for %s, 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
+  hDistRMap[iEps]->SetTitle(Form("dr (cm) for %s, 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
   hDistRMap[iEps]->DrawCopy("colz");
 
   cDistRPMap->cd(iEps+1);
@@ -152,7 +152,7 @@ void SCdistortionsForTDRfinal(Double_t radiusScale=1.5, Int_t epsScale=1,Int_t i
   hDistRPMap[iEps]->SetTitleSize(0.05,"XYZ");
   //hDistRPMap[iEps]->SetTitleOffset(1.5,"XY");
   //hDistRPMap[iEps]->SetTitleOffset(0.9,"Z");
-  hDistRPMap[iEps]->SetTitle(Form("d(r#varphi) (cm) for %s, 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
+  hDistRPMap[iEps]->SetTitle(Form("d(r#varphi) (cm) for %s, 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
   hDistRPMap[iEps]->DrawCopy("colz");
 
   
@@ -198,7 +198,7 @@ void SCdistortionsForTDRfinal(Double_t radiusScale=1.5, Int_t epsScale=1,Int_t i
   hdiffR[iEps]->SetTitleSize(0.05,"XYZ");
   //hdiffR[iEps]->SetTitleOffset(1.5,"XY");
   //hdiffR[iEps]->SetTitleOffset(0.9,"Z");
-  hdiffR[iEps]->SetTitle(Form("dr (cm) for %s, 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
+  hdiffR[iEps]->SetTitle(Form("dr (cm) for %s, 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
   hdiffR[iEps]->DrawCopy("colz");
 
 
@@ -210,7 +210,7 @@ void SCdistortionsForTDRfinal(Double_t radiusScale=1.5, Int_t epsScale=1,Int_t i
   hdiffPhiR[iEps]->SetTitleSize(0.05,"XYZ");
   //hdiffPhiR[iEps]->SetTitleOffset(1.5,"XY");
   //hdiffPhiR[iEps]->SetTitleOffset(0.9,"Z");
-  hdiffPhiR[iEps]->SetTitle(Form("d(r#varphi) (cm) for %s, 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
+  hdiffPhiR[iEps]->SetTitle(Form("d(r#varphi) (cm) for %s, 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
   hdiffPhiR[iEps]->DrawCopy("colz");
 
   cDistRIntMap->cd(iEps+1);
@@ -222,7 +222,7 @@ void SCdistortionsForTDRfinal(Double_t radiusScale=1.5, Int_t epsScale=1,Int_t i
   hdiffIntR[iEps]->SetTitleSize(0.05,"XYZ");
   //hdiffIntR[iEps]->SetTitleOffset(1.5,"XY");
   //hdiffIntR[iEps]->SetTitleOffset(0.9,"Z");
-  hdiffIntR[iEps]->SetTitle(Form("dr (cm) for %s, 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
+  hdiffIntR[iEps]->SetTitle(Form("dr (cm) for %s, 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
   hdiffIntR[iEps]->DrawCopy("colz");
 
 
@@ -234,7 +234,7 @@ void SCdistortionsForTDRfinal(Double_t radiusScale=1.5, Int_t epsScale=1,Int_t i
   hdiffIntPhiR[iEps]->SetTitleSize(0.05,"XYZ");
   //hdiffIntPhiR[iEps]->SetTitleOffset(1.5,"XY");
   //hdiffIntPhiR[iEps]->SetTitleOffset(0.9,"Z");
-  hdiffIntPhiR[iEps]->SetTitle(Form("d(r#varphi) (cm) for %s, 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
+  hdiffIntPhiR[iEps]->SetTitle(Form("d(r#varphi) (cm) for %s, 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
   hdiffIntPhiR[iEps]->DrawCopy("colz");
 
   cDistZIntMap->cd(iEps+1);
@@ -245,7 +245,7 @@ void SCdistortionsForTDRfinal(Double_t radiusScale=1.5, Int_t epsScale=1,Int_t i
   hdiffIntZ[iEps]->SetTitleSize(0.05,"XYZ");
   //hdiffIntZ[iEps]->SetTitleOffset(1.5,"XY");
   //hdiffIntZ[iEps]->SetTitleOffset(0.9,"Z");
-  hdiffIntZ[iEps]->SetTitle(Form("dz (cm) for %s, 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
+  hdiffIntZ[iEps]->SetTitle(Form("dz (cm) for %s, 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iEps]));
   hdiffIntZ[iEps]->DrawCopy("colz");
   }
   

diff --git a/TPC/Upgrade/macros/SCdistortionsForTDRfinalAllGases.C b/TPC/Upgrade/macros/SCdistortionsForTDRfinalAllGases.C
index e56f5077412216130189e5b145419b14239e201f..c3544fcbe973ced66f9a453ed5b76c434eee8335 100644 (file)
--- a/TPC/Upgrade/macros/SCdistortionsForTDRfinalAllGases.C
+++ b/TPC/Upgrade/macros/SCdistortionsForTDRfinalAllGases.C
@@ -13,7 +13,7 @@ void SCdistortionsForTDRfinalAllGases(Double_t radiusScale=1.5, Int_t epsScale=1
   Double_t omegaTau[nOmegaTau] = {0.32};
   Double_t omegaTau[nOmegaTau] = {0.32,0.43,1.77,1.84};
   TString tGas[nOmegaTau] = {"NeCO2_2","ArCO2","NeCF4","NeCF4_2"}; // CF4 is the same as CO2 here, but different omegaTau
-  TString sGas[nOmegaTau] = {"Ne/CO_{2}/N_{2} (90-10-5)","ArCO_{2} (90-10)","NeCF_{4} (90-10)","NeCF_{4} (80-20)"};
+  TString sGas[nOmegaTau] = {"Ne-CO_{2}-N_{2} (90-10-5)","Ar-CO_{2} (90-10)","Ne-CF_{4} (90-10)","Ne-CF_{4} (80-20)"};
   Int_t eps[nOmegaTau] = {20,10,20,20};
   Int_t col[nOmegaTau] = {kBlack,kRed,kOrange-3,kGreen+2};
   TF1 * fdiffR[nOmegaTau];
@@ -87,7 +87,7 @@ void SCdistortionsForTDRfinalAllGases(Double_t radiusScale=1.5, Int_t epsScale=1
     hMap[iOmegaTau]->SetTitleSize(0.05,"XYZ");
     hMap[iOmegaTau]->SetTitleOffset(1.5,"XY");
     hMap[iOmegaTau]->SetTitleOffset(0.9,"Z");
-    hMap[iOmegaTau]->SetTitle(Form("%s: 50 kHz, #epsilon = %d",sGas[iOmegaTau].Data(),eps[iOmegaTau]));
+    hMap[iOmegaTau]->SetTitle(Form("%s: 50 kHz, #varepsilon = %d",sGas[iOmegaTau].Data(),eps[iOmegaTau]));
     hMap[iOmegaTau]->DrawCopy("surf2fb");
     
     
@@ -143,7 +143,7 @@ void SCdistortionsForTDRfinalAllGases(Double_t radiusScale=1.5, Int_t epsScale=1
     hdiffR[iOmegaTau]->SetTitleSize(0.05,"XYZ");
     hdiffPhiR[iOmegaTau]->SetTitleSize(0.05,"XYZ");
     
-    legend->AddEntry(hdiffR[iOmegaTau],Form("%s (#epsilon = %d)",sGas[iOmegaTau].Data(),eps[iOmegaTau]),"lp");
+    legend->AddEntry(hdiffR[iOmegaTau],Form("%s (#varepsilon = %d)",sGas[iOmegaTau].Data(),eps[iOmegaTau]),"lp");
     
     cOmegaTau->cd(1);
     if(iOmegaTau==0)

diff --git a/TPC/Upgrade/macros/epsilonScanFineBinningForPerformanceNote.C b/TPC/Upgrade/macros/epsilonScanFineBinningForPerformanceNote.C
index 2ffc62c596c3f7d0dfc187f8bc1e56127f0e7ba5..d7718a80d4a19ab4c18814e4a04a5f764a4f17eb 100644 (file)
--- a/TPC/Upgrade/macros/epsilonScanFineBinningForPerformanceNote.C
+++ b/TPC/Upgrade/macros/epsilonScanFineBinningForPerformanceNote.C
@@ -15,7 +15,7 @@ void epsilonScanFineBinningForPerformanceNote(Int_t radiusScale=1, Int_t epsScal
   Double_t omegaTau[nOmegaTau] = {0.32};
   TString tGas[nOmegaTau] = {"NeCO2_2"}; 
   TString tGasOut[nOmegaTau] = {"NeCO2_2"}; 
-  TString sGas[nOmegaTau] = {"Ne/CO_{2}/N_{2} (90-10-5)"};
+  TString sGas[nOmegaTau] = {"Ne-CO_{2}-N_{2} (90-10-5)"};
   TString sLowE = "";
   //if(bLowE) sLowE = "_lowE";
   if(bLowE) sLowE = "_lowE2"; //second iteration
@@ -135,7 +135,7 @@ void epsilonScanFineBinningPlotOnly(Int_t radiusScale=1, Int_t epsScale=1,Int_t
   hPhiR1->SetTitle(Form("x = %.0f, y = %.0f, z = %.0f",x,y,z)); 
 
   cEpsilon->cd(1);
-  hR0->GetXaxis()->SetTitle("#epsilon");
+  hR0->GetXaxis()->SetTitle("#varepsilon");
   hR0->GetYaxis()->SetTitle("dr (cm)");
   hR0->SetLineWidth(2);
   hR0->DrawCopy("lp");
@@ -149,7 +149,7 @@ void epsilonScanFineBinningPlotOnly(Int_t radiusScale=1, Int_t epsScale=1,Int_t
   legend->Draw();
 
   cEpsilon->cd(2);
-  hPhiR0->GetXaxis()->SetTitle("#epsilon");
+  hPhiR0->GetXaxis()->SetTitle("#varepsilon");
   hPhiR0->GetYaxis()->SetTitle("d(r#varphi) (cm)");
   hPhiR0->SetLineWidth(2);
   hPhiR0->DrawCopy("lp");