Skip to content

Commit

Permalink
Merge pull request #42184 from bsunanda/Phase2-sim143
Browse files Browse the repository at this point in the history
Phase2-sim143 Add a few more scenarios to investigate the difference between DDD and DD4hep descriptions of 2026D98
  • Loading branch information
cmsbuild authored Jul 5, 2023
2 parents 14a4da8 + cae3785 commit ffc6072
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0"?>
<DDDefinition>
<open_geometry/>
<close_geometry/>

<IncludeSection>
<Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
<Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
<Include ref='Geometry/CMSCommonData/data/cms/2026/v5/cms.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
<Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
<Include ref='Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
<Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
<Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
<Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
<Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
<Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
</IncludeSection>
</DDDefinition>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Geometry.GeometryDD4hep_cff import *
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Muon.xml")
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import FWCore.ParameterSet.Config as cms

from Geometry.CMSCommonData.cmsExtendedGeometry2026D98MuonXML_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import FWCore.ParameterSet.Config as cms

# This config was generated automatically using generate2026Geometry.py
# If you notice a mistake, please update the generating script, not just this config

XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring(
'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
'Geometry/CMSCommonData/data/cms/2026/v5/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml',
'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml',
),
rootNodeName = cms.string('cms:OCMS')
)
3 changes: 1 addition & 2 deletions SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process('PrintG4Solids',Phase2C17I13M9,dd4hep)
else:
process = cms.Process('PrintG4Solids',Phase2C17I13M9)
+ "Reco_cff"
geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
if (options.geometry == "D94"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('PrintG4Solids',Phase2C20I13M9)
Expand Down

0 comments on commit ffc6072

Please sign in to comment.