Update geometry access for Hcal cells

cms-sw · Jul 25, 2017 · 3f48997 · 3f48997
1 parent 3b3a9c0
commit 3f48997
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/RecoMET/METAlgorithms/BuildFile.xml b/RecoMET/METAlgorithms/BuildFile.xml
@@ -10,6 +10,7 @@
 <use   name="TrackingTools/GeomPropagators"/>
 <use   name="TrackingTools/TrackAssociator"/>
 <use   name="Geometry/CaloTopology"/>
+<use   name="Geometry/HcalTowerAlgo"/>
 <use   name="Geometry/CSCGeometry"/>
 <use   name="RecoEcal/EgammaCoreTools"/>
 <use   name="DataFormats/ParticleFlowCandidate"/>

diff --git a/RecoMET/METAlgorithms/interface/HcalHaloAlgo.h b/RecoMET/METAlgorithms/interface/HcalHaloAlgo.h
@@ -12,19 +12,13 @@
 
 #include "Geometry/CaloTopology/interface/EcalBarrelTopology.h"
 #include "Geometry/CaloTopology/interface/EcalEndcapTopology.h"
-#include "DataFormats/CaloRecHit/interface/CaloID.h"
 
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
 
-#include "DataFormats/CaloRecHit/interface/CaloID.h"
-#include "DataFormats/EcalDetId/interface/EBDetId.h"
-#include "DataFormats/EcalDetId/interface/EEDetId.h"
-#include "DataFormats/EcalDetId/interface/ESDetId.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 
@@ -89,7 +83,8 @@ class HcalHaloAlgo{
   float SumEnergyThreshold;
   int NHitsThreshold;
 
-  const CaloGeometry *geo;
+  const CaloGeometry *geo_;
+  const HcalGeometry *hgeo_;
   math::XYZPoint getPosition(const DetId &id, reco::Vertex::Point vtx);
 
 };

diff --git a/RecoMET/METAlgorithms/src/HcalHaloAlgo.cc b/RecoMET/METAlgorithms/src/HcalHaloAlgo.cc
@@ -23,14 +23,12 @@ bool CompareTowers(const CaloTower* x, const CaloTower* y ){
   return x->iphi()*1000 + x->ieta() < y->iphi()*1000 + y->ieta();
 }
 
-HcalHaloAlgo::HcalHaloAlgo()
+HcalHaloAlgo::HcalHaloAlgo() : geo_(0), hgeo_(0)
 {
   HBRecHitEnergyThreshold = 0.;
   HERecHitEnergyThreshold = 0.;
   SumEnergyThreshold = 0.;
   NHitsThreshold = 0;
-
-  geo = 0;
 }
 
 HcalHaloData HcalHaloAlgo::Calculate(const CaloGeometry& TheCaloGeometry, edm::Handle<HBHERecHitCollection>& TheHBHERecHits, edm::Handle<EBRecHitCollection>& TheEBRecHits,edm::Handle<EERecHitCollection>& TheEERecHits,const edm::EventSetup& TheSetup){
@@ -224,10 +222,10 @@ HcalHaloData HcalHaloAlgo::Calculate(const CaloGeometry& TheCaloGeometry, edm::H
     prevHadEt = tower->hadEt();
   }
 
-  geo = 0;
   edm::ESHandle<CaloGeometry> pGeo;
   TheSetup.get<CaloGeometryRecord>().get(pGeo);
-  geo = pGeo.product();
+  geo_  = pGeo.product();
+  hgeo_ = dynamic_cast<const HcalGeometry*>(geo_->getSubdetectorGeometry(DetId::Hcal, 1));
 
   //Halo cluster building:
   //Various clusters are built, depending on the subdetector. 
@@ -520,7 +518,12 @@ bool HcalHaloAlgo::HEClusterShapeandTimeStudy( HaloClusterCandidateHCAL hcand, b
 
 math::XYZPoint HcalHaloAlgo::getPosition(const DetId &id, reco::Vertex::Point vtx){
 
-  const GlobalPoint& pos=geo->getPosition(id);
+  GlobalPoint pos;
+  if (id.det() == 4) {
+    pos = hgeo_->getPosition(id);
+  } else {
+    pos = GlobalPoint(geo_->getPosition(id));
+  }
   math::XYZPoint posV(pos.x() - vtx.x(),pos.y() - vtx.y(),pos.z() - vtx.z());
   return posV;
 }