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

Run3-hcx352 Try to avoid wrong list of SD names of HCAL while using DD4hep #42463

Merged
merged 1 commit into from
Aug 4, 2023
Merged

Run3-hcx352 Try to avoid wrong list of SD names of HCAL while using DD4hep #42463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0"?>
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">

<ConstantsSection label="hcalRecNumbering.xml" eval="true">
<Vector name="etagroup" type="numeric" nEntries="29">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
</Vector>
<Vector name="phigroup" type="numeric" nEntries="29">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
</Vector>
<Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layerGroupRecEta16" type="numeric" nEntries="19">
1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
</Vector>
<Vector name="layerGroupRecEta18" type="numeric" nEntries="19">
1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5
</Vector>
<Vector name="layerGroupRecEta19" type="numeric" nEntries="19">
1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
</Vector>
<Vector name="layerGroupRecEta26" type="numeric" nEntries="19">
1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
</Vector>
</ConstantsSection>

<SpecParSection label="hcalRecNumbering.xml" eval="true">
<SpecPar name="hcal">
<PartSelector path="//HBS.*"/>
<PartSelector path="//HTS.*"/>
<PartSelector path="//HES.*"/>
<PartSelector path="//HVQX"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
30 changes: 30 additions & 0 deletions Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="hcalRecNumbering.xml" eval="true">
<Vector name="etagroup" type="numeric" nEntries="16">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
</Vector>
<Vector name="phigroup" type="numeric" nEntries="16">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
</Vector>
<Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layerGroupRecEta16" type="numeric" nEntries="19">
1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
</ConstantsSection>

<SpecParSection label="hcalRecNumbering.xml" eval="true">
<SpecPar name="hcal">
<PartSelector path="//HBS.*"/>
<PartSelector path="//HTS.*"/>
<PartSelector path="//HVQX"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
101 changes: 101 additions & 0 deletions Geometry/HcalCommonData/data/hcalSimNumbering/2021/v2/hcalSimNumbering.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0"?>
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">

<ConstantsSection label="hcalSimNumbering.xml" eval="true">
<Vector name="phioff" type="numeric" nEntries="5">
0.0*deg, 0.0*deg, 0.0*deg, 10.0*deg, 10.0*deg
</Vector>
<Vector name="etaTable" type="numeric" nEntries="30">
0.000, 0.087, 0.174, 0.261, 0.348, 0.435, 0.522, 0.609, 0.696,
0.783, 0.870, 0.957, 1.044, 1.131, 1.218, 1.305, 1.392, 1.479,
1.566, 1.653, 1.740, 1.830, 1.930, 2.043, 2.172, 2.322, 2.500,
2.650, 2.868, 3.000
</Vector>
<Vector name="rTable" type="numeric" nEntries="14">
12.50*cm, 16.90*cm, 20.10*cm, 24.00*cm, 28.60*cm, 34.00*cm,
40.60*cm, 48.30*cm, 57.60*cm, 68.60*cm, 81.80*cm, 97.50*cm,
116.20*cm, 130.00*cm
</Vector>
<Vector name="phibin" type="numeric" nEntries="29">
5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg,
5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg,
5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 10.0*deg,
10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg,
10.0*deg, 10.0*deg
</Vector>
<Vector name="phitable" type="numeric" nEntries="13">
10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg,
10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 20.0*deg,
20.0*deg
</Vector>
<Vector name="layerGroupSimEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layerGroupSimEta16" type="numeric" nEntries="19">
1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layerGroupSimEta17" type="numeric" nEntries="19">
2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
</Vector>
<Vector name="layerGroupSimEta18" type="numeric" nEntries="19">
1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5
</Vector>
<Vector name="layerGroupSimEta19" type="numeric" nEntries="19">
1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
</Vector>
<Vector name="layerGroupSimEta26" type="numeric" nEntries="19">
1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
</Vector>
<Vector name="etaMin" type="numeric" nEntries="4">
1, 16, 29, 1
</Vector>
<Vector name="etaMax" type="numeric" nEntries="4">
16, 29, 41, 15
</Vector>
<Vector name="MaxDepth" type="numeric" nEntries="4">
4, 7, 4, 4
</Vector>
<Vector name="etaRange" type="numeric" nEntries="4">
1.392, 3.000, 5.500, 1.305
</Vector>
<Vector name="gparHF" type="numeric" nEntries="7">
22.0*cm, 165.0*cm, 30.0*cm, 0.0*cm, 1115.0*cm, 0.375*cm,
1137.0*cm
</Vector>
<Vector name="noff" type="numeric" nEntries="18">
15, 29, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14, 3, 4, 3, 1, 0
</Vector>
<Vector name="Layer0Wt" type="numeric" nEntries="2">
0.5, 1.2
</Vector>
<Vector name="HBGains" type="numeric" nEntries="4">
117.0, 117.0, 117.0, 217.0
</Vector>
<Vector name="HBShift" type="numeric" nEntries="4">
0, 0, 0, 0
</Vector>
<Vector name="HEGains" type="numeric" nEntries="7">
178.0, 178.0, 178.0, 178.0, 178.0, 178.0, 178.0
</Vector>
<Vector name="HEShift" type="numeric" nEntries="7">
0, 0, 0, 0, 0, 0, 0
</Vector>
<Vector name="HFGains" type="numeric" nEntries="4">
2.840, 2.090, 2.840, 2.090
</Vector>
<Vector name="HFShift" type="numeric" nEntries="4">
0, 0, 0, 0
</Vector>
</ConstantsSection>

