Skip to content

Commit

Permalink
Merge pull request #33390 from bsunanda/Run3-gex65
Browse files Browse the repository at this point in the history 
Run3-gex65 Update EB to adjust overlaps: work for DDD, need more work for DD4Hep
  • Loading branch information
@cmsbuild
cmsbuild committed Apr 12, 2021
2 parents 1f40484 + 5960033 commit 8b4ac9d
Show file tree
Hide file tree
Showing 15 changed files with 88 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Configuration/Geometry/python/dict2021Geometry.py
View file
Expand Up @@ -1784,7 +1784,7 @@
"default" : 1,
"C1" : {
1 : [
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/escon.xml',
'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
View file
Expand Up @@ -212,7 +212,7 @@
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
<Include ref='Geometry/EcalCommonData/data/escon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
View file
Expand Up @@ -212,7 +212,7 @@
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
<Include ref='Geometry/EcalCommonData/data/escon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
View file
Expand Up @@ -212,7 +212,7 @@
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
<Include ref='Geometry/EcalCommonData/data/escon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
View file
Expand Up @@ -212,7 +212,7 @@
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
<Include ref='Geometry/EcalCommonData/data/escon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
View file
Expand Up @@ -212,7 +212,7 @@
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
<Include ref='Geometry/EcalCommonData/data/escon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
View file
Expand Up @@ -212,7 +212,7 @@
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
<Include ref='Geometry/EcalCommonData/data/escon.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
View file
Expand Up @@ -213,7 +213,7 @@
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/escon.xml',
'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
View file
Expand Up @@ -213,7 +213,7 @@
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/escon.xml',
'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
View file
Expand Up @@ -213,7 +213,7 @@
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/escon.xml',
'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
View file
Expand Up @@ -213,7 +213,7 @@
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/escon.xml',
'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
View file
Expand Up @@ -213,7 +213,7 @@
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/escon.xml',
'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
View file
Expand Up @@ -213,7 +213,7 @@
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/escon.xml',
'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
Expand Down
58 changes: 58 additions & 0 deletions Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml
View file
@@ -0,0 +1,58 @@
<?xml version="1.0"?>
<DDDefinition>
<ConstantsSection label="ebcon.xml" eval="true">
<Constant name="BarZPts01" value="-3046.0*mm"/>
<Constant name="BarZPts02" value="-2686.7*mm"/>
<Constant name="BarZPts03" value=" 2686.7*mm"/>
<Constant name="BarZPts04" value=" 3046.0*mm"/>
<Constant name="BarRMin01" value=" 1455.22*mm"/>
<Constant name="BarRMin02" value=" 1238.00*mm"/>
<Constant name="BarRMin03" value=" 1238.00*mm"/>
<Constant name="BarRMin04" value=" 1455.22*mm"/>
<Constant name="BarRMax01" value=" 1775*mm"/>
<Constant name="BarRMax02" value=" 1775*mm"/>
<Constant name="BarRMax03" value=" 1775*mm"/>
<Constant name="BarRMax04" value=" 1775*mm"/>
<Constant name="BarTranX" value="0*mm"/>
<Constant name="BarTranY" value="0*mm"/>
<Constant name="BarTranZ" value="0*mm"/>
<Constant name="BarPhiLo" value="0*deg"/>
<Constant name="BarPhiHi" value="360*deg"/>
<Constant name="SpmHere01" value="1"/>
<Constant name="SpmHere02" value="1"/>
<Constant name="SpmHere03" value="1"/>
<Constant name="SpmHere04" value="1"/>
<Constant name="SpmHere05" value="1"/>
<Constant name="SpmHere06" value="1"/>
<Constant name="SpmHere07" value="1"/>
<Constant name="SpmHere08" value="1"/>
<Constant name="SpmHere09" value="1"/>
<Constant name="SpmHere10" value="1"/>
<Constant name="SpmHere11" value="1"/>
<Constant name="SpmHere12" value="1"/>
<Constant name="SpmHere13" value="1"/>
<Constant name="SpmHere14" value="1"/>
<Constant name="SpmHere15" value="1"/>
<Constant name="SpmHere16" value="1"/>
<Constant name="SpmHere17" value="1"/>
<Constant name="SpmHere18" value="1"/>
<Constant name="SpmHere19" value="1"/>
<Constant name="SpmHere20" value="1"/>
<Constant name="SpmHere21" value="1"/>
<Constant name="SpmHere22" value="1"/>
<Constant name="SpmHere23" value="1"/>
<Constant name="SpmHere24" value="1"/>
<Constant name="SpmHere25" value="1"/>
<Constant name="SpmHere26" value="1"/>
<Constant name="SpmHere27" value="1"/>
<Constant name="SpmHere28" value="1"/>
<Constant name="SpmHere29" value="1"/>
<Constant name="SpmHere30" value="1"/>
<Constant name="SpmHere31" value="1"/>
<Constant name="SpmHere32" value="1"/>
<Constant name="SpmHere33" value="1"/>
<Constant name="SpmHere34" value="1"/>
<Constant name="SpmHere35" value="1"/>
<Constant name="SpmHere36" value="1"/>
</ConstantsSection>
</DDDefinition>
35 changes: 17 additions & 18 deletions Geometry/EcalCommonData/src/EcalBarrelNumberingScheme.cc
View file
Expand Up @@ -4,6 +4,7 @@
///////////////////////////////////////////////////////////////////////////////
#include "Geometry/EcalCommonData/interface/EcalBarrelNumberingScheme.h"
#include "DataFormats/EcalDetId/interface/EBDetId.h"
#include <sstream>

//#define EDM_ML_DEBUG

Expand All @@ -19,9 +20,12 @@ uint32_t EcalBarrelNumberingScheme::getUnitID(const EcalBaseNumber& baseNumber)
const uint32_t nLevels(baseNumber.getLevels());

#ifdef EDM_ML_DEBUG
edm::LogVerbatim("EcalGeom") << "ECalBarrelNumberingScheme geometry levels = " << nLevels;
std::ostringstream st1;
for (uint32_t k = 0; k < nLevels; ++k)
st1 << ", " << baseNumber.getLevelName(k) << ":" << baseNumber.getCopyNumber(k);
edm::LogVerbatim("EcalGeom") << "ECalBarrelNumberingScheme geometry levels = " << nLevels << st1.str();
#endif
if (12 > nLevels) {
if (11 > nLevels) {
edm::LogWarning("EcalGeom") << "ECalBarrelNumberingScheme::getUnitID(): "
<< "Not enough levels found in EcalBaseNumber ( " << nLevels << ") Returning 0";
return 0;
Expand All @@ -31,25 +35,20 @@ uint32_t EcalBarrelNumberingScheme::getUnitID(const EcalBaseNumber& baseNumber)

const int cryType(::atoi(cryName.c_str() + 5));

uint32_t wallCopy(0), hawCopy(0), fawCopy(0), supmCopy(0);
const int off(13 < nLevels ? 3 : 0);

const uint32_t wallCopy(baseNumber.getCopyNumber(3 + off));
const uint32_t hawCopy(baseNumber.getCopyNumber(4 + off));
const uint32_t fawCopy(baseNumber.getCopyNumber(5 + off));
const uint32_t supmCopy(baseNumber.getCopyNumber(6 + off));
if (nLevels != 11) {
wallCopy = baseNumber.getCopyNumber(3 + off);
hawCopy = baseNumber.getCopyNumber(4 + off);
fawCopy = baseNumber.getCopyNumber(5 + off);
supmCopy = baseNumber.getCopyNumber(6 + off);
} else {
wallCopy = baseNumber.getCopyNumber(3);
}
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("EcalGeom") << nLevels << ", " << off << ", " << cryType << ", " << baseNumber.getLevelName(0) << ":"
<< baseNumber.getCopyNumber(0) << ", " << baseNumber.getLevelName(1) << ":"
<< baseNumber.getCopyNumber(1) << ", " << baseNumber.getLevelName(2) << ":"
<< baseNumber.getCopyNumber(2) << ", " << baseNumber.getLevelName(3) << ":"
<< baseNumber.getCopyNumber(3) << ", " << baseNumber.getLevelName(4) << ":"
<< baseNumber.getCopyNumber(4) << ", " << baseNumber.getLevelName(5) << ":"
<< baseNumber.getCopyNumber(5) << ", " << baseNumber.getLevelName(6) << ":"
<< baseNumber.getCopyNumber(6) << ", " << baseNumber.getLevelName(7) << ":"
<< baseNumber.getCopyNumber(7) << ", " << baseNumber.getLevelName(8) << ":"
<< baseNumber.getCopyNumber(8) << ", " << baseNumber.getLevelName(9) << ":"
<< baseNumber.getCopyNumber(9) << ", " << baseNumber.getLevelName(10) << ":"
<< baseNumber.getCopyNumber(10);
edm::LogVerbatim("EcalGeom") << nLevels << " off: " << off << " cryType: " << cryType << " wallCopy: " << wallCopy
<< " hawCopy: " << hawCopy << " fawCopy: " << fawCopy << " supmCopy: " << supmCopy;
#endif
// error checking

Expand Down

0 comments on commit 8b4ac9d

Please sign in to comment.