]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Shadowed declarations: suppression
authordecaro <decaro@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 May 2008 16:14:13 +0000 (16:14 +0000)
committerdecaro <decaro@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 May 2008 16:14:13 +0000 (16:14 +0000)
TOF/AliTOFAlignment.cxx
TOF/AliTOFDDLRawData.cxx
TOF/AliTOFcalib.cxx
TOF/AliTOFtracker.cxx
TOF/AliTOFtrackerMI.cxx

index a89a6423b5740322ba5a85db8d75197c4c8d6395..b0b519b62b1ba5ad0c4b483e6d493dae5342abad 100644 (file)
@@ -567,30 +567,29 @@ void AliTOFAlignment::MakeDefData(const Int_t nf,TString namefiles[])
   Int_t nsm=0;
   Long64_t totdata[72]={0};
 
-  for (Int_t i=0;i<nf; i++)
+  for (Int_t ii=0;ii<nf; ii++)
     {
       AliSurveyObj *so = new AliSurveyObj();
-      const Char_t *nome=namefiles[i];
+      const Char_t *nome=namefiles[ii];
       so->FillFromLocalFile(nome);
       TObjArray *points = so->GetData();
       Int_t nSurveyPoint=points->GetEntries();
-      for(Int_t i=0;i<nSurveyPoint;i++){
-        const char* pointName= ((AliSurveyPoint *) points->At(i))->GetPointName().Data();
+      for(Int_t jj=0;jj<nSurveyPoint;jj++){
+        const char* pointName= ((AliSurveyPoint *) points->At(jj))->GetPointName().Data();
         nfm=atoi(&pointName[6]);
         nsm=atoi(&pointName[2]);
-        data[nsm*4+nfm][0][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(i))->GetX();
-        data[nsm*4+nfm][2][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(i))->GetY();
-        data[nsm*4+nfm][4][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(i))->GetZ();
-        data[nsm*4+nfm][1][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(i))->GetPrecisionX();
-        data[nsm*4+nfm][3][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(i))->GetPrecisionY();
-        data[nsm*4+nfm][5][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(i))->GetPrecisionZ();
+        data[nsm*4+nfm][0][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(jj))->GetX();
+        data[nsm*4+nfm][2][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(jj))->GetY();
+        data[nsm*4+nfm][4][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(jj))->GetZ();
+        data[nsm*4+nfm][1][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(jj))->GetPrecisionX();
+        data[nsm*4+nfm][3][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(jj))->GetPrecisionY();
+        data[nsm*4+nfm][5][totdata[nsm*4+nfm]]=((AliSurveyPoint *) points->At(jj))->GetPrecisionZ();
         totdata[nsm*4+nfm]=totdata[nsm*4+nfm]+1;
       } 
       delete so;
     }
 
   
-
   for(Int_t i=0; i<72 ;i++){
     Float_t numx=0, numy=0,numz=0, comodox=0, comodoy=0, comodoz=0,denx=0, deny=0, denz=0;
     if(totdata[i]!=0){    
index 40fc4583a164be1c58f4911eb72d5e427d8ce14c..e1d2cf04b4f756316ae0bbce742ddbfa68017ee1 100644 (file)
@@ -1416,7 +1416,7 @@ void AliTOFDDLRawData::MakeTDCdigits(Int_t nDDL, Int_t nTRM, Int_t iChain,
 
     if (fPackedAcquisition) {
 
-      for (Int_t jj=0; jj<=localIndex; jj++) {
+      for (jj=0; jj<=localIndex; jj++) {
        fIndex++;
        buf[fIndex] = localBuffer[jj];
        localBuffer[jj] = 0;
@@ -1451,7 +1451,7 @@ void AliTOFDDLRawData::MakeTDCdigits(Int_t nDDL, Int_t nTRM, Int_t iChain,
        AliInfo(Form(" In the TOF DDL %2i, TRM %2i, TDC %2i, chain %1i, the maximum number of t.o.f. good measurements per channel is %2i",
                     nDDL, nTRM, iChain, nTDC, iCH, maxMeasuresPerChannelInTDC));
       */
-       for (Int_t jj=0; jj<=localIndex; jj++) {
+      for (jj=0; jj<=localIndex; jj++) {
            fIndex++;
            buf[fIndex] = localBuffer[jj];
            localBuffer[jj] = 0;
index b7459ea9209c38bf39818bea26b29755c3573ea9..e8aa6ab9cee58bfb4bdceab7ee23ca14cd24e9eb 100644 (file)
@@ -1115,7 +1115,7 @@ Int_t AliTOFcalib::Calibrate(Int_t nch, Int_t *ch, Option_t *optionSave, Option_
     }
   
     for (Int_t irun=0;irun<fNruns;irun++){
-      Int_t i = ch[ich]+irun*fNChannels;
+      i = ch[ich]+irun*fNChannels;
       //fTree->GetEntry(i);
       fChain->GetEntry(i);
       ntracksRun=nentries/3;
@@ -1138,7 +1138,7 @@ Int_t AliTOFcalib::Calibrate(Int_t nch, Int_t *ch, Option_t *optionSave, Option_
 
     TProfile* hSlewingProf = new TProfile("hSlewingProf", "hSlewingProf",nusefulbins, binsProfile, "G");  // CHECK THE BUILD OPTION, PLEASE!!!!!!
     for (Int_t irun=0;irun<fNruns;irun++){
-      Int_t i = ch[ich]+irun*fNChannels;
+      i = ch[ich]+irun*fNChannels;
       //fTree->GetEntry(i);
       fChain->GetEntry(i);
       ntracksRun=nentries/3;
index ef8b92ee7f142b3c106a24750e0255689d78a5f6..0061255ebb31faa94f81a2ebc1ec1d22af41b489 100644 (file)
@@ -453,8 +453,8 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
       Double_t yc=(c->GetPhi() - trackTOFin->GetAlpha())*c->GetR();
       Double_t p[2]={yc, c->GetZ()};
-      Double_t cov[3]= {dY*dY/12., 0., dZ*dZ/12.};
-      if (trackTOFin->AliExternalTrackParam::GetPredictedChi2(p,cov) > maxChi2)continue;
+      Double_t cov2[3]= {dY*dY/12., 0., dZ*dZ/12.};
+      if (trackTOFin->AliExternalTrackParam::GetPredictedChi2(p,cov2) > maxChi2)continue;
 
       clind[0][nc] = c->GetDetInd(0);
       clind[1][nc] = c->GetDetInd(1);
index f0597f17dcf5eb81788d5cdedfe404084635f6cf..485d7f4e47f4c124655333a573f0d68384b2610b 100644 (file)
@@ -344,13 +344,14 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){
   // Some init 
   
   Int_t         index[1000];
+  Float_t       quality[1000];
   Float_t       dist3D[1000][6];
   Double_t      times[1000][6];
   Float_t       mintimedist[1000];
   Float_t       likelihood[1000];
   Float_t       length[1000];
   AliTOFcluster *clusters[1000];
-  Double_t       tpcpid[5];
+  Double_t      tpcpid[5];
   dist3D[0][0]=1;
   
   for (Int_t i=0; i<fNseedsTOF; i++) {
@@ -433,13 +434,13 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){
       Double_t dph=TMath::Abs(c->GetPhi()-phi);
       if (dph>TMath::Pi()) dph-=2.*TMath::Pi();
       if (TMath::Abs(dph)>dphi) continue;
-    
+
       clind[0][nc] = c->GetDetInd(0);
       clind[1][nc] = c->GetDetInd(1);
       clind[2][nc] = c->GetDetInd(2);
       clind[3][nc] = c->GetDetInd(3);
       clind[4][nc] = c->GetDetInd(4);
-      clind[5][nc] = k;      
+      clind[5][nc] = k;
       nc++;
     }
 
@@ -502,8 +503,9 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){
     //
     //choose the best cluster
     //
-    Float_t quality[1000];
-    Int_t   index[1000];
+    //Float_t quality[1000];
+    //Int_t   index[1000];
+    for (Int_t kk=0; kk<1000; kk++) quality[kk]=0;
     //
     AliTOFcluster * cgold=0;
     Int_t igold =-1;