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

bsunanda:Run2-hcx72 Modify the code/xml files to define BH #13529

Merged
merged 1 commit into from
Mar 1, 2016
Merged

bsunanda:Run2-hcx72 Modify the code/xml files to define BH #13529

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
4 changes: 2 additions & 2 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023DevXML_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@
'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml',
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumberingRebuild.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HGCalCommonData/data/v7/hgcal.xml',
'Geometry/HGCalCommonData/data/v7/hgcalEE.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumberingRebuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<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">
<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
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
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, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 5, 5, 5, 5, 5, 5, 4
2, 2, 2, 2, 2, 2, 5, 5, 5, 5, 5, 5, 5
</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 Down
37 changes: 37 additions & 0 deletions Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?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="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, 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="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, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 5, 5, 5, 5, 5, 5, 5
</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">
1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12
</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_RCT" eval="false"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
8 changes: 6 additions & 2 deletions Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,13 @@
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="101">
<Vector name="phibin" type="numeric" nEntries="100">
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, 1.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, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg,
1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg,
1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg,
1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg,
1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg,
1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg,
1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg, 1.0*deg,
Expand Down
19 changes: 12 additions & 7 deletions Geometry/HcalCommonData/src/HcalDDDRecConstants.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@ HcalDDDRecConstants::getEtaBins(const int itype) const {
lmax = l + 1;
} else if ((int)layerGroup( ieta-1, l ) > dep) {
if (dstart < 0) dstart = dep;
int lmax0 = (lmax >= lmin) ? lmax : lmin;
if (type == 1 && ieta+1 == hpar->noff[1] && dep > hcons.getDepthEta29(0)) {
etabin0.layer.push_back(std::pair<int,int>(lmin,lmax));
etabin0.layer.push_back(std::pair<int,int>(lmin,lmax0));
} else {
etabin.layer.push_back(std::pair<int,int>(lmin,lmax));
etabin.layer.push_back(std::pair<int,int>(lmin,lmax0));
}
lmin = (l + 1);
lmax = l;
Expand Down Expand Up @@ -291,8 +292,10 @@ HcalDDDRecConstants::getThickActive(const int type) const {
for (unsigned int i = 0; i < bins[k].layer.size(); ++i) {
double thick(0);
for (int j = bins[k].layer[i].first; j <= bins[k].layer[i].second; ++j) {
if (type == 0 || j > 1)
thick += ((type == 0) ? gconsHB[j-1].second : gconsHE[j-1].second);
if (type == 0 || j > 1) {
double t = ((type == 0) ? gconsHB[j-1].second : gconsHE[j-1].second);
if (t > 0) thick += t;
}
}
thick *= (2.*scale);
HcalDDDRecConstants::HcalActiveLength active(ieta,depth,eta,thick);
Expand Down Expand Up @@ -429,7 +432,7 @@ void HcalDDDRecConstants::initialize(void) {
iEtaMin = hpar->etaMin;
iEtaMax = hpar->etaMax;
etaTable.clear(); ietaMap.clear(); etaSimValu.clear();
int ieta(0), ietaHB(0), ietaHE(0);
int ieta(0), ietaHB(0), ietaHE(0), ietaHEM(0);
etaTable.push_back(hpar->etaTable[ieta]);
for (int i=0; i<nEta; ++i) {
int ef = ieta+1;
Expand All @@ -449,9 +452,11 @@ void HcalDDDRecConstants::initialize(void) {
for (int k=0; k<(hpar->etagroup[i]); ++k) ietaMap.push_back(i+1);
if (ieta <= hpar->etaMax[0]) ietaHB = i+1;
if (ieta <= hpar->etaMin[1]) ietaHE = i+1;
if (ieta <= hpar->etaMax[1]) ietaHEM= i+1;
}
iEtaMin[1] = ietaHE;
iEtaMax[0] = ietaHB;
iEtaMax[1] = ietaHEM;

// Then Phi bins
ieta = 0;
Expand All @@ -461,8 +466,8 @@ void HcalDDDRecConstants::initialize(void) {
phibin.push_back(dphi);
ieta += (hpar->etagroup[i]);
}
for (unsigned int i=1; i<hpar->etaTable.size(); ++i) {
int unit = hcons.unitPhi(hpar->phibin[i-1]);
for (unsigned int i=1; i<etaTable.size(); ++i) {
int unit = hcons.unitPhi(phibin[i-1]);
phiUnitS.push_back(unit);
}

Expand Down
1 change: 1 addition & 0 deletions Geometry/HcalCommonData/src/HcalDDDSimConstants.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ int HcalDDDSimConstants::unitPhi(double dphi) const {

const double fiveDegInRad = 2*M_PI/72;
int units = int(dphi/fiveDegInRad+0.5);
if (units < 1) units = 1;
return units;
}

Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/test/python/runHcalRecNumberingTester_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms
process = cms.Process("HcalParametersTest")

process.load('Geometry.HcalCommonData.testPhase0GeometryXML_cfi')
process.load('Geometry.HcalCommonData.testPhase2GeometryXML_cfi')
process.load('Geometry.HcalCommonData.hcalDDConstants_cff')

process.source = cms.Source("EmptySource")
Expand Down