-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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-hgx360FX Attempt to make a Phase2 scenario with 0 overlaps with zero tolerance in lieu of #46565 and #46610 #46755
Merged
Merged
Changes from all commits
Commits
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
61 changes: 61 additions & 0 deletions
61
Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116Reco_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,61 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
# This config was generated automatically using generateRun4Geometry.py | ||
# If you notice a mistake, please update the generating script, not just this config | ||
|
||
from Configuration.Geometry.GeometryDD4hepExtendedRun4D116_cff import * | ||
|
||
# tracker | ||
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * | ||
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * | ||
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * | ||
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * | ||
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * | ||
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * | ||
trackerGeometry.applyAlignment = True | ||
|
||
# calo | ||
from Geometry.CaloEventSetup.HGCalTopology_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_cff import * | ||
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * | ||
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * | ||
|
||
# forward | ||
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * | ||
from Geometry.ForwardGeometry.ZdcGeometry_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 = False | ||
|
17 changes: 17 additions & 0 deletions
17
Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116_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 generateRun4Geometry.py | ||
# If you notice a mistake, please update the generating script, not just this config | ||
|
||
from Configuration.Geometry.GeometryDD4hep_cff import * | ||
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml") | ||
|
||
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * | ||
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_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.MuonNumbering.muonOffsetESProducer_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * |
61 changes: 61 additions & 0 deletions
61
Configuration/Geometry/python/GeometryExtendedRun4D116Reco_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,61 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
# This config was generated automatically using generateRun4Geometry.py | ||
# If you notice a mistake, please update the generating script, not just this config | ||
|
||
from Configuration.Geometry.GeometryExtendedRun4D116_cff import * | ||
|
||
# tracker | ||
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * | ||
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * | ||
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * | ||
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * | ||
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * | ||
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * | ||
trackerGeometry.applyAlignment = True | ||
|
||
# calo | ||
from Geometry.CaloEventSetup.HGCalTopology_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_cff import * | ||
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * | ||
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * | ||
|
||
# forward | ||
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * | ||
from Geometry.ForwardGeometry.ZdcGeometry_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 = False | ||
|
15 changes: 15 additions & 0 deletions
15
Configuration/Geometry/python/GeometryExtendedRun4D116_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,15 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
# This config was generated automatically using generateRun4Geometry.py | ||
# If you notice a mistake, please update the generating script, not just this config | ||
|
||
from Geometry.CMSCommonData.cmsExtendedGeometryRun4D116XML_cfi import * | ||
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * | ||
from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_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.MuonNumbering.muonOffsetESProducer_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * |
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
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.
Making this detector will make a difficult time to validate M12, as we needs to wait for C25. I would suggest adding another scenario with D110 + M12, so that we can validate M12 first while we are waiting new calorimeter to go for validation.
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.
M12 removes the overlaps in M11 and the only sensible validation is to use the g4 overlap tool which is done. Similarly C25 and F9 only remove overlap and that is tested with g4overlap.No other validation makes sense.
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.
Did you make it clear what is C25 in README? No, you don't. The point is if C25 is based on HGCal version which does not validate yet, so I don't see the point to wait. We can just lunch this easy validation M12 first. We used to do muon together with other, it is fine to do but we need a clear plan and ETA of other detector.
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.
C25 is derived from C18 where Geometry/EcalCommonData/data/ebalgo.xml is replaced with Geometry/EcalCommonData/data/ebalgo/2021/v1/ebalgo.xml. There is no change in HGCal geometry. The changes in ebalgo.xml is mum and fm are defined in ebalgo/2021/v1/ebalgo.xml. and the type of SpmCutTM and SpmCutTP were not defined in Geometry/EcalCommonData/data/ebalgo.xml and are defined as "numeric" in the new version.
In any case we try to see a scenario with very little overlap and going toward 0 overlap. I shall define them in README in a new PR now that the other Run3 PR is combined.