Skip to content

Commit eea2338

Browse files
cquarantfabiocos
cquarant
and
fabiocos
committed
Squashed commit of the following:
commit 0e9e960 Author: cquarant <[email protected]> Date: Mon Feb 24 15:43:10 2025 +0100 code format commit 815794d Author: cquarant <[email protected]> Date: Mon Feb 24 15:22:49 2025 +0100 modified condition for old ETL geometries commit 2deeaf6 Author: cquarant <[email protected]> Date: Mon Feb 24 14:18:04 2025 +0100 modified condition for old ETL geometries commit 73cc420 Author: cquarant <[email protected]> Date: Mon Feb 24 12:26:17 2025 +0100 update exception for geometry >= btlv3etlv8 commit 2df61cd Author: Claudio Quaranta <[email protected]> Date: Tue Feb 18 10:36:57 2025 +0100 Update relval_Run4.py assigned 32834.0 as a new WF number commit e46b0fd Author: cquarant <[email protected]> Date: Mon Feb 17 12:11:51 2025 +0100 updated .xml config files for geometry D117 commit 6643456 Author: cquarant <[email protected]> Date: Tue Feb 11 12:42:43 2025 +0100 code formatting commit b7dac6e Author: cquarant <[email protected]> Date: Tue Feb 11 12:21:28 2025 +0100 added BTL Electronics Mapping in MTDCommondata test (dd4hep) commit db2c3fc Author: cquarant <[email protected]> Date: Fri Feb 7 19:41:54 2025 +0100 Updated BTLElectronicsMapping to work only with BTL geometry v4, MTDCommonData test DD4hep_TestMTDIdealGeometry to be updated (now compiles but doesn't run) commit e484418 Author: cquarant <[email protected]> Date: Fri Feb 7 11:22:57 2025 +0100 code formatting + BTLElectronicsMapping commit ffe82c0 Author: Fabio Cossutti <[email protected]> Date: Thu Feb 6 15:45:30 2025 +0100 Code cleaning, activate test for BTL navigation commit 2f14a44 Author: Fabio Cossutti <[email protected]> Date: Thu Feb 6 13:46:13 2025 +0100 Restore BTL phi order from -pi to +pi commit bc2ed7d Author: Fabio Cossutti <[email protected]> Date: Tue Feb 4 14:00:01 2025 +0100 Update geometry D117 definition according to latest developments commit 35cb1d3 Author: Fabio Cossutti <[email protected]> Date: Thu Jan 16 17:54:37 2025 +0100 Add BTL v4/scenario D117, update MTDTopologyScheme moving EtlLayout outside of ETLDetId commit d864110 Author: cquarant <[email protected]> Date: Wed Feb 5 18:31:04 2025 +0100 fixed runitByType number for geometry v4 commit 7004b6f Author: cquarant <[email protected]> Date: Wed Feb 5 12:05:11 2025 +0100 corrected geoId constructor for v2/v3 geometry commit df00936 Author: cquarant <[email protected]> Date: Tue Feb 4 11:15:36 2025 +0100 resolved conflict commit c250f1e Author: cquarant <[email protected]> Date: Wed Jan 29 17:51:09 2025 +0100 bug fixing commit 1fb8ccd Author: cquarant <[email protected]> Date: Wed Jan 29 12:31:29 2025 +0100 fix geographicalId commit ee29483 Author: cquarant <[email protected]> Date: Mon Jan 27 18:44:26 2025 +0100 new BTLDetId re-implementation with robust backward compatibility (work in progress) commit 8a04c53 Author: cquarant <[email protected]> Date: Mon Jan 27 12:48:55 2025 +0100 BtlDetId v4 Geometry commit 4f47015 Author: Fabio Cossutti <[email protected]> Date: Thu Jan 16 17:54:37 2025 +0100 Add BTL v4/scenario D117, update MTDTopologyScheme moving EtlLayout outside of ETLDetId Co-authored-by: Claudio Quaranta <[email protected]> Co-authored-by: Fabio Cossutti <[email protected]>
1 parent 38e3ea5 commit eea2338

35 files changed

+2414
-233
lines changed

‎Configuration/Geometry/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ Fast Timing system:
141141
* I15: Same as I14, addition of notch and revision of envelope
142142
* I16: Starting from I15, revised BTL with complete passive material description, it needs Tracker T31 or newer
143143
* I17: Same as I16, BTL with one crystal thickness (type) only, ETL with LGAD split into two sensors
144+
* I18: Same as I17, needed for updated BTL numbering scheme and BTLDetId format
144145

145146
The script also handles the common and forward elements of the geometry:
146147
* O4: detailed cavern description, changes for modified CALO region for endcap part, no overlaps inside the Muon System
@@ -182,4 +183,5 @@ Several detector combinations have been generated:
182183
* D114 = T39+C19+M11+I17+O9+F8
183184
* D115 = T35+C20+M11+I17+O9+F8
184185
* D116 = T35+C25+M12+I17+O10+F9
186+
* D117 = T35+C25+M12+I18+O10+F9
185187

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117Reco_cff.py‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generateRun4Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Configuration.Geometry.GeometryDD4hepExtendedRun4D117_cff import *
7+
8+
# tracker
9+
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
10+
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
11+
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
12+
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
13+
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
14+
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
15+
trackerGeometry.applyAlignment = True
16+
17+
# calo
18+
from Geometry.CaloEventSetup.HGCalTopology_cfi import *
19+
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
20+
from Geometry.CaloEventSetup.CaloTopology_cfi import *
21+
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
22+
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
23+
SelectedCalos = cms.vstring("HCAL",
24+
"ZDC",
25+
"EcalBarrel",
26+
"TOWER",
27+
"HGCalEESensitive",
28+
"HGCalHESiliconSensitive",
29+
"HGCalHEScintillatorSensitive"
30+
)
31+
)
32+
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
33+
from Geometry.HcalEventSetup.HcalGeometry_cfi import *
34+
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
35+
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
36+
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
37+
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
38+
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
39+
from Geometry.EcalMapping.EcalMapping_cfi import *
40+
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
41+
42+
# muon
43+
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
44+
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
45+
from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
46+
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
47+
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
48+
49+
# forward
50+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
51+
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *
52+
53+
# timing
54+
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
55+
from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
56+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
57+
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
58+
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
59+
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
60+
mtdGeometry.applyAlignment = False
61+

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117_cff.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generateRun4Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Configuration.Geometry.GeometryDD4hep_cff import *
7+
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D117.xml")
8+
9+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
10+
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
11+
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
12+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
13+
from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
14+
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
15+
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
16+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
17+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

