Skip to content

Commit 36392dc

Browse files
fabiocosfabiocos
committed
Move to scenarios D118 and D119, rebasing onto cms-sw#47353, make MTDTopology for ETL independent on BTL scenario
1 parent 6404a03 commit 36392dc

18 files changed

+31
-29
lines changed

‎Configuration/Geometry/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,6 @@ Several detector combinations have been generated:
185185
* D114 = T39+C19+M11+I17+O9+F8
186186
* D115 = T35+C20+M11+I17+O9+F8
187187
* D116 = T35+C25+M12+I17+O10+F9
188-
* D117 = T35+C25+M12+I18+O10+F9
189-
* D200 = T35+C18+M11+I19+O9+F8
190-
* D201 = T35+C18+M11+I20+O9+F8
188+
* D117 = T35+C25+M15+I18+O10+F9
189+
* D118 = T35+C25+M15+I19+O10+F9
190+
* D119 = T35+C25+M15+I20+O10+F9

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D200Reco_cff.py renamed to ‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118Reco_cff.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This config was generated automatically using generateRun4Geometry.py
44
# If you notice a mistake, please update the generating script, not just this config
55

6-
from Configuration.Geometry.GeometryDD4hepExtendedRun4D200_cff import *
6+
from Configuration.Geometry.GeometryDD4hepExtendedRun4D118_cff import *
77

88
# tracker
99
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D200_cff.py renamed to ‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118_cff.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# If you notice a mistake, please update the generating script, not just this config
55

66
from Configuration.Geometry.GeometryDD4hep_cff import *
7-
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D200.xml")
7+
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D118.xml")
88

99
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
1010
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D201Reco_cff.py renamed to ‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119Reco_cff.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This config was generated automatically using generateRun4Geometry.py
44
# If you notice a mistake, please update the generating script, not just this config
55

6-
from Configuration.Geometry.GeometryDD4hepExtendedRun4D201_cff import *
6+
from Configuration.Geometry.GeometryDD4hepExtendedRun4D119_cff import *
77

88
# tracker
99
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D201_cff.py renamed to ‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119_cff.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# If you notice a mistake, please update the generating script, not just this config
55

66
from Configuration.Geometry.GeometryDD4hep_cff import *
7-
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D201.xml")
7+
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D119.xml")
88

99
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
1010
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *

‎Configuration/Geometry/python/GeometryExtendedRun4D200Reco_cff.py renamed to ‎Configuration/Geometry/python/GeometryExtendedRun4D118Reco_cff.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This config was generated automatically using generateRun4Geometry.py
44
# If you notice a mistake, please update the generating script, not just this config
55

6-
from Configuration.Geometry.GeometryExtendedRun4D200_cff import *
6+
from Configuration.Geometry.GeometryExtendedRun4D118_cff import *
77

88
# tracker
99
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *

‎Configuration/Geometry/python/GeometryExtendedRun4D200_cff.py renamed to ‎Configuration/Geometry/python/GeometryExtendedRun4D118_cff.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This config was generated automatically using generateRun4Geometry.py
44
# If you notice a mistake, please update the generating script, not just this config
55

6-
from Geometry.CMSCommonData.cmsExtendedGeometryRun4D200XML_cfi import *
6+
from Geometry.CMSCommonData.cmsExtendedGeometryRun4D118XML_cfi import *
77
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
88
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
99
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

‎Configuration/Geometry/python/GeometryExtendedRun4D201Reco_cff.py renamed to ‎Configuration/Geometry/python/GeometryExtendedRun4D119Reco_cff.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This config was generated automatically using generateRun4Geometry.py
44
# If you notice a mistake, please update the generating script, not just this config
55

6-
from Configuration.Geometry.GeometryExtendedRun4D201_cff import *
6+
from Configuration.Geometry.GeometryExtendedRun4D119_cff import *
77

88
# tracker
99
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *

‎Configuration/Geometry/python/GeometryExtendedRun4D201_cff.py renamed to ‎Configuration/Geometry/python/GeometryExtendedRun4D119_cff.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This config was generated automatically using generateRun4Geometry.py
44
# If you notice a mistake, please update the generating script, not just this config
55

6-
from Geometry.CMSCommonData.cmsExtendedGeometryRun4D201XML_cfi import *
6+
from Geometry.CMSCommonData.cmsExtendedGeometryRun4D119XML_cfi import *
77
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
88
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
99
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

‎Configuration/Geometry/python/dictRun4Geometry.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1642,8 +1642,8 @@
16421642
("O9","T35","C20","M14","F8","I17") : "D115",
16431643
("O10","T35","C25","M15","F9","I17") : "D116",
16441644
("O10","T35","C25","M15","F9","I18") : "D117",
1645-
("O10","T35","C25","M15","F9","I19") : "D200",
1646-
("O10","T35","C25","M15","F9","I20") : "D201",
1645+
("O10","T35","C25","M15","F9","I19") : "D118",
1646+
("O10","T35","C25","M15","F9","I20") : "D119",
16471647
}
16481648

16491649
deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75", "D78", "D79", "D87", "D89", "D90", "D49", "D60", "D68", "D70", "D76", "D77", "D80", "D81", "D82", "D83", "D84", "D85","D86","D88","D91","D92","D93","D94","D97"])

