Merge pull request #31781 from perrotta/removeAfewDeadAssignments

Clean up a few dead assignments from CalibCalorimetry/HcalAlgos and RecoMuon/TrackingTools
cms-sw · Oct 20, 2020 · bb76a8f · bb76a8f
2 parents 6286c1a + ab1d3e4
commit bb76a8f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/CalibCalorimetry/HcalAlgos/src/HcalLogicalMapGenerator.cc b/CalibCalorimetry/HcalAlgos/src/HcalLogicalMapGenerator.cc
@@ -2021,7 +2021,7 @@ void HcalLogicalMapGenerator::buildHOXMap(const HcalTopology* topo,
               ihtr_fi = HO_htr_fi_eta1234_sipm[phmod6][4][(irm - 1) / 2][sidear];
               itb = 0;
               fpga = "top";
-              mytype = 3;
+              //              mytype = 3;
               ih = 2;
               ihtr = ihslotho[php2mod18ov6][ih];
               ispigot = ihtr < 9 ? (ihtr - 2) * 2 + itb : (ihtr - 13) * 2 + itb;

diff --git a/CalibCalorimetry/HcalAlgos/src/HcalPedestalAnalysis.cc b/CalibCalorimetry/HcalAlgos/src/HcalPedestalAnalysis.cc
@@ -803,7 +803,6 @@ void HcalPedestalAnalysis::Trendings(map<HcalDetId, map<int, PEDBUNCH> >& toolT,
       _meot->second[i].second.second[4]->GetYaxis()->SetTitle("Distant correlation");
       _meot->second[i].second.second[4]->Write(); */
       // chi2
-      j = 0;
       for (sample_it = _meot->second[i].second.first[4].begin(); sample_it != _meot->second[i].second.first[4].end();
            ++sample_it) {
         Chi2->Fill(*sample_it);

diff --git a/RecoMuon/TrackingTools/src/MuonErrorMatrix.cc b/RecoMuon/TrackingTools/src/MuonErrorMatrix.cc
@@ -428,19 +428,15 @@ double MuonErrorMatrix::Term(const AlgebraicSymMatrix55 &curv, int i, int j) {
   } else {
     double si = curv(i, i);
     double sj = curv(j, j);
-
     if (si <= 0 || sj <= 0) {
+      //check validity
       edm::LogError("MuonErrorMatrix") << "invalid term in the error matrix.\n si: " << si << " sj: " << sj
                                        << ". result will be corrupted\n"
                                        << curv;
       return 0;
     }
-
-    si = sqrt(si);
-    sj = sqrt(sj);
-    //check validity
-
-    return result = curv(i, j) / (si * sj);
+    result = curv(i, j) / sqrt(si * sj);
+    return result;
   }
   //by default
   return 0;