ECAL geom updates for tyvek + change in physics list

Calorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt

@@ -2,6 +2,9 @@
 # Package: EcalGeoModel
 ################################################################################
 
+# Option to chose geo with or without tyvek paper
+option( ECAL_GEO_TYVEK "Apply Tyvek in Ecal geometry" ON )
+
 # Declare the package name:
 atlas_subdir( EcalGeoModel )
 
@@ -25,7 +28,26 @@ atlas_add_test( EcalGMConfig_test
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
                 PROPERTIES TIMEOUT 300 )
 
+# Decide which ecal gdml file to use based on option
+if (ECAL_GEO_TYVEK)
+   add_custom_command (OUTPUT ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml 
+                       COMMAND mkdir -p ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/
+		       COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalTyvek.gdml ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml )
+   add_custom_target (make_ecal_gdml ALL DEPENDS  ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml)
+   get_filename_component( _realpath ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalTyvek.gdml REALPATH )
+else() 
+   add_custom_command (OUTPUT ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml 
+                       COMMAND mkdir -p ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/   
+		       COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalNoTyvek.gdml ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml )
+   add_custom_target (make_ecal_gdml ALL DEPENDS  ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml)
+   get_filename_component( _realpath ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalNoTyvek.gdml REALPATH )
+endif()
+
+install(FILES ${_realpath} DESTINATION ${CMAKE_INSTALL_PREFIX}/XML/EcalGeoModel RENAME Ecal.gdml)
+unset( _realpath )
+
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_scripts( test/*.py )
-atlas_install_xmls( data/*.gdml )
+# Not needed as done with symlink above
+#atlas_install_xmls( data/*.gdml )

Simulation/G4Faser/G4FaserAlg/test/runG4.py

@@ -75,6 +75,12 @@ if __name__ == "__main__":
     ConfigFlags.Detector.GeometryDownstreamDipole = True
     ConfigFlags.GeoModel.Align.Dynamic  = False
     ConfigFlags.Sim.ReleaseGeoModel     = False
+
+#
+# Physics list
+#
+
+    ConfigFlags.Sim.PhysicsList = "FTFP_BERT"
 #
 # All flags should be set before calling lock
 #

Simulation/G4Faser/G4FaserAlg/test/runG4Cosmics.py

@@ -76,6 +76,12 @@ if __name__ == "__main__":
     ConfigFlags.Detector.GeometryDownstreamDipole = True
     ConfigFlags.GeoModel.Align.Dynamic  = False
     ConfigFlags.Sim.ReleaseGeoModel     = False
+
+#
+# Physics list
+#
+
+    ConfigFlags.Sim.PhysicsList = "FTFP_BERT"
 #
 # All flags should be set before calling lock
 #
@@ -93,6 +99,8 @@ if __name__ == "__main__":
     pg.randomSeed = 123456
 
     pg.sampler = CosmicSampler()
+    # For just box around Ecal:
+    # pg.sampler = CosmicSampler(z0Mm = 3099.2, targetDzMm = 705, targetDxMm = 200, targetDyMm = 200)
     acc.addEventAlgo(pg, "AthBeginSeq") # to run *before* G4
 #
 # Only one of these two should be used in a given job