From 15878ded3111bee43586700fffff688cadbb8e18 Mon Sep 17 00:00:00 2001
From: Pieter David <pieter.david@cern.ch>
Date: Fri, 1 Jun 2018 17:16:45 +0200
Subject: [PATCH] re-apply code checks fixes

---
 .../plugins/SiStripBaselineComparator.cc         |  8 ++++----
 .../plugins/SiStripHybridFormatAnalyzer.cc       |  8 ++++----
 .../src/SiStripAPVRestorer.cc                    | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripBaselineComparator.cc b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripBaselineComparator.cc
index 4d44e2ea8a828..ae3eabe69c2e8 100644
--- a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripBaselineComparator.cc
+++ b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripBaselineComparator.cc
@@ -77,13 +77,13 @@
 class SiStripBaselineComparator : public edm::EDAnalyzer {
    public:
       explicit SiStripBaselineComparator(const edm::ParameterSet&);
-      ~SiStripBaselineComparator();
+      ~SiStripBaselineComparator() override;
 
 
    private:
-      virtual void beginJob() override ;
-      virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
-      virtual void endJob() override ;
+      void beginJob() override ;
+      void analyze(const edm::Event&, const edm::EventSetup&) override;
+      void endJob() override ;
       
 	  edm::InputTag srcClusters_;
 	  edm::InputTag srcClusters2_;
diff --git a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripHybridFormatAnalyzer.cc b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripHybridFormatAnalyzer.cc
index c6509f4498863..0d6809922a606 100644
--- a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripHybridFormatAnalyzer.cc
+++ b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripHybridFormatAnalyzer.cc
@@ -76,13 +76,13 @@
 class SiStripHybridFormatAnalyzer : public edm::EDAnalyzer {
    public:
       explicit SiStripHybridFormatAnalyzer(const edm::ParameterSet&);
-      ~SiStripHybridFormatAnalyzer();
+      ~SiStripHybridFormatAnalyzer() override;
 
 
    private:
-      virtual void beginJob() override ;
-      virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
-      virtual void endJob() override ;
+      void beginJob() override ;
+      void analyze(const edm::Event&, const edm::EventSetup&) override;
+      void endJob() override ;
       
 	  edm::InputTag srcDigis_;
 	  edm::InputTag srcAPVCM_;
diff --git a/RecoLocalTracker/SiStripZeroSuppression/src/SiStripAPVRestorer.cc b/RecoLocalTracker/SiStripZeroSuppression/src/SiStripAPVRestorer.cc
index 570d168080a00..d89bb09cd6698 100644
--- a/RecoLocalTracker/SiStripZeroSuppression/src/SiStripAPVRestorer.cc
+++ b/RecoLocalTracker/SiStripZeroSuppression/src/SiStripAPVRestorer.cc
@@ -122,7 +122,7 @@ uint16_t SiStripAPVRestorer::inspect(uint32_t detId, uint16_t firstAPV, const di
 
   // update boolean version of APV flags
   for ( size_t i = 0; i < apvFlags_.size(); ++i ) {
-    apvFlagsBool_.push_back((apvFlags_[i] != "") && ( ! apvFlagsBoolOverride_[i] ));
+    apvFlagsBool_.push_back((!apvFlags_[i].empty()) && ( ! apvFlagsBoolOverride_[i] ));
   }
 
   return nAPVFlagged;
@@ -134,7 +134,7 @@ void SiStripAPVRestorer::restore(uint16_t firstAPV, digivector_t& digis)
 
   for ( uint16_t iAPV=firstAPV; iAPV < digis.size()/128 + firstAPV; ++iAPV ) {
     auto algoToUse = apvFlags_[iAPV];
-    if ( algoToUse != "") {
+    if ( !algoToUse.empty()) {
       // if(!SelfSelectRestoreAlgo_) algoToUse = RestoreAlgo_;
       if        ( algoToUse == "Flat" ) {
         FlatRestore(iAPV, firstAPV, digis);
@@ -1013,8 +1013,8 @@ void SiStripAPVRestorer::DerivativeFollowerRestore(uint16_t APVn, uint16_t first
 
   //----Variables of the first part---//
 
-  bool isMinimumAndNoMax = 0;
-  bool isFirstStrip = 0;
+  bool isMinimumAndNoMax = false;
+  bool isFirstStrip = false;
 
   //---Variables of the second part---//
 
@@ -1076,7 +1076,7 @@ void SiStripAPVRestorer::DerivativeFollowerRestore(uint16_t APVn, uint16_t first
                 discontinuities.erase(itdiscontinuities);
         }
 
-        if ((discontinuities.size()%2==1)&&(discontinuities.size()>0)){ //&&(no_minimo == 0)
+        if ((discontinuities.size()%2==1)&&(!discontinuities.empty())){ //&&(no_minimo == 0)
                 itdiscontinuities=discontinuities.end();
                 --itdiscontinuities;
                 discontinuities.erase(itdiscontinuities);
@@ -1122,7 +1122,7 @@ void SiStripAPVRestorer::DerivativeFollowerRestore(uint16_t APVn, uint16_t first
       }
 
 
-      if (discontinuities.size()>0){
+      if (!discontinuities.empty()){
         itdiscontinuities=discontinuities.end();
         --itdiscontinuities;
       }
@@ -1173,7 +1173,7 @@ void SiStripAPVRestorer::DerivativeFollowerRestore(uint16_t APVn, uint16_t first
 
   //----------THIRD PART reconstruction of the event without baseline-------//
 
-  if(discontinuities.size()>0){
+  if(!discontinuities.empty()){
     if ((first_start_cluster_strip)==127-1) discontinuities.insert(discontinuities.end(), std::pair<int, int >(127, first_start_cluster_ADC));
     if ((isMax==true)&&(isAuxiliary_Minimum==true)) discontinuities.insert(discontinuities.end(), std::pair<int, int >(auxiliary_end_cluster, first_start_cluster_ADC));
   }
@@ -1191,7 +1191,7 @@ void SiStripAPVRestorer::DerivativeFollowerRestore(uint16_t APVn, uint16_t first
     isFirstStrip=false;
   }
 
-  if(discontinuities.size()){
+  if(!discontinuities.empty()){
     itdiscontinuities=discontinuities.begin();
     uint16_t firstStrip  = itdiscontinuities->first;
     int16_t firstADC = itdiscontinuities->second;