Coverity errors corrected/avoided.

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index 57e32b00757cff368d76fdaa02510a0bcf7faf72..6bb3c9cfca59bce92bc4550a94925f8a6ead6497 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -123,10 +123,8 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
     AliESD*      old = esd->GetAliESDOld();\r
 \r
     // Fetch Stack for debuggging if available \r
-    AliStack *pStack = 0;\r
     AliMCEventHandler *mcH = 0;\r
     if(MCEvent()){\r
-      pStack = MCEvent()->Stack();\r
       mcH = (AliMCEventHandler*) ((AliAnalysisManager::GetAnalysisManager())->GetMCtruthEventHandler()); \r
     }\r
     // set arrays and pointers\r

diff --git a/STEER/AliAODEvent.cxx b/STEER/AliAODEvent.cxx
index 350f99f09f7f1004cfbe5b674d7c020f7dc43b1f..e69001cda95a95be40acedf96db1985772172f87 100644 (file)
--- a/STEER/AliAODEvent.cxx
+++ b/STEER/AliAODEvent.cxx
@@ -484,7 +484,8 @@ Int_t AliAODEvent::GetMuonTracks(TRefArray *muonTracks) const
 
   AliAODTrack *track = 0;
   for (Int_t iTrack = 0; iTrack < GetNTracks(); iTrack++) {
-    if ((track = GetTrack(iTrack))->IsMuonTrack()) {
+    track = GetTrack(iTrack);
+    if (track->IsMuonTrack()) {
       muonTracks->Add(track);
     }
   }

diff --git a/STEER/AliAODHeader.h b/STEER/AliAODHeader.h
index f9d50a3dc7142373e389005d45f4558355d7e2d2..44a5e98cc85846448aa4a04dfff7f78e1e5dbcdf 100644 (file)
--- a/STEER/AliAODHeader.h
+++ b/STEER/AliAODHeader.h
@@ -112,7 +112,8 @@ class AliAODHeader : public AliVHeader {
   void RemoveQTheta();
 
   void SetDiamond(Float_t xy[2],Float_t cov[3]) { 
-    for(Int_t i=0;i<3;i++) {if(i<2) fDiamondXY[i]=xy[i]; fDiamondCovXY[i]=cov[i];}
+    for(Int_t i=0;i<3;i++) {fDiamondCovXY[i] = cov[i];}
+    for(Int_t i=0;i<2;i++) {fDiamondXY[i]    = xy[i] ;}
   }
   void SetDiamondZ(Float_t z, Float_t sig2z){
     fDiamondZ=z; fDiamondSig2Z=sig2z;

diff --git a/STEER/AliESDEvent.cxx b/STEER/AliESDEvent.cxx
index a0d8e3ca378245c6c20a31068524c0b5b6fd7fc3..aa418317af5bf80e3f9e9a0e2865b89c9b3d76c6 100644 (file)
--- a/STEER/AliESDEvent.cxx
+++ b/STEER/AliESDEvent.cxx
@@ -249,8 +249,11 @@ AliESDEvent & AliESDEvent::operator=(const AliESDEvent& source) {
        ((TNamed*)mine)->SetName(name);
       }
       else if(mine->InheritsFrom("TCollection")){
-       if(mine->InheritsFrom("TClonesArray"))
-         dynamic_cast<TClonesArray*>(mine)->SetClass(dynamic_cast<TClonesArray*>(its)->GetClass());
+       if(mine->InheritsFrom("TClonesArray")) {
+         TClonesArray* tcits = dynamic_cast<TClonesArray*>(its);
+         if (tcits)
+           dynamic_cast<TClonesArray*>(mine)->SetClass(tcits->GetClass());
+       }
        dynamic_cast<TCollection*>(mine)->SetName(name);
       }
       AliDebug(1, Form("adding object %s of type %s", mine->GetName(), mine->ClassName()));