-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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.
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
bsunanda:Phase2-hgx67 Correct reconstruction geometry for EE and FH with full coverage #16524
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,159 @@ | ||
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', | ||
geomXMLFiles = cms.vstring( | ||
'Geometry/CMSCommonData/data/materials.xml', | ||
'Geometry/CMSCommonData/data/rotations.xml', | ||
'Geometry/CMSCommonData/data/extend/cmsextent.xml', | ||
'Geometry/CMSCommonData/data/PhaseI/cms.xml', | ||
'Geometry/CMSCommonData/data/cmsMother.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/TiltedTracker/pixfwdMaterials.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdCylinder.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwd.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdDisks.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk1.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk2.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk3.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk4.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk5.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk6.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdInnerDisk7.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk1.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk2.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk3.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk4.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk5.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk6.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk7.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk8.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk9.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdOuterDisk10.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade1.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade2.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade3.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade4.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade5.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade6.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade7.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade8.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade9.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixfwdblade10.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml', | ||
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/pixbar.xml', | ||
'Geometry/TrackerCommonData/data/trackermaterial.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/tracker.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/trackerbar.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/trackerfwd.xml', | ||
'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker/trackerStructureTopology.xml', | ||
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker/trackersens.xml', | ||
'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker/trackerRecoMaterial.xml', | ||
'Geometry/TrackerSimData/data/PhaseII/TiltedTracker/trackerProdCuts.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/PhaseII/HGCal/hcalendcapalgo.xml', | ||
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', | ||
'Geometry/HcalCommonData/data/PhaseII/SSAbsorber/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/hcalbarrelalgo.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/HcalSimData/data/HcalProdCuts.xml', | ||
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', | ||
'Geometry/HGCalCommonData/data/v8/hgcal.xml', | ||
'Geometry/HGCalCommonData/data/v8/hgcalEE.xml', | ||
'Geometry/HGCalCommonData/data/v8/hgcalHEsil.xml', | ||
'Geometry/HGCalCommonData/data/v7/hgcalwafer.xml', | ||
'Geometry/HGCalCommonData/data/v8/hgcalCons.xml', | ||
'Geometry/HGCalSimData/data/hgcsensv8.xml'), | ||
'Geometry/HGCalCommonData/data/fastTimingBarrel.xml', | ||
'Geometry/HGCalCommonData/data/fastTimingEndcap.xml', | ||
'Geometry/HGCalCommonData/data/fastTimingElement.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_BaseLine/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/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/hgcsensv8.xml', | ||
'Geometry/HGCalSimData/data/hgccons.xml', | ||
'Geometry/HGCalSimData/data/hgcProdCuts.xml', | ||
'Geometry/HGCalSimData/data/fasttimesens.xml', | ||
'Geometry/HGCalSimData/data/fasttimeProdCuts.xml', | ||
'Geometry/MuonSimData/data/PhaseII/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/GEMSpecsFilter.xml', | ||
'Geometry/GEMGeometryBuilder/data/v5/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') | ||
) | ||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kpedro88
shouldn't edits in this file be accompanied by more changes?
(e.g. README, generated geometry cff files and definition of new workflows)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@slava77 it's acceptable if @bsunanda wants to add the necessary geometry info for C3 without making a workflow for it right away. (So in general, adding items is okay, but editing anything that's currently used in a workflow should be accompanied by rerunning the script to update any affected cff files.)
But yes, I would appreciate keeping the README up to date, i.e. C3 corresponds to HGCal v8 + Phase2 HCAL.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At this moment it is a bit premature to add a new or modify existing workflow. I shall update the README - but I shall do that in a separate PR (this one is signed by all and updating this PR will require it go through the entire cycle all over again)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The PR is now provided to add the comment in README file