From 3753c094081d91769adb41f803a2c5596947f683 Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Thu, 7 Jan 2016 12:15:40 +0000
Subject: [PATCH] * Fixing Gaspard benchmark
---
Benchmarks/gaspard/ShowResults.C | 2 +-
NPLib/Physics/CMakeLists.txt | 4 ++--
Projects/Nana/NIM.cxx | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Benchmarks/gaspard/ShowResults.C b/Benchmarks/gaspard/ShowResults.C
index 78d970325..9735b282e 100644
--- a/Benchmarks/gaspard/ShowResults.C
+++ b/Benchmarks/gaspard/ShowResults.C
@@ -43,7 +43,7 @@
TCanvas* canvas1 ;
TCanvas* canvas2 ;
-void ControlSimu(const char * fname = "benchmark_gaspard"){
+void ShowResults(const char * fname = "benchmark_gaspard"){
// for the style
gROOT->SetStyle("nptool");
gROOT->ForceStyle(false);
diff --git a/NPLib/Physics/CMakeLists.txt b/NPLib/Physics/CMakeLists.txt
index 14e342a01..3d19e9ec7 100644
--- a/NPLib/Physics/CMakeLists.txt
+++ b/NPLib/Physics/CMakeLists.txt
@@ -1,7 +1,7 @@
add_custom_command(OUTPUT NPReactionDict.cxx COMMAND ../scripts/build_dict.sh NPReaction.h NPReactionDict.cxx NPReaction.rootmap libNPPhysics.so NPPhysicsLinkDef.h DEPENDS NPReaction.h)
add_custom_command(OUTPUT NPEnergyLossDict.cxx COMMAND ../scripts/build_dict.sh NPEnergyLoss.h NPEnergyLossDict.cxx NPEnergyLoss.rootmap libNPPhysics.so NPPhysicsLinkDef.h DEPENDS NPEnergyLoss.h)
-add_custom_command(OUTPUT TInitialConditionsDict.cxx COMMAND ../scripts/build_dict.sh TInitialConditions.h TInitialConditionsDict.cxx TInitialConditions.rootmap libNPPhysics.so DEPENDS TInitialConditions.h)
-add_custom_command(OUTPUT TInteractionCoordinatesDict.cxx COMMAND ../scripts/build_dict.sh TInteractionCoordinates.h TInteractionCoordinatesDict.cxx TInteractionCoordinates.rootmap libNPPhysics.so DEPENDS TInteractionCoordinates.h)
+add_custom_command(OUTPUT TInitialConditionsDict.cxx COMMAND ../scripts/build_dict.sh TInitialConditions.h TInitialConditionsDict.cxx TInitialConditions.rootmap libNPInitialConditions.so DEPENDS TInitialConditions.h)
+add_custom_command(OUTPUT TInteractionCoordinatesDict.cxx COMMAND ../scripts/build_dict.sh TInteractionCoordinates.h TInteractionCoordinatesDict.cxx TInteractionCoordinates.rootmap libNPInteractionCoordinates.so DEPENDS TInteractionCoordinates.h)
add_library(NPPhysics SHARED NPBeam.cxx NPEnergyLoss.cxx NPFunction.cxx NPNucleus.cxx NPReaction.cxx NPReactionDict.cxx NPEnergyLossDict.cxx )
target_link_libraries(NPPhysics ${ROOT_LIBRARIES} MathMore NPCore)
diff --git a/Projects/Nana/NIM.cxx b/Projects/Nana/NIM.cxx
index cc991ebab..f9a619024 100644
--- a/Projects/Nana/NIM.cxx
+++ b/Projects/Nana/NIM.cxx
@@ -1,5 +1,5 @@
void NIM(){
- TCanvas* c = new TCanvas("c","c",900,900);
+ TCanvas* c = new TCanvas("c","c",2*900,900);
// TFile* fexp = new TFile("Nana_exp.root","READ");
@@ -40,10 +40,11 @@ void NIM(){
hexp->Draw();
hexp->GetXaxis()->SetTitle("LaBr3 Energy (keV)");
hexp->GetYaxis()->SetTitle("Counts per 4 keV");
+ hexp->GetXaxis()->SetRangeUser(0,1600);
hsim->Draw("same");
hbgd->SetFillColor(kRed);
hbgd->SetLineColor(kRed);
- hbgd->Draw("same");
+// hbgd->Draw("same");
// hexp_o->SetFillColor(kGreen);
// hexp_o->SetLineColor(kGreen);
//hexp_o->Draw("same");
--
GitLab