Remove remaining unneeded dependencies from Reco subsystems

DQMOffline/JetMET/BuildFile.xml

@@ -15,7 +15,6 @@
 <use   name="RecoJets/JetAlgorithms"/>
 <use   name="RecoJets/JetProducers"/>
 <use   name="RecoHI/HiJetAlgos"/>
-<use   name="RecoHI/HiCentralityAlgos"/> 
 <use   name="DataFormats/CSCRecHit"/>
 <use   name="DataFormats/EcalDetId"/>
 <use   name="DataFormats/DetId"/>

IORawData/DTCommissioning/plugins/BuildFile.xml

@@ -3,7 +3,6 @@
   <use   name="FWCore/ParameterSet"/>
   <use   name="DataFormats/FEDRawData"/>
   <use   name="DataFormats/Provenance"/>
-  <use   name="IORawData/DTCommissioning"/>
   <flags   EDM_PLUGIN="1"/>
   <use   name="xrootd"/>
   <flags   cppflags="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"/>

RecoEgamma/PhotonIdentification/BuildFile.xml

@@ -2,7 +2,6 @@
 <use   name="DataFormats/HcalRecHit"/>
 <use   name="DataFormats/EgammaReco"/>
 <use   name="DataFormats/PatCandidates"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
 <use   name="RecoEcal/EgammaCoreTools"/>
 <use   name="DataFormats/BeamSpot"/>
 <use   name="Geometry/CaloGeometry"/>

RecoHGCal/TICL/BuildFile.xml

@@ -2,7 +2,6 @@
 <use   name="DataFormats/HGCalReco"/>
 <use   name="DataFormats/VertexReco"/>
 <use   name="FWCore/PluginManager"/>
-<use   name="RecoLocalCalo/HGCalRecProducers"/>
 <export>
     <lib   name="1"/>
 </export>

RecoHI/HiEgammaAlgos/interface/TrackIsoCalculator.h

@@ -1,39 +1,22 @@
 #ifndef HiEgammaAlgos_TrackIsoCalculator_h
 #define HiEgammaAlgos_TrackIsoCalculator_h
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Utilities/interface/InputTag.h"
-
-#include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
-#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
-
+#include "DataFormats/EgammaCandidates/interface/Photon.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 
-#include "DataFormats/PatCandidates/interface/Photon.h"
-
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
-
 class TrackIsoCalculator {
 public:
-  TrackIsoCalculator(const edm::Event &iEvent,
-                     const edm::EventSetup &iSetup,
-                     const edm::Handle<reco::TrackCollection> trackLabel,
-                     const std::string trackQuality_);
+  TrackIsoCalculator(reco::TrackCollection const& trackCollection, std::string const& trackQuality);
 
   /// Return the tracker energy in a cone around the photon
-  double getTrackIso(const reco::Photon clus, const double i, const double threshold, const double innerDR = 0);
+  double getTrackIso(reco::Photon const& clus, const double i, const double threshold, const double innerDR = 0);
   /// Return the background-subtracted tracker energy in a cone around the photon
-  double getBkgSubTrackIso(const reco::Photon clus, const double i, const double threshold, const double innerDR = 0);
+  double getBkgSubTrackIso(reco::Photon const& clus, const double i, const double threshold, const double innerDR = 0);
 
 private:
-  edm::Handle<reco::TrackCollection> recCollection;
-  std::string trackQuality_;
+  reco::TrackCollection const& recCollection_;
+  std::string const& trackQuality_;
 };
 
 #endif

RecoHI/HiEgammaAlgos/plugins/photonIsolationHIProducer.cc

