From 260542424eed600dca350a44e81db78f627e5924 Mon Sep 17 00:00:00 2001
From: fuchenxi <1256257282@qq.com>
Date: Sat, 31 Aug 2024 21:10:15 +0800
Subject: [PATCH] =?UTF-8?q?G4macro=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
particle/__init__.py | 2 +-
particle/cflm.py | 2 +-
particle/g4_sic_energy_deposition.py | 2 +-
particle/g4si_itk.py | 2 +-
particle/g4simulation.py | 2 +-
spaceres/telescope_jiaqi.py | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/particle/__init__.py b/particle/__init__.py
index 32d7051..6dfde86 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 d429e69..5fa9f2d 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 bedbebb..9d790de 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 edc20c6..350c6b6 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 b70647c..71e303d 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 745cb29..918cfdd 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()
--
GitLab