X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=RICH%2FAliRICH.cxx;h=ee69b108f811d2ca01cfd8d3c35a99715bba82d6;hb=c90dd3e25ef9bc83db7fb882e07b55b20d8f48cd;hp=fe9a40f40632b4f81f0ee05212db6526e9dc50d7;hpb=efa2a56167e6df453cc775c6c574cfc3a71a4f28;p=u%2Fmrichter%2FAliRoot.git

diff --git a/RICH/AliRICH.cxx b/RICH/AliRICH.cxx
index fe9a40f4063..ee69b108f81 100644
--- a/RICH/AliRICH.cxx
+++ b/RICH/AliRICH.cxx
@@ -452,9 +452,9 @@ void AliRICH::ReconstructClusters()
 //
 // Initialize the necessary correspondance table
 //
-    static const Int_t kMaxNpadx = 600;
-    static const Int_t kMaxNpady = 600;
-    Int_t elem[kMaxNpadx*2][kMaxNpady*2];
+    static const Int_t kMaxNPadx = 600;
+    static const Int_t kMaxNPady = 600;
+    Int_t elem[kMaxNPadx*2][kMaxNPady*2];
 //
 // Loop on chambers and on cathode planes
 //
@@ -490,12 +490,12 @@ void AliRICH::ReconstructClusters()
 	    //
 	    // Build the correspondance table
 	    //
-	    memset(elem,0,sizeof(Int_t)*kMaxNpadx*kMaxNpady*4);
+	    memset(elem,0,sizeof(Int_t)*kMaxNPadx*kMaxNPady*4);
 	    Int_t digit;
 	    for (digit=0; digit<ndigits; digit++) 
 	    {
 		mdig    = (AliRICHdigit*)RICHdigits->UncheckedAt(digit);
-		elem[kMaxNpadx+mdig->fPadX][kMaxNpady+mdig->fPadY] = digit+1;
+		elem[kMaxNPadx+mdig->fPadX][kMaxNPady+mdig->fPadY] = digit+1;
 		// because default is 0
 	    }
 	    //
@@ -513,9 +513,9 @@ void AliRICH::ReconstructClusters()
 		//
 		// if digit still available, start clustering
 		//
