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

Broken Geometry Paths #2129

Merged
merged 3 commits into from Jan 23, 2014
Merged

Broken Geometry Paths #2129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c78bc2
Broken Geometry Paths
Jan 22, 2014
43c27d4
Better to use this changed caloBase.xml
Jan 22, 2014
fc74b27
Possible fix for LHC HCal
Jan 23, 2014
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
24 changes: 12 additions & 12 deletions DataFormats/HcalDetId/src/HcalDetId.cc
View file
Open in desktop
Expand Up @@ -17,8 +17,8 @@ HcalDetId::HcalDetId(HcalSubdetector subdet, int tower_ieta, int tower_iphi, int
((tower_ieta>0)?(0x2000|((tower_ieta&0x3F)<<7)):(((-tower_ieta)&0x3F)<<7)) |
(tower_iphi&0x7F);
} else {
id_ |= (0x1000000) | ((depth&0xF)<<19) |
((tower_ieta>0)?(0x800000|((tower_ieta&0x1FF)<<10)):(((-tower_ieta)&0x1FF)<<10)) |
id_ |= (0x1000000) | ((depth&0xF)<<20) |
((tower_ieta>0)?(0x80000|((tower_ieta&0x1FF)<<10)):(((-tower_ieta)&0x1FF)<<10)) |
(tower_iphi&0x3FF);
}
}
Expand Down Expand Up @@ -60,10 +60,10 @@ bool HcalDetId::operator==(DetId gen) const {
phi = rawid&0x7F;
dep = (rawid>>14)&0x1F;
} else {
zsid = (rawid&0x800000)?(1):(-1);
zsid = (rawid&0x80000)?(1):(-1);
eta = (rawid>>10)&0x1FF;
phi = rawid&0x3FF;
dep = (rawid>>19)&0xF;
dep = (rawid>>20)&0xF;
}
bool result=(zsid==zside() && eta==ietaAbs() && phi==iphi() && dep==depth());
return result;
Expand All @@ -79,10 +79,10 @@ bool HcalDetId::operator!=(DetId gen) const {
phi = rawid&0x7F;
dep = (rawid>>14)&0x1F;
} else {
zsid = (rawid&0x800000)?(1):(-1);
zsid = (rawid&0x80000)?(1):(-1);
eta = (rawid>>10)&0x1FF;
phi = rawid&0x3FF;
dep = (rawid>>19)&0xF;
dep = (rawid>>20)&0xF;
}
bool result=(zsid!=zside() || eta!=ietaAbs() || phi!=iphi() || dep!=depth());
return result;
Expand All @@ -100,19 +100,19 @@ bool HcalDetId::operator<(DetId gen) const {
phi = rawid&0x7F;
dep = (rawid>>14)&0x1F;
} else {
zsid = (rawid&0x800000)?(1):(-1);
zsid = (rawid&0x80000)?(1):(-1);
eta = (rawid>>10)&0x1FF;
phi = rawid&0x3FF;
dep = (rawid>>19)&0xF;
dep = (rawid>>20)&0xF;
}
rawid = 0;
if ((id_&0x1000000) == 0) {
rawid |= ((dep&0x1F)<<14) |
((zsid>0)?(0x2000|((eta&0x3F)<<7)):((eta&0x3F)<<7)) |
(phi&0x7F);
} else {
rawid |= (0x1000000) | ((dep&0xF)<<19) |
((zsid>0)?(0x800000|((eta&0x1FF)<<10)):((eta&0x1FF)<<10)) |
rawid |= (0x1000000) | ((dep&0xF)<<20) |
((zsid>0)?(0x80000|((eta&0x1FF)<<10)):((eta&0x1FF)<<10)) |
(phi&0x3FF);
}
return (id_&0x1FFFFFF)<rawid;
Expand All @@ -121,7 +121,7 @@ bool HcalDetId::operator<(DetId gen) const {

int HcalDetId::zside() const {
if (oldFormat()) return (id_&0x2000)?(1):(-1);
else return (id_&0x800000)?(1):(-1);
else return (id_&0x80000)?(1):(-1);
}

int HcalDetId::ietaAbs() const {
Expand All @@ -136,7 +136,7 @@ int HcalDetId::iphi() const {

int HcalDetId::depth() const {
if (oldFormat()) return (id_>>14)&0x1F;
else return (id_>>19)&0xF;
else return (id_>>20)&0xF;
}

int HcalDetId::crystal_iphi_low() const {
Expand Down
47 changes: 25 additions & 22 deletions Geometry/CMSCommonData/data/PhaseII/caloBase.xml
View file
Open in desktop
@@ -1,25 +1,28 @@
<?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">
<SolidSection label="caloBase.xml">
<Polycone name="CALO" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-[cms:CalorBeamZ2]" rMin="273.76*cm" rMax="[cms:CalorMuonR]"/>
<ZSection z="-524.1*cm" rMin="273.76*cm" rMax="[cms:CalorMuonR]"/>
<ZSection z="-524.1*cm" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ1]" rMin="[cms:CalorBeamR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TrackBeamZ2]" rMin="[cms:TrackBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TrackBeamZ2]" rMin="[cms:TrackCalorR]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TrackBeamZ2]" rMin="[cms:TrackCalorR]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TrackBeamZ2]" rMin="[cms:TrackBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ1]" rMin="[cms:CalorBeamR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="524.1*cm" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="524.1*cm" rMin="273.76*cm" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ2]" rMin="273.76*cm" rMax="[cms:CalorMuonR]"/>
</Polycone>
</SolidSection>
<LogicalPartSection label="caloBase.xml">
<LogicalPart name="CALO" category="unspecified">
<rSolid name="CALO"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>

<SolidSection label="caloBase.xml">
<Polycone name="CALO" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-[cms:CalorBeamZ2]" rMin="[cms:CalorMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ3]" rMin="[cms:CalorMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ3]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ1]" rMin="[cms:CalorBeamR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TrackBeamZ2]" rMin="[cms:TrackBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TrackBeamZ2]" rMin="[cms:TrackCalorR]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TrackBeamZ2]" rMin="[cms:TrackCalorR]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TrackBeamZ2]" rMin="[cms:TrackBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ1]" rMin="[cms:CalorBeamR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ3]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ3]" rMin="[cms:CalorMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ2]" rMin="[cms:CalorMuonR2]" rMax="[cms:CalorMuonR]"/>
</Polycone>
</SolidSection>

