Make namespace lower case and minor style fixes

cms-sw · May 21, 2019 · ccfac0e · ccfac0e
1 parent 2bce062
commit ccfac0e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/RecoTauTag/RecoTau/interface/TauTagTools.h b/RecoTauTag/RecoTau/interface/TauTagTools.h
@@ -7,7 +7,7 @@
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 
-namespace TauTagTools{
+namespace tautagtools {
   reco::TrackRefVector filteredTracks(const reco::TrackRefVector& theInitialTracks, double tkminPt, int tkminPixelHitsn, int tkminTrackerHitsn, double tkmaxipt, double tkmaxChi2, const reco::Vertex& pV);
   reco::TrackRefVector filteredTracks(const reco::TrackRefVector& theInitialTracks, double tkminPt, int tkminPixelHitsn, int tkminTrackerHitsn, double tkmaxipt, double tkmaxChi2, double tktorefpointmaxDZ, const reco::Vertex& pV, double refpoint_Z);
 

diff --git a/RecoTauTag/RecoTau/plugins/PFTauSelectorDefinition.h b/RecoTauTag/RecoTau/plugins/PFTauSelectorDefinition.h
@@ -1,5 +1,5 @@
-#ifndef RecoTauTag_TauTagTools_PFTauSelectorDefinition
-#define RecoTauTag_TauTagTools_PFTauSelectorDefinition
+#ifndef RecoTauTag_RecoTau_PFTauSelectorDefinition
+#define RecoTauTag_RecoTau_PFTauSelectorDefinition
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/RecoTauTag/RecoTau/src/PFRecoTauTagInfoAlgorithm.cc b/RecoTauTag/RecoTau/src/PFRecoTauTagInfoAlgorithm.cc
@@ -44,15 +44,21 @@ PFTauTagInfo PFRecoTauTagInfoAlgorithm::buildPFTauTagInfo(const JetBaseRef& theP
   bool pvIsFake = (thePV.z() < -500.);
 
   std::vector<reco::CandidatePtr> theFilteredPFChargedHadrCands;
-  if (UsePVconstraint_ && !pvIsFake) theFilteredPFChargedHadrCands=TauTagTools::filteredPFChargedHadrCands(thePFCands,ChargedHadrCand_tkminPt_,ChargedHadrCand_tkminPixelHitsn_,ChargedHadrCand_tkminTrackerHitsn_,ChargedHadrCand_tkmaxipt_,ChargedHadrCand_tkmaxChi2_,ChargedHadrCand_tkPVmaxDZ_, thePV, thePV.z());
-  else theFilteredPFChargedHadrCands=TauTagTools::filteredPFChargedHadrCands(thePFCands,ChargedHadrCand_tkminPt_,ChargedHadrCand_tkminPixelHitsn_,ChargedHadrCand_tkminTrackerHitsn_,ChargedHadrCand_tkmaxipt_,ChargedHadrCand_tkmaxChi2_, thePV);
+  if (UsePVconstraint_ && !pvIsFake) {
+    theFilteredPFChargedHadrCands = tautagtools::filteredPFChargedHadrCands(thePFCands,ChargedHadrCand_tkminPt_,ChargedHadrCand_tkminPixelHitsn_,ChargedHadrCand_tkminTrackerHitsn_,ChargedHadrCand_tkmaxipt_,ChargedHadrCand_tkmaxChi2_,ChargedHadrCand_tkPVmaxDZ_, thePV, thePV.z());
+  } else {
+    theFilteredPFChargedHadrCands = tautagtools::filteredPFChargedHadrCands(thePFCands,ChargedHadrCand_tkminPt_,ChargedHadrCand_tkminPixelHitsn_,ChargedHadrCand_tkminTrackerHitsn_,ChargedHadrCand_tkmaxipt_,ChargedHadrCand_tkmaxChi2_, thePV);
+  }
   resultExtended.setPFChargedHadrCands(theFilteredPFChargedHadrCands);
-  resultExtended.setPFNeutrHadrCands(TauTagTools::filteredPFNeutrHadrCands(thePFCands,NeutrHadrCand_HcalclusMinEt_));
-  resultExtended.setPFGammaCands(TauTagTools::filteredPFGammaCands(thePFCands,GammaCand_EcalclusMinEt_));
+  resultExtended.setPFNeutrHadrCands(tautagtools::filteredPFNeutrHadrCands(thePFCands,NeutrHadrCand_HcalclusMinEt_));
+  resultExtended.setPFGammaCands(tautagtools::filteredPFGammaCands(thePFCands,GammaCand_EcalclusMinEt_));
 
   TrackRefVector theFilteredTracks;
-  if (UsePVconstraint_ && !pvIsFake) theFilteredTracks=TauTagTools::filteredTracks(theTracks,tkminPt_,tkminPixelHitsn_,tkminTrackerHitsn_,tkmaxipt_,tkmaxChi2_,tkPVmaxDZ_,thePV, thePV.z());
-  else theFilteredTracks=TauTagTools::filteredTracks(theTracks,tkminPt_,tkminPixelHitsn_,tkminTrackerHitsn_,tkmaxipt_,tkmaxChi2_,thePV);
+  if (UsePVconstraint_ && !pvIsFake) {
+    theFilteredTracks = tautagtools::filteredTracks(theTracks,tkminPt_,tkminPixelHitsn_,tkminTrackerHitsn_,tkmaxipt_,tkmaxChi2_,tkPVmaxDZ_,thePV, thePV.z());
+  } else {
+    theFilteredTracks = tautagtools::filteredTracks(theTracks,tkminPt_,tkminPixelHitsn_,tkminTrackerHitsn_,tkmaxipt_,tkmaxChi2_,thePV);
+  }
   resultExtended.setTracks(theFilteredTracks);
 
   return resultExtended;

diff --git a/RecoTauTag/RecoTau/src/TauTagTools.cc b/RecoTauTag/RecoTau/src/TauTagTools.cc
@@ -2,7 +2,7 @@
 
 using namespace reco;
 
-namespace TauTagTools{
+namespace tautagtools {
 
   TrackRefVector filteredTracks(const TrackRefVector& theInitialTracks,double tkminPt,int tkminPixelHitsn,int tkminTrackerHitsn,double tkmaxipt,double tkmaxChi2, const Vertex& pv){
     TrackRefVector filteredTracks;