diff --git a/Projects/ana_e850/macro/Mass/PlotYieldEvolution.C b/Projects/ana_e850/macro/Mass/PlotYieldEvolution.C index 9b27123255383726c246fe26a16ffbd13cec2b38..9c736fdb2fa87816016693969c3c2eb08192848c 100644 --- a/Projects/ana_e850/macro/Mass/PlotYieldEvolution.C +++ b/Projects/ana_e850/macro/Mass/PlotYieldEvolution.C @@ -1,7 +1,8 @@ -TGraphErrors* GetGoodenYield(int A); +TGraphErrors* GetGoodenYield(int A, int year, double scale); ////////////////////////////////////////////////// -void PlotYieldEvolution(int A_asked=132){ +void PlotYieldEvolution(int A_asked=99, double scale=1.2){ + gROOT->SetStyle("pierre_style"); int Energy[11] = {6,7,8,9,10,11,12,13,14,15,16}; TGraphErrors* gevol = new TGraphErrors(); TGraphErrors* g_relative = new TGraphErrors(); @@ -17,7 +18,7 @@ void PlotYieldEvolution(int A_asked=132){ double Sn = 6.534; while(ifile>>A>>yield>>yield_err){ if(A==A_asked){ - gevol->SetPoint(i,Energy[i]-Sn,1.*yield); + gevol->SetPoint(i,Energy[i]-Sn,scale*yield); gevol->SetPointError(i,0,yield_err); g_relative->SetPoint(i,Energy[i]-5.5,yield_err/yield); @@ -25,19 +26,33 @@ void PlotYieldEvolution(int A_asked=132){ } } - TH2F* h2 = new TH2F("h2","h2",100,-1,10,100,1,10); - TCanvas* c1 = new TCanvas("c1","c1",800,1600); - c1->Divide(1,2); - c1->cd(1); + TH2F* h2 = new TH2F("h2","h2",100,-1,11.5,100,1,11.5); + TCanvas* c1 = new TCanvas("c1","c1",800,800); + c1->cd(); gevol->SetMarkerStyle(8); - gevol->SetMarkerSize(1); + gevol->SetMarkerSize(1.5); h2->Draw(); - gevol->Draw("psame"); if(A_asked==140 || A_asked==97 || A_asked==99 || A_asked==147 || A_asked==132 || A_asked==143){ - TGraphErrors* ggooden = GetGoodenYield(A_asked); - ggooden->Draw("psame"); + TGraphErrors* ggooden2016 = GetGoodenYield(A_asked,2016,1); + ggooden2016->SetMarkerStyle(22); + ggooden2016->SetMarkerColor(2); + ggooden2016->SetLineColor(2); + ggooden2016->SetMarkerSize(1.5); + ggooden2016->Draw("psame"); + + TGraphErrors* ggooden2024 = GetGoodenYield(A_asked,2024,1); + ggooden2024->SetMarkerStyle(23); + ggooden2024->SetMarkerColor(4); + ggooden2024->SetLineColor(4); + ggooden2024->SetMarkerSize(1.5); + ggooden2024->Draw("psame"); + } - c1->cd(2); + + gevol->Draw("psame"); + + TCanvas* c2 = new TCanvas("c2","c2",800,800); + c2->cd(); g_relative->SetMarkerStyle(8); g_relative->Draw("ap"); @@ -46,8 +61,8 @@ void PlotYieldEvolution(int A_asked=132){ ////////////////////////////////////////////////// -TGraphErrors* GetGoodenYield(int A){ - string filename = "gooden/mass_" + to_string(A) + ".dat"; +TGraphErrors* GetGoodenYield(int A, int year, double scale=1){ + string filename = "gooden/" + to_string(year) + "/mass_" + to_string(A) + ".dat"; ifstream ifile; ifile.open(filename.c_str()); @@ -57,12 +72,10 @@ TGraphErrors* GetGoodenYield(int A){ TGraphErrors* gerr = new TGraphErrors(); for(int i=0; i<8; i++){ ifile>>En>>Y>>Yerr; - gerr->SetPoint(i,En,Y); + gerr->SetPoint(i,En,scale*Y); gerr->SetPointError(i,0,Yerr); } - gerr->SetMarkerStyle(22); - gerr->SetMarkerColor(2); - return gerr; + return gerr; } diff --git a/Projects/ana_e850/macro/Mass/gooden/2016/mass_132.dat b/Projects/ana_e850/macro/Mass/gooden/2016/mass_132.dat new file mode 100644 index 0000000000000000000000000000000000000000..73986c7dfca6b8a015cb23cd1e4cf289adc77e83 --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2016/mass_132.dat @@ -0,0 +1,9 @@ +0.58 5.11 0.26 +1.37 5.41 0.27 +2.37 5.48 0.28 +3.60 5.42 0.27 +4.49 5.23 0.27 +5.50 4.90 0.23 +8.90 4.17 0.32 +14.8 3.95 0.17 + diff --git a/Projects/ana_e850/macro/Mass/gooden/2016/mass_140.dat b/Projects/ana_e850/macro/Mass/gooden/2016/mass_140.dat new file mode 100644 index 0000000000000000000000000000000000000000..ddd43c291dc09832ecb203bb5198a7bc36b30e43 --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2016/mass_140.dat @@ -0,0 +1,9 @@ +0.58 5.49 0.20 +1.37 5.38 0.17 +2.37 5.52 0.18 +3.60 5.52 0.16 +4.49 5.23 0.19 +5.50 5.07 0.15 +8.90 4.79 0.32 +14.8 3.95 0.17 + diff --git a/Projects/ana_e850/macro/Mass/gooden/2016/mass_143.dat b/Projects/ana_e850/macro/Mass/gooden/2016/mass_143.dat new file mode 100644 index 0000000000000000000000000000000000000000..6da48ac3901d0a7dbbaeedc4da518b06179272d9 --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2016/mass_143.dat @@ -0,0 +1,9 @@ +0.58 4.38 0.16 +1.37 4.46 0.16 +2.37 4.48 0.17 +3.60 4.58 0.18 +4.49 4.34 0.22 +5.50 4.06 0.15 +8.90 3.78 0.24 +14.8 2.90 0.14 + diff --git a/Projects/ana_e850/macro/Mass/gooden/2016/mass_147.dat b/Projects/ana_e850/macro/Mass/gooden/2016/mass_147.dat new file mode 100644 index 0000000000000000000000000000000000000000..11dd06ab9675a54c68a0856e1bc7abdcfa3ed5f7 --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2016/mass_147.dat @@ -0,0 +1,9 @@ +0.58 2.01 0.08 +1.37 2.13 0.03 +2.37 2.29 0.11 +3.60 2.39 0.10 +4.49 2.34 0.1 +5.50 2.34 0.11 +8.90 2.01 0.22 +14.8 1.67 0.08 + diff --git a/Projects/ana_e850/macro/Mass/gooden/2016/mass_97.dat b/Projects/ana_e850/macro/Mass/gooden/2016/mass_97.dat new file mode 100644 index 0000000000000000000000000000000000000000..808114f873c4739e3b35d735ed1250312defb3c5 --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2016/mass_97.dat @@ -0,0 +1,9 @@ +0.58 5.47 0.17 +1.37 5.56 0.17 +2.37 5.93 0.18 +3.60 5.90 0.15 +4.49 5.77 0.18 +5.50 5.83 0.17 +8.90 5.36 0.34 +14.8 4.74 0.17 + diff --git a/Projects/ana_e850/macro/Mass/gooden/2016/mass_99.dat b/Projects/ana_e850/macro/Mass/gooden/2016/mass_99.dat new file mode 100644 index 0000000000000000000000000000000000000000..8e8c81507a31d3357e585afbb37e4a09d824b18a --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2016/mass_99.dat @@ -0,0 +1,9 @@ +0.58 6.79 0.31 +1.37 6.95 0.32 +2.37 7.11 0.33 +3.60 6.87 0.33 +4.49 6.73 0.29 +5.50 6.63 0.29 +8.90 5.90 0.39 +14.8 5.42 0.26 + diff --git a/Projects/ana_e850/macro/Mass/gooden/2024/mass_132.dat b/Projects/ana_e850/macro/Mass/gooden/2024/mass_132.dat new file mode 100644 index 0000000000000000000000000000000000000000..9f78b29428d8d54e60f94ca2500e443325a5b6cd --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2024/mass_132.dat @@ -0,0 +1,5 @@ +5.5 4.04 0.20 +6.5 3.84 0.14 +7.5 3.80 0.15 +9.0 3.54 0.14 +11.0 3.54 0.15 diff --git a/Projects/ana_e850/macro/Mass/gooden/2024/mass_140.dat b/Projects/ana_e850/macro/Mass/gooden/2024/mass_140.dat new file mode 100644 index 0000000000000000000000000000000000000000..0f4165d5197910ecb2b9e521e3013bada845c1e7 --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2024/mass_140.dat @@ -0,0 +1,5 @@ +5.5 4.99 0.09 +6.5 4.84 0.08 +7.5 4.79 0.10 +9.0 4.64 0.09 +11.0 4.34 0.11 diff --git a/Projects/ana_e850/macro/Mass/gooden/2024/mass_143.dat b/Projects/ana_e850/macro/Mass/gooden/2024/mass_143.dat new file mode 100644 index 0000000000000000000000000000000000000000..d02bac29783887a46d2bfceb9c7adf3019cc2c08 --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2024/mass_143.dat @@ -0,0 +1,5 @@ +5.5 3.50 0.07 +6.5 3.41 0.07 +7.5 3.48 0.07 +9.0 3.31 0.07 +11.0 2.84 0.09 diff --git a/Projects/ana_e850/macro/Mass/gooden/2024/mass_147.dat b/Projects/ana_e850/macro/Mass/gooden/2024/mass_147.dat new file mode 100644 index 0000000000000000000000000000000000000000..0ae51c8fb7f84be4f8b88d63a6596f7a5fd43d2e --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2024/mass_147.dat @@ -0,0 +1,5 @@ +5.5 2.43 0.05 +6.5 1.97 0.04 +7.5 1.86 0.04 +9.0 1.72 0.04 +11.0 1.64 0.06 diff --git a/Projects/ana_e850/macro/Mass/gooden/2024/mass_97.dat b/Projects/ana_e850/macro/Mass/gooden/2024/mass_97.dat new file mode 100644 index 0000000000000000000000000000000000000000..83e169de982c1cba37258d0244df8aa7c7c4c8b1 --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2024/mass_97.dat @@ -0,0 +1,5 @@ +5.5 5.96 0.10 +6.5 5.79 0.08 +7.5 5.73 0.09 +9.0 5.57 0.09 +11.0 5.63 0.12 diff --git a/Projects/ana_e850/macro/Mass/gooden/2024/mass_99.dat b/Projects/ana_e850/macro/Mass/gooden/2024/mass_99.dat new file mode 100644 index 0000000000000000000000000000000000000000..2a25380c92127780dd7a7e9ca35b54c6c9afa469 --- /dev/null +++ b/Projects/ana_e850/macro/Mass/gooden/2024/mass_99.dat @@ -0,0 +1,5 @@ +5.5 5.98 0.14 +6.5 6.24 0.12 +7.5 6.23 0.13 +9.0 5.96 0.13 +11.0 5.64 0.16