‎Configuration/Geometry/python/GeometryExtendedRun4D117Reco_cff.py‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generateRun4Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Configuration.Geometry.GeometryExtendedRun4D117_cff import *
7+
8+
# tracker
9+
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
10+
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
11+
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
12+
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
13+
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
14+
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
15+
trackerGeometry.applyAlignment = True
16+
17+
# calo
18+
from Geometry.CaloEventSetup.HGCalTopology_cfi import *
19+
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
20+
from Geometry.CaloEventSetup.CaloTopology_cfi import *
21+
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
22+
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
23+
SelectedCalos = cms.vstring("HCAL",
24+
"ZDC",
25+
"EcalBarrel",
26+
"TOWER",
27+
"HGCalEESensitive",
28+
"HGCalHESiliconSensitive",
29+
"HGCalHEScintillatorSensitive"
30+
)
31+
)
32+
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
33+
from Geometry.HcalEventSetup.HcalGeometry_cfi import *
34+
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
35+
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
36+
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
37+
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
38+
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
39+
from Geometry.EcalMapping.EcalMapping_cfi import *
40+
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
41+
42+
# muon
43+
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
44+
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
45+
from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
46+
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
47+
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
48+
49+
# forward
50+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
51+
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *
52+
53+
# timing
54+
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
55+
from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
56+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
57+
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
58+
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
59+
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
60+
mtdGeometry.applyAlignment = False
61+

