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

bsunada:Run2-hcx32 Bug fix for HcalTopology #11538

Merged
merged 2 commits into from
Sep 29, 2015
Merged

bsunada:Run2-hcx32 Bug fix for HcalTopology #11538

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a16676
Bug fix for HcalTopology
Sep 28, 2015
8ea846f
Avoid changes
Sep 29, 2015
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
10 changes: 8 additions & 2 deletions Geometry/CaloTopology/src/HcalTopology.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,9 @@ unsigned int HcalTopology::detId2denseId(const DetId& id) const {
return 0xFFFFFFFu;
}
}
#ifdef DebugLog
std::cout << "DetId2Dense " << topoVersion_ << " ID " << HcalDetId(id) << " : " << std::hex << retval << std::dec << std::endl;
#endif
return retval;
}

Expand Down Expand Up @@ -1150,11 +1153,14 @@ DetId HcalTopology::denseId2detId(unsigned int denseid) const {
ip = (in - dp + 1)%(maxDepthHB_*72);
ip = (ip/maxDepthHB_) + 1;
ie = (in - dp + 1 - maxDepthHB_*(ip-1))/(72*maxDepthHB_);
if (ie >= nEtaHB_) {ie = lastHBRing()+nEtaHB_ - ie; iz = -1;}
else {ie = firstHERing() + ie; iz = 1;}
if (ie >= nEtaHB_) {ie = lastHBRing()+nEtaHB_ - ie; iz = -1;}
else {ie = firstHBRing() + ie; iz = 1;}
}
}
}
#ifdef DebugLog
std::cout << "Dens2Det " << topoVersion_ << " i/p " << std::hex << denseid << std::dec << " : " << HcalDetId(sd,iz*int(ie),ip,dp) << std::endl;
#endif
return HcalDetId( sd, iz*int(ie), ip, dp );
}

Expand Down