diff --git a/NPSimulation/CMakeLists.txt b/NPSimulation/CMakeLists.txt index 263491358c3ba26d6cc5174edbf3c98fdb19dc0c..76a620888ba7846e9e76cd507dda4dd710ff8177 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 59ec4338b66d9c9b5ea40578d5963917a2e9fa04..ef2436126640bc3c315ce6c60977b09c817a551b 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 98034832234df5e3c65dbcb6d651e627ec47396b..bcb38b96cc3c9ec114e4fa0ebc3c36948c37b23c 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