Make cleaning, i.e. change comaprison of collection size with 0 to em…

…pty() clean Buildfile.xml
cms-sw · Jul 29, 2020 · 7a0d2c9 · 7a0d2c9
1 parent 7602aaf
commit 7a0d2c9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/RecoJets/JetPlusTracks/plugins/JetPlusTrackAddonSeedProducer.cc b/RecoJets/JetPlusTracks/plugins/JetPlusTrackAddonSeedProducer.cc
@@ -64,6 +64,7 @@ JetPlusTrackAddonSeedProducer::JetPlusTrackAddonSeedProducer(const edm::Paramete
    srcTrackJets = iConfig.getParameter<edm::InputTag>("srcTrackJets");
    srcPVs_ = iConfig.getParameter<edm::InputTag>("srcPVs");
    ptCUT = iConfig.getParameter<double>("ptCUT");
+   dRcone = iConfig.getParameter<double>("dRcone");
    usePAT = iConfig.getParameter<bool>("UsePAT");
 
    produces<reco::CaloJetCollection>("ak4CaloJetsJPTSeed"); 
@@ -109,7 +110,7 @@ JetPlusTrackAddonSeedProducer::produce(edm::Event& iEvent, const edm::EventSetup
   auto pCaloOut = std::make_unique<reco::CaloJetCollection>();
 
    if (jetsTrackJets.isValid()) {
-     if(jetsTrackJets->size() > 0 ) {
+     if(!jetsTrackJets->empty() ) {
      // std::cout<<" AddonSeed::The size of trackjets "<<jetsTrackJets->size()<<" "<<jets_h->size()<<std::endl;
       for (unsigned ijet = 0; ijet < jetsTrackJets->size(); ++ijet) {
           const reco::TrackJet* jet = &(*(jetsTrackJets->refAt(ijet)));
@@ -120,7 +121,7 @@ JetPlusTrackAddonSeedProducer::produce(edm::Event& iEvent, const edm::EventSetup
           double dphi = fabs(jet->phi()-oldjet->phi()); 
           if(dphi>4.*atan(1.)) dphi = 8.*atan(1.) - dphi;
           double dr = sqrt(dphi*dphi+deta*deta);
-          if(dr<0.4) iflag = 1;  
+          if(dr<dRcone) iflag = 1;  
          } // Calojets
 
      if(iflag == 1) continue;
@@ -171,8 +172,7 @@ JetPlusTrackAddonSeedProducer::produce(edm::Event& iEvent, const edm::EventSetup
       edm::Handle<CaloTowerCollection> ct;
       iEvent.getByToken(input_ctw_token_, ct);
       if(ct.isValid()) {
-      for(CaloTowerCollection::const_iterator it = ct->begin();
-                                           it != ct->end(); it++) {  
+      for(CaloTowerCollection::const_iterator it = ct->begin();it != ct->end(); it++) {  
         double  deta=(*jet).eta()-(*it).eta();
         double  dphi=(*jet).phi()-(*it).phi();
         if(dphi > 4.*atan(1.) ) dphi = dphi-8.*atan(1.);
@@ -189,7 +189,7 @@ JetPlusTrackAddonSeedProducer::produce(edm::Event& iEvent, const edm::EventSetup
          eminhf += 0.5*(*it).energyInHF();
          ncand++;
       }
-      } // tower collection is valid. 
+      } 
      } 
          eefraction = (emineb+eminee)/caloen;
          hhfraction = (hadinhb+hadinhe+hadinhf+hadinho)/caloen;

diff --git a/RecoJets/JetPlusTracks/plugins/JetPlusTrackAddonSeedProducer.h b/RecoJets/JetPlusTracks/plugins/JetPlusTrackAddonSeedProducer.h
@@ -59,6 +59,7 @@ class JetPlusTrackAddonSeedProducer : public edm::stream::EDProducer<> {
 
       std::string            alias;
       double                 ptCUT;
+      double                 dRcone;
       bool                   usePAT;
       edm::EDGetTokenT<edm::View<reco::CaloJet> > input_jets_token_;
       edm::EDGetTokenT<edm::View<reco::TrackJet> > input_trackjets_token_;

diff --git a/RecoJets/JetPlusTracks/plugins/JetPlusTrackCorrector.cc b/RecoJets/JetPlusTracks/plugins/JetPlusTrackCorrector.cc
@@ -426,10 +426,12 @@ bool JetPlusTrackCorrector::jtaUsingEventData( const reco::Jet& fJet,
   else { rebuildJta( fJet, jtV, trks.vertex_, excluded ); rebuildJta( fJet, jtV, relocate, excluded ); trks.vertex_ = relocate;}
 
   // std::cout<<" JetPlusTrackCorrector::trks.vertex_.empty() "<<trks.vertex_.size()<<" "<<relocate.size()<<std::endl;   
+
   // Check if any tracks are associated to jet at vertex
-  // if ( trks.vertex_.empty() ) { return false; }
 
-  if ( trks.vertex_.size() == 0 ) { return false; }
+  if ( trks.vertex_.empty() ) { return false; }
+
+  //if ( trks.vertex_.size() == 0 ) { return false; }
 
   // Get Jet-track association at Calo
   edm::Handle<reco::JetTracksAssociation::Container> jetTracksAtCalo;

diff --git a/RecoJets/JetPlusTracks/plugins/JetPlusTrackProducer.cc b/RecoJets/JetPlusTracks/plugins/JetPlusTrackProducer.cc
@@ -134,7 +134,7 @@ JetPlusTrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
     double scaleJPT = 1.;
     std::vector<reco::JPTJet> theJPTJets;
    if (jetsTrackJets.isValid()) {
-     if(jetsTrackJets->size() > 0 ) {
+     if(!jetsTrackJets->empty()) {
       for (unsigned ijet = 0; ijet < jetsTrackJets->size(); ++ijet) {
          const reco::TrackJet* jet = &(*(jetsTrackJets->refAt(ijet)));
          int icalo = -1;

diff --git a/RecoJets/JetPlusTracks/plugins/TrackFromPFProducer.cc b/RecoJets/JetPlusTracks/plugins/TrackFromPFProducer.cc
@@ -38,7 +38,7 @@ void TrackFromPFProducer::produce(edm::Event& theEvent, const edm::EventSetup& s
     for(unsigned int i = 0, n = pfCandidates->size(); i < n; ++i) {
         const pat::PackedCandidate &pf = (*pfCandidates)[i];
         if(pf.hasTrackDetails()){
-          reco::Track mytrack = pf.pseudoTrack();
+          const reco::Track &mytrack = pf.pseudoTrack();
 
          // std::cout<<" Track "<<std::isfinite(mytrack.pt())<<" "<<
            //    isnan(mytrack.eta())<<" "<<pf.ptTrk()<<" "<<pf.etaAtVtx()<<" "<<

diff --git a/RecoJets/JetPlusTracks/python/JetPlusTrackCorrections_cff.py b/RecoJets/JetPlusTracks/python/JetPlusTrackCorrections_cff.py
@@ -19,6 +19,7 @@
     srcTrackJets = cms.InputTag("ak4TrackJets"),
     srcPVs = cms.InputTag('offlinePrimaryVertices'),
     ptCUT = cms.double(15.),
+    dRcone = cms.double(0.4),
     PFCandidates = cms.InputTag('packedPFCandidates'),
     towerMaker = cms.InputTag('towerMaker'),
     UsePAT = cms.bool(False)