diff --git a/Geometry/CaloTopology/interface/HcalTopology.h b/Geometry/CaloTopology/interface/HcalTopology.h index 8f8e759bf12f8..a8e691328a7a5 100644 --- a/Geometry/CaloTopology/interface/HcalTopology.h +++ b/Geometry/CaloTopology/interface/HcalTopology.h @@ -26,10 +26,6 @@ class HcalTopology : public CaloSubdetectorTopology { public: HcalTopology(const HcalDDDRecConstants* hcons, const bool mergePosition = false); - HcalTopology(HcalTopologyMode::Mode mode, - int maxDepthHB, - int maxDepthHE, - HcalTopologyMode::TriggerMode tmode = HcalTopologyMode::TriggerMode_2009); HcalTopologyMode::Mode mode() const { return mode_; } HcalTopologyMode::TriggerMode triggerMode() const { return triggerMode_; } diff --git a/Geometry/CaloTopology/src/HcalTopology.cc b/Geometry/CaloTopology/src/HcalTopology.cc index 918d523fea6a6..d3534ca11687f 100644 --- a/Geometry/CaloTopology/src/HcalTopology.cc +++ b/Geometry/CaloTopology/src/HcalTopology.cc @@ -157,71 +157,6 @@ HcalTopology::HcalTopology(const HcalDDDRecConstants* hcons, const bool mergePos #endif } -HcalTopology::HcalTopology(HcalTopologyMode::Mode mode, - int maxDepthHB, - int maxDepthHE, - HcalTopologyMode::TriggerMode tmode) - : hcons_(nullptr), - mergePosition_(false), - excludeHB_(false), - excludeHE_(false), - excludeHO_(false), - excludeHF_(false), - mode_(mode), - triggerMode_(tmode), - firstHBRing_(1), - lastHBRing_(16), - firstHERing_(16), - lastHERing_(29), - firstHFRing_(29), - lastHFRing_(41), - firstHORing_(1), - lastHORing_(15), - firstHEDoublePhiRing_((mode == HcalTopologyMode::H2 || mode == HcalTopologyMode::H2HE) ? (22) : (21)), - firstHEQuadPhiRing_(999), - firstHFQuadPhiRing_(40), - firstHETripleDepthRing_((mode == HcalTopologyMode::H2 || mode == HcalTopologyMode::H2HE) ? (24) : (27)), - singlePhiBins_(IPHI_MAX), - doublePhiBins_(36), - maxDepthHB_(maxDepthHB), - maxDepthHE_(maxDepthHE), - maxDepthHF_(2), - etaHE2HF_(30), - etaHF2HE_(29), - maxPhiHE_(IPHI_MAX), - HBSize_(kHBSizePreLS1), - HESize_(kHESizePreLS1), - HOSize_(kHOSizePreLS1), - HFSize_(kHFSizePreLS1), - HTSize_(kHTSizePreLS1), - CALIBSize_(kCALIBSizePreLS1), - numberOfShapes_((mode_ == HcalTopologyMode::LHC) ? 87 : 500) { - if (mode_ == HcalTopologyMode::LHC) { - topoVersion_ = 0; //DL - HBSize_ = kHBSizePreLS1; // qie-per-fiber * fiber/rm * rm/rbx * rbx/barrel * barrel/hcal - HESize_ = kHESizePreLS1; // qie-per-fiber * fiber/rm * rm/rbx * rbx/endcap * endcap/hcal - HOSize_ = kHOSizePreLS1; // ieta * iphi * 2 - HFSize_ = kHFSizePreLS1; // phi * eta * depth * pm - } else { // need to know more eventually - HBSize_ = maxDepthHB * 16 * IPHI_MAX * 2; - HESize_ = maxDepthHE * (29 - 16 + 1) * maxPhiHE_ * 2; - HOSize_ = 15 * IPHI_MAX * 2; // ieta * iphi * 2 - HFSize_ = IPHI_MAX * 13 * maxDepthHF_ * 2; // phi * eta * depth * pm - CALIBSize_ = kOffCalibHFX_; - topoVersion_ = 10; - } - nEtaHB_ = (lastHBRing_ - firstHBRing_ + 1); - nEtaHE_ = (lastHERing_ - firstHERing_ + 1); - if (triggerMode_ == HcalTopologyMode::TriggerMode_2009) { - HTSize_ = kHTSizePreLS1; - } else { - HTSize_ = kHTSizePhase1; - } - - edm::LogWarning("HCalGeom") << "This is an incomplete constructor of HcalTopology - be warned that many " - << "functionalities will not be there - revert from this - get from EventSetup"; -} - bool HcalTopology::valid(const DetId& id) const { assert(id.det() == DetId::Hcal); return validHcal(id);