-		if (elem[kMaxNpadx+mdig->fPadX][kMaxNpady+mdig->fPadY]) {
+		if (elem[kMaxNPadx+mdig->fPadX][kMaxNPady+mdig->fPadY]) {
 		    Cluster = new AliRICHRecCluster(digit, ich, icat);
-		    elem[kMaxNpadx+mdig->fPadX][kMaxNpady+mdig->fPadY]=0;
+		    elem[kMaxNPadx+mdig->fPadX][kMaxNPady+mdig->fPadY]=0;
 		    //
 		    // loop over the current list of digits 
                     // and look for neighbours
@@ -528,13 +528,13 @@ void AliRICH::ReconstructClusters()
 			segmentation->Neighbours(pDigit->fPadX,pDigit->fPadY, 
 						 &Nlist, Xlist, Ylist);
 			for (Int_t Ilist=0;Ilist<Nlist;Ilist++) {
-			    if (elem[kMaxNpadx+Xlist[Ilist]][kMaxNpady
+			    if (elem[kMaxNPadx+Xlist[Ilist]][kMaxNPady
 							    +Ylist[Ilist]]) {
 				//
 				// Add the digit at the end and reset the table
 				//
-				Cluster->AddDigit(elem[kMaxNpadx+Xlist[Ilist]][kMaxNpady+Ylist[Ilist]]-1);
-				elem[kMaxNpadx+Xlist[Ilist]][kMaxNpady
+				Cluster->AddDigit(elem[kMaxNPadx+Xlist[Ilist]][kMaxNPady+Ylist[Ilist]]-1);
+				elem[kMaxNPadx+Xlist[Ilist]][kMaxNPady
 							    +Ylist[Ilist]] =0;
 			    } // if elem
 			} // for Ilist
@@ -888,7 +888,7 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename)
     //
     AliRICHHitMap* hm;
     
-    for (Int_t icat=0; icat<1; icat++) { 
+    for (int icat=0; icat<1; icat++) { 
 	for (i=0; i<7; i++) {
 	    if (HitMap[i]) {
 		hm=HitMap[i];
@@ -1014,18 +1014,18 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename)
 //
 //   Loop over tracks
 //
-	    for (Int_t track=0; track<ntracks; track++) {
+	    for (Int_t trak=0; trak<ntracks; trak++) {
 
 		if (fHits2)       fHits2->Clear();
 		if (fClusters2)   fClusters2->Clear();
 		
-		TH1->GetEvent(track);
+		TH1->GetEvent(trak);
 //
 //   Loop over hits
 		AliRICHhit* mHit;
-		for(int i=0;i<fHits2->GetEntriesFast();++i) 
+		for(int j=0;j<fHits2->GetEntriesFast();++j) 
 		{
-		    mHit=(AliRICHhit*) (*fHits2)[i];
+		    mHit=(AliRICHhit*) (*fHits2)[j];
 		    Int_t   nch   = mHit->fChamber-1;  // chamber number
 		    if (nch >9) continue;
 		    iChamber = &(RICH->Chamber(nch));
@@ -1042,7 +1042,7 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename)
 			Int_t ipx      = mPad->fPadX;       // pad number on X
 			Int_t ipy      = mPad->fPadY;       // pad number on Y
 			Int_t iqpad    = mPad->fQpad;       // charge per pad
-			if (track==3 && nch==0 && icat==0) printf("bgr - track,iqpad,ipx,ipy %d %d %d %d\n",track,iqpad,ipx,ipy);
+			if (trak==3 && nch==0 && icat==0) printf("bgr - trak,iqpad,ipx,ipy %d %d %d %d\n",trak,iqpad,ipx,ipy);
 //
 //
 			if (cathode != (icat+1)) continue;
@@ -1064,9 +1064,9 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename)
 			digits[2]=iqpad;
 
 			
-			if (track <4 && icat==0 && nch==0)
-			    printf("bgr - HitMap[nch]->TestHit(ipx, ipy),track %d %d\n",
-				   HitMap[nch]->TestHit(ipx, ipy),track);
+			if (trak <4 && icat==0 && nch==0)
+			    printf("bgr - HitMap[nch]->TestHit(ipx, ipy),trak %d %d\n",
+				   HitMap[nch]->TestHit(ipx, ipy),trak);
 			AliRICHlist* pdigit;
 			// build the list of fired pads and update the info
 			if (!HitMap[nch]->TestHit(ipx, ipy)) {
@@ -1159,9 +1159,9 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename)
 		charges[tr]=Int_t(pp(1));
 	    }      //end loop over list of tracks for one pad
 	    if (nptracks < 10 ) {
-		for (Int_t i=nptracks; i<10; i++) {
-		    tracks[i]=0;
-		    charges[i]=0;
+		for (Int_t t=nptracks; t<10; t++) {
+		    tracks[t]=0;
+		    charges[t]=0;
 		}
 	    }
 	    // fill digits
@@ -1175,10 +1175,10 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename)
 	Stat_t ndig=TD->GetEntries();
 	cout<<"number of digits  "<<ndig<<endl;
 	TClonesArray *fDch;
-	for (int i=0;i<7;i++) {
-	    fDch= RICH->DigitsAddress(i);
-	    int ndig=fDch->GetEntriesFast();
-	    printf (" i, ndig %d %d \n",i,ndig);
+	for (int k=0;k<7;k++) {
+	    fDch= RICH->DigitsAddress(k);
+	    int ndigit=fDch->GetEntriesFast();
+	    printf (" k, ndigits %d %d \n",k,ndigit);
 	}
 	RICH->ResetDigits();