Variable shadowing corrected.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 3 Jun 2009 06:19:37 +0000 (06:19 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 3 Jun 2009 06:19:37 +0000 (06:19 +0000)
JETAN/AliJetESDReader.cxx
JETAN/AliJetFillUnitArrayEMCalDigits.cxx
JETAN/AliUA1JetFinderV2.cxx

index 055f1e7..04591f9 100755 (executable)
@@ -483,11 +483,11 @@ void AliJetESDReader::InitUnitArray()
                if(nBin>=fNumUnits+nElements && nBin<fNumUnits+nElements+nGaps){
                  if(nBin<fNumUnits+nElements+n0)
                    {
-                     Float_t phi = eta = 0.;
-                     fGrid0->GetEtaPhiFromIndex2(nBin+1-(fNumUnits+nElements),phi,eta);
+                     Float_t phi0 = eta = 0.;
+                     fGrid0->GetEtaPhiFromIndex2(nBin+1-(fNumUnits+nElements),phi0,eta);
                      Deta = fGrid0->GetDeta(); 
                      Dphi = fGrid0->GetDphi(); 
-                     new ((*fUnitArray)[nBin]) AliJetUnitArray(nBin,0,eta,phi,0.,Deta,Dphi,kTpc,kOutJet,kPtSmaller,kPtSmaller,kBad,0.,-1);
+                     new ((*fUnitArray)[nBin]) AliJetUnitArray(nBin,0,eta,phi0,0.,Deta,Dphi,kTpc,kOutJet,kPtSmaller,kPtSmaller,kBad,0.,-1);
                    }
                  else if(nBin>=fNumUnits+nElements+n0 && nBin<fNumUnits+nElements+n0+n1)
                    {
@@ -499,27 +499,27 @@ void AliJetESDReader::InitUnitArray()
                    }
                  else if(nBin>=fNumUnits+nElements+n0+n1 && nBin<fNumUnits+nElements+n0+n1+n2)
                    {
-                     Float_t phi = eta = 0.;
-                     fGrid2->GetEtaPhiFromIndex2(nBin+1-(fNumUnits+nElements+n0+n1),phi,eta);
+                     Float_t phi0 = eta = 0.;
+                     fGrid2->GetEtaPhiFromIndex2(nBin+1-(fNumUnits+nElements+n0+n1),phi0,eta);
                      Deta = fGrid2->GetDeta(); 
                      Dphi = fGrid2->GetDphi(); 
-                     new ((*fUnitArray)[nBin]) AliJetUnitArray(nBin,0,eta,phi,0.,Deta,Dphi,kTpc,kOutJet,kPtSmaller,kPtSmaller,kBad,0.,-1);
+                     new ((*fUnitArray)[nBin]) AliJetUnitArray(nBin,0,eta,phi0,0.,Deta,Dphi,kTpc,kOutJet,kPtSmaller,kPtSmaller,kBad,0.,-1);
                    }
                  else if(nBin>=fNumUnits+nElements+n0+n1+n2 && nBin<fNumUnits+nElements+n0+n1+n2+n3)
                    {
-                     Float_t phi = eta = 0.;
-                     fGrid3->GetEtaPhiFromIndex2(nBin+1-(fNumUnits+nElements+n0+n1+n2),phi,eta);
+                     Float_t phi0 = eta = 0.;
+                     fGrid3->GetEtaPhiFromIndex2(nBin+1-(fNumUnits+nElements+n0+n1+n2),phi0,eta);
                      Deta = fGrid3->GetDeta(); 
                      Dphi = fGrid3->GetDphi(); 
-                     new ((*fUnitArray)[nBin]) AliJetUnitArray(nBin,0,eta,phi,0.,Deta,Dphi,kTpc,kOutJet,kPtSmaller,kPtSmaller,kBad,0.,-1);
+                     new ((*fUnitArray)[nBin]) AliJetUnitArray(nBin,0,eta,phi0,0.,Deta,Dphi,kTpc,kOutJet,kPtSmaller,kPtSmaller,kBad,0.,-1);
                    }
                  else if(nBin>=fNumUnits+nElements+n0+n1+n2+n3 && nBin<fNumUnits+nElements+nGaps)
                    {
-                     Float_t phi = eta = 0.;
-                     fGrid4->GetEtaPhiFromIndex2(nBin+1-(fNumUnits+nElements+n0+n1+n2+n3),phi,eta);
+                     Float_t phi0 = eta = 0.;
+                     fGrid4->GetEtaPhiFromIndex2(nBin+1-(fNumUnits+nElements+n0+n1+n2+n3),phi0,eta);
                      Deta = fGrid4->GetDeta(); 
                      Dphi = fGrid4->GetDphi(); 
-                     new ((*fUnitArray)[nBin]) AliJetUnitArray(nBin,0,eta,phi,0.,Deta,Dphi,kTpc,kOutJet,kPtSmaller,kPtSmaller,kBad,0.,-1);
+                     new ((*fUnitArray)[nBin]) AliJetUnitArray(nBin,0,eta,phi0,0.,Deta,Dphi,kTpc,kOutJet,kPtSmaller,kPtSmaller,kBad,0.,-1);
                    }
                }
              } // end if(fDZ)
index 88dba89..fe613ab 100644 (file)
@@ -322,7 +322,7 @@ void AliJetFillUnitArrayEMCalDigits::Exec(Option_t* /*option*/)
     
     for(Int_t j = beg; j < nclus; j++) { // loop over clusters
       // Retrieve cluster from esd
-      AliESDCaloCluster *fClus = (AliESDCaloCluster *) caloClusters->At(j) ;
+      fClus = (AliESDCaloCluster *) caloClusters->At(j) ;
 
       // Get the cluster info
       Float_t energy       = fClus->E() ;
index 47f9ce6..9e11e17 100644 (file)
@@ -1149,7 +1149,7 @@ void AliUA1JetFinderV2::SubtractBackg(Int_t& nIn, Int_t&nJ, Float_t&etbgTotalN,
   
   //calculate energy inside and outside cones
   AliUA1JetHeaderV1* header = (AliUA1JetHeaderV1*) fHeader;
-  Int_t              fOpt = fReader->GetReaderHeader()->GetDetector();
+  fOpt = fReader->GetReaderHeader()->GetDetector();
   Float_t rc= header->GetRadius();
   Float_t etIn[30];
   Float_t etOut = 0;