Warnings removal (Marian)

AliTPCv4.h AliTPCv4.cxx - Eff C++ warning  - virtula function
AliTPCFast.cxx          - Shadowed parameters
AliTPCcalibTracks.cxx   - Shadowed parameters

diff --git a/TPC/AliTPCFast.cxx b/TPC/AliTPCFast.cxx
index c4f3c09db3e4f6597529b1b41bb960f6c41ac4a1..2d5ec7aa0f3f1ded748bd3a4e5968b00f1802564 100644 (file)
--- a/TPC/AliTPCFast.cxx
+++ b/TPC/AliTPCFast.cxx
@@ -453,23 +453,23 @@ void AliTPCFast::Hits2ExactClustersSector(AliRunLoader* runLoader,
          Float_t sumxz=0;
          Float_t sumx2z=0;
          Float_t sumq=0;
-         for (Int_t index=0;index<currentIndex;index++){
-           Float_t x,x2,x3,x4;
-           x=x2=x3=x4=xxx(index*4);
-           x2*=x;
+         for (Int_t cindex=0;cindex<currentIndex;cindex++){
+           Float_t x1,x2,x3,x4;
+           x1=x2=x3=x4=xxx(cindex*4);
+           x2*=x1;
            x3*=x2;
            x4*=x3;
-           sumx+=x;
+           sumx+=x1;
            sumx2+=x2;
            sumx3+=x3;
            sumx4+=x4;
-           sumy+=xxx(index*4+1);
-           sumxy+=xxx(index*4+1)*x;
-           sumx2y+=xxx(index*4+1)*x2;
-           sumz+=xxx(index*4+2);
-           sumxz+=xxx(index*4+2)*x;
-           sumx2z+=xxx(index*4+2)*x2;   
-           sumq+=xxx(index*4+3);
+           sumy+=xxx(cindex*4+1);
+           sumxy+=xxx(cindex*4+1)*x1;
+           sumx2y+=xxx(cindex*4+1)*x2;
+           sumz+=xxx(cindex*4+2);
+           sumxz+=xxx(cindex*4+2)*x1;
+           sumx2z+=xxx(cindex*4+2)*x2;  
+           sumq+=xxx(cindex*4+3);
          }
          Float_t det=currentIndex*(sumx2*sumx4-sumx3*sumx3)-sumx*(sumx*sumx4-sumx2*sumx3)+
            sumx2*(sumx*sumx3-sumx2*sumx2);

diff --git a/TPC/AliTPCcalibTracks.cxx b/TPC/AliTPCcalibTracks.cxx
index 4e4b7769f5d407036f9180a328578325bea7794e..b2a9a47f6b2cfb8ce45247ba2398f7b22ddb5543 100644 (file)
--- a/TPC/AliTPCcalibTracks.cxx
+++ b/TPC/AliTPCcalibTracks.cxx
@@ -421,18 +421,18 @@ AliTPCcalibTracks::AliTPCcalibTracks(const Text_t *name, const Text_t *title, Al
       for (Int_t ipad = 0; ipad < 3; ipad++){
          Int_t   bin   = GetBin(iq, ipad);
          Float_t qmean = GetQ(bin);
-         char name[200];
-         sprintf(name,"ResolY Pad%d Qmiddle%f",ipad, qmean);
-         his3D = new TH3F(name, name, 20,10,250, 20, 0,1.5, 50, -1,1);
+         char hname[200];
+         sprintf(hname,"ResolY Pad%d Qmiddle%f",ipad, qmean);
+         his3D = new TH3F(hname, hname, 20,10,250, 20, 0,1.5, 50, -1,1);
          fArrayQDY->AddAt(his3D, bin);
-         sprintf(name,"ResolZ Pad%d Qmiddle%f",ipad, qmean);
-         his3D = new TH3F(name, name, 20,10,250, 20, 0,1.5, 50, -1,1);
+         sprintf(hname,"ResolZ Pad%d Qmiddle%f",ipad, qmean);
+         his3D = new TH3F(hname, hname, 20,10,250, 20, 0,1.5, 50, -1,1);
          fArrayQDZ->AddAt(his3D, bin);
-         sprintf(name,"RMSY Pad%d Qmiddle%f",ipad, qmean);
-         his3D = new TH3F(name, name, 20,10,250, 20, 0,1.5, 50, 0,1);
+         sprintf(hname,"RMSY Pad%d Qmiddle%f",ipad, qmean);
+         his3D = new TH3F(hname, hname, 20,10,250, 20, 0,1.5, 50, 0,1);
          fArrayQRMSY->AddAt(his3D, bin);
-         sprintf(name,"RMSZ Pad%d Qmiddle%f",ipad, qmean);
-         his3D = new TH3F(name, name, 20,10,250, 20, 0,1.5, 50, 0,1);
+         sprintf(hname,"RMSZ Pad%d Qmiddle%f",ipad, qmean);
+         his3D = new TH3F(hname, hname, 20,10,250, 20, 0,1.5, 50, 0,1);
          fArrayQRMSZ->AddAt(his3D, bin);
       }
    }
@@ -824,21 +824,21 @@ void  AliTPCcalibTracks::FillResolutionHistoLocal(AliTPCseed * track){
          paramZ0 -= paramZ1;
          matrixY0 += matrixY1;
          matrixZ0 += matrixZ1;
-         Double_t chi2 = 0;
+         Double_t cchi2 = 0;
          
          TMatrixD difY(2, 1, paramY0.GetMatrixArray());
          TMatrixD difYT(1, 2, paramY0.GetMatrixArray());
          matrixY0.Invert();
          TMatrixD mulY(matrixY0, TMatrixD::kMult, difY);
          TMatrixD chi2Y(difYT, TMatrixD::kMult, mulY);
-         chi2 += chi2Y(0, 0);
+         cchi2 += chi2Y(0, 0);
          
          TMatrixD difZ(2, 1, paramZ0.GetMatrixArray());
          TMatrixD difZT(1, 2, paramZ0.GetMatrixArray());
          matrixZ0.Invert();
          TMatrixD mulZ(matrixZ0, TMatrixD::kMult, difZ);
          TMatrixD chi2Z(difZT, TMatrixD::kMult, mulZ);
-         chi2 += chi2Z(0, 0);      
+         cchi2 += chi2Z(0, 0);      
          
          // REMOVE KINK - TO be fixed - proper chi2 calculation for curved track to be implemented
          //if (chi2 * 0.25 > kCutChi2) fRejectedTracksHisto->Fill(8);
@@ -853,7 +853,7 @@ void  AliTPCcalibTracks::FillResolutionHistoLocal(AliTPCseed * track){
         TTreeSRedirector *cstream = GetDebugStreamer();
         if (cstream){
           (*cstream)<<"Cut8"<<
-            "chi2="<<chi2<<
+            "chi2="<<cchi2<<
             "\n";
         }       
       }
@@ -2256,9 +2256,9 @@ Long64_t AliTPCcalibTracks::Merge(TCollection *collectionList) {
    if (GetDebugLevel() > 0) cout << "merging fArrayAmps..." << endl;
    // merge fArrayAmps
    for (Int_t i = 0; i < fArrayAmp->GetEntriesFast(); i++ ) {  // loop over data member, i<72
-      TIterator *objListIterator = arrayAmpList->MakeIterator();
+      TIterator *cobjListIterator = arrayAmpList->MakeIterator();
       histList = new TList;
-      while (( objarray =  (TObjArray*)objListIterator->Next() )) { 
+      while (( objarray =  (TObjArray*)cobjListIterator->Next() )) { 
          // loop over arrayAmpList, get TObjArray, get object at position i, cast it into TH1F
          if (!objarray) continue;
          hist = (TH1F*)(objarray->At(i));
@@ -2266,7 +2266,7 @@ Long64_t AliTPCcalibTracks::Merge(TCollection *collectionList) {
       }
       ((TH1F*)(fArrayAmp->At(i)))->Merge(histList);
       delete histList;
-      delete objListIterator;
+      delete cobjListIterator;
    }
    
    if (GetDebugLevel() > 0) cout << "merging fArrayQDY..." << endl;

diff --git a/TPC/AliTPCv4.cxx b/TPC/AliTPCv4.cxx
index 59298b8a8892bdbe80294fe0dd95cf9b43ef0cef..cb1b9b1686e172904e066ca8e2496fb3713f61bc 100644 (file)
--- a/TPC/AliTPCv4.cxx
+++ b/TPC/AliTPCv4.cxx
@@ -1083,7 +1083,7 @@ void AliTPCv4::SetOuterChambersAlignable() const
 }
 
 //_____________________________________________________________________________
-void AliTPCv4::DrawDetector() const
+void AliTPCv4::DrawDetector()
 {
   //
   // Draw a shaded view of the Time Projection Chamber version 1

diff --git a/TPC/AliTPCv4.h b/TPC/AliTPCv4.h
index 74f647a81260b910cd5a2158cdb8979dfeeeffc3..05eb59477f1f932e54025a6fb14b8989ba2ef64c 100644 (file)
--- a/TPC/AliTPCv4.h
+++ b/TPC/AliTPCv4.h
@@ -39,7 +39,7 @@ public:
   virtual void  Init();
   virtual Int_t IsVersion() const {return 4;}
   virtual void  StepManager();
-  virtual void  DrawDetector() const;
+  virtual void  DrawDetector();
 
 protected:
   Int_t fIdSens;    // sensitive strip