From 12c9b1c348f5ed2277d63ee20a5da35f44344d9a Mon Sep 17 00:00:00 2001 From: cblume Date: Wed, 30 Nov 2011 08:53:03 +0000 Subject: [PATCH] Try to fix coverity defects --- TRD/AliTRDdigitizer.cxx | 6 +++--- TRD/AliTRDpadPlane.cxx | 37 +++++++++++++++++++++++++++++++++++-- TRD/AliTRDsimTR.cxx | 1 + 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx index 323d65000b6..9bdc9d0fdae 100644 --- a/TRD/AliTRDdigitizer.cxx +++ b/TRD/AliTRDdigitizer.cxx @@ -618,6 +618,7 @@ Bool_t AliTRDdigitizer::MakeDigits() Float_t **hits = new Float_t*[kNdet]; Int_t *nhit = new Int_t[kNdet]; + memset(nhit,0,kNdet*sizeof(Int_t)); AliTRDarraySignal *signals = 0x0; @@ -722,11 +723,10 @@ Bool_t AliTRDdigitizer::SortHits(Float_t **hits, Int_t *nhit) Int_t nhitTrk = 0; Int_t *lhit = new Int_t[kNdet]; + memset(lhit,0,kNdet*sizeof(Int_t)); for (Int_t det = 0; det < kNdet; det++) { - lhit[det] = 0; - nhit[det] = 0; - hits[det] = 0; + hits[det] = 0x0; } AliLoader *gimme = fRunLoader->GetLoader("TRDLoader"); diff --git a/TRD/AliTRDpadPlane.cxx b/TRD/AliTRDpadPlane.cxx index beba8be59d8..19927357d0f 100644 --- a/TRD/AliTRDpadPlane.cxx +++ b/TRD/AliTRDpadPlane.cxx @@ -162,10 +162,43 @@ AliTRDpadPlane &AliTRDpadPlane::operator=(const AliTRDpadPlane &p) // Assignment operator // - if (this != &p) { - ((AliTRDpadPlane &) p).Copy(*this); + if (this == &p) { + return *this; } + fLayer = p.fLayer; + fStack = p.fStack; + fLength = p.fLength; + fWidth = p.fWidth; + fLengthRim = p.fLengthRim; + fWidthRim = p.fLengthRim; + fLengthOPad = p.fLengthOPad; + fWidthOPad = p.fWidthOPad; + fLengthIPad = p.fLengthIPad; + fWidthIPad = p.fWidthIPad; + fRowSpacing = p.fRowSpacing; + fColSpacing = p.fColSpacing; + fNrows = p.fNrows; + fNcols = p.fNcols; + fTiltingAngle = p.fTiltingAngle; + fTiltingTan = p.fTiltingTan; + fPadRow = 0; + fPadCol = 0; + fPadRowSMOffset = p.fPadRowSMOffset; + fAnodeWireOffset = p.fAnodeWireOffset; + + Int_t iBin = 0; + + fPadRow = new Double_t[fNrows]; + for (iBin = 0; iBin < fNrows; iBin++) { + fPadRow[iBin] = ((AliTRDpadPlane &) p).fPadRow[iBin]; + } + + fPadCol = new Double_t[fNrows]; + for (iBin = 0; iBin < fNrows; iBin++) { + fPadCol[iBin] = ((AliTRDpadPlane &) p).fPadCol[iBin]; + } + return *this; } diff --git a/TRD/AliTRDsimTR.cxx b/TRD/AliTRDsimTR.cxx index b1354f513b7..8a5726ce80b 100644 --- a/TRD/AliTRDsimTR.cxx +++ b/TRD/AliTRDsimTR.cxx @@ -219,6 +219,7 @@ AliTRDsimTR &AliTRDsimTR::operator=(const AliTRDsimTR &s) // if (this != &s) ((AliTRDsimTR &) s).Copy(*this); + this->Init(); return *this; -- 2.43.0