code patches applied

cms-sw · Sep 14, 2017 · 4423a20 · 4423a20
1 parent 259e0d8
commit 4423a20
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/L1Trigger/TrackTrigger/interface/classNameFinder.h b/L1Trigger/TrackTrigger/interface/classNameFinder.h
@@ -9,7 +9,7 @@ template< class T >
 std::string classNameFinder( std::string fName )
 {
   int status2 = 0;
-  char *dm2 = abi::__cxa_demangle( typeid(T).name(), 0, 0, &status2 );
+  char *dm2 = abi::__cxa_demangle( typeid(T).name(), nullptr, nullptr, &status2 );
   std::string s2 = "failed demangle";
   if ( status2 == 0 )
   {
@@ -22,7 +22,7 @@ template< class T >
 std::string templateNameFinder()
 {
   int status2 = 0;
-  char *dm2 = abi::__cxa_demangle( typeid(T).name(), 0, 0, &status2 );
+  char *dm2 = abi::__cxa_demangle( typeid(T).name(), nullptr, nullptr, &status2 );
   std::string s2 = "failed demangle";
   if ( status2 == 0 )
   {

diff --git a/L1Trigger/TrackTrigger/plugins/TTStubBuilder.cc b/L1Trigger/TrackTrigger/plugins/TTStubBuilder.cc
@@ -58,7 +58,7 @@ void TTStubBuilder< Ref_Phase2TrackerDigi_ >::produce( edm::Event& iEvent, const
     /// If there are Clusters in both sensors
     /// you can try and make a Stub
     /// This is ~redundant
-    if ( lowerClusters.size() == 0 || upperClusters.size() == 0 )
+    if ( lowerClusters.empty() || upperClusters.empty() )
       continue;
 
     /// Create the vectors of objects to be passed to the FastFillers
@@ -208,7 +208,7 @@ void TTStubBuilder< Ref_Phase2TrackerDigi_ >::produce( edm::Event& iEvent, const
       } /// End of loop over temp output
     } /// End store only the selected stubs if max no. stub/ROC is set
     /// Create the FastFillers
-    if ( tempInner.size() > 0 )
+    if ( !tempInner.empty() )
     {
       typename edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > >::FastFiller lowerOutputFiller( *ttClusterDSVForOutput, lowerDetid );
       for ( unsigned int m = 0; m < tempInner.size(); m++ )
@@ -219,7 +219,7 @@ void TTStubBuilder< Ref_Phase2TrackerDigi_ >::produce( edm::Event& iEvent, const
         lowerOutputFiller.abort();
     }
 
-    if ( tempOuter.size() > 0 )
+    if ( !tempOuter.empty() )
     {
       typename edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > >::FastFiller upperOutputFiller( *ttClusterDSVForOutput, upperDetid );
       for ( unsigned int m = 0; m < tempOuter.size(); m++ )
@@ -230,7 +230,7 @@ void TTStubBuilder< Ref_Phase2TrackerDigi_ >::produce( edm::Event& iEvent, const
         upperOutputFiller.abort();
     }
 
-    if ( tempAccepted.size() > 0 )
+    if ( !tempAccepted.empty() )
     {
       typename edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > >::FastFiller tempAcceptedFiller( *ttStubDSVForOutputTemp, stackDetid);
       for ( unsigned int m = 0; m < tempAccepted.size(); m++ )
@@ -280,8 +280,8 @@ void TTStubBuilder< Ref_Phase2TrackerDigi_ >::produce( edm::Event& iEvent, const
       TTStub< Ref_Phase2TrackerDigi_ > tempTTStub( stubIter->getDetId() );
 
       /// Compare the clusters stored in the stub with the ones of this module
-      edm::Ref< edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > >, TTCluster< Ref_Phase2TrackerDigi_ > > lowerClusterToBeReplaced = stubIter->getClusterRef(0);
-      edm::Ref< edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > >, TTCluster< Ref_Phase2TrackerDigi_ > > upperClusterToBeReplaced = stubIter->getClusterRef(1);
+      const edm::Ref< edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > >, TTCluster< Ref_Phase2TrackerDigi_ > >& lowerClusterToBeReplaced = stubIter->getClusterRef(0);
+      const edm::Ref< edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > >, TTCluster< Ref_Phase2TrackerDigi_ > >& upperClusterToBeReplaced = stubIter->getClusterRef(1);
 
       bool lowerOK = false;
       bool upperOK = false;

diff --git a/L1Trigger/TrackTrigger/plugins/TTStubBuilder.h b/L1Trigger/TrackTrigger/plugins/TTStubBuilder.h
@@ -47,7 +47,7 @@ class TTStubBuilder : public edm::EDProducer
     explicit TTStubBuilder( const edm::ParameterSet& iConfig );
 
     /// Destructor;
-    ~TTStubBuilder();
+    ~TTStubBuilder() override;
 
   private:
     /// Data members
@@ -56,9 +56,9 @@ class TTStubBuilder : public edm::EDProducer
     bool ForbidMultipleStubs;
 
     /// Mandatory methods
-    virtual void beginRun( const edm::Run& run, const edm::EventSetup& iSetup );
-    virtual void endRun( const edm::Run& run, const edm::EventSetup& iSetup );
-    virtual void produce( edm::Event& iEvent, const edm::EventSetup& iSetup );
+    void beginRun( const edm::Run& run, const edm::EventSetup& iSetup ) override;
+    void endRun( const edm::Run& run, const edm::EventSetup& iSetup ) override; 
+    void produce( edm::Event& iEvent, const edm::EventSetup& iSetup ) override;
 
     /// Sorting method for stubs
     /// NOTE: this must be static!