Removing variable shadowing

diff --git a/PHOS/AliPHOSEsdCluster.cxx b/PHOS/AliPHOSEsdCluster.cxx
index a9b3f39bfc66157ab96358a261aa0d9654a75c14..c443afd012c5fb395d449ed30f6a0e9f165f4950 100644 (file)
--- a/PHOS/AliPHOSEsdCluster.cxx
+++ b/PHOS/AliPHOSEsdCluster.cxx
@@ -162,7 +162,6 @@ void AliPHOSEsdCluster::EvalCoord(Float_t logWeight, TVector3 &vtx)
   Double_t dzz  = 0.;
   Double_t dxz  = 0.;
   for(Int_t iDigit=0; iDigit < fNCells; iDigit++) {
-    Int_t relid[4] ;
     Float_t xi ;
     Float_t zi ;
     phosgeom->AbsToRelNumbering(fCellsAbsId[iDigit], relid) ;

diff --git a/PHOS/AliPHOSEvalRecPoint.cxx b/PHOS/AliPHOSEvalRecPoint.cxx
index df81c9fb39d8153cd04c1dc05aecfe084c835bdb..f0e46c64260b2a21a1bbfcd81112db33decdf7e4 100644 (file)
--- a/PHOS/AliPHOSEvalRecPoint.cxx
+++ b/PHOS/AliPHOSEvalRecPoint.cxx
@@ -1002,7 +1002,7 @@ Int_t AliPHOSEvalRecPoint::UnfoldLocalMaxima()
       newRP->AddDigit(*digitMax,maxAtEnergy[iMax]);
 
       //Neighbous ( matrix 3x3 around the local maximum)
-      for(Int_t iDigit=0; iDigit<nDigits; iDigit++)
+      for(iDigit=0; iDigit<nDigits; iDigit++)
        {     
          AliPHOSDigit* digit = (AliPHOSDigit*)fLoader->Digits()->At( digitsList[iDigit] );
          Float_t eDigit = energies[iDigit];

diff --git a/PHOS/AliPHOSJetFinder.cxx b/PHOS/AliPHOSJetFinder.cxx
index cb5e5456aad7194bbcbd6dd26dc49754689ce2b8..53a1a2d066210d428ff07001b35c336562b5d56a 100644 (file)
--- a/PHOS/AliPHOSJetFinder.cxx
+++ b/PHOS/AliPHOSJetFinder.cxx
@@ -253,7 +253,7 @@ void AliPHOSJetFinder::FindJetsFromDigits(const TClonesArray * digits, TObjArray
        CalculateEEtaPhi(digit,e,eta,phi) ;
        jet->AddDigit(e,eta,phi,-1) ;  
        //loop over left digits
-       for(Int_t iDigit = 0 ; iDigit < copyDigits->GetEntries() ; iDigit++){
+       for(iDigit = 0 ; iDigit < copyDigits->GetEntries() ; iDigit++){
          if(iDigit!= ind){ //first digit already in jet
            digit = static_cast<AliPHOSDigit *>(copyDigits->At(iDigit));
            CalculateEEtaPhi(digit,e,eta,phi) ;     

diff --git a/PHOS/AliPHOSOnlineMonitor.cxx b/PHOS/AliPHOSOnlineMonitor.cxx
index 0411277a7a582255b16fe457f7304d3b6a795e25..02a611e85a9662c29f694307dfb12fcca6c0ea32 100644 (file)
--- a/PHOS/AliPHOSOnlineMonitor.cxx
+++ b/PHOS/AliPHOSOnlineMonitor.cxx
@@ -506,7 +506,7 @@ void  AliPHOSOnlineMonitor::ScanPedestals(TClonesArray * digits){
   }
 }
 //____________________________________________________________________________ 
-void  AliPHOSOnlineMonitor::ScanEdep(TClonesArray * digits){
+void  AliPHOSOnlineMonitor::ScanEdep(TClonesArray * /*digits*/){
   //Fill 2D distribution of ADC values in NEL and WEL events
 //   AliPHOSGetter * gime = AliPHOSGetter::Instance() ;
 //   AliPHOSCalibrationDB *cdb = 0 ;

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index 3df63d818cda0711ae9564de795f023d5ccae14d..593a17e9f994d66194fa281296b056c372e42b9b 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -1455,8 +1455,8 @@ void  AliPHOSPIDv1::MakeRecParticles()
     rp->SetLastDaughter(-1);
     rp->SetPolarisation(0,0,0);
     //Set the position in global coordinate system from the RecPoint
-    AliPHOSTrackSegment * ts  = static_cast<AliPHOSTrackSegment *>(fTrackSegments->At(rp->GetPHOSTSIndex()));
-    AliPHOSEmcRecPoint  * erp = static_cast<AliPHOSEmcRecPoint *>(fEMCRecPoints->At(ts->GetEmcIndex()));
+    AliPHOSTrackSegment * ts1  = static_cast<AliPHOSTrackSegment *>(fTrackSegments->At(rp->GetPHOSTSIndex()));
+    AliPHOSEmcRecPoint  * erp = static_cast<AliPHOSEmcRecPoint *>(fEMCRecPoints->At(ts1->GetEmcIndex()));
     TVector3 pos ; 
     fGeom->GetGlobalPHOS(erp, pos) ; 
     rp->SetPos(pos);

diff --git a/PHOS/AliPHOSRawDigiProducer.cxx b/PHOS/AliPHOSRawDigiProducer.cxx
index 97ecbed7f410d62107d7930c7c07703c67f79fa0..89116f07784a2674bc4cca1085585a59b712ee8d 100644 (file)
--- a/PHOS/AliPHOSRawDigiProducer.cxx
+++ b/PHOS/AliPHOSRawDigiProducer.cxx
@@ -179,8 +179,7 @@ void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawDecoder*
       iLG++ ;
       digLG = dynamic_cast<AliPHOSDigit*>(tmpLG.At(iLG)) ;
     }
-    Int_t absId=digHG->GetId() ;                                                                                                         
-    Int_t relId[4] ;                                                                                                                     
+    absId=digHG->GetId() ;                                                                                                         
     fGeom->AbsToRelNumbering(absId,relId) ;                                                                                              
  
     if(digLG && digHG->GetId() == digLG->GetId()){ //we found pair

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
index 444f36629b9e452892fe48ee8a024d0e84d847eb..e586aa1ab3b869550d63f51c30b7731983e6b85c 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
@@ -307,7 +307,6 @@ void  AliPHOSTrackSegmentMakerv1::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * em
       track = fESD->GetTrack(iClosestTrack);
       if (track->GetPxPyPzAt(rCPV, fESD->GetMagneticField(), pxyz)) { // track momentum ibid.
         vecP.SetXYZ(pxyz[0],pxyz[1],pxyz[2]);
-        Int_t dummyMod ;
        fGeom->ImpactOnEmc(vtxCPV,vecP.Theta(),vecP.Phi(),dummyMod,zCPV,xCPV) ;
       }
     }

diff --git a/PHOS/AliPHOSTracker.cxx b/PHOS/AliPHOSTracker.cxx
index f5476d5deca0aed8e04f87bcae685e1f6f0ea0d0..912c3a7a69a8865e6a03954065bce9776c2a007f 100644 (file)
--- a/PHOS/AliPHOSTracker.cxx
+++ b/PHOS/AliPHOSTracker.cxx
@@ -203,8 +203,8 @@ Int_t AliPHOSTracker::PropagateBack(AliESDEvent *esd) {
      Int_t ncl=cArray.GetEntriesFast();
      AliPHOSEmcRecPoint *bestCluster=0;            // The "best" cluster
      Double_t maxd2=400; // (cm^2)
-     for (Int_t i=0; i<ncl; i++) {
-       AliPHOSEmcRecPoint *c=(AliPHOSEmcRecPoint *)cArray.UncheckedAt(i);
+     for (Int_t j=0; j<ncl; j++) {
+       AliPHOSEmcRecPoint *c=(AliPHOSEmcRecPoint *)cArray.UncheckedAt(j);
 
        if (c->TestBit(14)) continue; // This clusters is "used"
 

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index 2707883c82af90c58c4d9a15c995301e8f6fa00d..415aa710dc4e37778d58f6b82aed12fa282973f5 100644 (file)
--- a/PHOS/AliPHOSv1.cxx
+++ b/PHOS/AliPHOSv1.cxx
@@ -76,14 +76,14 @@
 ClassImp(AliPHOSv1)
 
 //____________________________________________________________________________
-AliPHOSv1::AliPHOSv1()
+AliPHOSv1::AliPHOSv1() : fCPVDigits(0)
 {
   //Def ctor.
 }
 
 //____________________________________________________________________________
 AliPHOSv1::AliPHOSv1(const char *name, const char *title):
-  AliPHOSv0(name,title)
+  AliPHOSv0(name,title),   fCPVDigits(new TClonesArray("AliPHOSCPVDigit",20))
 {
   //
   // We store hits :

diff --git a/STEER/AliMillepede.cxx b/STEER/AliMillepede.cxx
index ac434c509bc189a41610f7f8e701e07d983ec2f2..347e3d71e190911f25be46c32f8d459c1fb6f8a6 100644 (file)
--- a/STEER/AliMillepede.cxx
+++ b/STEER/AliMillepede.cxx
@@ -816,7 +816,7 @@ Int_t AliMillepede::LocalFit(int iFit, double localParams[], Bool_t bSingleFit)
     fVecBGlo[iIdx] -= fVecBGloCorr[iIdxIdx];
     
     for (jIdxIdx=0; jIdxIdx<=iIdxIdx; jIdxIdx++) {    
-      int jIdx = fCGLRow2Glo[jIdxIdx];
+      jIdx = fCGLRow2Glo[jIdxIdx];
       fMatCGlo[iIdx][jIdx] -= fMatCGloCorr[iIdxIdx][jIdxIdx];
       fMatCGlo[jIdx][iIdx] = fMatCGlo[iIdx][jIdx];
     }

diff --git a/STEER/AliQADataMakerSteer.cxx b/STEER/AliQADataMakerSteer.cxx
index fd387ba4a536ef5c8957c179bc4a107c2af90bad..616e9c0df4aa29f488d15ebc4c5061916cc4d471 100644 (file)
--- a/STEER/AliQADataMakerSteer.cxx
+++ b/STEER/AliQADataMakerSteer.cxx
@@ -255,8 +255,7 @@ TObjArray * AliQADataMakerSteer::GetFromOCDB(AliQA::DETECTORINDEX_t det, AliQA::
 {
        // Retrieve the list of QA data for a given detector and a given task 
        TObjArray * rv = NULL ;
-       TString tmp(AliQA::GetQARefStorage()) ; 
-       if ( tmp.IsNull() ) { 
+       if ( !strlen(AliQA::GetQARefStorage()) ) { 
                AliError("No storage defined, use AliQA::SetQARefStorage") ; 
                return NULL ; 
        }       
@@ -770,10 +769,10 @@ Bool_t AliQADataMakerSteer::SaveIt2OCDB(const Int_t runNumber, TFile * inputFile
                if ( tmp.Contains(AliQA::GetLabLocalOCDB()) ) 
                        man->SetDefaultStorage(AliQA::GetQARefStorage()) ;
                else {
-                       TString tmp(AliQA::GetQARefDefaultStorage()) ; 
-                       tmp.Append(year) ; 
-                       tmp.Append("?user=alidaq") ; 
-                       man->SetDefaultStorage(tmp.Data()) ; 
+                       TString tmp1(AliQA::GetQARefDefaultStorage()) ; 
+                       tmp1.Append(year) ; 
+                       tmp1.Append("?user=alidaq") ; 
+                       man->SetDefaultStorage(tmp1.Data()) ; 
                }
        }
        man->SetSpecificStorage("*", AliQA::GetQARefStorage()) ; 

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index c7cdb2c1b61b5b55502c12b742a8996223c646d4..f4ed157b68e648edb36e1d650bf132dcd6ab720a 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -2371,7 +2371,7 @@ void AliReconstruction::FillRawDataErrorLog(Int_t iEvent, AliESDEvent* esd)
 
 }
 
-TNamed* AliReconstruction::CopyFileToTNamed(TString fPath,TString fName){
+TNamed* AliReconstruction::CopyFileToTNamed(TString fPath,TString pName){
   // Dump a file content into a char in TNamed
   ifstream in;
   in.open(fPath.Data(),ios::in | ios::binary|ios::ate);
@@ -2384,9 +2384,9 @@ TNamed* AliReconstruction::CopyFileToTNamed(TString fPath,TString fName){
     in.read (memblock, kBytes);
     in.close();
     TString fData(memblock,kBytes);
-    fn = new TNamed(fName,fData);
+    fn = new TNamed(pName,fData);
     printf("fData Size: %d \n",fData.Sizeof());
-    printf("fName Size: %d \n",fName.Sizeof());
+    printf("pName Size: %d \n",pName.Sizeof());
     printf("fn    Size: %d \n",fn->Sizeof());
     delete[] memblock;
   }
@@ -2397,21 +2397,21 @@ TNamed* AliReconstruction::CopyFileToTNamed(TString fPath,TString fName){
   return fn;
 }
 
-void AliReconstruction::TNamedToFile(TTree* fTree, TString fName){
+void AliReconstruction::TNamedToFile(TTree* fTree, TString pName){
   // This is not really needed in AliReconstruction at the moment
   // but can serve as a template
 
   TList *fList = fTree->GetUserInfo();
-  TNamed *fn = (TNamed*)fList->FindObject(fName.Data());
+  TNamed *fn = (TNamed*)fList->FindObject(pName.Data());
   printf("fn Size: %d \n",fn->Sizeof());
 
-  TString fTmp(fn->GetName()); // to be 100% sure in principle fName also works
+  TString fTmp(fn->GetName()); // to be 100% sure in principle pName also works
   const char* cdata = fn->GetTitle();
   printf("fTmp Size %d\n",fTmp.Sizeof());
 
   int size = fn->Sizeof()-fTmp.Sizeof()-sizeof(UChar_t)-sizeof(Int_t); // see dfinition of TString::SizeOf()...
   printf("calculated size %d\n",size);
-  ofstream out(fName.Data(),ios::out | ios::binary);
+  ofstream out(pName.Data(),ios::out | ios::binary);
   out.write(cdata,size);
   out.close();
 

diff --git a/STEER/AliTriggerConfiguration.cxx b/STEER/AliTriggerConfiguration.cxx
index 520caa834fbda3139b1091962994bcb0c1273f17..a0cf8e4a7e57ce8a28942adb0957d6cfdc38d823 100755 (executable)
--- a/STEER/AliTriggerConfiguration.cxx
+++ b/STEER/AliTriggerConfiguration.cxx
@@ -330,14 +330,14 @@ TString AliTriggerConfiguration::GetActiveDetectors() const
    Int_t nclus = fClusters.GetEntriesFast();
    if( !nclus ) return activeDet;
    
-   for( Int_t j=0; j<nclus; j++ ) {
+   for( Int_t j=0; j<nclus; ++j ) {
       TString detStr = ((AliTriggerCluster*)fClusters.At(j))->GetDetectorsInCluster();
       TObjArray* det = detStr.Tokenize(" ");
       Int_t ndet = det->GetEntriesFast();
-      for( Int_t j=0; j<ndet; j++ ) {
-         if( activeDet.Contains( ((TObjString*)det->At(j))->String() ) )continue;
+      for( Int_t k=0; k<ndet; ++k ) {
+         if( activeDet.Contains( ((TObjString*)det->At(k))->String() ) )continue;
          activeDet.Append( " " );
-         activeDet.Append( ((TObjString*)det->At(j))->String() );
+         activeDet.Append( ((TObjString*)det->At(k))->String() );
       }
    }
    return activeDet;