From d780df028dbe26169e8c4b30dd07023cbdeba244 Mon Sep 17 00:00:00 2001
From: morfouace <pierre.morfouace@cea.fr>
Date: Fri, 6 Sep 2024 16:00:30 +0200
Subject: [PATCH] debugging DSSD simulation
---
NPSimulation/Scorers/DSSDScorers.cc | 2 +-
.../ana_e850/macro/Mass/PlotYieldEvolution.C | 52 +++++++++++++++++--
2 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/NPSimulation/Scorers/DSSDScorers.cc b/NPSimulation/Scorers/DSSDScorers.cc
index 033852be2..dda9d4ec7 100644
--- a/NPSimulation/Scorers/DSSDScorers.cc
+++ b/NPSimulation/Scorers/DSSDScorers.cc
@@ -210,7 +210,7 @@ G4bool PS_Rectangle::ProcessHits(G4Step* aStep, G4TouchableHistory*) {
}
else
{
- m_HitLength.Set(t_Energy, t_Time, t_StripWidthNumber, t_DetectorNumber);
+ m_HitLength.Set(t_Energy, t_Time, t_StripLengthNumber, t_DetectorNumber);
}
it = m_HitWidth.find(DSSDData::CalculateIndex(t_StripWidthNumber, t_DetectorNumber));
diff --git a/Projects/ana_e850/macro/Mass/PlotYieldEvolution.C b/Projects/ana_e850/macro/Mass/PlotYieldEvolution.C
index 9c736fdb2..ea5776c2f 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, int year, double scale);
+TGraphErrors* GetTonchevYield(int A);
//////////////////////////////////////////////////
-void PlotYieldEvolution(int A_asked=99, double scale=1.2){
+void PlotYieldEvolution(int A_asked=99, double scale=1.25){
gROOT->SetStyle("pierre_style");
int Energy[11] = {6,7,8,9,10,11,12,13,14,15,16};
TGraphErrors* gevol = new TGraphErrors();
@@ -31,6 +32,10 @@ void PlotYieldEvolution(int A_asked=99, double scale=1.2){
c1->cd();
gevol->SetMarkerStyle(8);
gevol->SetMarkerSize(1.5);
+ h2->GetXaxis()->SetTitle("E_{n} (MeV)");
+ h2->GetYaxis()->SetTitle("Yield (%)");
+ h2->GetXaxis()->CenterTitle();
+ h2->GetYaxis()->CenterTitle();
h2->Draw();
if(A_asked==140 || A_asked==97 || A_asked==99 || A_asked==147 || A_asked==132 || A_asked==143){
TGraphErrors* ggooden2016 = GetGoodenYield(A_asked,2016,1);
@@ -38,18 +43,38 @@ void PlotYieldEvolution(int A_asked=99, double scale=1.2){
ggooden2016->SetMarkerColor(2);
ggooden2016->SetLineColor(2);
ggooden2016->SetMarkerSize(1.5);
- ggooden2016->Draw("psame");
+ ggooden2016->SetName("gooden2016");
+ //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");
+ ggooden2024->SetName("gooden2024");
+ //ggooden2024->Draw("psame");
+
+ TGraphErrors* gtonchev = GetTonchevYield(A_asked);
+ gtonchev->SetMarkerStyle(23);
+ gtonchev->SetMarkerColor(4);
+ gtonchev->SetLineColor(4);
+ gtonchev->SetMarkerSize(1.5);
+ gtonchev->SetName("Tonchev");
+ gtonchev->Draw("psame");
+
}
+ gevol->SetName("ganil");
gevol->Draw("psame");
+
+ TLegend* leg = new TLegend(0.6,0.7,0.9,0.95);
+ leg->SetBorderSize(0);
+ //leg->AddEntry("gooden2016","Gooden 2016","lp");
+ //leg->AddEntry("gooden2024","Gooden 2024","lp");
+ leg->AddEntry("Tonchev","Tonchev et al. 2024","lp");
+ leg->AddEntry("ganil","PISTA 2023","lp");
+ leg->Draw("same");
TCanvas* c2 = new TCanvas("c2","c2",800,800);
c2->cd();
@@ -79,3 +104,24 @@ TGraphErrors* GetGoodenYield(int A, int year, double scale=1){
return gerr;
}
+
+//////////////////////////////////////////////////
+TGraphErrors* GetTonchevYield(int A){
+ string filename = "tonchev/mass_" + to_string(A) + ".dat";
+ ifstream ifile;
+ ifile.open(filename.c_str());
+
+ double En;
+ double Y;
+ double Yerr;
+ TGraphErrors* gerr = new TGraphErrors();
+ int i=0;
+ while(ifile>>En>>Y>>Yerr){
+ gerr->SetPoint(i,En,Y);
+ gerr->SetPointError(i,0,Yerr);
+ i++;
+ }
+
+ return gerr;
+
+}
--
GitLab