@@ -22,7 +22,6 @@
 class photonIsolationHIProducer : public edm::stream::EDProducer<> {
 public:
   explicit photonIsolationHIProducer(const edm::ParameterSet& ps);
-  ~photonIsolationHIProducer() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
@@ -56,8 +55,6 @@ photonIsolationHIProducer::photonIsolationHIProducer(const edm::ParameterSet& co
   produces<reco::HIPhotonIsolationMap>();
 }
 
-photonIsolationHIProducer::~photonIsolationHIProducer() {}
-
 void photonIsolationHIProducer::produce(edm::Event& evt, const edm::EventSetup& es) {
   edm::Handle<reco::PhotonCollection> photons;
   evt.getByToken(photonProducer_, photons);
@@ -84,7 +81,7 @@ void photonIsolationHIProducer::produce(edm::Event& evt, const edm::EventSetup&
 
   EcalClusterIsoCalculator CxC(evt, es, barrelClusters, endcapClusters);
   HcalRechitIsoCalculator RxC(evt, es, hbhe, hf, ho);
-  TrackIsoCalculator TxC(evt, es, trackCollection, trackQuality_);
+  TrackIsoCalculator TxC(*trackCollection, trackQuality_);
   EcalClusterLazyTools lazyTool(evt, es, barrelEcalHits_, endcapEcalHits_);
 
   for (reco::PhotonCollection::const_iterator phoItr = photons->begin(); phoItr != photons->end(); ++phoItr) {

RecoHI/HiEgammaAlgos/src/TrackIsoCalculator.cc

@@ -1,84 +1,62 @@
-// ROOT includes
-#include <Math/VectorUtil.h>
-
 #include "RecoHI/HiEgammaAlgos/interface/TrackIsoCalculator.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 
-#include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/EgammaReco/interface/BasicCluster.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
-#include "DataFormats/Math/interface/Vector3D.h"
+#include "DataFormats/Math/interface/deltaR.h"
 
 using namespace edm;
 using namespace reco;
 using namespace std;
 
-TrackIsoCalculator::TrackIsoCalculator(const edm::Event &iEvent,
-                                       const edm::EventSetup &iSetup,
-                                       const edm::Handle<reco::TrackCollection> trackLabel,
-                                       const std::string trackQuality) {
-  recCollection = trackLabel;
-  trackQuality_ = trackQuality;
-}
+TrackIsoCalculator::TrackIsoCalculator(reco::TrackCollection const& trackCollection, std::string const& trackQuality)
+    : recCollection_{trackCollection}, trackQuality_{trackQuality} {}
 
-double TrackIsoCalculator::getTrackIso(const reco::Photon cluster,
+double TrackIsoCalculator::getTrackIso(reco::Photon const& cluster,
                                        const double x,
                                        const double threshold,
                                        const double innerDR) {
-  double TotalPt = 0;
+  double totalPt = 0;
 
-  for (reco::TrackCollection::const_iterator recTrack = recCollection->begin(); recTrack != recCollection->end();
-       recTrack++) {
-    bool goodtrack = recTrack->quality(reco::TrackBase::qualityByName(trackQuality_));
+  for (auto const& recTrack : recCollection_) {
+    bool goodtrack = recTrack.quality(reco::TrackBase::qualityByName(trackQuality_));
     if (!goodtrack)
       continue;
 
-    double pt = recTrack->pt();
-    double dR2 = reco::deltaR2(cluster, *recTrack);
+    double pt = recTrack.pt();
+    double dR2 = reco::deltaR2(cluster, recTrack);
     if (dR2 >= (0.01 * x * x))
       continue;
     if (dR2 < innerDR * innerDR)
       continue;
     if (pt > threshold)
-      TotalPt = TotalPt + pt;
+      totalPt = totalPt + pt;
   }
 
-  return TotalPt;
+  return totalPt;
 }
 
-double TrackIsoCalculator::getBkgSubTrackIso(const reco::Photon cluster,
+double TrackIsoCalculator::getBkgSubTrackIso(reco::Photon const& cluster,
                                              const double x,
                                              const double threshold,
                                              const double innerDR) {
   double SClusterEta = cluster.eta();
-  double TotalPt = 0;
+  double totalPt = 0.0;
 
-  TotalPt = 0;
-
-  for (reco::TrackCollection::const_iterator recTrack = recCollection->begin(); recTrack != recCollection->end();
-       recTrack++) {
-    bool goodtrack = recTrack->quality(reco::TrackBase::qualityByName(trackQuality_));
+  for (auto const& recTrack : recCollection_) {
+    bool goodtrack = recTrack.quality(reco::TrackBase::qualityByName(trackQuality_));
     if (!goodtrack)
       continue;
 
-    double pt = recTrack->pt();
-    double eta2 = recTrack->eta();
-    double dEta = fabs(eta2 - SClusterEta);
-    double dR2 = reco::deltaR2(cluster, *recTrack);
-    if (dEta >= 0.1 * x)
+    double pt = recTrack.pt();
+    if (std::abs(recTrack.eta() - SClusterEta) >= 0.1 * x)
       continue;
-    if (dR2 < innerDR * innerDR)
+    if (reco::deltaR2(cluster, recTrack) < innerDR * innerDR)
       continue;
 
     if (pt > threshold)
-      TotalPt = TotalPt + pt;
+      totalPt = totalPt + pt;
   }
 
   double Tx = getTrackIso(cluster, x, threshold, innerDR);
-  double CTx = (Tx - TotalPt / 40.0 * x) * (1 / (1 - x / 40.));
+  double CTx = (Tx - totalPt / 40.0 * x) * (1 / (1 - x / 40.));
 
   return CTx;
 }

RecoJets/FFTJetAlgorithms/BuildFile.xml

@@ -1,5 +1,4 @@
 <use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/Common"/>
 
 <use   name="fftjet"/>
 <use   name="fftw3"/>

RecoJets/JetAlgorithms/BuildFile.xml

@@ -5,13 +5,9 @@
 <use   name="DataFormats/JetReco"/>
 <use   name="DataFormats/Candidate"/>
 <use   name="FWCore/Framework"/>
-<use   name="SimDataFormats/Vertex"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="DataFormats/HepMCCandidate"/>
 <use   name="FWCore/Utilities"/>
 <use   name="FWCore/ServiceRegistry"/>
 <use   name="CondFormats/JetMETObjects"/>
-<use   name="CondFormats/DataRecord"/>
 <export>
   <lib   name="1"/>
 </export>

RecoJets/JetAnalyzers/BuildFile.xml

@@ -3,23 +3,16 @@
 <use   name="FWCore/ParameterSet"/>
 <use   name="root"/>
 <use   name="DataFormats/Candidate"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/Records"/>
 <use   name="DataFormats/JetReco"/>
 <use   name="DataFormats/HepMCCandidate"/>
 <use   name="DataFormats/CaloTowers"/>
 <use   name="DataFormats/HcalRecHit"/>
 <use   name="DataFormats/HcalDigi"/>
 <use   name="DataFormats/HcalDetId"/>
 <use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/StdDictionaries"/>
-<use   name="DataFormats/WrappedStdDictionaries"/>
-<use   name="TBDataFormats/HcalTBObjects"/>
 <use   name="SimDataFormats/GeneratorProducts"/>
 <use   name="JetMETCorrections/Objects"/>
-<use   name="JetMETCorrections/MCJet"/>
 <use   name="CommonTools/UtilAlgos"/>
 <use   name="FWCore/ServiceRegistry"/>
 <use   name="FWCore/Utilities"/>
-<use   name="PhysicsTools/PatUtils"/>
-<use   name="PhysicsTools/PatAlgos"/>
+<use   name="PhysicsTools/SelectorUtils"/>

RecoJets/JetProducers/BuildFile.xml

@@ -1,7 +1,6 @@
 <use   name="boost"/>
 <use   name="FWCore/Framework"/>
 <use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/BTauReco"/>
 <use   name="DataFormats/PatCandidates"/>
 <use   name="Geometry/CaloGeometry"/>
 <use   name="Geometry/CaloTopology"/>
@@ -15,7 +14,6 @@
 <use   name="fastjet"/>
 <use   name="vdt_headers"/>
 <use   name="boost_serialization"/>
-<use   name="CondFormats/DataRecord"/>
 <export>
   <lib   name="1"/>
 </export>

RecoLocalCalo/CaloTowersCreator/BuildFile.xml

@@ -1,7 +1,6 @@
 <use   name="boost"/>
 <use   name="DataFormats/CaloTowers"/>
 <use   name="DataFormats/HcalRecHit"/>
-<use   name="DataFormats/EcalDetId"/>
 <use   name="DataFormats/DetId"/>
 <use   name="DataFormats/RecoCandidate"/>
 <use   name="Geometry/CaloTopology"/>

RecoLocalCalo/Castor/BuildFile.xml

@@ -1,5 +1,4 @@
 <use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="DataFormats/CastorReco"/>
 <use   name="DataFormats/Math"/>

RecoLocalCalo/EcalDeadChannelRecoveryAlgos/BuildFile.xml

@@ -1,7 +1,5 @@
 <use   name="DataFormats/EcalDetId"/>
-<use   name="Geometry/CaloGeometry"/>
 <use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/Records"/>
 <use   name="CommonTools/MVAUtils"/>
 <use   name="root"/>
 <use   name="rootmath"/>

RecoLocalCalo/EcalRecProducers/BuildFile.xml

@@ -1,4 +1,3 @@
-<use   name="FWCore/MessageLogger"/>
 <use   name="FWCore/Framework"/>
 <use   name="clhep"/>
 <export>

RecoLocalCalo/HGCalRecAlgos/BuildFile.xml

@@ -5,7 +5,6 @@
 <use   name="FWCore/MessageLogger"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="FWCore/Framework"/>
-<use   name="CondFormats/DataRecord"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="Geometry/Records"/>

RecoLocalCalo/HGCalRecProducers/BuildFile.xml

@@ -1,4 +1,3 @@
-<use   name="FWCore/MessageLogger"/>
 <use   name="FWCore/Framework"/>
 <use   name="Geometry/HGCalGeometry"/>
 <use   name="clhep"/>

RecoLocalCalo/HcalRecAlgos/BuildFile.xml

@@ -3,16 +3,15 @@
 <use   name="clhep"/>
 <use   name="DataFormats/HcalDigi"/>
 <use   name="DataFormats/HcalRecHit"/>
+<use   name="DataFormats/TrackReco"/>
 <use   name="CalibFormats/HcalObjects"/>
 <use   name="CalibFormats/CaloObjects"/>
 <use   name="CalibCalorimetry/HcalAlgos"/>
-<use   name="RecoMET/METAlgorithms"/>
-<use   name="DataFormats/CaloTowers"/>
 <use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="FWCore/MessageLogger"/>
 <use   name="CondFormats/DataRecord"/>
+<use   name="RecoLocalCalo/EcalRecAlgos"/>
 <use   name="vdt_headers"/>
 <use   name="rootminuit2"/> 
 <export>

RecoLocalCalo/HcalRecProducers/BuildFile.xml

@@ -4,9 +4,5 @@
 <use   name="RecoLocalCalo/HcalRecAlgos"/>
 <use   name="FWCore/Framework"/>
 <use   name="DataFormats/Common"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/RecoCandidate"/>
 <use   name="Geometry/Records"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="CondFormats/EcalObjects"/>
 <use   name="boost"/>

RecoLocalFastTime/FTLClusterizer/BuildFile.xml

@@ -1,9 +1,7 @@
 <use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Framework"/>
 <use   name="FWCore/Utilities"/>
 <use   name="Geometry/MTDGeometryBuilder"/>
 <use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
 <use   name="TrackingTools/TrajectoryState"/>
 <use   name="clhep"/>
 <export>

RecoLocalFastTime/FTLCommonAlgos/BuildFile.xml

@@ -1,4 +1,3 @@
-<use   name="FWCore/MessageLogger"/>
 <use   name="FWCore/Framework"/>
 <use   name="Geometry/HGCalGeometry"/>
 <use   name="Geometry/Records"/>