Merge branch 'lintao/ci/auto-geo-conv' into 'master'

Test the geometry convert from DD4hep to TGeo

See merge request cepc/CEPCSW!56

.gitlab-ci.yml

@@ -58,5 +58,7 @@ build:lcg:el7:
   artifacts:
     paths:
       - InstallArea
+      - TDR_o1_v01.tgeo.root
+      - TDR_o1_v02.tgeo.root
     reports:
       junit: build.${CEPCSW_LCG_VERSION}.${CEPCSW_LCG_PLATFORM}/cepcsw-ctest-result.xml

Detector/DetCRD/CMakeLists.txt

@@ -35,14 +35,24 @@ install(TARGETS DetCRD
 # Add tests
 ################################################################################
 
-add_test(
-  NAME Test_TDR_o1_v01_Sim
-  COMMAND gaudirun.py Detector/DetCRD/scripts/TDR_o1_v01/sim.py
-  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-)
+foreach(detoption TDR_o1_v01 TDR_o1_v02)
+  add_test(
+    NAME Test_${detoption}_Sim
+    COMMAND gaudirun.py Detector/DetCRD/scripts/${detoption}/sim.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    )
 
-add_test(
-  NAME Test_TDR_o1_v01_Rec
-  COMMAND gaudirun.py Detector/DetCRD/scripts/TDR_o1_v01/tracking.py
-  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-)
+  add_test(
+    NAME Test_${detoption}_Rec
+    COMMAND gaudirun.py Detector/DetCRD/scripts/${detoption}/tracking.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    )
+
+  add_test(
+    NAME Test_${detoption}_DD4hep2TGeo
+    COMMAND geoConverter -compact2tgeo 
+                         -input Detector/DetCRD/compact/${detoption}/${detoption}.xml 
+                         -output ${detoption}.tgeo.root
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    )
+endforeach()

Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml

@@ -185,6 +185,9 @@
     <limitset name="cal_limits">
       <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
     </limitset>
+    <limitset name="tpc_limits">
+      <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
+    </limitset>
     <limitset name="dc_limits">
       <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
     </limitset>