Skip to content

Commit b96fd02

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46430 from bsunanda/Run2-hcx377
Run2-hcx377 Put all 2015 scenarios using the same hcalRecNumbering.xml file
2 parents 55fd977 + 61a50cd commit b96fd02

12 files changed

+12
-12
lines changed

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
221221
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
222222
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
223-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
223+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
224224
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
225225
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
226226
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
221221
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
222222
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
223-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
223+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
224224
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
225225
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
226226
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
221221
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
222222
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
223-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
223+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
224224
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
225225
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
226226
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015PilotXML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
219219
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
220220
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
221-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
221+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
222222
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
223223
'Geometry/MuonCommonData/data/mbCommon.xml',
224224
'Geometry/MuonCommonData/data/mb1.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC2Gap_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
220220
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
221221
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
222-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
222+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
223223
'Geometry/MuonCommonData/data/RPC2Gap/mbCommon.xml',
224224
'Geometry/MuonCommonData/data/RPC2Gap/mb1.xml',
225225
'Geometry/MuonCommonData/data/RPC2Gap/mb2.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC4RE11_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
220220
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
221221
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
222-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
222+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
223223
'Geometry/MuonCommonData/data/mbCommon.xml',
224224
'Geometry/MuonCommonData/data/mb1.xml',
225225
'Geometry/MuonCommonData/data/mb2.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
221221
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
222222
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
223-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
223+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
224224
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
225225
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
226226
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
222222
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
223223
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
224-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
224+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
225225
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
226226
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
227227
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
222222
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
223223
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
224-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
224+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
225225
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
226226
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
227227
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
222222
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
223223
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
224-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
224+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
225225
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
226226
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
227227
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

‎Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
220220
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
221221
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
222-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
222+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
223223
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
224224
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
225225
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

‎Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
220220
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
221221
'Geometry/HcalCommonData/data/hcalSimNumbering.xml',
222-
'Geometry/HcalCommonData/data/hcalRecNumbering.xml',
222+
'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml',
223223
'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
224224
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
225225
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

0 commit comments

Comments
 (0)