From 5c3f7edb3750d3b724bce7b2ca828da495b52586 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Tue, 17 Dec 2019 19:37:10 +0100
Subject: [PATCH] Allow to set ambient temperature and pressure for all
materials. With examples/ClientTests/compact/Check_Air.xml --
scripts/Check_Air.py
---
examples/ClientTests/scripts/Check_Air.py | 12 ++++++------
examples/ClientTests/scripts/Check_shape.py | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/examples/ClientTests/scripts/Check_Air.py b/examples/ClientTests/scripts/Check_Air.py
index a9df730fe..0979f3eda 100644
--- a/examples/ClientTests/scripts/Check_Air.py
+++ b/examples/ClientTests/scripts/Check_Air.py
@@ -30,9 +30,9 @@ def run():
c = i.upper()
if c.find('BATCH') < 2 and c.find('BATCH') >= 0:
batch = True
- if c[:4] == '-GEO':
+ elif c[:4] == '-GEO':
geo = sys.argv[cnt]
- if c[:4] == '-VIS':
+ elif c[:4] == '-VIS':
vis = True
if not geo:
@@ -57,10 +57,10 @@ def run():
DDG4.setPrintLevel(DDG4.OutputLevel.DEBUG)
#
ui.Commands = [
- '/ddg4/ConstructGeometry/printVolume /world_volume_1',
- '/ddg4/ConstructGeometry/printMaterial Air',
- '/ddg4/ConstructGeometry/printMaterial Vacuum',
- '/ddg4/UI/exit'
+ '/ddg4/ConstructGeometry/printVolume /world_volume_1',
+ '/ddg4/ConstructGeometry/printMaterial Air',
+ '/ddg4/ConstructGeometry/printMaterial Vacuum',
+ '/ddg4/UI/exit'
]
kernel.NumEvents = 0
kernel.configure()
diff --git a/examples/ClientTests/scripts/Check_shape.py b/examples/ClientTests/scripts/Check_shape.py
index 9915f2e13..2d99d1b0f 100644
--- a/examples/ClientTests/scripts/Check_shape.py
+++ b/examples/ClientTests/scripts/Check_shape.py
@@ -28,9 +28,9 @@ def run():
c = sys.argv[i].upper()
if c.find('BATCH') < 2 and c.find('BATCH') >= 0:
batch = True
- if c[:4] == '-GEO':
+ elif c[:4] == '-GEO':
geo = sys.argv[i + 1]
- if c[:4] == '-VIS':
+ elif c[:4] == '-VIS':
vis = True
if not geo:
@@ -42,8 +42,8 @@ def run():
# Configure UI
geant4 = DDG4.Geant4(kernel, tracker='Geant4TrackerCombineAction')
if batch:
- kernel.UI = ''
- ui = geant4.setupCshUI(ui=None, vis=vis)
+ ui = geant4.setupCshUI(ui=None, vis=None)
+ kernel.UI = 'UI'
else:
ui = geant4.setupCshUI(vis=vis)
kernel.loadGeometry(geo)
@@ -57,7 +57,7 @@ def run():
# '/ddg4/ConstructGeometry/writeGDML test.gdml',
ui.Commands = [
'/ddg4/ConstructGeometry/printVolume /world_volume_1/Shape_Test_0/Shape_Test_vol_0_0',
- 'exit'
+ '/ddg4/UI/exit'
]
kernel.NumEvents = 0
kernel.configure()
--
GitLab