-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Phase2-hgx240 Add 2 new scenarios for V12 of HGCAL #29827
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
32f1cae
Add 2 new scenarios for V12 of HGCAL
9d24c00
Remove the new wf from relval_2026.py
9c8c6e9
Fix the python scripts
2dfe393
Update D57/D58 to have the modified ME0
547bc7b
Take Kevin's comments
b976816
Fix HGCal V12
b7c5195
Modify nose detector and use I11 option for D57 and D58
3284545
Update README.md
91876f6
Update the materials file
35d0d59
Moved to T17
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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
60 changes: 60 additions & 0 deletions
60
Configuration/Geometry/python/GeometryExtended2026D57Reco_cff.py
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 |
---|---|---|
@@ -0,0 +1,60 @@ | ||
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 | ||
|
||
from Configuration.Geometry.GeometryExtended2026D57_cff import * | ||
|
||
# tracker | ||
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * | ||
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * | ||
from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * | ||
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * | ||
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * | ||
trackerGeometry.applyAlignment = cms.bool(False) | ||
|
||
# calo | ||
from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * | ||
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * | ||
from Geometry.CaloEventSetup.CaloTopology_cfi import * | ||
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * | ||
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", | ||
SelectedCalos = cms.vstring("HCAL", | ||
"ZDC", | ||
"EcalBarrel", | ||
"TOWER", | ||
"HGCalEESensitive", | ||
"HGCalHESiliconSensitive", | ||
"HGCalHEScintillatorSensitive" | ||
) | ||
) | ||
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * | ||
from Geometry.HcalEventSetup.HcalGeometry_cfi import * | ||
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * | ||
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * | ||
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * | ||
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * | ||
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * | ||
from Geometry.EcalMapping.EcalMapping_cfi import * | ||
from Geometry.EcalMapping.EcalMappingRecord_cfi import * | ||
|
||
# muon | ||
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * | ||
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * | ||
from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * | ||
from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * | ||
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * | ||
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * | ||
|
||
# forward | ||
from Geometry.ForwardGeometry.ForwardGeometry_cfi import * | ||
|
||
# timing | ||
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * | ||
from Geometry.MTDGeometryBuilder.mtdParameters_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * | ||
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * | ||
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * | ||
mtdGeometry.applyAlignment = cms.bool(False) | ||
|
14 changes: 14 additions & 0 deletions
14
Configuration/Geometry/python/GeometryExtended2026D57_cff.py
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 |
---|---|---|
@@ -0,0 +1,14 @@ | ||
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 | ||
|
||
from Geometry.CMSCommonData.cmsExtendedGeometry2026D57XML_cfi import * | ||
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * | ||
from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import * | ||
from Geometry.EcalCommonData.ecalSimulationParameters_cff import * | ||
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * | ||
from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * | ||
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * | ||
from Geometry.MuonNumbering.muonGeometryConstants_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * |
63 changes: 63 additions & 0 deletions
63
Configuration/Geometry/python/GeometryExtended2026D58Reco_cff.py
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 |
---|---|---|
@@ -0,0 +1,63 @@ | ||
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 | ||
|
||
from Configuration.Geometry.GeometryExtended2026D58_cff import * | ||
|
||
# tracker | ||
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * | ||
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * | ||
from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * | ||
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * | ||
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * | ||
trackerGeometry.applyAlignment = cms.bool(False) | ||
|
||
# calo | ||
from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * | ||
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * | ||
from Geometry.CaloEventSetup.HFNoseTopology_cfi import * | ||
from Geometry.ForwardGeometry.HFNoseGeometryESProducer_cfi import * | ||
from Geometry.CaloEventSetup.CaloTopology_cfi import * | ||
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * | ||
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", | ||
SelectedCalos = cms.vstring("HCAL", | ||
"ZDC", | ||
"EcalBarrel", | ||
"TOWER", | ||
"HGCalEESensitive", | ||
"HGCalHESiliconSensitive", | ||
"HGCalHEScintillatorSensitive", | ||
"HGCalHFNoseSensitive", | ||
) | ||
) | ||
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * | ||
from Geometry.HcalEventSetup.HcalGeometry_cfi import * | ||
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * | ||
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * | ||
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * | ||
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * | ||
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * | ||
from Geometry.EcalMapping.EcalMapping_cfi import * | ||
from Geometry.EcalMapping.EcalMappingRecord_cfi import * | ||
|
||
# muon | ||
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * | ||
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * | ||
from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * | ||
from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * | ||
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * | ||
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * | ||
|
||
# forward | ||
from Geometry.ForwardGeometry.ForwardGeometry_cfi import * | ||
|
||
# timing | ||
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * | ||
from Geometry.MTDGeometryBuilder.mtdParameters_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * | ||
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * | ||
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * | ||
mtdGeometry.applyAlignment = cms.bool(False) | ||
|
17 changes: 17 additions & 0 deletions
17
Configuration/Geometry/python/GeometryExtended2026D58_cff.py
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 |
---|---|---|
@@ -0,0 +1,17 @@ | ||
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 | ||
|
||
from Geometry.CMSCommonData.cmsExtendedGeometry2026D58XML_cfi import * | ||
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * | ||
from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import * | ||
from Geometry.EcalCommonData.ecalSimulationParameters_cff import * | ||
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * | ||
from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * | ||
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * | ||
from Geometry.ForwardCommonData.hfnoseParametersInitialization_cfi import * | ||
from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi import * | ||
from Geometry.MuonNumbering.muonGeometryConstants_cff import * | ||
|
||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * |
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.
Why Tracker T19 is taken here in these new scenarios? That's an experimental version with 3D pixels in TBPX1,2 and TPFX Ring1, which is still largely unvalidated. The current baseline for planar sensors is T17 to be replaced by T20 once that's validated. @emiglior @ghugo83.
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.
This is a good point, in principle these development geometries should stick with T17 (or even T15, which is still the TDR baseline).
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.
Using T17 now
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.
Yes absolutely, please use T17.