From 0c94eff446d1c5f874aa7bfb7ffab06ff7dd0a2c Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Thu, 26 Feb 2015 10:08:35 +0000
Subject: [PATCH] Merge branch 'master' into merge_work
---
examples/ClientTests/CMakeLists.txt | 24 ++++++++++++++++++++
examples/ClientTests/README.txt | 4 ++--
examples/ClientTests/scripts/LheD_tracker.py | 7 +++---
examples/ClientTests/scripts/MiniTel.py | 4 +++-
4 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index 46f37fcf1..c978e6475 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -88,3 +88,27 @@ install(DIRECTORY scripts
# to do: add corresponding uninstall...
#-------------------------------------------------------
+
+
+foreach (file Assemblies BoxTrafos FCC_HcalBarrel IronCylinder LheD_tracker MagnetFields MaterialTester MiniTel SectorBarrelCalorimeter SiliconBlock )
+
+ foreach( type lcdd gdml vis )
+
+ SET( test_name "${PackageName}_converter_simple_${type}_${file}" )
+ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
+ geoConverter -compact2${type} -input ${CMAKE_CURRENT_SOURCE_DIR}/compact/${file}.xml -output ${file}_out.${type} )
+ #----- here we simply require that at least 1 volume have been converted
+ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES PASS_REGULAR_EXPRESSION " Handled [1-9][0-9]* volumes" )
+
+ endforeach(type)
+
+endforeach()
+
+
+foreach(script MiniTel LheD_tracker )
+ SET( test_name "${PackageName}_sim_${script}" )
+ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
+ python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/${script}.py batch)
+ #----- here we simply require that at least 1 volume have been converted
+ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" )
+endforeach(script)
diff --git a/examples/ClientTests/README.txt b/examples/ClientTests/README.txt
index 393d583d6..08763429f 100644
--- a/examples/ClientTests/README.txt
+++ b/examples/ClientTests/README.txt
@@ -9,8 +9,8 @@ LHeD_tracker
------------
by Ercan Pilicier
Detector constructors: LheD_tracker_BeamPipe_geo.cpp LheD_tracker_SiVertexBarrel_geo.cpp
-Xompact XML: compact/LHeD_tracker.xml
-Script: scripts/LHeD_tracker.py
+Compact XML: compact/LheD_tracker.xml
+Script: scripts/LheD_tracker.py
Example of the LHeC vertex detector and the beampipe using elliptical tubes.
(TGeoEltu).
diff --git a/examples/ClientTests/scripts/LheD_tracker.py b/examples/ClientTests/scripts/LheD_tracker.py
index 57924cde1..ce2f7076f 100644
--- a/examples/ClientTests/scripts/LheD_tracker.py
+++ b/examples/ClientTests/scripts/LheD_tracker.py
@@ -1,6 +1,6 @@
#
#
-import os, time, DDG4
+import os, time, DDG4, sys
from DDG4 import OutputLevel as Output
from SystemOfUnits import *
#
@@ -18,7 +18,7 @@ def run():
lcdd = kernel.lcdd()
install_dir = os.environ['DD4hepINSTALL']
example_dir = install_dir+'/examples/DDG4/examples';
- kernel.loadGeometry("file:"+install_dir+"/examples/ClientTests/compact/LHeD_tracker.xml")
+ kernel.loadGeometry("file:"+install_dir+"/examples/ClientTests/compact/LheD_tracker.xml")
DDG4.importConstants(lcdd,debug=False)
geant4 = DDG4.Geant4(kernel,tracker='Geant4TrackerCombineAction')
@@ -28,7 +28,8 @@ def run():
geant4.setupCshUI()
#simple.setupCshUI('csh',True,True)
#simple.setupCshUI('csh',True,True,'vis.mac')
-
+ if len(sys.argv) >= 2 and sys.argv[1] =="batch":
+ kernel.UI = ''
field = geant4.addConfig('Geant4FieldTrackingSetupAction/MagFieldTrackingSetup')
field.stepper = "HelixSimpleRunge"
field.equation = "Mag_UsualEqRhs"
diff --git a/examples/ClientTests/scripts/MiniTel.py b/examples/ClientTests/scripts/MiniTel.py
index 8e7900185..b26e588b0 100644
--- a/examples/ClientTests/scripts/MiniTel.py
+++ b/examples/ClientTests/scripts/MiniTel.py
@@ -1,4 +1,4 @@
-import os, time, DDG4
+import os, time, DDG4, sys
from DDG4 import OutputLevel as Output
from SystemOfUnits import *
#
@@ -23,6 +23,8 @@ def run():
simple = DDG4.Simple(kernel)
simple.printDetectors()
simple.setupCshUI()
+ if len(sys.argv) >= 2 and sys.argv[1] =="batch":
+ kernel.UI = ''
# Configure I/O
evt_root = simple.setupROOTOutput('RootOutput','MiniTel_'+time.strftime('%Y-%m-%d_%H-%M'),mc_truth=True)
--
GitLab