From f91473f6f6441139eed7c6cf42a96c563f7b5600 Mon Sep 17 00:00:00 2001 From: fca Date: Wed, 21 Jul 1999 16:22:32 +0000 Subject: [PATCH] Remove warnings on SunOS --- RICH/AliRICH.cxx | 61 +++++++++++++++++++-------------------- RICH/AliRICH.h | 4 +-- RICH/AliRICHHitMap.cxx | 5 +++- RICH/AliRICHHitMap.h | 4 +-- RICH/AliRICHSegResCkv.cxx | 2 +- RICH/AliRICHSegResCkv.h | 2 +- RICH/AliRICHSegResV0.cxx | 2 +- RICH/AliRICHSegResV0.h | 3 +- RICH/AliRICHdisplay.cxx | 6 ++-- RICH/AliRICHpoints.cxx | 4 +-- RICH/AliRICHv0.cxx | 6 +++- 11 files changed, 51 insertions(+), 48 deletions(-) diff --git a/RICH/AliRICH.cxx b/RICH/AliRICH.cxx index fe9a40f4063..7e3071dab8c 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; digitUncheckedAt(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;IlistAddDigit(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 @@ -828,10 +828,9 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename) // keep galice.root for signal and name differently the file for // background when add! otherwise the track info for signal will be lost ! - static Bool_t first=kTRUE; + static Bool_t first=true; static TTree *TH1; static TFile *File; - Int_t i; char *Add = strstr(option,"Add"); AliRICHchamber* iChamber; @@ -845,7 +844,7 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename) AliRICH *RICH = (AliRICH *) gAlice->GetDetector("RICH"); AliRICHHitMap* HitMap[10]; - for (i=0; i<10; i++) {HitMap[i]=0;} + for (Int_t i=0; i<10; i++) {HitMap[i]=0;} if (Add ) { if(first) { fFileName=filename; @@ -854,7 +853,7 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename) cout<<"I have opened "<cd(); File->ls(); @@ -888,8 +887,8 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename) // AliRICHHitMap* hm; - for (Int_t icat=0; icat<1; icat++) { - for (i=0; i<7; i++) { + for (int icat=0; icat<1; icat++) { + for (Int_t i=0; i<7; i++) { if (HitMap[i]) { hm=HitMap[i]; delete hm; @@ -897,7 +896,7 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename) } } Int_t counter=0; - for (i =0; i<7; i++) { + for (Int_t i =0; i<7; i++) { iChamber=(AliRICHchamber*) (*fChambers)[i]; if (iChamber->Nsec()==1 && icat==1) { continue; @@ -1014,18 +1013,18 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename) // // Loop over tracks // - for (Int_t track=0; trackClear(); if (fClusters2) fClusters2->Clear(); - TH1->GetEvent(track); + TH1->GetEvent(trak); // // Loop over hits AliRICHhit* mHit; - for(int i=0;iGetEntriesFast();++i) + for(int j=0;jGetEntriesFast();++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 +1041,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 +1063,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 +1158,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 +1174,10 @@ void AliRICH::Digitise(Int_t nev,Option_t *option,Text_t *filename) Stat_t ndig=TD->GetEntries(); cout<<"number of digits "<DigitsAddress(i); + for (int k=0;k<7;k++) { + fDch= RICH->DigitsAddress(k); int ndig=fDch->GetEntriesFast(); - printf (" i, ndig %d %d \n",i,ndig); + printf (" k, ndigits %d %d \n",k,ndig); } RICH->ResetDigits(); diff --git a/RICH/AliRICH.h b/RICH/AliRICH.h index 6c28e4a1469..97d6039d82b 100644 --- a/RICH/AliRICH.h +++ b/RICH/AliRICH.h @@ -96,8 +96,8 @@ public TObject { // // Chamber response methods // Pulse height from scored quantity (eloss) - virtual Float_t IntPH(Float_t eloss) =0; - virtual Float_t IntPH() =0; + virtual Float_t IntPH(Float_t eloss=0) =0; + // virtual Float_t IntPH() =0; virtual Int_t FeedBackPhotons(Float_t *source, Float_t qtot) =0; // Charge disintegration virtual Float_t IntXY(AliRICHsegmentation *) =0; diff --git a/RICH/AliRICHHitMap.cxx b/RICH/AliRICHHitMap.cxx index 1d2774b1737..861cf47ad93 100644 --- a/RICH/AliRICHHitMap.cxx +++ b/RICH/AliRICHHitMap.cxx @@ -3,6 +3,9 @@ ClassImp(AliRICHHitMap) ClassImp(AliRICHHitMapA1) + //const char* dummy=0; + + AliRICHHitMapA1::AliRICHHitMapA1(AliRICHsegmentation *seg, TObjArray *dig) { fSegmentation = seg; @@ -23,7 +26,7 @@ AliRICHHitMapA1::~AliRICHHitMapA1() if (fHitMap) delete[] fHitMap; } -void AliRICHHitMapA1::Clear() +void AliRICHHitMapA1::Clear(Option_t *) { memset(fHitMap,0,sizeof(int)*fMaxIndex); } diff --git a/RICH/AliRICHHitMap.h b/RICH/AliRICHHitMap.h index 903efad1e74..6bf3caa0bc8 100644 --- a/RICH/AliRICHHitMap.h +++ b/RICH/AliRICHHitMap.h @@ -10,7 +10,7 @@ class AliRICHHitMap : public TObject { public: virtual void FillHits() =0; - virtual void Clear() =0; + virtual void Clear(Option_t* =0) =0; virtual void SetHit(Int_t ix, Int_t iy, Int_t idigit) =0; virtual void DeleteHit(Int_t ix, Int_t iy) =0; virtual Int_t GetHitIndex(Int_t ix, Int_t iy) =0; @@ -37,7 +37,7 @@ public AliRICHHitMap AliRICHHitMapA1(AliRICHsegmentation *seg, TObjArray *dig); virtual ~AliRICHHitMapA1(); virtual void FillHits(); - virtual void Clear(); + virtual void Clear(Option_t* =0); virtual void SetHit(Int_t ix, Int_t iy, Int_t idigit); virtual void DeleteHit(Int_t ix, Int_t iy); virtual Int_t GetHitIndex(Int_t ix, Int_t iy); diff --git a/RICH/AliRICHSegResCkv.cxx b/RICH/AliRICHSegResCkv.cxx index 539e7467729..aff6e326ee8 100644 --- a/RICH/AliRICHSegResCkv.cxx +++ b/RICH/AliRICHSegResCkv.cxx @@ -6,7 +6,7 @@ //___________________________________________ ClassImp(AliRICHresponseCkv) //___________________________________________ -Float_t AliRICHresponseCkv::IntPH() +Float_t AliRICHresponseCkv::IntPH(Float_t) { Float_t charge = -fChslope*TMath::Log(gRandom->Rndm()); diff --git a/RICH/AliRICHSegResCkv.h b/RICH/AliRICHSegResCkv.h index bf61d6714f9..88dbdb293b0 100644 --- a/RICH/AliRICHSegResCkv.h +++ b/RICH/AliRICHSegResCkv.h @@ -9,7 +9,7 @@ class AliRICHresponseCkv : public AliRICHresponseV0 { AliRICHresponseCkv(){} virtual ~AliRICHresponseCkv(){} - virtual Float_t IntPH(); + virtual Float_t IntPH(Float_t =0); ClassDef(AliRICHresponseCkv,1) diff --git a/RICH/AliRICHSegResV0.cxx b/RICH/AliRICHSegResV0.cxx index aeba88b0643..52ac66a77c3 100644 --- a/RICH/AliRICHSegResV0.cxx +++ b/RICH/AliRICHSegResV0.cxx @@ -317,5 +317,5 @@ Int_t AliRICHresponseV0::FeedBackPhotons(Float_t source[3], Float_t qtot) mom,source,pol,position[3], "Cherenkov", nt, weight); } - return(nfp); + return(sNfeed); } diff --git a/RICH/AliRICHSegResV0.h b/RICH/AliRICHSegResV0.h index 8efae70f9f6..d9c0a4ca371 100644 --- a/RICH/AliRICHSegResV0.h +++ b/RICH/AliRICHSegResV0.h @@ -124,8 +124,7 @@ public AliRICHresponse { // // Chamber response methods // Pulse height from scored quantity (eloss) - virtual Float_t IntPH(Float_t eloss); - virtual Float_t IntPH(){return 0;} + virtual Float_t IntPH(Float_t eloss=0); virtual Int_t FeedBackPhotons(Float_t *source, Float_t qtot); // Charge disintegration diff --git a/RICH/AliRICHdisplay.cxx b/RICH/AliRICHdisplay.cxx index a28f478d9e5..4364c8a5a04 100644 --- a/RICH/AliRICHdisplay.cxx +++ b/RICH/AliRICHdisplay.cxx @@ -617,8 +617,6 @@ void AliRICHdisplay::LoadDigits() // Read digits info and store x,y,z info in arrays fPoints // Loop on all detectors - Int_t ich; - printf("Entering Load-digits"); @@ -628,7 +626,7 @@ void AliRICHdisplay::LoadDigits() AliRICHsegmentation* segmentation; Int_t NallDigits=0; - for (ich=0; ich<7; ich++) { + for (Int_t ich=0; ich<7; ich++) { TClonesArray *RICHdigits = RICH->DigitsAddress(ich); if (RICHdigits == 0) continue; gAlice->ResetDigits(); @@ -639,7 +637,7 @@ void AliRICHdisplay::LoadDigits() } if (fPoints == 0) fPoints = new TObjArray(NallDigits); Int_t counter=0; - for (ich=0; ich<7; ich++) { + for (Int_t ich=0; ich<7; ich++) { TClonesArray *RICHdigits = RICH->DigitsAddress(ich); if (RICHdigits == 0) continue; gAlice->ResetDigits(); diff --git a/RICH/AliRICHpoints.cxx b/RICH/AliRICHpoints.cxx index 06a0bb96f1a..61c28d149f6 100644 --- a/RICH/AliRICHpoints.cxx +++ b/RICH/AliRICHpoints.cxx @@ -208,7 +208,7 @@ void AliRICHpoints::GetCenterOfGravity() // simple RICH cluster finder from digits -- finds neighbours and // calculates center of gravity for the cluster // - const Int_t MAX_Nipx=400, MAX_Nipy=800; + const Int_t MAX_nipx=400, MAX_nipy=800; printf("\n Hallo world"); AliRICHdisplay *display=(AliRICHdisplay*)gAlice->Display(); Int_t chamber=display->GetChamber(); @@ -232,7 +232,7 @@ void AliRICHpoints::GetCenterOfGravity() dig=(AliRICHdigit*)RICHdigits->UncheckedAt(fDigitIndex); Int_t ipx=dig->fPadX; Int_t ipy=dig->fPadY; - Bin bins[MAX_Nipx][MAX_Nipy]; + Bin bins[MAX_nipx][MAX_nipy]; bins[ipx+npx][ipy+npy].dig=dig; int ndig; diff --git a/RICH/AliRICHv0.cxx b/RICH/AliRICHv0.cxx index df89ff41f33..c2650f8e072 100644 --- a/RICH/AliRICHv0.cxx +++ b/RICH/AliRICHv0.cxx @@ -30,7 +30,7 @@ AliRICHv0::AliRICHv0(const char *name, const char *title) fChambers = new TObjArray(7); for (Int_t i=0; i<7; i++) { - (*fChambers)[i] = new AliRICHchamber(); + (*fChambers)[i] = new AliRICHchamber(); } } @@ -744,6 +744,8 @@ void AliRICHchamber::DisIntegration(Float_t eloss, Float_t xhit, Float_t yhit, Float_t local[3]; Float_t source[3]; Int_t Nfp=0; + // Float_t dummy=0; + // // Width of the integration area @@ -763,12 +765,14 @@ void AliRICHchamber::DisIntegration(Float_t eloss, Float_t xhit, Float_t yhit, local[2]=yhit; //Generate feedback photons Nfp = ((AliRICHresponse*) (*fResponse)[0])->FeedBackPhotons(source,qtot); + //printf("\nFeedbacks (Mip) :%d",Nfp); } else if (res==cerenkov) { qtot = ((AliRICHresponse*) (*fResponse)[1])->IntPH(); local[0]=xhit; local[1]=6.026; local[2]=yhit; Nfp = ((AliRICHresponse*) (*fResponse)[1])->FeedBackPhotons(source,qtot); + //printf("\nFeedbacks (Cerenkov):%d",Nfp); } // -- 2.43.0