diff --git a/NPSimulation/icons/NPToolLogo.png b/NPSimulation/icons/NPToolLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..df56ad7caa18f7e0754fb520b78060c68b955659 Binary files /dev/null and b/NPSimulation/icons/NPToolLogo.png differ diff --git a/NPSimulation/macro/aliases.mac b/NPSimulation/macro/aliases.mac index 33d4a9eb195214b7e70d316207bb3b3c71f188fd..5d257853c3e7d423beaab669fa013822e6801c99 100644 --- a/NPSimulation/macro/aliases.mac +++ b/NPSimulation/macro/aliases.mac @@ -14,5 +14,5 @@ /control/alias gui_zoomout "/vis/viewer/zoom 0.5" /control/alias gui_empty "/" /control/alias gui_exit "exit" - +/control/alias gui_nptool "./scripts/url.sh" diff --git a/NPSimulation/macro/gui.mac b/NPSimulation/macro/gui.mac index 45c92454b4dc9305115239dde6407092b1d40bfb..0f51b6e06cd087396e5fe98e9c4edd6324dca2aa 100644 --- a/NPSimulation/macro/gui.mac +++ b/NPSimulation/macro/gui.mac @@ -21,10 +21,13 @@ /gui/addMenu custom "Custom View" /gui/addButton custom "Add Axis" "/vis/scene/add/axes" /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" +# No hit collection is implemented +#/gui/addButton custom "Add Scorer Hits" "/vis/scene/add/psHits" +#/gui/addButton custom "Add Hits" "/vis/scene/add/hits" + +/gui/addIcon "nptool" user_icon "/gui/system {gui_nptool}" icons/NPToolLogo.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 diff --git a/NPSimulation/scripts/url.sh b/NPSimulation/scripts/url.sh new file mode 100755 index 0000000000000000000000000000000000000000..b0698a947e018739480c94fdcd1ed298a080abed --- /dev/null +++ b/NPSimulation/scripts/url.sh @@ -0,0 +1,23 @@ +# ***************************************************************************** +# * Copyright (C) 2009 this file is part of the NPTool Project * +# * * +# * For the licensing terms see $NPTOOL/Licence/NPTool_Licence * +# * For the list of contributors see $NPTOOL/Licence/Contributors * +# *****************************************************************************/ + +# ***************************************************************************** +# * Original Author: A. Matta contact address: a.matta@surrey.ac.uk * +# * * +# * Creation Date : 05/11/14 * +# * Last update : * +# *---------------------------------------------------------------------------* +# * Decription: This script open then ptool website * +# * * +# *---------------------------------------------------------------------------* +# * Comment: * +# * * +# * * +# ***************************************************************************** + +#! /bin/bash +open https://github.com/adrien-matta/nptool diff --git a/NPSimulation/src/EventAction.cc b/NPSimulation/src/EventAction.cc index 5e96f1b7658727718cd7d009a161cd6d489755ce..acdbee2a080965336e089a1ee10e6b83930f3790 100644 --- a/NPSimulation/src/EventAction.cc +++ b/NPSimulation/src/EventAction.cc @@ -52,7 +52,6 @@ EventAction::~EventAction(){ void EventAction::BeginOfEventAction(const G4Event* event){ if ((event->GetEventID() + 1) % m_printModulo == 0) -// G4cout << "Event: " << event->GetEventID() + 1 << G4endl; G4cout << "\rEvent: " << event->GetEventID() + 1 << flush; }