From 22382c5f860044f082293fd25b7f1dc495daafd2 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sat, 5 Aug 2023 17:38:24 +0200 Subject: [PATCH] Modify all Phase2 scenarios after fixing the HCAL SD issue --- .../Geometry/python/dict2026Geometry.py | 30 +++++++++---------- .../dd4hep/cmsExtendedGeometry2026D100.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D101.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D86.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D88.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D91.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D92.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D93.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D94.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D95.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D96.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D97.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D98.xml | 6 ++-- .../dd4hep/cmsExtendedGeometry2026D99.xml | 6 ++-- .../cmsExtendedGeometry2026D100XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D101XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D86XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D88XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D91XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D92XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D93XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D94XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D95XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D96XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D97XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D98XML_cfi.py | 6 ++-- .../cmsExtendedGeometry2026D99XML_cfi.py | 6 ++-- 27 files changed, 93 insertions(+), 93 deletions(-) diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index 08ab863c105a6..7d2d453a959d9 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -299,8 +299,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', @@ -315,7 +315,7 @@ 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', @@ -374,8 +374,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', @@ -389,7 +389,7 @@ 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', @@ -448,8 +448,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml', @@ -462,7 +462,7 @@ 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', @@ -521,8 +521,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', @@ -541,7 +541,7 @@ 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml', @@ -607,8 +607,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17ng/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalwafer/v17ng/hgcalwafer.xml', @@ -621,7 +621,7 @@ 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D100.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D100.xml index 63239e7e8b763..9e1551c67afe2 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D100.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D100.xml @@ -53,8 +53,8 @@ - - + + @@ -97,7 +97,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D101.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D101.xml index e3bc240cfe722..c183abd4c3ad0 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D101.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D101.xml @@ -55,8 +55,8 @@ - - + + @@ -97,7 +97,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml index aef3e86ce5fec..9d303844ad706 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml @@ -54,8 +54,8 @@ - - + + @@ -98,7 +98,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml index 7a1c987cb998a..5d0339eddfaa2 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml @@ -54,8 +54,8 @@ - - + + @@ -98,7 +98,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml index 7cabb1484419e..f27b61840f01f 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml @@ -53,8 +53,8 @@ - - + + @@ -97,7 +97,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml index 617c966086717..de88ec582a432 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml @@ -55,8 +55,8 @@ - - + + @@ -98,7 +98,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml index af988de1b5c67..24bb788ce8d2c 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml @@ -55,8 +55,8 @@ - - + + @@ -97,7 +97,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml index 21bc928eb5a3b..2a9f6fdf03c29 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml @@ -55,8 +55,8 @@ - - + + @@ -103,7 +103,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml index 92fb59c23e844..232a78e12b6bf 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml @@ -54,8 +54,8 @@ - - + + @@ -98,7 +98,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml index 00b05135718eb..f23ad48f580d6 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml @@ -55,8 +55,8 @@ - - + + @@ -98,7 +98,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D97.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D97.xml index ec6340f2fb61a..f700e021e49f2 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D97.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D97.xml @@ -53,8 +53,8 @@ - - + + @@ -97,7 +97,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml index 3d80424cbcf35..437b58622bb88 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml @@ -54,8 +54,8 @@ - - + + @@ -98,7 +98,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml index 5348fb5c2feda..465ffd6d38859 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml @@ -55,8 +55,8 @@ - - + + @@ -98,7 +98,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D100XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D100XML_cfi.py index 3fa8426935a9a..0d44744e0e48b 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D100XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D100XML_cfi.py @@ -54,8 +54,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', @@ -100,7 +100,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D101XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D101XML_cfi.py index ba73b7a9a2919..7c1fe59f5384c 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D101XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D101XML_cfi.py @@ -56,8 +56,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17ng/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalwafer/v17ng/hgcalwafer.xml', @@ -100,7 +100,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py index a45349da71b90..74df1581df3e5 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py @@ -55,8 +55,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', @@ -101,7 +101,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py index fd4580b173858..7bf1ad339ecee 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py @@ -55,8 +55,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', @@ -101,7 +101,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py index 0aec57f6fa431..b946fcadc1581 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py @@ -54,8 +54,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', @@ -100,7 +100,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py index 15b4c65cd69ff..26e36fe8c0e7d 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py @@ -56,8 +56,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', @@ -101,7 +101,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py index b16e2b741784c..6acaecc0ecd94 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py @@ -56,8 +56,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml', @@ -100,7 +100,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py index bba04bee6a860..fcda9d122caee 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py @@ -56,8 +56,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', @@ -106,7 +106,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py index a4d3bc90d4a50..ba483bc45aecc 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py @@ -55,8 +55,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', @@ -101,7 +101,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py index 2b0c92e15170c..e88547216174e 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py @@ -56,8 +56,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', @@ -101,7 +101,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D97XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D97XML_cfi.py index 1a208b2980ae9..56a36a72787c6 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D97XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D97XML_cfi.py @@ -54,8 +54,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', @@ -100,7 +100,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py index 6104e7b2b062b..691a1200ddedf 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py @@ -55,8 +55,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', @@ -101,7 +101,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py index 157b81d870aa7..1db3aa48b13da 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py @@ -56,8 +56,8 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', @@ -101,7 +101,7 @@ 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hf/v1/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',