diff --git a/LArCalorimeter/LArRecUtils/python/LArAutoCorrTotalSCToolDefault.py b/LArCalorimeter/LArRecUtils/python/LArAutoCorrTotalSCToolDefault.py index ece3013af8791555bcb304fad0a12098467b73a9..84cf8e38cd760f7dd677dcf1c6f826722705c13a 100644 --- a/LArCalorimeter/LArRecUtils/python/LArAutoCorrTotalSCToolDefault.py +++ b/LArCalorimeter/LArRecUtils/python/LArAutoCorrTotalSCToolDefault.py @@ -32,6 +32,7 @@ def LArAutoCorrTotalSCToolDefault (name="LArAutoCorrTotalSCToolDefault", **kw): tool.keyNoise = "LArNoiseSC" tool.keyPedestal = "LArPedestalSC" tool.keyfSampl = "LARfSamplSC" + tool.keyMinBias = "LArMinBiasSC" from AthenaCommon.BeamFlags import jobproperties tool.deltaBunch = int(jobproperties.Beam.bunchSpacing()/( 25.*ns)+0.5) diff --git a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx index 3cf5b44b0dd7c4eaeb1057de88a6396a108a4d50..f415fbd2a770eb8a75c2bc6754fd06fafba03139 100755 --- a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx +++ b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx @@ -291,9 +291,11 @@ StatusCode LArAutoCorrTotalTool::getTerms() // m_nsamples_AC_OFC = size of AC matrix & OFC vector (e.g 5 in Atlas) //::::::::::::::::::::::::::::::: float fSigma2=0.; + float MinBiasRMS=0.; + float SigmaNoise=0.; + float Adc2MeV=0.; if(!m_NoPile) { - float SigmaNoise; if(m_isMC) SigmaNoise = m_dd_noise->noise(id,igain); else @@ -306,11 +308,10 @@ StatusCode LArAutoCorrTotalTool::getTerms() SigmaNoise = 0.;//(we will have the ERROR message below) } float fSampl = m_dd_fSampl->FSAMPL(id); - float MinBiasRMS = m_dd_minbias->minBiasRMS(id); + MinBiasRMS = m_dd_minbias->minBiasRMS(id); if(fSampl!=0) MinBiasRMS/=fSampl; const std::vector<float> * polynom_adc2mev = &(m_adc2mevTool->ADC2MEV(id,igain)); - float Adc2MeV=0.; if (polynom_adc2mev->size()>0) { Adc2MeV=(*polynom_adc2mev)[1]; } diff --git a/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx b/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx index 2e4e1239426cf799a173de214f7081d3eb0ece15..b8a8cfc4bea4421342086048261e0e4703248d34 100755 --- a/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx +++ b/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx @@ -455,9 +455,9 @@ LArOFCTool::computeOFC(int aORb, const HWIdentifier& CellID, for(c=0;c<nsamples_AC_OFC;++c) std::cout<<Shape[c+iBeginOfNSamples]<<" "; std::cout<<" <- "<<iBeginOfNSamples<<std::endl; - for(i=0;i<nsamples_AC_OFC;++i) std::cout<<ACinv_PS[i]<<" "; - std::cout<<std::endl; - for(i=0;i<nsamples_AC_OFC;++i) std::cout<<ACinv_PSD[i]<<" "; + for(i=0;i<nsamples_AC_OFC;++i) std::cout<<ACinv_PS[i]<<" "; + std::cout<<std::endl; + for(i=0;i<nsamples_AC_OFC;++i) std::cout<<ACinv_PSD[i]<<" "; std::cout<<std::endl; std::cout<<" Q1="<<Q1<<" Q2="<<Q2<<" Q3="<<Q3 <<" DELTA="<<DELTA<<std::endl;