diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/cmt/requirements b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/cmt/requirements index fc1abdf97fafdbdf104e8e6f0635ceb4013046a2..a63366e0ec410188f5135ba1e765469bf3890ba0 100755 --- a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/cmt/requirements +++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/cmt/requirements @@ -18,7 +18,7 @@ include_dirs ../include #------ Building the library ------- -macro_append ROOT_linkopts " -lHist" +macro_append ROOT_linkopts " -lHist -lGpad" library G4TestEm5 $(G4LibraryFlags) ../src/*.cc apply_pattern linker_library library=G4TestEm5 diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/incnew/RMSPlotter.hh b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/incnew/RMSPlotter.hh index 6d2155a724267544b451d56b8ca19dba7f3bab53..c58d4b48daeb4e5f9e560aadcd4e4c2b5ea9429a 100644 --- a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/incnew/RMSPlotter.hh +++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/incnew/RMSPlotter.hh @@ -6,6 +6,7 @@ #include"TF1.h" #include<map> #include"TFitResultPtr.h" +#include<fstream> struct DataPoint{ double Energy; double rms; diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/scripts/Em5run.sh b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/scripts/Em5run.sh index c017106e077d1f519039d440ba0f67140214f396..27ba541d7e756b8d3f5c75a7635c68c9fa0263b6 100755 --- a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/scripts/Em5run.sh +++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/scripts/Em5run.sh @@ -23,7 +23,7 @@ cd $TestDir fi MacGen.py $n -testEm5.exe BruteForce.mac +testEm5.exe BruteForce.mac $n diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/srcnew/TestEm5.cc b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/srcnew/TestEm5.cc index f848fe7551ea7e5f13692d5ce39b2b2f93948025..362182057378a352c6ebc5175d0e9709a7b48bc0 100644 --- a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/srcnew/TestEm5.cc +++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/srcnew/TestEm5.cc @@ -50,6 +50,7 @@ #include"TGraphErrors.h" #include"TH1D.h" #include"TFile.h" +#include"TCanvas.h" #ifdef G4VIS_USE #include "G4VisExecutive.hh" @@ -126,6 +127,10 @@ int main(int argc,char** argv) { TFile* Out= new TFile("RMSResults.root","RECREATE"); rmsplot->Write(); rmsfittedplot->Write(); + TCanvas C; + rmsplot->Draw("AP"); + C.Print("Results.pdf"); + std::vector<TH1D*>::iterator Vi=V.begin(); for(;Vi!=V.end();++Vi) { diff --git a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/srcnew/src/RMSPlotter.cc b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/srcnew/src/RMSPlotter.cc index 6aa4896cca6530c4fcf01a2afbca32784a35bc47..bdbcf12e05bb122f2ad4abbb0c14481912f4b4f0 100644 --- a/Geant4/G4examples/extended/electromagnetic/G4TestEm5/srcnew/src/RMSPlotter.cc +++ b/Geant4/G4examples/extended/electromagnetic/G4TestEm5/srcnew/src/RMSPlotter.cc @@ -43,6 +43,8 @@ void RMSPlotter::AddRun(Double_t _Energy, Double_t _rms){ } TGraphErrors* RMSPlotter::MakePlots(){ + std::ofstream outt("Results_Table.txt"); + outt<<"Energy/MeV "<<"RMS of Scattering Angle/mRad "<<" Uncertainty/mRad" <<std::endl; int D= DataPoints.size(); Double_t* E=new Double_t[D]; Double_t* R=new Double_t[D]; @@ -55,13 +57,16 @@ TGraphErrors* RMSPlotter::MakePlots(){ R[a]=(*Di).rms=(*Di).Distribution->GetMean(); RU[a]=(*Di).rmsUncert=(*Di).Distribution->GetRMS(); EU[a]=0; + outt<<E[a]<<" , "<<R[a]<<" , "<<RU[a]<<std::endl; } ThePlot= new TGraphErrors(D,E,R,EU,RU); - ThePlot->SetTitle("Plot from taking RMS of RMS Distribution;Energy/MeV;RMS/mrad"); + ThePlot->SetTitle("RMS of Scattering Angle Against Energy;Energy/MeV;RMS/mrad"); delete[] E; delete[] R; delete[] RU; delete[] EU; + outt.close(); + std::cout<<"MADE A PLOT "<<std::endl; return ThePlot; }