Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the visualisation option after the the intialization #70

Merged
merged 1 commit into from
May 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions t10_SpectroGamma/mac/main.mac
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
#==============================================================================================
# Visualization
#==============================================================================================

#/control/execute mac/visu.mac

#==============================================================================================
# World
Expand Down Expand Up @@ -48,6 +43,12 @@
#==============================================================================================
/gate/run/initialize

#==============================================================================================
# Visualization
#==============================================================================================

#/control/execute mac/visu.mac

#==============================================================================================
# Source
#==============================================================================================
Expand Down
12 changes: 6 additions & 6 deletions t11_EMField/mac/main.mac
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
#=====================================================
# Visualization
#=====================================================

#/control/execute mac/visu.mac

#=====================================================
# Material
#=====================================================
Expand Down Expand Up @@ -124,6 +118,12 @@

/gate/run/initialize

#=====================================================
# Visualization
#=====================================================

#/control/execute mac/visu.mac

#=====================================================
# Source
#=====================================================
Expand Down
3 changes: 2 additions & 1 deletion t13_phsp/mac/main-read-phsp.mac
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

#=====================================================
/control/execute mac/verbose.mac
#/control/execute mac/visu.mac

# =====================================================
# GEOMETRY
Expand Down Expand Up @@ -59,6 +58,8 @@

/gate/run/initialize

#/control/execute mac/visu.mac

#=====================================================
# BEAMS
#=====================================================
Expand Down
3 changes: 2 additions & 1 deletion t13_phsp/mac/main-write-phsp.mac
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

#=====================================================
/control/execute mac/verbose.mac
#/control/execute mac/visu.mac

# =====================================================
# GEOMETRY
Expand Down Expand Up @@ -75,6 +74,8 @@

/gate/run/initialize

#/control/execute mac/visu.mac

# Bremsstrahlung splitting : generate 100 photon (if below 100 MeV) with weight 1/100
/process/em/setSecBiasing eBrem target 100 100 MeV

Expand Down
3 changes: 2 additions & 1 deletion t14_phsp_pairs/mac/main_read_gan.mac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/control/execute mac/verbose.mac
/gate/verbose Beam 2
/gate/verbose Actor 1
#/control/execute mac/visu.mac

# GEOMETRY
/control/execute mac/world.mac
Expand All @@ -29,6 +28,8 @@
# INITIALISATION
/gate/run/initialize

#/control/execute mac/visu.mac

# SOURCE
/gate/source/addSource beam_pairs phaseSpace
/gate/source/beam_pairs/setPytorchBatchSize 60000
Expand Down
3 changes: 2 additions & 1 deletion t14_phsp_pairs/mac/main_read_gan_phsp.mac
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

/control/execute mac/verbose.mac
#/control/execute mac/visu.mac

# GEOMETRY
/control/execute mac/world.mac
Expand All @@ -27,6 +26,8 @@
# INITIALISATION
/gate/run/initialize

#/control/execute mac/visu.mac

# SOURCE
/gate/source/addSource beam_pairs phaseSpace
/gate/source/beam_pairs/addPhaseSpaceFile data/a_002_40K_pairs.npy
Expand Down
3 changes: 2 additions & 1 deletion t14_phsp_pairs/mac/main_read_phsp.mac
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

/control/execute mac/verbose.mac
#/control/execute mac/visu.mac

# GEOMETRY
/control/execute mac/world.mac
Expand All @@ -27,6 +26,8 @@
# INITIALISATION
/gate/run/initialize

#/control/execute mac/visu.mac

# SOURCE
/gate/source/addSource beam_pairs phaseSpace
/gate/source/beam_pairs/addPhaseSpaceFile output/phsp_write_pairs.npy
Expand Down
3 changes: 2 additions & 1 deletion t14_phsp_pairs/mac/main_write_phsp.mac
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

/control/execute mac/verbose.mac
#/control/execute mac/visu.mac

# GEOMETRY
/control/execute mac/world.mac
Expand Down Expand Up @@ -49,6 +48,8 @@
# INITIALISATION
/gate/run/initialize

#/control/execute mac/visu.mac

# SOURCE

/gate/source/addSource source
Expand Down
9 changes: 7 additions & 2 deletions t15_optical/mac/main_OpticalSimu_BacktoBackBGO.mac
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
# *********************************************************************

#=====================================================
# VISUALISATION and VERBOSE
# VERBOSE
#=====================================================

#/vis/disable
#/control/execute ./mac/macro/Visualisation.mac
/control/execute ./mac/macro/Verbose.mac

#=====================================================
Expand All @@ -46,6 +45,12 @@

/gate/run/initialize

#=====================================================
# VISUALISATION
#=====================================================

#/control/execute ./mac/macro/Visualisation.mac

#=====================================================
# OPTICAL SURFACES
#=====================================================
Expand Down
1 change: 0 additions & 1 deletion t16_decay/mac/main1.mac
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

/control/execute mac/verbose.mac
#/control/execute mac/visu.mac
/control/execute mac/volumes.mac

#=====================================================
Expand Down
1 change: 0 additions & 1 deletion t16_decay/mac/main2.mac
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

/control/execute mac/verbose.mac
#/control/execute mac/visu.mac
/control/execute mac/volumes.mac

#=====================================================
Expand Down
1 change: 0 additions & 1 deletion t16_decay/mac/main3.mac
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

/control/execute mac/verbose.mac
#/control/execute mac/visu.mac
/control/execute mac/volumes.mac

