From ae97a0b9a8d06d68d1e99b76d139afdc4b1b1f23 Mon Sep 17 00:00:00 2001 From: vestbo Date: Mon, 30 Jul 2001 14:36:28 +0000 Subject: [PATCH] several bugfixes --- HLT/src/AliL3ClustFinder.cxx | 8 +++++--- HLT/src/AliL3ConfMapper.cxx | 4 ++-- HLT/src/AliL3Defs.h | 2 +- HLT/src/AliL3Display.cxx | 14 +++++++------- HLT/src/AliL3Evaluate.cxx | 14 +++++++------- HLT/src/AliL3Evaluate.h | 2 +- HLT/src/AliL3MemHandler.cxx | 2 +- HLT/src/AliL3MemHandler.h | 4 ++-- HLT/src/AliL3Merger.cxx | 6 +++--- HLT/src/AliL3Track.cxx | 2 +- HLT/src/AliL3Track.h | 2 +- HLT/src/AliL3VertexFinder.cxx | 2 +- 12 files changed, 32 insertions(+), 30 deletions(-) diff --git a/HLT/src/AliL3ClustFinder.cxx b/HLT/src/AliL3ClustFinder.cxx index 30fdda18478..b93cf132e07 100644 --- a/HLT/src/AliL3ClustFinder.cxx +++ b/HLT/src/AliL3ClustFinder.cxx @@ -454,8 +454,9 @@ void AliL3ClustFinder::WriteClusters(Int_t ncl,resx *r) Float_t fpad=(Float_t)r[j].pad/(Float_t)r[j].charge; Float_t ftime=(Float_t)r[j].t/(Float_t)r[j].charge; - if(fCurrentRow > 54) {thisrow = fCurrentRow-55; thissector = fCurrentSlice+36;} - else {thisrow = fCurrentRow; thissector = fCurrentSlice;} + fTransform->Slice2Sector(fCurrentSlice,fCurrentRow,thissector,thisrow); + //if(fCurrentRow > 54) {thisrow = fCurrentRow-55; thissector = fCurrentSlice+36;} + //else {thisrow = fCurrentRow; thissector = fCurrentSlice;} fTransform->Raw2Local(xyz,thissector,thisrow,fpad,ftime); if(xyz[0]==0) LOG(AliL3Log::kError,"AliL3ClustFinder","Cluster Finder") < 170) + printf("padrow %d X %f Y %f Z %f\n",fCurrentRow,xyz[0],xyz[1],xyz[2]); fNClusters++; counter++; diff --git a/HLT/src/AliL3ConfMapper.cxx b/HLT/src/AliL3ConfMapper.cxx index 80813fafa3d..736f8834e6f 100644 --- a/HLT/src/AliL3ConfMapper.cxx +++ b/HLT/src/AliL3ConfMapper.cxx @@ -86,7 +86,7 @@ void AliL3ConfMapper::InitSector(Int_t sector,Int_t *rowrange,Float_t *etarange) else //complete sector { fRowMin = 0; - fRowMax = 173; + fRowMax = 175; } if(etarange) { @@ -138,7 +138,7 @@ void AliL3ConfMapper::SetPointers() { //Data organization. //Allocate volumes, set conformal coordinates and pointers. - fNumRowSegmentPlusOne = 174;//fNumRowSegment+1; + fNumRowSegmentPlusOne = 176;//fNumRowSegment+1; fNumPhiSegmentPlusOne = fNumPhiSegment+1; fNumEtaSegmentPlusOne = fNumEtaSegment+1; fNumPhiEtaSegmentPlusOne = fNumPhiSegmentPlusOne*fNumEtaSegmentPlusOne; diff --git a/HLT/src/AliL3Defs.h b/HLT/src/AliL3Defs.h index 129d8df68b5..e34faeb2b71 100644 --- a/HLT/src/AliL3Defs.h +++ b/HLT/src/AliL3Defs.h @@ -3,7 +3,7 @@ #include "AliL3RootTypes.h" -const Int_t NRows[5][2] = {{ 0, 45},{46,77},{78,109},{110,141},{142,173}}; +const Int_t NRows[5][2] = {{ 0, 45},{46,77},{78,109},{110,141},{142,175}}; const Double_t Pi = 3.14159265358979323846; const Double_t ToRad = Pi/180.; diff --git a/HLT/src/AliL3Display.cxx b/HLT/src/AliL3Display.cxx index dac4111a71f..a115c57f6d4 100644 --- a/HLT/src/AliL3Display.cxx +++ b/HLT/src/AliL3Display.cxx @@ -39,7 +39,7 @@ AliL3Display::AliL3Display(Int_t *slice) { //Ctor. Specify which slices you want to look at. - TFile *file = new TFile("/nfs/david/subatom/alice/data/GEO/alice.geom"); + TFile *file = new TFile("alice.geom"); if(!file) printf("NO FILE\n"); if(file->IsOpen()) LOG(AliL3Log::kError,"AliL3Display::AliL3Display","File Open") @@ -121,9 +121,9 @@ void AliL3Display::DisplayTracks(Int_t min_hits) Int_t ntracks = fTracks->GetNTracks(); TPolyLine3D *line = new TPolyLine3D[ntracks]; - Float_t xcl[174]; - Float_t ycl[174]; - Float_t zcl[174]; + Float_t xcl[176]; + Float_t ycl[176]; + Float_t zcl[176]; for(Int_t j=0; jGetNTracks(); TPolyLine3D *line = new TPolyLine3D[ntracks]; - Float_t xcl[174]; - Float_t ycl[174]; - Float_t zcl[174]; + Float_t xcl[176]; + Float_t ycl[176]; + Float_t zcl[176]; for(Int_t j=0; jGetEntriesFast()]; TObjArray *good_particles = DefineGoodTracks(slice,row[patch],good_number,particle_id); SetMinPoints(min_points); @@ -369,7 +369,7 @@ void AliL3Evaluate::EvaluateSlice(Int_t slice,Int_t min_points,Int_t good_number //min_points = minimum points on track to be considered for evaluation //good_number = minimum hits (padrows) produced by simulated track for consideration. - Int_t row[2] = {0,173}; + Int_t row[2] = {0,175}; Int_t *particle_id = new Int_t[fParticles->GetEntriesFast()]; TObjArray *good_particles = DefineGoodTracks(slice,row,good_number,particle_id); @@ -387,7 +387,7 @@ void AliL3Evaluate::EvaluateGlobal(Int_t min_points,Int_t good_number) { //Make efficiency plots for tracking on several slices. - Int_t row[2] = {0,173}; + Int_t row[2] = {0,175}; Int_t *particle_id = new Int_t[fParticles->GetEntriesFast()]; SetMinPoints(min_points); AssignIDs(); @@ -811,8 +811,8 @@ TNtuple *AliL3Evaluate::EvaluatePoints() TNtuple *ntuppel = new TNtuple("ntuppel","residuals","resy:ptgen:padrow:zHit:slice"); - Int_t good_number=173; - Int_t row[2] = {0,173}; + Int_t good_number=175; + Int_t row[2] = {0,175}; UInt_t id; //Float_t yres_local; for(Int_t slice=fMinSlice; slice<=fMaxSlice; slice++) @@ -909,8 +909,8 @@ TNtuple *AliL3Evaluate::EvaluateGEANT() { TNtuple *ntuppel = new TNtuple("ntuppel","residuals","resy:ptgen:padrow:zHit:slice"); - Int_t good_number=173; - Int_t row[2] = {0,173}; + Int_t good_number=175; + Int_t row[2] = {0,175}; Float_t xyz_cross[3]; Float_t xyz_cl[3]; diff --git a/HLT/src/AliL3Evaluate.h b/HLT/src/AliL3Evaluate.h index 07d6b92097b..0d1438c261b 100644 --- a/HLT/src/AliL3Evaluate.h +++ b/HLT/src/AliL3Evaluate.h @@ -36,7 +36,7 @@ class AliL3Evaluate : public TObject { Int_t fMinSlice; Int_t fMaxSlice; UInt_t fNcl[36][5]; - Int_t fRowid[36][174]; + Int_t fRowid[36][176]; Int_t fMinPointsOnTrack; //Minimum points on track to be considered. Bool_t fIsSlow; Bool_t fNoOverlap; diff --git a/HLT/src/AliL3MemHandler.cxx b/HLT/src/AliL3MemHandler.cxx index fd274a350c3..eb0dbc122b8 100644 --- a/HLT/src/AliL3MemHandler.cxx +++ b/HLT/src/AliL3MemHandler.cxx @@ -37,7 +37,7 @@ AliL3MemHandler::AliL3MemHandler(){ fNUsed = 0; fNDigits = 0; - Int_t row[2] = {0,173}; + Int_t row[2] = {0,175}; Init(0,0,row); ResetROI(); } diff --git a/HLT/src/AliL3MemHandler.h b/HLT/src/AliL3MemHandler.h index e7ca8804224..4e21b78c66c 100644 --- a/HLT/src/AliL3MemHandler.h +++ b/HLT/src/AliL3MemHandler.h @@ -50,8 +50,8 @@ class AliL3MemHandler{ Int_t fSlice; Int_t fPatch; - Int_t fEtaMinTimeBin[174]; - Int_t fEtaMaxTimeBin[174]; + Int_t fEtaMinTimeBin[176]; + Int_t fEtaMaxTimeBin[176]; public: diff --git a/HLT/src/AliL3Merger.cxx b/HLT/src/AliL3Merger.cxx index 12fbe2a84f4..9365588f810 100644 --- a/HLT/src/AliL3Merger.cxx +++ b/HLT/src/AliL3Merger.cxx @@ -154,7 +154,7 @@ AliL3Track * AliL3Merger::MultiMerge(AliL3TrackArray *mergedtracks,AliL3Track ** for(Int_t i=0;iGetNHits(); } - if(nps>174){ + if(nps>176){ LOG(AliL3Log::kWarning,"AliL3Merger::MultiMerge","Adding Points") <NextTrack(); //copy points - UInt_t nn[174]; + UInt_t nn[176]; nps = 0; // for(Int_t i=0;iGetCharge()!=outertrack->GetCharge()) return kFALSE; if( (!innertrack->IsPoint()) || (!outertrack->IsPoint()) ) return kFALSE; - if(innertrack->GetNHits()+outertrack->GetNHits()>174) return kFALSE; + if(innertrack->GetNHits()+outertrack->GetNHits()>176) return kFALSE; if(fabs(innertrack->GetPointY()-outertrack->GetPointY()) >fMaxY) return kFALSE; if(fabs(innertrack->GetPointZ()-outertrack->GetPointZ()) >fMaxZ) return kFALSE; diff --git a/HLT/src/AliL3Track.cxx b/HLT/src/AliL3Track.cxx index c9dd0e9e7ba..6b05205eca2 100644 --- a/HLT/src/AliL3Track.cxx +++ b/HLT/src/AliL3Track.cxx @@ -51,7 +51,7 @@ AliL3Track::AliL3Track() fIsLocal=true; fRowRange[0]=0; fRowRange[1]=0; - memset(fHitNumbers,0,174*sizeof(UInt_t)); + memset(fHitNumbers,0,176*sizeof(UInt_t)); } void AliL3Track::Set(AliL3Track *tpt){ diff --git a/HLT/src/AliL3Track.h b/HLT/src/AliL3Track.h index 478c0d89fe8..4f87e97e9f5 100644 --- a/HLT/src/AliL3Track.h +++ b/HLT/src/AliL3Track.h @@ -47,7 +47,7 @@ class AliL3Track { Bool_t fIsLocal; //Track given in local coordinates. - UInt_t fHitNumbers[174]; //Array of hit numbers for this track + UInt_t fHitNumbers[176]; //Array of hit numbers for this track protected: diff --git a/HLT/src/AliL3VertexFinder.cxx b/HLT/src/AliL3VertexFinder.cxx index 33d5d82dd22..20a132a675a 100644 --- a/HLT/src/AliL3VertexFinder.cxx +++ b/HLT/src/AliL3VertexFinder.cxx @@ -60,7 +60,7 @@ void AliL3VertexFinder::Read(Int_t ncluster, AliL3SpacePointData* hits ){ // analyze sector // - const Int_t seedRow = 173; + const Int_t seedRow = 175; const Int_t firstRow = seedRow-32; for(Int_t n=0;n