<LogicalPartSection label="caloBase.xml">
<LogicalPart name="CALO" category="unspecified">
<rSolid name="CALO"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>

</DDDefinition>
1 change: 1 addition & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/muonBase.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
View file
Open in desktop
Expand Up @@ -98,7 +98,7 @@
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalsenspmf.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
'Geometry/HcalSimData/data/hfpmt.xml',
'Geometry/HcalSimData/data/hffibrebundle.xml',
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCalXML_cfi.py
View file
Open in desktop
Expand Up @@ -101,7 +101,7 @@
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalsenspmf.xml',
'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
'Geometry/HcalSimData/data/hfpmt.xml',
'Geometry/HcalSimData/data/hffibrebundle.xml',
Expand Down
1 change: 0 additions & 1 deletion Geometry/CMSCommonData/python/ecalhcalGeometryXML_cfi.py
View file
Open in desktop
Expand Up @@ -35,7 +35,6 @@
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
# 'Geometry/HcalCommonData/data/hcalforwardfibre.xml',
'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml',
'Geometry/ForwardCommonData/data/bundle/forwardshield.xml',
Expand Down
1 change: 0 additions & 1 deletion Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@
<PartSelector path="//HTS.*"/>
<PartSelector path="//.*HES.*"/>
<PartSelector path="//HVQF"/>
<PartSelector path="//HFFibre.*"/>
<Parameter name="OnlyForHcalSimNumbering" value="HCAL" eval="false"/>
<Parameter name="phioff" value="0.0*deg"/>
<Parameter name="phioff" value="0.0*deg"/>
Expand Down
1 change: 0 additions & 1 deletion Geometry/HcalCommonData/data/PhaseI/hcalSimNumbering.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@
<PartSelector path="//HTS.*"/>
<PartSelector path="//.*HES.*"/>
<PartSelector path="//HVQF"/>
<PartSelector path="//HFFibre.*"/>
<Parameter name="OnlyForHcalSimNumbering" value="HCAL" eval="false"/>
<Parameter name="phioff" value="0.0*deg"/>
<Parameter name="phioff" value="0.0*deg"/>
Expand Down
1 change: 0 additions & 1 deletion Geometry/HcalCommonData/data/PhaseII/NoHE/hcalSimNumbering.xml
View file
Open in desktop
Expand Up @@ -6,7 +6,6 @@
<PartSelector path="//HBS.*"/>
<PartSelector path="//HTS.*"/>
<PartSelector path="//HVQF"/>
<PartSelector path="//HFFibre.*"/>
<Parameter name="OnlyForHcalSimNumbering" value="HCAL" eval="false"/>
<Parameter name="phioff" value="0.0*deg"/>
<Parameter name="phioff" value="0.0*deg"/>
Expand Down
1 change: 0 additions & 1 deletion Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@
<PartSelector path="//HTS.*"/>
<PartSelector path="//.*HES.*"/>
<PartSelector path="//HVQF"/>
<PartSelector path="//HFFibre.*"/>
<Parameter name="OnlyForHcalSimNumbering" value="HCAL" eval="false"/>
<Parameter name="phioff" value="0.0*deg"/>
<Parameter name="phioff" value="0.0*deg"/>
Expand Down
1 change: 0 additions & 1 deletion Geometry/HcalCommonData/data/PhaseII/hcalSimNumberingEta4.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@
<PartSelector path="//HTS.*"/>
<PartSelector path="//.*HES.*"/>
<PartSelector path="//HVQF"/>
<PartSelector path="//HFFibre.*"/>
<Parameter name="OnlyForHcalSimNumbering" value="HCAL" eval="false"/>
<Parameter name="phioff" value="0.0*deg"/>
<Parameter name="phioff" value="0.0*deg"/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalSimData/data/hffibre.xml
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<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">
<SpecParSection label="hffibre.xml" eval="true">
<SpecPar name="hffibre">
<PartSelector path="//HFFibre.*"/>
<PartSelector path="//HVQX"/>
<Parameter name="Volume" value="HFFibre" eval="false"/>
</SpecPar>
</SpecParSection>
Expand Down