From fe218156beaf72b125a6d44fedb6e4b38fbf7b2d Mon Sep 17 00:00:00 2001
From: Andrea <perrotta@cern.ch>
Date: Thu, 27 Aug 2020 17:30:35 +0200
Subject: [PATCH] Remove dead assignments in
 RecoLocalMuon.CSCValidation.CSCValidation

---
 .../CSCValidation/src/CSCValidation.cc        | 20 ++++---------------
 .../CSCValidation/src/CSCValidation.h         |  5 ++---
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/RecoLocalMuon/CSCValidation/src/CSCValidation.cc b/RecoLocalMuon/CSCValidation/src/CSCValidation.cc
index db103499ace7a..d88f1ba613067 100644
--- a/RecoLocalMuon/CSCValidation/src/CSCValidation.cc
+++ b/RecoLocalMuon/CSCValidation/src/CSCValidation.cc
@@ -851,6 +851,7 @@ void CSCValidation::doStripDigis(edm::Handle<CSCStripDigiCollection> strips) {
 //=======================================================
 
 void CSCValidation::doPedestalNoise(edm::Handle<CSCStripDigiCollection> strips) {
+  constexpr float threshold = 13.3;
   for (CSCStripDigiCollection::DigiRangeIterator dPNiter = strips->begin(); dPNiter != strips->end(); dPNiter++) {
     CSCDetId id = (CSCDetId)(*dPNiter).first;
     std::vector<CSCStripDigi>::const_iterator pedIt = (*dPNiter).second.first;
@@ -859,18 +860,10 @@ void CSCValidation::doPedestalNoise(edm::Handle<CSCStripDigiCollection> strips)
       int myStrip = pedIt->getStrip();
       std::vector<int> myADCVals = pedIt->getADCCounts();
       float TotalADC = getSignal(*strips, id, myStrip);
-      bool thisStripFired = false;
       float thisPedestal = 0.5 * (float)(myADCVals[0] + myADCVals[1]);
       float thisSignal =
           (1. / 6) * (myADCVals[2] + myADCVals[3] + myADCVals[4] + myADCVals[5] + myADCVals[6] + myADCVals[7]);
-      float threshold = 13.3;
-      if (id.station() == 1 && id.ring() == 4) {
-        if (myStrip <= 16)
-          myStrip += 64;  // no trapping for any bizarreness
-      }
-      if (TotalADC > threshold) {
-        thisStripFired = true;
-      }
+      bool thisStripFired = TotalADC > threshold;
       if (!thisStripFired) {
         float ADC = thisSignal - thisPedestal;
         histos->fill1DHist(ADC, "hStripPed", "Pedestal Noise Distribution", 50, -25., 25., "PedestalNoise");
@@ -2625,8 +2618,6 @@ void CSCValidation::doGasGain(const CSCWireDigiCollection& wirecltn,
     for (wiredetUnitIt = wirecltn.begin(); wiredetUnitIt != wirecltn.end(); ++wiredetUnitIt) {
       const CSCDetId id = (*wiredetUnitIt).first;
       idlayer = indexer.dbIndex(id, channel);
-      idchamber = idlayer / 10;
-      layer = id.layer();
       // looping in the layer of given CSC
       mult = 0;
       wire = 0;
@@ -3329,7 +3320,6 @@ void CSCValidation::doTimeMonitoring(edm::Handle<CSCRecHit2DCollection> recHits,
   /// Get a handle to the FED data collection
   edm::Handle<FEDRawDataCollection> rawdata;
   event.getByToken(rd_token, rawdata);
-  bool goodEvent = false;
   // If set selective unpacking mode
   // hardcoded examiner mask below to check for DCC and DDU level errors will be used first
   // then examinerMask for CSC level errors will be used during unpacking of each CSC block
@@ -3347,12 +3337,9 @@ void CSCValidation::doTimeMonitoring(edm::Handle<CSCRecHit2DCollection> recHits,
     unsigned long length = fedData.size();
 
     if (length >= 32) {  ///if fed has data then unpack it
-      CSCDCCExaminer* examiner = nullptr;
       std::stringstream examiner_out, examiner_err;
-      goodEvent = true;
       ///examine event for integrity
-      //CSCDCCExaminer examiner;
-      examiner = new CSCDCCExaminer();
+      CSCDCCExaminer* examiner = new CSCDCCExaminer();
       if (examinerMask & 0x40000)
         examiner->crcCFEB(true);
       if (examinerMask & 0x8000)
@@ -3362,6 +3349,7 @@ void CSCValidation::doTimeMonitoring(edm::Handle<CSCRecHit2DCollection> recHits,
       examiner->setMask(examinerMask);
       const short unsigned int* data = (short unsigned int*)fedData.data();
 
+      bool goodEvent;
       if (examiner->check(data, long(fedData.size() / 2)) < 0) {
         goodEvent = false;
       } else {
diff --git a/RecoLocalMuon/CSCValidation/src/CSCValidation.h b/RecoLocalMuon/CSCValidation/src/CSCValidation.h
index c1b34ac3d4bc6..8e2fd4a793846 100644
--- a/RecoLocalMuon/CSCValidation/src/CSCValidation.h
+++ b/RecoLocalMuon/CSCValidation/src/CSCValidation.h
@@ -15,7 +15,7 @@
  *    Andy Kubik, Northwestern University
  */
 
-#include <FWCore/Framework/interface/ConsumesCollector.h>
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
@@ -25,7 +25,6 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
-
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
@@ -48,9 +47,9 @@
 #include "EventFilter/CSCRawToDigi/interface/CSCDCCEventData.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCCFEBData.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h"
+#include "EventFilter/CSCRawToDigi/interface/CSCMonitorInterface.h"
 #include "CondFormats/CSCObjects/interface/CSCCrateMap.h"
 #include "CondFormats/DataRecord/interface/CSCCrateMapRcd.h"
-#include <EventFilter/CSCRawToDigi/interface/CSCMonitorInterface.h>
 #include "FWCore/ServiceRegistry/interface/Service.h"
 //FEDRawData
 #include "DataFormats/FEDRawData/interface/FEDRawData.h"