<SpecParSection label="hcalSimNumbering.xml" eval="true">
<SpecPar name="hcalSimNumberingPar">
<PartSelector path="//HBS.*"/>
<PartSelector path="//HTS.*"/>
<PartSelector path="//HES.*"/>
<PartSelector path="//HVQX"/>
<Parameter name="OnlyForHcalSimNumbering" value="HCAL" eval="false"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
84 changes: 84 additions & 0 deletions Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="hcalSimNumbering.xml" eval="true">
<Vector name="phioff" type="numeric" nEntries="5">
0.0*deg, 0.0*deg, 0.0*deg, 10.0*deg, 10.0*deg
</Vector>
<Vector name="etaTable" type="numeric" nEntries="17">
0.000, 0.087, 0.174, 0.261, 0.348, 0.435, 0.522, 0.609, 0.696,
0.783, 0.870, 0.957, 1.044, 1.131, 1.218, 1.305, 1.392
</Vector>
<Vector name="rTable" type="numeric" nEntries="14">
12.50*cm, 16.90*cm, 20.10*cm, 24.00*cm, 28.60*cm, 34.00*cm,
40.60*cm, 48.30*cm, 57.60*cm, 68.60*cm, 81.80*cm, 97.50*cm,
116.20*cm, 130.00*cm
</Vector>
<Vector name="phibin" type="numeric" nEntries="16">
5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg,
5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg,
5.0*deg, 5.0*deg
</Vector>
<Vector name="phitable" type="numeric" nEntries="13">
10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg,
10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 20.0*deg,
20.0*deg
</Vector>
<Vector name="layerGroupSimEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layerGroupSimEta16" type="numeric" nEntries="19">
1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="etaMin" type="numeric" nEntries="4">
1, 28, 29, 1
</Vector>
<Vector name="etaMax" type="numeric" nEntries="4">
16, 15, 41, 15
</Vector>
<Vector name="MaxDepth" type="numeric" nEntries="4">
4, 0, 4, 4
</Vector>
<Vector name="etaRange" type="numeric" nEntries="4">
1.392, 3.000, 5.500, 1.305
</Vector>
<Vector name="gparHF" type="numeric" nEntries="7">
22.0*cm, 165.0*cm, 30.0*cm, 0.0*cm, 1115.0*cm, 0.375*cm,
1137.0*cm
</Vector>
<Vector name="noff" type="numeric" nEntries="18">
15, 99, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14, 3, 4, 3, 1, 0
</Vector>
<Vector name="Layer0Wt" type="numeric" nEntries="2">
1.2, 1.2
</Vector>
<Vector name="HBGains" type="numeric" nEntries="4">
117.0, 117.0, 117.0, 217.0
</Vector>
<Vector name="HBShift" type="numeric" nEntries="4">
0, 0, 0, 0
</Vector>
<Vector name="HEGains" type="numeric" nEntries="4">
178.0, 178.0, 178.0, 0.000
</Vector>
<Vector name="HEShift" type="numeric" nEntries="4">
0, 0, 0, 0
</Vector>
<Vector name="HFGains" type="numeric" nEntries="4">
2.840, 2.090, 2.840, 2.090
</Vector>
<Vector name="HFShift" type="numeric" nEntries="4">
0, 0, 0, 0
</Vector>
</ConstantsSection>

<SpecParSection label="hcalSimNumbering.xml" eval="true">
<SpecPar name="hcal">
<PartSelector path="//HBS.*"/>
<PartSelector path="//HTS.*"/>
<PartSelector path="//HVQX"/>
<Parameter name="OnlyForHcalSimNumbering" value="HCAL" eval="false"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
1 change: 1 addition & 0 deletions Geometry/HcalCommonData/python/GeometryExtended2016Reco_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

# Reconstruction geometry services
# Tracking Geometry
Expand Down
52 changes: 52 additions & 0 deletions Geometry/HcalCommonData/python/GeometryExtended2021Reco_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.HcalCommonData.cmsExtendedGeometry2021XML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

# Reconstruction geometry services
# tracker
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff 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 *
trackerGeometry.applyAlignment = cms.bool(False)

# Calorimeters
from Geometry.CaloEventSetup.CaloTopology_cfi import *
from Geometry.CaloEventSetup.CaloGeometry_cfi import *
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
SelectedCalos = cms.vstring("HCAL",
"ZDC",
"EcalBarrel",
"EcalEndcap",
"EcalPreshower",
"TOWER",
)
)
from Geometry.EcalAlgo.EcalGeometry_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.ForwardGeometry.ForwardGeometry_cfi import *
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
from Geometry.EcalMapping.EcalMapping_cfi import *
from Geometry.EcalMapping.EcalMappingRecord_cfi import *

Loading