diff --git a/particle/__init__.py b/particle/__init__.py index 32d705136747f56e2d1fb41aa4220f6d1f87f9b8..6dfde866ecc0968ecbbc9fce0b9aba666228863a 100644 --- a/particle/__init__.py +++ b/particle/__init__.py @@ -10,7 +10,7 @@ def main(kwargs): cflm.main() elif label == "test": from . import g4_sic_energy_deposition - command="./cfg/gui.mac" + command="./paras/g4macro/gui.mac" g4_sic_energy_deposition.main() else: raise NameError(label) \ No newline at end of file diff --git a/particle/cflm.py b/particle/cflm.py index d429e693957bbfba6cb2fd25486c5e6a069148ac..5fa9f2d6588cb67eae8ef882d2b4420062d6dff5 100755 --- a/particle/cflm.py +++ b/particle/cflm.py @@ -299,7 +299,7 @@ def main(): UImanager = g4b.G4UImanager.GetUIpointer() - UImanager.ApplyCommand("/control/execute cfg/init_vis.mac") + UImanager.ApplyCommand("/control/execute paras/g4macro/init_vis.mac") UImanager.ApplyCommand('/run/initialize') UImanager.ApplyCommand('/tracking/verbose 2') diff --git a/particle/g4_sic_energy_deposition.py b/particle/g4_sic_energy_deposition.py index bedbebba3613e0b1f20b7bad962e42f3548c0d71..9d790de73ffe37cd027bd08de256ddd96b78470b 100755 --- a/particle/g4_sic_energy_deposition.py +++ b/particle/g4_sic_energy_deposition.py @@ -317,7 +317,7 @@ def main(): UImanager = g4b.G4UImanager.GetUIpointer() - UImanager.ApplyCommand("/control/execute cfg/init_vis.mac")#鍒濆鍖栧彲瑙嗗寲閰嶇疆 + UImanager.ApplyCommand("/control/execute paras/g4macro/init_vis.mac")#鍒濆鍖栧彲瑙嗗寲閰嶇疆 UImanager.ApplyCommand('/run/initialize')#鍒濆鍖栬繍琛岋紝鍑嗗寮€濮嬫ā鎷� UImanager.ApplyCommand("/gun/particle ion") diff --git a/particle/g4si_itk.py b/particle/g4si_itk.py index edc20c6d17c086f600c6bfc57afb57dcfdb5e79f..350c6b6837977c2a194ff60bfec73ca2cb2ac2ae 100644 --- a/particle/g4si_itk.py +++ b/particle/g4si_itk.py @@ -41,7 +41,7 @@ class SiITk: visManager = g4b.G4VisExecutive() visManager.Initialize() UImanager = g4b.G4UImanager.GetUIpointer() - UImanager.ApplyCommand('/control/execute init_vis.mac') + UImanager.ApplyCommand('/control/execute paras/g4macro/init_vis.mac') else: UImanager = g4b.G4UImanager.GetUIpointer() UImanager.ApplyCommand('/run/initialize') diff --git a/particle/g4simulation.py b/particle/g4simulation.py index b70647c6e059bf98b55f58c935a677a2a7a3f02b..71e303d0a8b12c7a3f53f0a0dd9fa0ad668e2077 100644 --- a/particle/g4simulation.py +++ b/particle/g4simulation.py @@ -88,7 +88,7 @@ class Particles: visManager = g4b.G4VisExecutive() visManager.Initialize() UImanager = g4b.G4UImanager.GetUIpointer() - UImanager.ApplyCommand('/control/execute init_vis.mac') + UImanager.ApplyCommand('/control/execute paras/g4macro/init_vis.mac') else: UImanager = g4b.G4UImanager.GetUIpointer() UImanager.ApplyCommand('/run/initialize') diff --git a/spaceres/telescope_jiaqi.py b/spaceres/telescope_jiaqi.py index 745cb294a5eef1494633a751c0bd444cff7f2936..918cfdd30fe70b0a9e47889782b66d9240e2f58b 100755 --- a/spaceres/telescope_jiaqi.py +++ b/spaceres/telescope_jiaqi.py @@ -622,7 +622,7 @@ if ui == None: UImanager.ApplyCommand(command+fileName) else: # interactive mode - UImanager.ApplyCommand("/control/execute ./cfg/init_vistelescope.mac") + UImanager.ApplyCommand("/control/execute ./paras/g4macro/init_vistelescope.mac") if ui.IsGUI(): - UImanager.ApplyCommand("/control/execute ./cfg/gui.mac") + UImanager.ApplyCommand("/control/execute ./paras/g4macro/gui.mac") ui.SessionStart()