Skip to content

Commit 30ad2dd

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48238 from bsunanda/Phase2-hgx364H
Phase2-hgx364H Add two new scenario for HGCal V19n and V19ng without cell declaration at G4 geometry level and removing the gaps
2 parents 77e0d31 + 6a562f4 commit 30ad2dd

23 files changed

+2648
-8
lines changed

‎Configuration/Geometry/README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@ Calorimeters:
128128
* C21: HGCal (v17 version of HGCal geometry as in C19 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D101)
129129
* C22: HGCal (v18 version of HGCal geometry as in C18 with calibration cells, nonzero cssette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB (used in Run4D104)
130130
* C23: HGCal (same as the v18 version which is in C22 but without internal cells in the Geant4 geometry defintiion) + Phase2 HCAL and EB (used in Run4D106)
131-
* C24: HGCal (v18 version of HGCal geometry as in C122 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109)
131+
* C24: HGCal (v18 version of HGCal geometry as in C22 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109)
132132
* C25: sane as C18 but changing ebalgo.xml to make it more conformant with standard
133133
* C26: HGCal (v19 version of HGCal geometry with calibration cells, nonzero cssette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB (used in Run4D120)
134+
* C27: HGCal (same as the v19 version which is in C26 but without internal cells in the Geant4 geometry defintiion) + Phase2 HCAL and EB (used in Run4D106)
135+
* C28: HGCal (v19 version of HGCal geometry as in C22 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109)
134136

135137
Muon system:
136138
* M4: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips, no overlaps, MB4Shields
@@ -204,3 +206,5 @@ Several detector combinations have been generated:
204206
* D119 = T35+C25+M15+I20+O10+F9
205207
* D120 = T35+C26+M15+I20+O10+F9
206208
* D121 = T35+C25+M16+I17+O10+F9
209+
* D122 = T35+C27+M15+I20+O10+F9
210+
* D123 = T35+C28+M15+I20+O10+F9

‎Configuration/Geometry/python/GeometryDD4hepExtendedRun4D122Reco_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.GeometryDD4hepExtendedRun4D122_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/GeometryDD4hepExtendedRun4D122_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/cmsExtendedGeometryRun4D122.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/GeometryDD4hepExtendedRun4D123Reco_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.GeometryDD4hepExtendedRun4D123_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/GeometryDD4hepExtendedRun4D123_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/cmsExtendedGeometryRun4D123.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/GeometryExtendedRun4D122Reco_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.GeometryExtendedRun4D122_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/GeometryExtendedRun4D122_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.cmsExtendedGeometryRun4D122XML_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/GeometryExtendedRun4D123Reco_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.GeometryExtendedRun4D123_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/GeometryExtendedRun4D123_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.cmsExtendedGeometryRun4D123XML_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 *

0 commit comments

Comments
 (0)