diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/src/MuCCaFitter.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/src/MuCCaFitter.cxx index ab512e1d1dbe6016d0de5efe8896733c326b480f..e4adf33e6a6b38f123c7e4e8cbac6c6713eb90d5 100644 --- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/src/MuCCaFitter.cxx +++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/src/MuCCaFitter.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ #include "MdtCalibFitters/MuCCaFitter.h" @@ -110,11 +110,10 @@ namespace MuonCalib { log << MSG::DEBUG << "fit() MuCCaFitter>>> getZ( pos )= " << getZ(pos) << " getY( pos )= " << getY(pos) << " Zc= " << Zc << " Yc= " << Yc << endmsg; } - double Szz(0), Syy(0), Szy(0), Syyzz(0), Att(0); + double Syy(0), Szy(0), Syyzz(0), Att(0); R = 0; for (int i = 0; i < N; ++i) { if (selection[i]) continue; - Szz += (z[i] - Zc) * (z[i] - Zc) * w[i]; Syy += (y[i] - Yc) * (y[i] - Yc) * w[i]; Szy += (y[i] - Yc) * (z[i] - Zc) * w[i]; Syyzz += ((y[i] - Yc) - (z[i] - Zc)) * ((y[i] - Yc) + (z[i] - Zc)) * w[i]; @@ -202,13 +201,12 @@ namespace MuonCalib { double aoutn, bout, sig2a, sig2b, corrab; double temp, det; double hesse[2][2]; - double W, WX, WX2, WY, WY2, WXY; + double W, WX, WX2, WY, WXY; // double errormatrix[2][2]; W = 0.; WX = 0.; WX2 = 0.; WY = 0.; - WY2 = 0.; WXY = 0; for (int i = 0; i < number_of_hits; i++) { temp = 1. / (sr[i] * sr[i]); @@ -216,7 +214,6 @@ namespace MuonCalib { WX += xout[i] * temp; WX2 += xout[i] * xout[i] * temp; WY += yout[i] * temp; - WY2 += yout[i] * yout[i] * temp; WXY += xout[i] * yout[i] * temp; } det = W * WX2 - WX * WX; diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/QratCscClusterFitter.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/QratCscClusterFitter.cxx index 4851d744bc4be9761a8724db856565487749c6de..8649d903c7f5a5a93439ddfb3bb65b827ca060f8 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/QratCscClusterFitter.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/QratCscClusterFitter.cxx @@ -396,13 +396,11 @@ Results QratCscClusterFitter::fit(const StripFitList& sfits, double tantheta) co // Find the peak strip and check the shape. unsigned int istrip_peak = 0; // strip number within cluster // Loop over strips excluding the edges. - double charge_clu = sfits[0].charge + sfits[nstrip - 1].charge; for (unsigned int istrip = 1; istrip < nstrip - 1; ++istrip) { StripFit sfit = sfits[istrip]; float qthis = sfit.charge; float qlast = sfits[istrip - 1].charge; float qnext = sfits[istrip + 1].charge; - charge_clu += qthis; // Peak if the adjacent strips have less charge. bool ispeak = qthis > qlast && qthis > qnext; // Special case: next strip has the same charge. diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_maptgchits.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_maptgchits.cxx index 619eb00e39c9dc14df9afb137b2537e744e51348..363a78a0dac7c3d272943827ee25912948f66128 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_maptgchits.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_maptgchits.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ ////////////////////////////////////////////////////////////////////////////////////////////// @@ -123,24 +123,14 @@ MdtVsTgcRawDataValAlg::maphists(const xAOD::MuonSegmentContainer *newsegment, // Get detector variables Identifier tgcid=(*tgc_itc)->identify(); int tgcStationName = m_idHelperSvc->tgcIdHelper().stationName(tgcid); - int gasGap = m_idHelperSvc->tgcIdHelper().gasGap(tgcid); // Get position variables const Amg::Vector3D tgcGlobalPos = tpd->globalPosition(); float tgcGlobalPhi = tgcGlobalPos.phi(); if(tgcGlobalPhi<0)tgcGlobalPhi+=2*M_PI; - // Cut non-TGC-Endcap, get layer number + // Cut non-TGC-Endcap if(tgcStationName<41 || tgcStationName>48)continue; - // 41=T1F,42=T1E,43=T2F,44=T2E,45=T3F,46=T3E,47=T4F,48=T4E - int layer = gasGap-1; - if(tgcStationName==43||tgcStationName==44){ - layer+=3; - }else if(tgcStationName==45||tgcStationName==46){ - layer+=5; - }else if(tgcStationName==47||tgcStationName==48){ - layer+=7; - } }// TGC PRD Collection }// TGC PRD Container