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:Run2-hcx68 Add xml files for BH (HGCal) #13346

Merged
merged 1 commit into from Feb 21, 2016
Merged

bsunanda:Run2-hcx68 Add xml files for BH (HGCal) #13346

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Geometry/HcalCommonData/data/PhaseI/hcalSimNumbering.xml
View file
Open in desktop
Expand Up @@ -74,11 +74,11 @@
<Vector name="HBShift" type="numeric" nEntries="4">
0, 0, 0, 0
</Vector>
<Vector name="HEGains" type="numeric" nEntries="5">
178.0, 178.0, 178.0, 178.0, 178.0
<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="5">
0, 0, 0, 0, 0
<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
Expand Down
16 changes: 11 additions & 5 deletions Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumbering.xml
View file
Open in desktop
Expand Up @@ -9,17 +9,23 @@
</Vector>
<Vector name="phigroup" type="numeric" nEntries="33">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 4, 4
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, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
1, 2, 2, 2, 3, 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, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2
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">
3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
</Vector>
<Vector name="layerGroupRecEta31" type="numeric" nEntries="19">
4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
</Vector>
</ConstantsSection>

Expand Down
40 changes: 40 additions & 0 deletions Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumberingRebuild.xml
View file
Open in desktop
@@ -0,0 +1,40 @@
<?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="33">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 4
</Vector>
<Vector name="phigroup" type="numeric" nEntries="33">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5,10,10
</Vector>
<Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 3, 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, 3, 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">
3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
</Vector>
<Vector name="layerGroupRecEta28" type="numeric" nEntries="19">
4, 4, 4, 4, 4, 4, 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="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
34 changes: 20 additions & 14 deletions Geometry/HcalCommonData/data/PhaseII/HGCal/hcalSimNumbering.xml
View file
Open in desktop
Expand Up @@ -19,23 +19,29 @@
<Vector name="phibin" type="numeric" nEntries="33">
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, 2.5*deg,
2.5*deg, 2.5*deg, 2.5*deg, 2.5*deg, 2.5*deg, 2.5*deg, 2.5*deg,
2.5*deg, 2.5*deg, 2.5*deg, 2.5*deg, 2.5*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
</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, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
1, 2, 2, 2, 3, 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, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layerGroupSimEta17" type="numeric" nEntries="19">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2
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">
3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
</Vector>
<Vector name="layerGroupSimEta31" type="numeric" nEntries="19">
4, 4, 4, 4, 4, 4, 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
Expand All @@ -44,7 +50,7 @@
16, 33, 41, 15
</Vector>
<Vector name="MaxDepth" type="numeric" nEntries="4">
3, 2, 4, 4
4, 7, 4, 4
</Vector>
<Vector name="etaRange" type="numeric" nEntries="4">
1.392, 3.000, 5.500, 1.305
Expand All @@ -53,8 +59,8 @@
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="13">
15, 99, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14
<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
Expand All @@ -65,14 +71,14 @@
<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, 178.0
<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="4">
0, 0, 0, 0
<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, 0.000, 0.000
2.840, 2.090, 2.840, 2.090
</Vector>
<Vector name="HFShift" type="numeric" nEntries="4">
0, 0, 0, 0
Expand Down
4 changes: 2 additions & 2 deletions Geometry/HcalCommonData/data/PhaseII/NoHE/hcalRecNumbering.xml
View file
Open in desktop
Expand Up @@ -9,10 +9,10 @@
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, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
1, 2, 2, 2, 3, 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, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
</ConstantsSection>

Expand Down
12 changes: 6 additions & 6 deletions Geometry/HcalCommonData/data/PhaseII/NoHE/hcalSimNumbering.xml
View file
Open in desktop
Expand Up @@ -25,10 +25,10 @@
20.0*deg
</Vector>
<Vector name="layerGroupSimEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
1, 2, 2, 2, 3, 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, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="etaMin" type="numeric" nEntries="4">
1, 16, 29, 1
Expand All @@ -37,7 +37,7 @@
16, 29, 41, 15
</Vector>
<Vector name="MaxDepth" type="numeric" nEntries="4">
3, 2, 4, 4
4, 2, 4, 4
</Vector>
<Vector name="etaRange" type="numeric" nEntries="4">
1.392, 3.000, 5.500, 1.305
Expand All @@ -46,8 +46,8 @@
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="13">
15, 99, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14
<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
Expand All @@ -65,7 +65,7 @@
0, 0, 0, 0
</Vector>
<Vector name="HFGains" type="numeric" nEntries="4">
2.840, 2.090, 0.000, 0.000
2.840, 2.090, 2.840, 2.090
</Vector>
<Vector name="HFShift" type="numeric" nEntries="4">
0, 0, 0, 0
Expand Down
25 changes: 9 additions & 16 deletions Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml
View file
Open in desktop
Expand Up @@ -2,15 +2,17 @@
<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="38">
<Vector name="etagroup" type="numeric" nEntries="58">
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 5, 5, 5, 5, 5, 5, 4
</Vector>
<Vector name="phigroup" type="numeric" nEntries="38">
<Vector name="phigroup" type="numeric" nEntries="58">
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, 1,
1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2
1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 5, 5, 5, 5, 5, 5, 4
</Vector>
<Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
Expand All @@ -19,16 +21,7 @@
1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
1, 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="layerGroupRecEta44" type="numeric" nEntries="19">
1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
</Vector>
</ConstantsSection>

Expand Down
12 changes: 6 additions & 6 deletions Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingEta4.xml
View file
Open in desktop
Expand Up @@ -14,14 +14,14 @@
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2
</Vector>
<Vector name="layergroupEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
<Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layergroupEta16" type="numeric" nEntries="19">
1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
<Vector name="layerGroupRecEta16" type="numeric" nEntries="19">
1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layergroupEta17" type="numeric" nEntries="19">
1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5
<Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
</Vector>
</ConstantsSection>

Expand Down
23 changes: 16 additions & 7 deletions Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuildHE.xml
View file
Open in desktop
Expand Up @@ -12,14 +12,23 @@
1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 4, 4
</Vector>
<Vector name="layergroupEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
<Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layergroupEta16" type="numeric" nEntries="19">
1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
<Vector name="layerGroupRecEta16" type="numeric" nEntries="19">
1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
</Vector>
<Vector name="layergroupEta17" type="numeric" nEntries="19">
1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5
<Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
1, 1, 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>

Expand All @@ -28,7 +37,7 @@
<PartSelector path="//HCal"/>
<Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
<Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_RCT" eval="false"/>
<Parameter name="TriggerMode" value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>