* Updating GUI

NPSimulation/Simulation.cc

@@ -97,19 +97,22 @@ int main(int argc, char** argv){
   ///////////////////////////////////////////////////////////////
   // interactive mode : define UI session
   // Get the pointer to the User Interface manager
+  G4cout << "//////////// Starting UI ////////////"<< endl;
   G4UImanager* UImanager = G4UImanager::GetUIpointer();
- cout <<  UImanager->GetVerboseLevel() << endl ;
 #ifdef G4UI_USE
   G4UIExecutive* ui = new G4UIExecutive(argc, argv);
 #ifdef G4VIS_USE
+  UImanager->ApplyCommand("/control/execute macro/aliases.mac");
   G4VisManager* visManager = new G4VisExecutive("Quiet");
   visManager->Initialize();
-  UImanager->ApplyCommand("/control/execute vis.mac");
+  UImanager->ApplyCommand("/control/execute macro/vis.mac");
 #endif
-  if (ui->IsGUI())
-    UImanager->ApplyCommand("/control/execute gui.mac");
-   ui->SessionStart();
-  delete ui;
+    if (ui->IsGUI()){
+            UImanager->ApplyCommand("/control/execute macro/gui.mac");
+    }
+
+    ui->SessionStart();
+    delete ui;
 #endif
   
 #ifdef G4VIS_USE

NPSimulation/macro/aliases.mac

+# Aliases are needed to avoid warning
+/control/alias gui_beamon "/run/beamOn 1"
+/control/alias gui_vis "/control/execute vis.mac "
+/control/alias gui_tracking "/tracking/verbose 1"
+/control/alias gui_surface "/vis/viewer/set/style surface"
+/control/alias gui_wireframe "/vis/viewer/set/style wireframe"
+/control/alias gui_beam "/vis/scene/add/arrow 0 0 -1 0 0 1 m"
+/control/alias gui_home "/vis/viewer/set/viewpointThetaPhi 45. 45."
+/control/alias gui_front "/vis/viewer/set/viewpointThetaPhi 0. 0."
+/control/alias gui_back "/vis/viewer/set/viewpointThetaPhi 180. 0."
+/control/alias gui_left "/vis/viewer/set/viewpointThetaPhi 90. 0." 
+/control/alias gui_right "/vis/viewer/set/viewpointThetaPhi -90. 0."
+/control/alias gui_zoomin "/vis/viewer/zoom 2"
+/control/alias gui_zoomout "/vis/viewer/zoom 0.5"
+/control/alias gui_empty "/"
+/control/alias gui_exit "exit"
+
+

NPSimulation/gui.mac → NPSimulation/macro/gui.mac

@@ -6,12 +6,11 @@
 # File
 #
 #
-
 # Viewer menu :
 /gui/addMenu viewer Viewer
-/gui/addButton viewer "New viewer" "/control/execute vis.mac"
-/gui/addButton viewer "Set style surface" "/vis/viewer/set/style surface"
-/gui/addButton viewer "Set style wireframe" "/vis/viewer/set/style wireframe"
+/gui/addButton viewer "New viewer" "{gui_vis}"
+/gui/addButton viewer "Set style surface" "{gui_surface}"
+/gui/addButton viewer "Set style wireframe" "{gui_wireframe}"
 
 /gui/addMenu tracking Tracking
 /gui/addButton tracking "Set Tracking verbose" "/tracking/verbose"
@@ -21,23 +20,22 @@
 
 /gui/addMenu custom "Custom View"
 /gui/addButton custom "Add Axis" "/vis/scene/add/axes"
-/gui/addButton custom "Add Beam axis" "/vis/scene/add/arrow 0 0 -1 0 0 1 m"
+/gui/addButton custom "Add Beam axis" "{gui_beam}"
 /gui/addButton custom "Add Scorer Hits" "/vis/scene/add/psHits"
 /gui/addButton custom "Add Hits" "/vis/scene/add/hits"
 /gui/addButton custom "Add Event ID" "/vis/scene/add/eventID"
 
-/gui/addIcon "Exit" user_icon "exit" icons/power.png
-/gui/addIcon "There is nothing here" user_icon "/" icons/empty.png 
+/gui/addIcon "Exit" user_icon "{gui_exit}" icons/power.png
+/gui/addIcon "There is nothing here" user_icon "{gui_empty}" icons/empty.png 
 /gui/addIcon "Run beam on" user_icon "/run/beamOn" icons/rocket.png
-/gui/addIcon "One event" user_icon "/run/beamOn 1" icons/play.png
-/gui/addIcon "Seriously?" user_icon "/" icons/empty.png 
-/gui/addIcon "Activate tracking verbose" user_icon "/tracking/verbose 1" icons/shoeprints.png
-/gui/addIcon "Only borring emptyness" user_icon "/" icons/empty.png 
-/gui/addIcon "Home" user_icon "/vis/viewer/set/viewpointThetaPhi 45. 45." icons/videocameraclassic.png
-/gui/addIcon "Front" user_icon "/vis/viewer/set/viewpointThetaPhi 0. 0." icons/arrow-up.png
-/gui/addIcon "Back" user_icon "/vis/viewer/set/viewpointThetaPhi 180. 0." icons/arrow-down.png
-/gui/addIcon "Left" user_icon "/vis/viewer/set/viewpointThetaPhi 90. 0." icons/arrow-left.png
-/gui/addIcon "Right" user_icon "/vis/viewer/set/viewpointThetaPhi -90. 0." icons/arrow-right.png
-/gui/addIcon "Zoom in" user_icon "/vis/viewer/zoom 2" icons/zoomin.png
-/gui/addIcon "Zoom out" user_icon "/vis/viewer/zoom 0.5" icons/zoomout.png
+/gui/addIcon "One event" user_icon "{gui_beamon}" icons/play.png
+/gui/addIcon "Activate tracking verbose" user_icon "{gui_tracking}" icons/shoeprints.png
+/gui/addIcon "Only borring emptyness" user_icon "{gui_empty}" icons/empty.png 
+/gui/addIcon "Home" user_icon     "{gui_home}" icons/videocameraclassic.png
+/gui/addIcon "Front" user_icon    "{gui_front}" icons/arrow-up.png
+/gui/addIcon "Back" user_icon     "{gui_back}" icons/arrow-down.png
+/gui/addIcon "Left" user_icon     "{gui_left}" icons/arrow-left.png
+/gui/addIcon "Right" user_icon    "{gui_right}" icons/arrow-right.png
+/gui/addIcon "Zoom in" user_icon  "{gui_zoomin}" icons/zoomin.png
+/gui/addIcon "Zoom out" user_icon "{gui_zoomout}" icons/zoomout.png
 

NPSimulation/vis.mac → NPSimulation/macro/vis.mac

@@ -4,8 +4,10 @@
 # Sets some default verbose
 #
 /control/verbose 0
-/control/saveHistory
 /run/verbose 0
+/cuts/verbose 0
+/process/em/verbose 0
+/process/eLoss/verbose 0
 #
 # Use this open statement to create an OpenGL view:
 /vis/open OGLI 1200x600-0+0

NPSimulation/vasigamma.mac

-#verbose level
-/control/verbose 0
-/material/verbose 0
-/tracking/verbose 0
-/process/verbose 0
-/event/verbose 0
-/run/verbose 0
-
-# choose a graphic system
-#/vis/open OGLIX
-#/vis/open OGLSX
-#/vis/open VRML2FILE
-#/vis/scene/create
-#/vis/drawVolume
-#/vis/viewer/set/viewpointThetaPhi 0 0 deg
-#/vis/viewer/zoom 7
-
-# options to draw trajectories
-#/vis/scene/endOfEventAction accumulate
-#/vis/scene/add/trajectories 1
-#/tracking/storeTrajectory 1
-#/vis/scene/add/axes 0 0 0 20 cm
-#/vis/viewer/refresh
-
-# run event
-/run/beamOn 100000
-