Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bsunanda:Phase2-gem24 Fix the issue of GE21 with staggered gap #17889

Merged
merged 2 commits into from Mar 18, 2017
Merged

bsunanda:Phase2-gem24 Fix the issue of GE21 with staggered gap #17889

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09eedd3
Fix the issue of GE21 with staggered gap
Mar 10, 2017
e9d89f5
Remove one test configuration file as suggested by Yana
Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions Geometry/GEMGeometry/test/testGEMGeometry_cfg.py
View file
Open in desktop
Expand Up @@ -2,8 +2,13 @@

process = cms.Process("Demo")

process.load('Configuration.Geometry.GeometryExtended2023D1_cff')
process.load('Configuration.Geometry.GeometryExtended2023D1Reco_cff')

process.load('Configuration.Geometry.GeometryExtended2023D4Reco_cff')
process.load('Configuration.Geometry.GeometryExtended2023D4_cff')


#process.load('Configuration.Geometry.GeometryExtended2023D1_cff')
#process.load('Configuration.Geometry.GeometryExtended2023D1Reco_cff')
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')
Expand Down
4 changes: 2 additions & 2 deletions Geometry/GEMGeometryBuilder/data/GEMSpecsFilter.xml
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@
<PartSelector path="//GEMBox11S"/>
<PartSelector path="//GSAX11S"/>
<PartSelector path="//GHA1..*"/>
<PartSelector path="//GEMBox21L"/>
<PartSelector path="//GSAX21L"/>
<PartSelector path="//GEMBox21..*"/>
<PartSelector path="//GSAX21..*"/>
<PartSelector path="//GHA2..*"/>
<Parameter name="MuStructure" value="MuonEndCapGEM"/>
</SpecPar>
Expand Down
4 changes: 2 additions & 2 deletions Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@
<PartSelector path="//GEMBox11S"/>
<PartSelector path="//GSAX11S"/>
<PartSelector path="//GHA1..*"/>
<PartSelector path="//GEMBox21L"/>
<PartSelector path="//GSAX21L"/>
<PartSelector path="//GEMBox21.*"/>
<PartSelector path="//GSAX21.*"/>
<PartSelector path="//GHA2..*"/>
<Parameter name="MuStructure" value="MuonEndCapGEM"/>
</SpecPar>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/MuonCommonData/data/PhaseII/TDR_Dev/muonNumbering.xml
View file
Open in desktop
Expand Up @@ -494,7 +494,7 @@
</SpecPar>
<SpecPar name="MuonGEMSector">
<PartSelector path="//GEMBox11."/>
<PartSelector path="//GEMBox21L"/>
<PartSelector path="//GEMBox21."/>
<Parameter name="CopyNoTag" value="[mg_sector]"/>
<Parameter name="CopyNoOffset" value="3*[super]"/>
</SpecPar>
Expand Down
117 changes: 117 additions & 0 deletions Geometry/MuonCommonData/python/testGEMXML_cfi.py
View file
Open in desktop
@@ -0,0 +1,117 @@
import FWCore.ParameterSet.Config as cms

# This config was generated automatically using generate2023Geometry.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.xml',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ianna @bsunanda - I presume this hierarchy needs to be updated to be compatible with 91x?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidlange6 - yes, but after #17944 is merged. Otherwise, it's double work.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I see the coupling? @ianna

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidlange6 - the following files have been moved (some of them in #17944):

Geometry/CMSCommonData/python/cmsExtendedGeometry2023D9XML_cfi.py
11c11
<         'Geometry/CMSCommonData/data/PostLS2/cms.xml',
---
>         'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
17c17
<         'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
---
>         'Geometry/CMSCommonData/data/muonBase/2023/v1/muonBase.xml',
59,68c65,69
<         'Geometry/MuonCommonData/data/v1/mbCommon.xml',
<         'Geometry/MuonCommonData/data/v1/mb1.xml',
<         'Geometry/MuonCommonData/data/v1/mb2.xml',
<         'Geometry/MuonCommonData/data/v1/mb3.xml',
<         'Geometry/MuonCommonData/data/v1/mb4.xml',
---
>         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
>         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
>         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
>         'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
>         'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
70,71c71,72
<         'Geometry/MuonCommonData/data/PhaseII/mf.xml',
<         'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
---
>         'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml',
>         'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml',
74,78c75,79
<         'Geometry/MuonCommonData/data/v2/csc.xml',
<         'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
<         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
---
>         'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
>         'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml',
>         'Geometry/ForwardCommonData/data/forwardshield/2015/v1/forwardshield.xml',

'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
'Geometry/CMSCommonData/data/PostLS2/cms.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/PostLS2/beampipe.xml',
'Geometry/CMSCommonData/data/PostLS2/cmsBeam.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern.xml',
'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml',
'Geometry/EcalCommonData/data/ebalgo.xml',
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml',
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuild.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HGCalCommonData/data/v7/hgcal.xml',
'Geometry/HGCalCommonData/data/v7/hgcalEE.xml',
'Geometry/HGCalCommonData/data/v7/hgcalHEsil.xml',
'Geometry/HGCalCommonData/data/v7/hgcalwafer.xml',
'Geometry/HGCalCommonData/data/v7/hgcalCons.xml',
'Geometry/MuonCommonData/data/v1/mbCommon.xml',
'Geometry/MuonCommonData/data/v1/mb1.xml',
'Geometry/MuonCommonData/data/v1/mb2.xml',
'Geometry/MuonCommonData/data/v1/mb3.xml',
'Geometry/MuonCommonData/data/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/PhaseII/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
'Geometry/MuonCommonData/data/PhaseII/gemf.xml',
'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/PhaseII/TDR_Dev/gem21.xml',
'Geometry/MuonCommonData/data/v2/csc.xml',
'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/me0.xml',
'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
'Geometry/ForwardCommonData/data/zdcmaterials.xml',
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/PhaseII/TDR_Dev/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
'Geometry/HcalSimData/data/hfpmt.xml',
'Geometry/HcalSimData/data/hffibrebundle.xml',
'Geometry/HcalSimData/data/CaloUtil.xml',
'Geometry/HGCalSimData/data/hgcsensv6.xml',
'Geometry/HGCalSimData/data/hgccons.xml',
'Geometry/HGCalSimData/data/hgcProdCuts.xml',
'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
'Geometry/ForwardCommonData/data/brmsens.xml',
'Geometry/ForwardSimData/data/zdcsens.xml',
'Geometry/HcalSimData/data/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml',
),
rootNodeName = cms.string('cms:OCMS')
)