‎Configuration/Geometry/python/GeometryExtendedRun4D117_cff.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generateRun4Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Geometry.CMSCommonData.cmsExtendedGeometryRun4D117XML_cfi import *
7+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
8+
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
9+
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
10+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
11+
from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
12+
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
13+
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
14+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
15+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

‎Configuration/Geometry/python/dictRun4Geometry.py‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,6 +1531,34 @@
15311531
],
15321532
"era" : "phase2_timing, phase2_timing_layer, phase2_etlV4",
15331533
},
1534+
"I18" : {
1535+
1 : [
1536+
'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
1537+
'Geometry/MTDCommonData/data/btl/v4/btl.xml',
1538+
'Geometry/MTDCommonData/data/etl/v8/etl.xml',
1539+
'Geometry/MTDCommonData/data/mtdParameters/v6/mtdStructureTopology.xml',
1540+
'Geometry/MTDCommonData/data/mtdParameters/v6/mtdParameters.xml',
1541+
],
1542+
3 : [
1543+
'Geometry/MTDSimData/data/v5/mtdsens.xml'
1544+
],
1545+
4 : [
1546+
'Geometry/MTDSimData/data/v5/mtdProdCuts.xml'
1547+
],
1548+
"sim" : [
1549+
'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *',
1550+
],
1551+
"reco" :[
1552+
'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *',
1553+
'from Geometry.MTDGeometryBuilder.mtdParameters_cff import *',
1554+
'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *',
1555+
'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *',
1556+
'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *',
1557+
'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
1558+
'mtdGeometry.applyAlignment = False'
1559+
],
1560+
"era" : "phase2_timing, phase2_timing_layer, phase2_etlV4",
1561+
},
15341562
}
15351563

15361564
allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, timingDict ]
@@ -1557,6 +1585,7 @@
15571585
("O9","T39","C19","M14","F8","I17") : "D114",
15581586
("O9","T35","C20","M14","F8","I17") : "D115",
15591587
("O10","T35","C25","M15","F9","I17") : "D116",
1588+
("O10","T35","C25","M15","F9","I18") : "D117",
15601589
}
15611590

15621591
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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
numWFIB.extend([31234.0]) #Run4D114
3737
numWFIB.extend([32034.0]) #Run4D115
3838
numWFIB.extend([32434.0]) #Run4D116
39+
numWFIB.extend([32834.0]) #Run4D117
3940

4041
#Additional sample for short matrix and IB
4142
#Default Phase-2 Det NoPU

‎Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@
9595
'Run4D115PU',
9696
'Run4D116',
9797
'Run4D116PU',
98+
'Run4D117',
99+
'Run4D117PU',
98100
]
99101

100102
# pre-generation of WF numbers
@@ -3179,6 +3181,13 @@ def condition(self, fragment, stepList, key, hasHarvest):
31793181
'Era' : 'Phase2C17I13M9',
31803182
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
31813183
},
3184+
'Run4D117' : {
3185+
'Geom' : 'ExtendedRun4D117',
3186+
'HLTmenu': '@relvalRun4',
3187+
'GT' : 'auto:phase2_realistic_T33',
3188+
'Era' : 'Phase2C17I13M9',
3189+
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
3190+
},
31823191
}
31833192

31843193
# standard PU sequences

‎Configuration/StandardSequences/python/GeometryConf.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,6 @@
130130
'DD4hepExtendedRun4D115' : 'DD4hepExtendedRun4D115,DD4hepExtendedRun4D115Reco',
131131
'ExtendedRun4D116' : 'ExtendedRun4D116,ExtendedRun4D116Reco',
132132
'DD4hepExtendedRun4D116' : 'DD4hepExtendedRun4D116,DD4hepExtendedRun4D116Reco',
133+
'ExtendedRun4D117' : 'ExtendedRun4D117,ExtendedRun4D117Reco',
134+
'DD4hepExtendedRun4D117' : 'DD4hepExtendedRun4D117,DD4hepExtendedRun4D117Reco',
133135
}

0 commit comments

Comments
 (0)