diff --git a/athena_ci/package_filters.txt b/athena_ci/package_filters.txt index 55e0fc4f3e0f1d11a3fdb482d81040d386d72298..f9ed1225d3658e35e5370e8ada8e6ba486055b05 100644 --- a/athena_ci/package_filters.txt +++ b/athena_ci/package_filters.txt @@ -18,6 +18,7 @@ + DetectorDescription/GeoModel/GeoModelSvc + DetectorDescription/GeoModel/GeoModelUtilities + DetectorDescription/GeoModel/GeoSpecialShapes ++ DetectorDescription/GeoModel/DumpGeo + DetectorDescription/IdDictDetDescrCnv + DetectorDescription/ReadoutGeometryBase + ForwardDetectors/AFP/AFP_GeoModel diff --git a/athena_ci/patch_package_filters.txt b/athena_ci/patch_package_filters.txt index 88db99ff3de3be79aa6c5aa282a6645b7b5855e1..f5d158999179ac28adc33cf4b7ca20d8ad3100e4 100644 --- a/athena_ci/patch_package_filters.txt +++ b/athena_ci/patch_package_filters.txt @@ -1,3 +1,2 @@ # These Athena packages need to be rebuilt # due to patches in the `patches` directory -+ DetectorDescription/GeoModel/DumpGeo diff --git a/athena_ci/patches/DumpGeo.patch b/athena_ci/patches/DumpGeo.patch deleted file mode 100644 index 19bc392bea4f38d0f442d77a1d685df5ddd9e39c..0000000000000000000000000000000000000000 --- a/athena_ci/patches/DumpGeo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/DetectorDescription/GeoModel/DumpGeo/python/DumpGeoConfig.py b/DetectorDescription/GeoModel/DumpGeo/python/DumpGeoConfig.py -index af3d65bffbe..d3b3053e97b 100644 ---- a/DetectorDescription/GeoModel/DumpGeo/python/DumpGeoConfig.py -+++ b/DetectorDescription/GeoModel/DumpGeo/python/DumpGeoConfig.py -@@ -97,7 +97,7 @@ def configureGeometry(flags, cfg): - # to bypass a crash due to lack of support - # for EllipticTube in GeoModelIO - # See: https://its.cern.ch/jira/browse/ATLASSIM-7263 -- cfg.getService("GeoModelSvc").DetectorTools["ForwardRegionGeoModelTool"].vp1Compatibility=True -+ # cfg.getService("GeoModelSvc").DetectorTools["ForwardRegionGeoModelTool"].vp1Compatibility=True - - - def getATLASVersion():