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

Cmssw 6 2 x slhc #104

Merged
merged 4 commits into from
Apr 11, 2014
Merged

Cmssw 6 2 x slhc #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eca76fd
fix a few off-by-one errors in CaloTowers
kpedro88 Apr 9, 2014
d155b04
fix another off-by-one error in CaloTowers
kpedro88 Apr 9, 2014
8c77835
Merge pull request #3269 from kpedro88/Phase2-CT6
cmsbuild Apr 10, 2014
753119d
Merge pull request #3278 from bsunanda/Phase2-HE28
cmsbuild Apr 10, 2014
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 DataFormats/CaloTowers/interface/CaloTower.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ class CaloTower : public reco::LeafCandidate {
int hadLv11() const { return hadLvl1_; }

// energy contained in depths>1 in the HE for 18<|iEta|<29
double hadEnergyHeOuterLayer() const { return (id_.ietaAbs()<=firstHERing_ || id_.ietaAbs()>lastHERing_)? 0 : outerE_; }
double hadEnergyHeInnerLayer() const { return (id_.ietaAbs()<=firstHERing_ || id_.ietaAbs()>lastHERing_)? 0 : hadE_ - outerE_; }
double hadEnergyHeOuterLayer() const { return (id_.ietaAbs()<=firstHERing_+1 || id_.ietaAbs()>lastHERing_)? 0 : outerE_; }
double hadEnergyHeInnerLayer() const { return (id_.ietaAbs()<=firstHERing_+1 || id_.ietaAbs()>lastHERing_)? 0 : hadE_ - outerE_; }

// energy in the tower by HCAL subdetector
// This is trivial except for tower 16
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CaloTowers/src/CaloTower.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ math::PtEtaPhiMLorentzVector CaloTower::hadP4(Point v) const {
// note: for now we use the same position for HO as for the other detectors

double hcalTot;
if (abs(ieta())<lastHORing_) hcalTot = (energy() - emE_);
if (abs(ieta())<=lastHORing_) hcalTot = (energy() - emE_);
else hcalTot = hadE_;

if (hcalTot>0) {
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CaloTopology/src/CaloTowerTopology.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ CaloTowerTopology::CaloTowerTopology(const HcalTopology * topology) : hcaltopo(t
//translate phi segmentation boundaries into continuous ieta
firstHEDoublePhiRing_ = firstHERing_ + (hcaltopo->firstHEDoublePhiRing() - hcaltopo->firstHERing());
firstHEQuadPhiRing_ = firstHERing_ + (hcaltopo->firstHEQuadPhiRing() - hcaltopo->firstHERing());
firstHFQuadPhiRing_ = firstHFRing_ + (hcaltopo->firstHFQuadPhiRing() - hcaltopo->firstHFRing());
firstHFQuadPhiRing_ = firstHFRing_ - 1 + (hcaltopo->firstHFQuadPhiRing() - hcaltopo->firstHFRing());

//number of etas per phi segmentation type
int nEtaSinglePhi_, nEtaDoublePhi_, nEtaQuadPhi_;
Expand Down