Merge pull request #21221 from mrodozov/remove-unused-vars

Remove unused vars in multiple pkgs
cms-sw · Nov 24, 2017 · 8c36002 · 8c36002
2 parents 7d30f6f + 90723e1
commit 8c36002
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 30 deletions.
diff --git a/L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2EGammaAlgorithmFirmwareImp1.cc b/L1Trigger/L1TCalorimeter/src/firmware/Stage2Layer2EGammaAlgorithmFirmwareImp1.cc
@@ -503,7 +503,6 @@ unsigned int l1t::Stage2Layer2EGammaAlgorithmFirmwareImp1::trimmingLutIndex(unsi
 unsigned int l1t::Stage2Layer2EGammaAlgorithmFirmwareImp1::returnShape(const l1t::CaloCluster& clus)
 /*****************************************************************/
 {
-  const l1t::CaloCluster& clusCopy = clus;
 
   unsigned int shape = 0;
   if( (clus.checkClusterFlag(CaloCluster::INCLUDE_N)) ) shape |= (0x1);

diff --git a/PhysicsTools/Utilities/src/LumiReWeighting.cc b/PhysicsTools/Utilities/src/LumiReWeighting.cc
@@ -157,25 +157,11 @@ double LumiReWeighting::weight( float npv ) {
 
 double LumiReWeighting::weight( const edm::EventBase &e ) {
 
-  // find provenance of event objects, just to check at the job beginning if there might be an issue  
-
   if(FirstWarning_) {
-
-    const edm::ProcessHistory& PHist = e.processHistory();
-    edm::ProcessHistory::const_iterator PHist_iter = PHist.begin();
-
-    for(; PHist_iter<PHist.end() ;++PHist_iter) {
-      edm::ProcessConfiguration PConf = *(PHist_iter);
-      const edm::ReleaseVersion& Release =  PConf.releaseVersion() ;
-      const std::string& Process =  PConf.processName();
-
-    }
+    e.processHistory();
     //    SetFirstFalse();
     FirstWarning_ = false;
   }
-
-  // get pileup summary information
-
   Handle<std::vector< PileupSummaryInfo > >  PupInfo;
   e.getByLabel(pileupSumInfoTag_, PupInfo);
 
@@ -208,23 +194,12 @@ double LumiReWeighting::weightOOT( const edm::EventBase &e ) {
 
   //int Run = e.run();
   int LumiSection = e.luminosityBlock();
-
   // do some caching here, attempt to catch file boundaries
 
-  if(LumiSection != OldLumiSection_) {
-
-    const edm::ProcessHistory& PHist = e.processHistory();
-    edm::ProcessHistory::const_iterator PHist_iter = PHist.begin();
-
-    for(; PHist_iter<PHist.end() ;++PHist_iter) {
-      edm::ProcessConfiguration PConf = *(PHist_iter);
-      const edm::ReleaseVersion& Release =  PConf.releaseVersion() ;
-      const std::string& Process =  PConf.processName();
-
-    }
+  if(LumiSection != OldLumiSection_){
+    e.processHistory(); // keep the function call
     OldLumiSection_ = LumiSection;
   }
-
   // find the pileup summary information
 
   Handle<std::vector< PileupSummaryInfo > >  PupInfo;

diff --git a/Validation/Geometry/src/MaterialBudgetAction.cc b/Validation/Geometry/src/MaterialBudgetAction.cc
@@ -157,7 +157,6 @@ void MaterialBudgetAction::update(const BeginOfRun* )
     int siz = partTable->size();
     for (int ii= 0; ii < siz; ii++) {
       G4ParticleDefinition * particle = partTable->GetParticle(ii);
-      const std::string& particleName = particle->GetParticleName();
 
       //--- All processes of this particle 
       G4ProcessManager * pmanager = particle->GetProcessManager();