Coverity fixes

diff --git a/PWG2/RESONANCES/AliRsnCutESD2010.cxx b/PWG2/RESONANCES/AliRsnCutESD2010.cxx
index faa3c05630bb6b9e304fde2f381a9cf019bbf1c1..131d2913c744ad8ace7bbb3df87bde44e91bcc3b 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCutESD2010.cxx
+++ b/PWG2/RESONANCES/AliRsnCutESD2010.cxx
@@ -54,6 +54,8 @@ AliRsnCutESD2010::AliRsnCutESD2010
 //
 
    SetMC(isMC);
+   
+   for (Int_t i = 0; i < 5; i++) fTPCpar[i] = 0.0;
 }
 
 //_________________________________________________________________________________________________

diff --git a/PWG2/RESONANCES/AliRsnCutESD2010.h b/PWG2/RESONANCES/AliRsnCutESD2010.h
index 4359dc4641a8a92b2d2b6459d00a038a38c2be02..4cd7956e24bf61bf865af3e5e9f9e8755c41eea3 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCutESD2010.h
+++ b/PWG2/RESONANCES/AliRsnCutESD2010.h
@@ -34,8 +34,8 @@ public:
    AliESDtrackCuts* GetCutsITS() {return &fESDtrackCutsITS;}
    void             CopyCutsTPC(const AliESDtrackCuts *cuts) {fESDtrackCutsTPC = (*cuts);}
    void             CopyCutsITS(const AliESDtrackCuts *cuts) {fESDtrackCutsITS = (*cuts);}
-   void             CopyCutsTPC(AliESDtrackCuts cuts)        {fESDtrackCutsTPC = cuts;}
-   void             CopyCutsITS(AliESDtrackCuts cuts)        {fESDtrackCutsITS = cuts;}
+   //void             CopyCutsTPC(AliESDtrackCuts cuts)        {fESDtrackCutsTPC = cuts;}
+   //void             CopyCutsITS(AliESDtrackCuts cuts)        {fESDtrackCutsITS = cuts;}
    virtual Bool_t   IsSelected(TObject *object);
    virtual void     Print(const Option_t *option = "") const;
 

diff --git a/PWG2/RESONANCES/AliRsnEvent.cxx b/PWG2/RESONANCES/AliRsnEvent.cxx
index 0d0a5e7f10fe5aa0371225cd10b99775f2cc83f1..13092f8c0b4d8cb5017689296faf333877a4111b 100644 (file)
--- a/PWG2/RESONANCES/AliRsnEvent.cxx
+++ b/PWG2/RESONANCES/AliRsnEvent.cxx
@@ -454,7 +454,7 @@ Double_t AliRsnEvent::GetAverageMomentum(Int_t &count, AliRsnCutPID *cutPID)
 
 //_____________________________________________________________________________
 Bool_t AliRsnEvent::GetAngleDistr