#=====================================================
Expand Down
1 change: 0 additions & 1 deletion t16_decay/mac/main4.mac
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

/control/execute mac/verbose.mac
#/control/execute mac/visu.mac
/control/execute mac/volumes.mac

#=====================================================
Expand Down
25 changes: 0 additions & 25 deletions t18_movement_benchmark/mac/Geometry_Forte.mac
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,6 @@
#-------------------oooooOOOOO00000OOOOOooooo---------------------#


#=====================================================
# VISUALISATION
#=====================================================

#/vis/disable

#/vis/open OGL
#/vis/viewer/reset
#/vis/viewer/set/viewpointThetaPhi 120 30
#/vis/viewer/set/viewpointThetaPhi 30 30
#/vis/viewer/set/viewpointThetaPhi 270 0
#/vis/viewer/zoom 1.1
#/vis/viewer/set/style surface
#/vis/drawVolume
#/tracking/storeTrajectory 1
#/vis/scene/add/trajectories
#/vis/scene/endOfEventAction accumulate 10
#/vis/scene/add/axes
#/vis/viewer/update

#/vis/viewer/set/background white

#/vis/viewer/set/targetPoint 0 0 0 mm
#/vis/viewer/set/lightsVector -1 0.5 1

#=====================================================
# GEOMETRY
#=====================================================
Expand Down
25 changes: 0 additions & 25 deletions t18_movement_benchmark/mac/Geometry_Forte_Vis.mac
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,6 @@
#-------------------oooooOOOOO00000OOOOOooooo---------------------#


#=====================================================
# VISUALISATION
#=====================================================

#/vis/disable

/vis/open OGL
/vis/viewer/reset
#/vis/viewer/set/viewpointThetaPhi 120 30
/vis/viewer/set/viewpointThetaPhi 30 30
#/vis/viewer/set/viewpointThetaPhi 270 0
/vis/viewer/zoom 1.1
/vis/viewer/set/style surface
/vis/drawVolume
#/tracking/storeTrajectory 1
/vis/scene/add/trajectories
/vis/scene/endOfEventAction accumulate 10
#/vis/scene/add/axes
/vis/viewer/update

/vis/viewer/set/background white

/vis/viewer/set/targetPoint 0 0 0 mm
#/vis/viewer/set/lightsVector -1 0.5 1

#=====================================================
# GEOMETRY
#=====================================================
Expand Down
27 changes: 27 additions & 0 deletions t18_movement_benchmark/mac/Phantom_Source_Small.mac
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,33 @@



#=====================================================
# VISUALISATION
#=====================================================

#/vis/disable

#/vis/open OGL
#/vis/viewer/reset
#/vis/viewer/set/viewpointThetaPhi 120 30
#/vis/viewer/set/viewpointThetaPhi 30 30
#/vis/viewer/set/viewpointThetaPhi 270 0
#/vis/viewer/zoom 1.1
#/vis/viewer/set/style surface
#/vis/drawVolume
#/tracking/storeTrajectory 1
#/vis/scene/add/trajectories
#/vis/scene/endOfEventAction accumulate 10
#/vis/scene/add/axes
#/vis/viewer/update

#/vis/viewer/set/background white

#/vis/viewer/set/targetPoint 0 0 0 mm
#/vis/viewer/set/lightsVector -1 0.5 1



### S O U R C E D E F I N I T I O N ###


Expand Down
24 changes: 24 additions & 0 deletions t18_movement_benchmark/mac/Phantom_Source_Small_Vis.mac
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,30 @@

/gate/run/initialize

#=====================================================
# VISUALISATION
#=====================================================

#/vis/disable

/vis/open OGL
/vis/viewer/reset
#/vis/viewer/set/viewpointThetaPhi 120 30
/vis/viewer/set/viewpointThetaPhi 30 30
#/vis/viewer/set/viewpointThetaPhi 270 0
/vis/viewer/zoom 1.1
/vis/viewer/set/style surface
/vis/drawVolume
#/tracking/storeTrajectory 1
/vis/scene/add/trajectories
/vis/scene/endOfEventAction accumulate 10
#/vis/scene/add/axes
/vis/viewer/update

/vis/viewer/set/background white

/vis/viewer/set/targetPoint 0 0 0 mm
#/vis/viewer/set/lightsVector -1 0.5 1


### S O U R C E D E F I N I T I O N ###
Expand Down
15 changes: 7 additions & 8 deletions t20_digi_adder/mac/main_centroid.mac
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
#=====================================================
# VISUALISATION
#=====================================================

/vis/disable
#/control/execute visu.mac



/gate/geometry/setMaterialDatabase data/GateMaterials.db
#=====================================================
Expand All @@ -30,6 +22,13 @@

/gate/run/initialize

#=====================================================
# VISUALISATION
#=====================================================

/vis/disable
#/control/execute visu.mac


#=====================================================
# D I G I T I Z E R: DETECTOR ELECTRONIC RESPONSE
Expand Down
16 changes: 8 additions & 8 deletions t20_digi_adder/mac/main_energyWinner.mac
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
#=====================================================
# VISUALISATION
#=====================================================

/vis/disable
#/control/execute visu.mac



/gate/geometry/setMaterialDatabase data/GateMaterials.db
#=====================================================
Expand All @@ -31,6 +23,14 @@
/gate/run/initialize


#=====================================================
# VISUALISATION
#=====================================================

/vis/disable
#/control/execute visu.mac


#=====================================================
# D I G I T I Z E R: DETECTOR ELECTRONIC RESPONSE
#=====================================================
Expand Down
Loading