Shadowed variables corrected.

diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
index 764eae8e355b00c06487899039c166ca91564cd8..9d730c8a316d7daedd56d7047cfc23192bd8e13d 100644 (file)
--- a/ANALYSIS/AliAnalysisManager.cxx
+++ b/ANALYSIS/AliAnalysisManager.cxx
@@ -863,10 +863,9 @@ void AliAnalysisManager::StartAnalysis(const char *type, TTree *tree, Long64_t n
    switch (fMode) {
       case kLocalAnalysis:
          if (!tree) {
-            TIter next(fTasks);
-            AliAnalysisTask *task;
+            TIter nextT(fTasks);
             // Call CreateOutputObjects for all tasks
-            while ((task=(AliAnalysisTask*)next())) {
+            while ((task=(AliAnalysisTask*)nextT())) {
                TDirectory *curdir = gDirectory;
                task->CreateOutputObjects();
                if (curdir) curdir->cd();

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index 644fa43cfda915c38a9b2575050057484f55d679..977bffb4cb315d5643d6d56fea9a4f3d06809eba 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -586,29 +586,29 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                        
                        usedTrack[imother] = kTRUE;
                        
-                       AliESDtrack *esdTrack = esd->GetTrack(imother);
-                       esdTrack->GetPxPyPz(p);
-                       esdTrack->GetXYZ(pos);
-                       esdTrack->GetCovarianceXYZPxPyPz(covTr);
-                       esdTrack->GetESDpid(pid);
+                       AliESDtrack *esdTrackM = esd->GetTrack(imother);
+                       esdTrackM->GetPxPyPz(p);
+                       esdTrackM->GetXYZ(pos);
+                       esdTrackM->GetCovarianceXYZPxPyPz(covTr);
+                       esdTrackM->GetESDpid(pid);
                        
                        mother = 
-                           new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
-                                                              esdTrack->GetLabel(),
+                           new(tracks[jTracks++]) AliAODTrack(esdTrackM->GetID(),
+                                                              esdTrackM->GetLabel(),
                                                               p,
                                                               kTRUE,
                                                               pos,
                                                               kFALSE,
                                                               covTr, 
-                                                              (Short_t)esdTrack->GetSign(),
-                                                              esdTrack->GetITSClusterMap(), 
+                                                              (Short_t)esdTrackM->GetSign(),
+                                                              esdTrackM->GetITSClusterMap(), 
                                                               pid,
                                                               primary,
                                                               kTRUE, // check if this is right
                                                               kTRUE, // check if this is right
                                                               AliAODTrack::kPrimary);
-         if (esdTrack->GetSign() > 0) nPosTracks++;
-                       mother->SetFlags(esdTrack->GetStatus());
+                       if (esdTrackM->GetSign() > 0) nPosTracks++;
+                       mother->SetFlags(esdTrackM->GetStatus());
                        mother->ConvertAliPIDtoAODPID();
                        primary->AddDaughter(mother);
                        mother->ConvertAliPIDtoAODPID();
@@ -636,29 +636,29 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                        
                        usedTrack[idaughter] = kTRUE;
                        
-                       AliESDtrack *esdTrack = esd->GetTrack(idaughter);
-                       esdTrack->GetPxPyPz(p);
-                       esdTrack->GetXYZ(pos);
-                       esdTrack->GetCovarianceXYZPxPyPz(covTr);
-                       esdTrack->GetESDpid(pid);
+                       AliESDtrack *esdTrackD = esd->GetTrack(idaughter);
+                       esdTrackD->GetPxPyPz(p);
+                       esdTrackD->GetXYZ(pos);
+                       esdTrackD->GetCovarianceXYZPxPyPz(covTr);
+                       esdTrackD->GetESDpid(pid);
                        
                        daughter = 
-                           new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
-                                                              esdTrack->GetLabel(),
+                           new(tracks[jTracks++]) AliAODTrack(esdTrackD->GetID(),
+                                                              esdTrackD->GetLabel(),
                                                               p,
                                                               kTRUE,
                                                               pos,
                                                               kFALSE,
                                                               covTr, 
-                                                              (Short_t)esdTrack->GetSign(),
-                                                              esdTrack->GetITSClusterMap(), 
+                                                              (Short_t)esdTrackD->GetSign(),
+                                                              esdTrackD->GetITSClusterMap(), 
                                                               pid,
                                                               vkink,
                                                               kTRUE, // check if this is right
                                                               kTRUE, // check if this is right
                                                               AliAODTrack::kPrimary);
-         if (esdTrack->GetSign() > 0) nPosTracks++;
-                       daughter->SetFlags(esdTrack->GetStatus());
+                       if (esdTrackD->GetSign() > 0) nPosTracks++;
+                       daughter->SetFlags(esdTrackD->GetStatus());
                        daughter->ConvertAliPIDtoAODPID();
                        vkink->AddDaughter(daughter);
                        daughter->ConvertAliPIDtoAODPID();
@@ -771,11 +771,11 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
       AliESDPmdTrack *pmdTrack = esd->GetPmdTrack(iPmd);
       Int_t nLabel = 0;
       Int_t *label = 0x0;
-      Double_t pos[3] = { pmdTrack->GetClusterX(), pmdTrack->GetClusterY(), pmdTrack->GetClusterZ() };
-      Double_t pid[9] = { 0., 0., 0., 0., 0., 0., 0., 0., 0. }; // to be revised!
+      Double_t posPmd[3] = { pmdTrack->GetClusterX(), pmdTrack->GetClusterY(), pmdTrack->GetClusterZ()};
+      Double_t pidPmd[9] = { 0., 0., 0., 0., 0., 0., 0., 0., 0. }; // to be revised!
       // type not set!
       // assoc cluster not set
-      new(pmdClusters[jPmdClusters++]) AliAODPmdCluster(iPmd, nLabel, label, pmdTrack->GetClusterADC(), pos, pid);
+      new(pmdClusters[jPmdClusters++]) AliAODPmdCluster(iPmd, nLabel, label, pmdTrack->GetClusterADC(), posPmd, pidPmd);
     }
 
     // Access to the AOD container of clusters

diff --git a/ANALYSIS/AliESDtrackCuts.cxx b/ANALYSIS/AliESDtrackCuts.cxx
index 27c8b362e180648197a318bbd95ceb31fad54567..addaefb47e18b40b9980bad1eea93099be1ba415 100644 (file)
--- a/ANALYSIS/AliESDtrackCuts.cxx
+++ b/ANALYSIS/AliESDtrackCuts.cxx
@@ -649,9 +649,9 @@ AliESDtrackCuts::AcceptTrack(AliESDtrack* esdTrack) {
       
       for (Int_t j=i; j<kNCuts; j++) {
        if (cuts[i] && cuts[j]) {
-         Float_t x = fhCutCorrelation->GetXaxis()->GetBinCenter(fhCutCorrelation->GetXaxis()->FindBin(fgkCutNames[i]));
-         Float_t y = fhCutCorrelation->GetYaxis()->GetBinCenter(fhCutCorrelation->GetYaxis()->FindBin(fgkCutNames[j]));
-         fhCutCorrelation->Fill(x,y);
+         Float_t xC = fhCutCorrelation->GetXaxis()->GetBinCenter(fhCutCorrelation->GetXaxis()->FindBin(fgkCutNames[i]));
+         Float_t yC = fhCutCorrelation->GetYaxis()->GetBinCenter(fhCutCorrelation->GetYaxis()->FindBin(fgkCutNames[j]));
+         fhCutCorrelation->Fill(xC, yC);
        }
       }
     }

diff --git a/ANALYSIS/AliTrackPoints.cxx b/ANALYSIS/AliTrackPoints.cxx
index 000709f0cb4523753d05e09c870840774b2cb1cb..88390fdefa340e2c40ee20d38f2e69828e30af49 100644 (file)
--- a/ANALYSIS/AliTrackPoints.cxx
+++ b/ANALYSIS/AliTrackPoints.cxx
@@ -629,7 +629,7 @@ void AliTrackPoints::Testtpc(Int_t entr)
       //BUT they are local!!!!
       t->PropagateTo(r);
 //      Double_t phi = t->Phi();
-      Double_t rl = TMath::Hypot(t->GetX(),t->GetY());//real radius 
+      Double_t rL = TMath::Hypot(t->GetX(),t->GetY());//real radius 
       
       Double_t alpha = t->GetAlpha();
       Double_t salpha = TMath::Sin(alpha);
@@ -638,7 +638,7 @@ void AliTrackPoints::Testtpc(Int_t entr)
       y = t->GetX()*salpha + t->GetY()*calpha;
       z = t->GetZ();
       
-      printf("tx %f ty %f tz %f Rt = %f R from XY %f\n",x,y,z,TMath::Hypot(x,y),rl);
+      printf("tx %f ty %f tz %f Rt = %f R from XY %f\n",x,y,z,TMath::Hypot(x,y),rL);
       
       printf("tpz - tz %f\n",z-t->GetZ());
       printf("\n");