From f6c91dca35841900fa6f96b7c253531d11dd1a0b Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Thu, 24 Dec 2015 14:10:13 +0100
Subject: [PATCH] * NPSimulation cleaning - macro, icons and script are now
in the ressources folder
---
NPSimulation/CMakeLists.txt | 4 ++--
NPSimulation/PhysicsListOption.txt | 2 +-
NPSimulation/Simulation.cc | 2 +-
NPSimulation/{ => ressources}/icons/NPToolLogo.png | Bin
NPSimulation/{ => ressources}/icons/aperture.png | Bin
NPSimulation/{ => ressources}/icons/arrow-down.png | Bin
NPSimulation/{ => ressources}/icons/arrow-left.png | Bin
NPSimulation/{ => ressources}/icons/arrow-right.png | Bin
NPSimulation/{ => ressources}/icons/arrow-up.png | Bin
NPSimulation/{ => ressources}/icons/bolt.png | Bin
NPSimulation/{ => ressources}/icons/browser.png | Bin
NPSimulation/{ => ressources}/icons/camera.png | Bin
NPSimulation/{ => ressources}/icons/dev.png | Bin
NPSimulation/{ => ressources}/icons/empty.png | Bin
NPSimulation/{ => ressources}/icons/eye.png | Bin
NPSimulation/{ => ressources}/icons/folder.png | Bin
NPSimulation/{ => ressources}/icons/play.png | Bin
NPSimulation/{ => ressources}/icons/power.png | Bin
NPSimulation/{ => ressources}/icons/recycle.png | Bin
NPSimulation/{ => ressources}/icons/rocket.png | Bin
NPSimulation/{ => ressources}/icons/shoeprints.png | Bin
.../{ => ressources}/icons/videocameraclassic.png | Bin
NPSimulation/{ => ressources}/icons/zoomin.png | Bin
NPSimulation/{ => ressources}/icons/zoomout.png | Bin
NPSimulation/{ => ressources}/macro/aliases.mac.in | 0
NPSimulation/{ => ressources}/macro/browser.mac | 0
NPSimulation/{ => ressources}/macro/gui.mac.in | 0
NPSimulation/{ => ressources}/macro/reload.mac | 0
NPSimulation/{ => ressources}/macro/vis.mac | 0
.../{ => ressources}/scripts/bringtofront.osa | 0
NPSimulation/{ => ressources}/scripts/url.sh | 0
31 files changed, 4 insertions(+), 4 deletions(-)
rename NPSimulation/{ => ressources}/icons/NPToolLogo.png (100%)
rename NPSimulation/{ => ressources}/icons/aperture.png (100%)
rename NPSimulation/{ => ressources}/icons/arrow-down.png (100%)
rename NPSimulation/{ => ressources}/icons/arrow-left.png (100%)
rename NPSimulation/{ => ressources}/icons/arrow-right.png (100%)
rename NPSimulation/{ => ressources}/icons/arrow-up.png (100%)
rename NPSimulation/{ => ressources}/icons/bolt.png (100%)
rename NPSimulation/{ => ressources}/icons/browser.png (100%)
rename NPSimulation/{ => ressources}/icons/camera.png (100%)
rename NPSimulation/{ => ressources}/icons/dev.png (100%)
rename NPSimulation/{ => ressources}/icons/empty.png (100%)
rename NPSimulation/{ => ressources}/icons/eye.png (100%)
rename NPSimulation/{ => ressources}/icons/folder.png (100%)
rename NPSimulation/{ => ressources}/icons/play.png (100%)
rename NPSimulation/{ => ressources}/icons/power.png (100%)
rename NPSimulation/{ => ressources}/icons/recycle.png (100%)
rename NPSimulation/{ => ressources}/icons/rocket.png (100%)
rename NPSimulation/{ => ressources}/icons/shoeprints.png (100%)
rename NPSimulation/{ => ressources}/icons/videocameraclassic.png (100%)
rename NPSimulation/{ => ressources}/icons/zoomin.png (100%)
rename NPSimulation/{ => ressources}/icons/zoomout.png (100%)
rename NPSimulation/{ => ressources}/macro/aliases.mac.in (100%)
rename NPSimulation/{ => ressources}/macro/browser.mac (100%)
rename NPSimulation/{ => ressources}/macro/gui.mac.in (100%)
rename NPSimulation/{ => ressources}/macro/reload.mac (100%)
rename NPSimulation/{ => ressources}/macro/vis.mac (100%)
rename NPSimulation/{ => ressources}/scripts/bringtofront.osa (100%)
rename NPSimulation/{ => ressources}/scripts/url.sh (100%)
diff --git a/NPSimulation/CMakeLists.txt b/NPSimulation/CMakeLists.txt
index 263491358..76a620888 100755
--- a/NPSimulation/CMakeLists.txt
+++ b/NPSimulation/CMakeLists.txt
@@ -117,7 +117,7 @@ foreach(subdir ${SUB_DIRECTORY})
add_executable(npsimulation Simulation.cc)
target_Link_libraries(npsimulation ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPSCore)
-configure_file(macro/gui.mac.in macro/gui.mac @ONLY)
-configure_file(macro/aliases.mac.in macro/aliases.mac @ONLY)
+configure_file(ressources/macro/gui.mac.in ressources/macro/gui.mac @ONLY)
+configure_file(ressources/macro/aliases.mac.in ressources/macro/aliases.mac @ONLY)
install(PROGRAMS npsimulation DESTINATION ${CMAKE_BINARY_OUTPUT_DIRECTORY})
diff --git a/NPSimulation/PhysicsListOption.txt b/NPSimulation/PhysicsListOption.txt
index 59ec4338b..ef2436126 100644
--- a/NPSimulation/PhysicsListOption.txt
+++ b/NPSimulation/PhysicsListOption.txt
@@ -1,5 +1,5 @@
EmPhysicsList Option4
-DefaultCutOff 0.01
+DefaultCutOff 1
IonBinaryCascadePhysics 0
EmExtraPhysics 0
HadronElasticPhysics 0
diff --git a/NPSimulation/Simulation.cc b/NPSimulation/Simulation.cc
index 980348322..bcb38b96c 100644
--- a/NPSimulation/Simulation.cc
+++ b/NPSimulation/Simulation.cc
@@ -114,7 +114,7 @@ int main(int argc, char** argv){
#ifdef G4UI_USE
#ifdef G4VIS_USE
string Path_Macro = getenv("NPTOOL");
- Path_Macro+="/NPSimulation/macro/";
+ Path_Macro+="/NPSimulation/ressources/macro/";
UImanager->ApplyCommand("/control/execute " +Path_Macro+"aliases.mac");
visManager = new G4VisExecutive("Quiet");
diff --git a/NPSimulation/icons/NPToolLogo.png b/NPSimulation/ressources/icons/NPToolLogo.png
similarity index 100%
rename from NPSimulation/icons/NPToolLogo.png
rename to NPSimulation/ressources/icons/NPToolLogo.png
diff --git a/NPSimulation/icons/aperture.png b/NPSimulation/ressources/icons/aperture.png
similarity index 100%
rename from NPSimulation/icons/aperture.png
rename to NPSimulation/ressources/icons/aperture.png
diff --git a/NPSimulation/icons/arrow-down.png b/NPSimulation/ressources/icons/arrow-down.png
similarity index 100%
rename from NPSimulation/icons/arrow-down.png
rename to NPSimulation/ressources/icons/arrow-down.png
diff --git a/NPSimulation/icons/arrow-left.png b/NPSimulation/ressources/icons/arrow-left.png
similarity index 100%
rename from NPSimulation/icons/arrow-left.png
rename to NPSimulation/ressources/icons/arrow-left.png
diff --git a/NPSimulation/icons/arrow-right.png b/NPSimulation/ressources/icons/arrow-right.png
similarity index 100%
rename from NPSimulation/icons/arrow-right.png
rename to NPSimulation/ressources/icons/arrow-right.png
diff --git a/NPSimulation/icons/arrow-up.png b/NPSimulation/ressources/icons/arrow-up.png
similarity index 100%
rename from NPSimulation/icons/arrow-up.png
rename to NPSimulation/ressources/icons/arrow-up.png
diff --git a/NPSimulation/icons/bolt.png b/NPSimulation/ressources/icons/bolt.png
similarity index 100%
rename from NPSimulation/icons/bolt.png
rename to NPSimulation/ressources/icons/bolt.png
diff --git a/NPSimulation/icons/browser.png b/NPSimulation/ressources/icons/browser.png
similarity index 100%
rename from NPSimulation/icons/browser.png
rename to NPSimulation/ressources/icons/browser.png
diff --git a/NPSimulation/icons/camera.png b/NPSimulation/ressources/icons/camera.png
similarity index 100%
rename from NPSimulation/icons/camera.png
rename to NPSimulation/ressources/icons/camera.png
diff --git a/NPSimulation/icons/dev.png b/NPSimulation/ressources/icons/dev.png
similarity index 100%
rename from NPSimulation/icons/dev.png
rename to NPSimulation/ressources/icons/dev.png
diff --git a/NPSimulation/icons/empty.png b/NPSimulation/ressources/icons/empty.png
similarity index 100%
rename from NPSimulation/icons/empty.png
rename to NPSimulation/ressources/icons/empty.png
diff --git a/NPSimulation/icons/eye.png b/NPSimulation/ressources/icons/eye.png
similarity index 100%
rename from NPSimulation/icons/eye.png
rename to NPSimulation/ressources/icons/eye.png
diff --git a/NPSimulation/icons/folder.png b/NPSimulation/ressources/icons/folder.png
similarity index 100%
rename from NPSimulation/icons/folder.png
rename to NPSimulation/ressources/icons/folder.png
diff --git a/NPSimulation/icons/play.png b/NPSimulation/ressources/icons/play.png
similarity index 100%
rename from NPSimulation/icons/play.png
rename to NPSimulation/ressources/icons/play.png
diff --git a/NPSimulation/icons/power.png b/NPSimulation/ressources/icons/power.png
similarity index 100%
rename from NPSimulation/icons/power.png
rename to NPSimulation/ressources/icons/power.png
diff --git a/NPSimulation/icons/recycle.png b/NPSimulation/ressources/icons/recycle.png
similarity index 100%
rename from NPSimulation/icons/recycle.png
rename to NPSimulation/ressources/icons/recycle.png
diff --git a/NPSimulation/icons/rocket.png b/NPSimulation/ressources/icons/rocket.png
similarity index 100%
rename from NPSimulation/icons/rocket.png
rename to NPSimulation/ressources/icons/rocket.png
diff --git a/NPSimulation/icons/shoeprints.png b/NPSimulation/ressources/icons/shoeprints.png
similarity index 100%
rename from NPSimulation/icons/shoeprints.png
rename to NPSimulation/ressources/icons/shoeprints.png
diff --git a/NPSimulation/icons/videocameraclassic.png b/NPSimulation/ressources/icons/videocameraclassic.png
similarity index 100%
rename from NPSimulation/icons/videocameraclassic.png
rename to NPSimulation/ressources/icons/videocameraclassic.png
diff --git a/NPSimulation/icons/zoomin.png b/NPSimulation/ressources/icons/zoomin.png
similarity index 100%
rename from NPSimulation/icons/zoomin.png
rename to NPSimulation/ressources/icons/zoomin.png
diff --git a/NPSimulation/icons/zoomout.png b/NPSimulation/ressources/icons/zoomout.png
similarity index 100%
rename from NPSimulation/icons/zoomout.png
rename to NPSimulation/ressources/icons/zoomout.png
diff --git a/NPSimulation/macro/aliases.mac.in b/NPSimulation/ressources/macro/aliases.mac.in
similarity index 100%
rename from NPSimulation/macro/aliases.mac.in
rename to NPSimulation/ressources/macro/aliases.mac.in
diff --git a/NPSimulation/macro/browser.mac b/NPSimulation/ressources/macro/browser.mac
similarity index 100%
rename from NPSimulation/macro/browser.mac
rename to NPSimulation/ressources/macro/browser.mac
diff --git a/NPSimulation/macro/gui.mac.in b/NPSimulation/ressources/macro/gui.mac.in
similarity index 100%
rename from NPSimulation/macro/gui.mac.in
rename to NPSimulation/ressources/macro/gui.mac.in
diff --git a/NPSimulation/macro/reload.mac b/NPSimulation/ressources/macro/reload.mac
similarity index 100%
rename from NPSimulation/macro/reload.mac
rename to NPSimulation/ressources/macro/reload.mac
diff --git a/NPSimulation/macro/vis.mac b/NPSimulation/ressources/macro/vis.mac
similarity index 100%
rename from NPSimulation/macro/vis.mac
rename to NPSimulation/ressources/macro/vis.mac
diff --git a/NPSimulation/scripts/bringtofront.osa b/NPSimulation/ressources/scripts/bringtofront.osa
similarity index 100%
rename from NPSimulation/scripts/bringtofront.osa
rename to NPSimulation/ressources/scripts/bringtofront.osa
diff --git a/NPSimulation/scripts/url.sh b/NPSimulation/ressources/scripts/url.sh
similarity index 100%
rename from NPSimulation/scripts/url.sh
rename to NPSimulation/ressources/scripts/url.sh
--
GitLab