-(Double_t &angleMean, Double_t &angleRMS, AliRsnDaughter leading)
+(Double_t &angleMean, Double_t &angleRMS, AliRsnDaughter *leading)
 {
 //
 // Takes the leading particle and computes the mean and RMS
@@ -462,7 +462,8 @@ Bool_t AliRsnEvent::GetAngleDistr
 // with respect to the direction of leading particle.
 //
 
-   if (!leading.IsOK()) return kFALSE;
+   if (!leading) return kFALSE;
+   if (!leading->IsOK()) return kFALSE;
 
    Int_t i, count, nTracks = fRef->GetNumberOfTracks();
    Double_t angle, angle2Mean = 0.0;
@@ -471,9 +472,9 @@ Bool_t AliRsnEvent::GetAngleDistr
 
    for (i = 0, count = 0; i < nTracks; i++) {
       AliRsnDaughter trk = GetDaughter(i);
-      if (trk.GetID() == leading.GetID()) continue;
+      if (trk.GetID() == leading->GetID()) continue;
 
-      angle = leading.Prec().Angle(trk.Prec().Vect());
+      angle = leading->Prec().Angle(trk.Prec().Vect());
 
       angleMean += angle;
       angle2Mean += angle * angle;
@@ -645,15 +646,15 @@ Bool_t AliRsnEvent::SetDaughterAODv0(AliRsnDaughter &out, Int_t i)
    AliAODTrack  *tp = ev->GetTrack(v0->GetPosID());
    AliAODTrack  *tn = ev->GetTrack(v0->GetNegID());
    if (mcArray && tp && tn) {
-      Int_t        lp = TMath::Abs(tp->GetLabel());
-      Int_t        ln = TMath::Abs(tn->GetLabel());
+      Int_t lp = TMath::Abs(tp->GetLabel());
+      Int_t ln = TMath::Abs(tn->GetLabel());
       // loop on array to find MC daughters
       AliAODMCParticle *pp = 0x0, *pn = 0x0;
       TObjArrayIter next(mcArray);
       AliAODMCParticle *part = 0x0;
       while ((part = (AliAODMCParticle*)next())) {
-         if (TMath::Abs(part->GetLabel()) == lp) pp = (AliAODMCParticle*)mcArray->IndexOf(part);
-         if (TMath::Abs(part->GetLabel()) == ln) pn = (AliAODMCParticle*)mcArray->IndexOf(part);
+         if (TMath::Abs(part->GetLabel()) == lp) pp = part;
+         if (TMath::Abs(part->GetLabel()) == ln) pn = part;
       }
       // assign a MC reference and a label only to true V0s
       if (pp->GetMother() == pn->GetMother() && pp->GetMother() >= 0) out.SetLabel(pp->GetMother());

diff --git a/PWG2/RESONANCES/AliRsnEvent.h b/PWG2/RESONANCES/AliRsnEvent.h
index 8961b4327573d7f7b65883d534698430c0a38947..98d01f534edf65c5aa945c95dc907c4a2c60a16c 100644 (file)
--- a/PWG2/RESONANCES/AliRsnEvent.h
+++ b/PWG2/RESONANCES/AliRsnEvent.h
@@ -69,7 +69,7 @@ public:
    void             SetLeadingParticle(AliRsnDaughter &leading) {if (fLeading >= 0) SetDaughter(leading, fLeading);}
    Int_t            SelectLeadingParticle(Double_t ptMin = 0.0, AliRsnCutPID *cutPID = 0x0);
    Double_t         GetAverageMomentum(Int_t &count, AliRsnCutPID *cutPID = 0x0);
-   Bool_t           GetAngleDistr(Double_t &angleMean, Double_t &angleRMS, AliRsnDaughter reference);
+   Bool_t           GetAngleDistr(Double_t &angleMean, Double_t &angleRMS, AliRsnDaughter *reference);
    
 private:
 

diff --git a/PWG2/RESONANCES/AliRsnMonitorTrack.cxx b/PWG2/RESONANCES/AliRsnMonitorTrack.cxx
index 339141a13ca6c07893b392429a2ff2cb79c89b0a..067bdfa7a2bf80efaa86cc2097a4cb32bb8ffa56 100644 (file)
--- a/PWG2/RESONANCES/AliRsnMonitorTrack.cxx
+++ b/PWG2/RESONANCES/AliRsnMonitorTrack.cxx
@@ -30,6 +30,22 @@ AliRsnMonitorTrack::AliRsnMonitorTrack() :
 //
 // Unique constructor
 //
+   
+   Int_t k;
+
+   for (k = 0; k < 2; k++) fDCA[k] = 0.0;
+   for (k = 0; k < 6; k++) fITSmap[k] = 0;
+   for (k = 0; k < AliPID::kSPECIES; k++) {
+      fITSnsigma[k] = 0.0;
+      fTPCnsigma[k] = 0.0;
+      fTOFref   [k] = 0.0;
+      fTOFsigma [k] = 0.0;
+   }
+   for (k = 0; k < 3; k++) {
+      fPsim[k] = 0.0;
+      fPrec[k] = 0.0;
+      fPtpc[k] = 0.0;
+   }
 }
 
 AliRsnMonitorTrack::AliRsnMonitorTrack(const AliRsnMonitorTrack& copy) :

diff --git a/PWG2/RESONANCES/AliRsnMother.cxx b/PWG2/RESONANCES/AliRsnMother.cxx
index 7e490c2529a96d724452dbafbc1bb4f6d7b6624e..171133d27fde8b62ab1e483c3d43db103a291394 100644 (file)
--- a/PWG2/RESONANCES/AliRsnMother.cxx
+++ b/PWG2/RESONANCES/AliRsnMother.cxx
@@ -156,7 +156,7 @@ void AliRsnMother::ResetPair()
 }
 
 //_____________________________________________________________________________
-Double_t AliRsnMother::AngleTo(AliRsnDaughter track, Bool_t mc)
+Double_t AliRsnMother::AngleTo(AliRsnDaughter *track, Bool_t mc)
 {
 //
 // Compute the angle betwee this and the passed object
@@ -164,7 +164,7 @@ Double_t AliRsnMother::AngleTo(AliRsnDaughter track, Bool_t mc)
 //
 
    TLorentzVector &me = (mc ? fSumMC : fSum);
-   TLorentzVector &he = track.P(mc);
+   TLorentzVector &he = track->P(mc);
    
    return me.Angle(he.Vect());
 }

diff --git a/PWG2/RESONANCES/AliRsnMother.h b/PWG2/RESONANCES/AliRsnMother.h
index dad84d0b5b397ee3ecfe883d04f236adb2a206f7..049c4359426dedd340f4db80fce34dcb2ad780b5 100644 (file)
--- a/PWG2/RESONANCES/AliRsnMother.h
+++ b/PWG2/RESONANCES/AliRsnMother.h
@@ -42,7 +42,7 @@ public:
    
    // useful computations/operations
    void      ComputeSum(Double_t mass1, Double_t mass2);
-   Double_t  AngleTo(AliRsnDaughter track, Bool_t mc = kFALSE);
+   Double_t  AngleTo(AliRsnDaughter *track, Bool_t mc = kFALSE);
    Double_t  AngleToLeading(Bool_t &success);
    Double_t  CosThetaStar(Bool_t first = kTRUE, Bool_t useMC = kFALSE);
    void      ResetPair();

diff --git a/PWG2/RESONANCES/AliRsnVAnalysisTask.cxx b/PWG2/RESONANCES/AliRsnVAnalysisTask.cxx
index f583d83cc2fc098409f4346b2e8bb607336ea4c9..c99315bdd2e414dad1fc8bc5d7fc0228b7b8c239 100644 (file)
--- a/PWG2/RESONANCES/AliRsnVAnalysisTask.cxx
+++ b/PWG2/RESONANCES/AliRsnVAnalysisTask.cxx
@@ -175,7 +175,7 @@ void AliRsnVAnalysisTask::UserExec(Option_t* opt)
 
    if (!IsMixing()) {
 
-      if (fMCOnly && fMCEvent) {
+      if (fMCOnly && fMCEvent[0]) {
          fRsnEvent[0].SetRef(fMCEvent[0]);
          fRsnEvent[0].SetRefMC(fMCEvent[0]);
       } else if (fESDEvent[0]) {

diff --git a/PWG2/RESONANCES/AliRsnValue.cxx b/PWG2/RESONANCES/AliRsnValue.cxx
index 7759a349da12ed80a75bbf900781414660eaf2a3..cca64f8a8eaa7a1ecfa17b598d278f532392c9cc 100644 (file)
--- a/PWG2/RESONANCES/AliRsnValue.cxx
+++ b/PWG2/RESONANCES/AliRsnValue.cxx
@@ -314,6 +314,8 @@ Bool_t AliRsnValue::Eval(TObject *object, Bool_t useMC)
 
    // initialize the above 4-vectors according to the 
    // expected target type (which has been checked above)
+   // in particular, the 'fEvent' data member of base AliRsnTarget
+   // will be *always* well initialized if the TargetOK() returns kTRUE
    switch (fTargetType) {
       case AliRsnTarget::kDaughter:
          pRec = fDaughter->Prec();
@@ -336,10 +338,9 @@ Bool_t AliRsnValue::Eval(TObject *object, Bool_t useMC)
          AliError(Form("[%s] Wrong type", GetName()));
          return kFALSE;
    }
-   if (fEvent) {
-      leadingID = fEvent->GetLeadingParticleID();
-      esdev = fEvent->GetRefESD();
-   }
+   leadingID = fEvent->GetLeadingParticleID();
+   esdev = fEvent->GetRefESD();
+
    if (esdt) status = esdt->GetStatus();
    if (aodt) status = aodt->GetStatus();
    
@@ -684,6 +685,7 @@ Bool_t AliRsnValue::Eval(TObject *object, Bool_t useMC)
             AliRsnDaughter leadingPart = fEvent->GetDaughter(leadingID);
             AliVParticle *ref = leadingPart.GetRef();
             fComputedValue = ref->Pt();
+            return kTRUE;
          } else {
             AliError(Form("[%s] Leading ID has bad value (%d)", GetName(), leadingID));
             return kFALSE;

diff --git a/PWG2/RESONANCES/extra/AliRsnAnalysisPhi900GeV.cxx b/PWG2/RESONANCES/extra/AliRsnAnalysisPhi900GeV.cxx
index df1898f153190bc6b5f1b3082b8e48a70b3ba3b5..bf1eabc576625fede472ca5bb5c6e52caee1ab59 100644 (file)
--- a/PWG2/RESONANCES/extra/AliRsnAnalysisPhi900GeV.cxx
+++ b/PWG2/RESONANCES/extra/AliRsnAnalysisPhi900GeV.cxx
@@ -176,6 +176,10 @@ void AliRsnAnalysisPhi900GeV::UserExec(Option_t *)
    // retrieve ESD event and related stack (if available)
    AliESDEvent *esd   = dynamic_cast<AliESDEvent*>(fInputEvent);
    AliStack    *stack = (fMCEvent ? fMCEvent->Stack() : 0x0);
+   if (!esd) {
+      AliError("No ESD");
+      return;
+   }
 
    // get the best primary vertex:
    // first try the one with tracks

diff --git a/PWG2/RESONANCES/extra/AliRsnTOFT0maker.cxx b/PWG2/RESONANCES/extra/AliRsnTOFT0maker.cxx
index be63566d02a0d38244fd584940fe42d902fec9e8..40885f34d038c25427db81097cb0dff24613f040 100644 (file)
--- a/PWG2/RESONANCES/extra/AliRsnTOFT0maker.cxx
+++ b/PWG2/RESONANCES/extra/AliRsnTOFT0maker.cxx
@@ -84,6 +84,10 @@ AliRsnTOFT0maker::AliRsnTOFT0maker(const AliRsnTOFT0maker & t) :
    fKmask(t.fKmask),
    fNoTOFT0(t.fNoTOFT0)
 {
+   fCalculated[0] = t.fCalculated[0];
+   fCalculated[1] = t.fCalculated[1];
+   fCalculated[2] = t.fCalculated[2];
+   fCalculated[3] = t.fCalculated[3];
 }
 
 //____________________________________________________________________________
@@ -92,6 +96,11 @@ AliRsnTOFT0maker& AliRsnTOFT0maker::operator=(const AliRsnTOFT0maker &t)
 //
    // assign. operator
    //
+   
+   fCalculated[0] = t.fCalculated[0];
+   fCalculated[1] = t.fCalculated[1];
+   fCalculated[2] = t.fCalculated[2];
+   fCalculated[3] = t.fCalculated[3];
 
    fSettings = t.fSettings;
    if (this == &t)