‎Configuration/PyReleaseValidation/python/relval_Run4.py

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
numWFIB.extend([32034.0]) #Run4D115
3838
numWFIB.extend([32434.0]) #Run4D116
3939
numWFIB.extend([32834.0]) #Run4D117
40+
numWFIB.extend([33234.0]) #Run4D118
41+
numWFIB.extend([33634.0]) #Run4D119
4042

4143
#Additional sample for short matrix and IB
4244
#Default Phase-2 Det NoPU

‎Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@
9797
'Run4D116PU',
9898
'Run4D117',
9999
'Run4D117PU',
100-
'Run4D200',
101-
'Run4D200PU',
102-
'Run4D201',
103-
'Run4D201PU',
100+
'Run4D118',
101+
'Run4D118PU',
102+
'Run4D119',
103+
'Run4D119PU',
104104
]
105105

106106
# pre-generation of WF numbers
@@ -3297,15 +3297,15 @@ def condition(self, fragment, stepList, key, hasHarvest):
32973297
'Era' : 'Phase2C17I13M9',
32983298
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
32993299
},
3300-
'Run4D200' : {
3301-
'Geom' : 'ExtendedRun4D200',
3300+
'Run4D118' : {
3301+
'Geom' : 'ExtendedRun4D118',
33023302
'HLTmenu': '@relvalRun4',
33033303
'GT' : 'auto:phase2_realistic_T33',
33043304
'Era' : 'Phase2C17I13M9',
33053305
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
33063306
},
3307-
'Run4D201' : {
3308-
'Geom' : 'ExtendedRun4D201',
3307+
'Run4D119' : {
3308+
'Geom' : 'ExtendedRun4D119',
33093309
'HLTmenu': '@relvalRun4',
33103310
'GT' : 'auto:phase2_realistic_T33',
33113311
'Era' : 'Phase2C17I13M9',

‎Configuration/StandardSequences/python/GeometryConf.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@
132132
'DD4hepExtendedRun4D116' : 'DD4hepExtendedRun4D116,DD4hepExtendedRun4D116Reco',
133133
'ExtendedRun4D117' : 'ExtendedRun4D117,ExtendedRun4D117Reco',
134134
'DD4hepExtendedRun4D117' : 'DD4hepExtendedRun4D117,DD4hepExtendedRun4D117Reco',
135-
'ExtendedRun4D200' : 'ExtendedRun4D200,ExtendedRun4D200Reco',
136-
'DD4hepExtendedRun4D200' : 'DD4hepExtendedRun4D200,DD4hepExtendedRun4D200Reco',
137-
'ExtendedRun4D201' : 'ExtendedRun4D201,ExtendedRun4D201Reco',
138-
'DD4hepExtendedRun4D201' : 'DD4hepExtendedRun4D201,DD4hepExtendedRun4D201Reco',
135+
'ExtendedRun4D118' : 'ExtendedRun4D118,ExtendedRun4D118Reco',
136+
'DD4hepExtendedRun4D118' : 'DD4hepExtendedRun4D118,DD4hepExtendedRun4D118Reco',
137+
'ExtendedRun4D119' : 'ExtendedRun4D119,ExtendedRun4D119Reco',
138+
'DD4hepExtendedRun4D119' : 'DD4hepExtendedRun4D119,DD4hepExtendedRun4D119Reco',
139139
}

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D200.xml renamed to ‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D118.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D201.xml renamed to ‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D119.xml

File renamed without changes.

‎Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D200XML_cfi.py renamed to ‎Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D118XML_cfi.py

File renamed without changes.

‎Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D201XML_cfi.py renamed to ‎Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D119XML_cfi.py

File renamed without changes.

‎Geometry/MTDGeometryBuilder/plugins/MTDTopologyEP.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,8 @@ void MTDTopologyEP::fillETLtopology(const PMTDParameters& ptp, int& mtdTopologyM
9999

100100
MTDTopology::ETLfaceLayout tmpFace;
101101

102-
if (mtdTopologyMode == static_cast<int>(MTDTopologyMode::Mode::btlv2etlv5) ||
103-
mtdTopologyMode == static_cast<int>(MTDTopologyMode::Mode::btlv3etlv8) ||
104-
mtdTopologyMode == static_cast<int>(MTDTopologyMode::Mode::btlv4etlv8)) {
102+
if (static_cast<int>(MTDTopologyMode::etlLayoutFromTopoMode(mtdTopologyMode)) <=
103+
static_cast<int>(MTDTopologyMode::EtlLayout::v8)) {
105104
// Disc1 Front Face (0), starting with type Right (2)
106105

107106
tmpFace.idDiscSide_ = 0; // ETL front side, Disc1
@@ -150,7 +149,8 @@ void MTDTopologyEP::fillETLtopology(const PMTDParameters& ptp, int& mtdTopologyM
150149

151150
etlVals.emplace_back(tmpFace);
152151

153-
} else if (mtdTopologyMode == static_cast<int>(MTDTopologyMode::Mode::btlv4etlv9) || mtdTopologyMode == static_cast<int>(MTDTopologyMode::Mode::btlv4etlv10)) {
152+
} else if (static_cast<int>(MTDTopologyMode::etlLayoutFromTopoMode(mtdTopologyMode)) >
153+
static_cast<int>(MTDTopologyMode::EtlLayout::v8)) {
154154
// Disc1 Front Face (0), starting with type Right (2)
155155

156156
tmpFace.idDiscSide_ = 0; // ETL front side, Disc1

0 commit comments

Comments
 (0)