From d5cdf5cf4a92c14f6b175ca5007da6f7e021bdf9 Mon Sep 17 00:00:00 2001 From: loizides Date: Tue, 15 Jun 2004 17:11:34 +0000 Subject: [PATCH] Coding conventions. --- HLT/src/AliL3ConfMapper.cxx | 192 ++++++++++++++++++------------------ HLT/src/AliL3ConfMapper.h | 60 ++++++----- HLT/src/AliL3MemHandler.cxx | 144 +++++++++++++-------------- 3 files changed, 197 insertions(+), 199 deletions(-) diff --git a/HLT/src/AliL3ConfMapper.cxx b/HLT/src/AliL3ConfMapper.cxx index fd1d4181301..e9f167e1b8e 100644 --- a/HLT/src/AliL3ConfMapper.cxx +++ b/HLT/src/AliL3ConfMapper.cxx @@ -56,7 +56,6 @@ AliL3ConfMapper::~AliL3ConfMapper() if(fTrack) { delete fTrack; } - } void AliL3ConfMapper::InitVolumes() @@ -87,16 +86,16 @@ void AliL3ConfMapper::InitVolumes() memset(fVolume,0,fBounds*sizeof(AliL3ConfMapContainer)); memset(fRow,0,fNumRowSegmentPlusOne*sizeof(AliL3ConfMapContainer)); - Int_t max_num_of_tracks = 2000; - Int_t max_num_of_hits = 120000; + Int_t maxnumoftracks = 2000; + Int_t maxnumofhits = 120000; if(fHit) delete [] fHit; if(fTrack) delete fTrack; - fHit = new AliL3ConfMapPoint[max_num_of_hits]; - fTrack = new AliL3TrackArray("AliL3ConfMapTrack",max_num_of_tracks); + fHit = new AliL3ConfMapPoint[maxnumofhits]; + fTrack = new AliL3TrackArray("AliL3ConfMapTrack",maxnumoftracks); } void AliL3ConfMapper::InitSector(Int_t sector,Int_t *rowrange,Float_t *etarange) @@ -134,7 +133,7 @@ void AliL3ConfMapper::InitSector(Int_t sector,Int_t *rowrange,Float_t *etarange) fPhiMin = -10*AliL3Transform::ToRad();//fParam->GetAngle(sector) - 10/todeg; fPhiMax = 10*AliL3Transform::ToRad();//fParam->GetAngle(sector) + 10/todeg; - nTracks=0; + fNTracks=0; fMainVertexTracks = 0; fClustersUnused = 0; fEtaHitsOutOfRange=0; @@ -179,7 +178,7 @@ void AliL3ConfMapper::SetPointers() Float_t etaSlice = (fEtaMax-fEtaMin)/fNumEtaSegment; Int_t volumeIndex; - Int_t local_counter=0; + Int_t localcounter=0; for(Int_t j=0; jAt(j); @@ -209,7 +208,7 @@ void AliL3ConfMapper::SetPointers() fEtaHitsOutOfRange++; continue; } - local_counter++; + localcounter++; volumeIndex = (localrow-fRowMin)*fNumPhiEtaSegmentPlusOne+thisHit->phiIndex*fNumEtaSegmentPlusOne+thisHit->etaIndex; @@ -228,7 +227,7 @@ void AliL3ConfMapper::SetPointers() fRow[(localrow-fRowMin)].last = (void *)thisHit; } - if(fClustersUnused>0 && local_counter==0) + if(fClustersUnused>0 && localcounter==0) LOG(AliL3Log::kError,"AliL3ConfMapper::SetPointers","Parameters") < 2) fGoodDist=goodDist; - SetMaxAngleTracklet(maxangle, vertex_constraint); + SetMaxAngleTracklet(maxangle, vc); } void AliL3ConfMapper::ClusterLoop() @@ -393,18 +392,18 @@ void AliL3ConfMapper::ClusterLoop() if(fClustersUnused < fMinPoints[fVertexConstraint]) return; - Int_t row_segm,lastrow = fRowMin + fMinPoints[fVertexConstraint]; + Int_t rowsegm,lastrow = fRowMin + fMinPoints[fVertexConstraint]; AliL3ConfMapPoint *hit; //Loop over rows, and try to create tracks from the hits. //Starts at the outermost row, and loops as long as a track can be build, due to length. - for(row_segm = fRowMax; row_segm >= lastrow; row_segm--) + for(rowsegm = fRowMax; rowsegm >= lastrow; rowsegm--) { - if(fRow[(row_segm-fRowMin)].first && ((AliL3ConfMapPoint*)fRow[(row_segm-fRowMin)].first)->GetPadRow() < fRowMin + 1) + if(fRow[(rowsegm-fRowMin)].first && ((AliL3ConfMapPoint*)fRow[(rowsegm-fRowMin)].first)->GetPadRow() < fRowMin + 1) break; - for(hit = (AliL3ConfMapPoint*)fRow[(row_segm-fRowMin)].first; hit!=0; hit=hit->nextRowHit) + for(hit = (AliL3ConfMapPoint*)fRow[(rowsegm-fRowMin)].first; hit!=0; hit=hit->nextRowHit) { if(hit->GetUsage() == true) continue; @@ -421,12 +420,12 @@ void AliL3ConfMapper::CreateTrack(AliL3ConfMapPoint *hit) { //Tries to create a track from the initial hit given by ClusterLoop() - AliL3ConfMapPoint *closest_hit = NULL; + AliL3ConfMapPoint *closesthit = NULL; AliL3ConfMapTrack *track = NULL; Int_t point; - Int_t tracks = nTracks; - nTracks++; + Int_t tracks = fNTracks; + fNTracks++; track = (AliL3ConfMapTrack*)fTrack->NextTrack(); @@ -450,31 +449,31 @@ void AliL3ConfMapper::CreateTrack(AliL3ConfMapPoint *hit) for(point=1; pointGetX() - ((AliL3ConfMapPoint*)hit)->GetX(); - dy = ((AliL3ConfMapPoint*)closest_hit)->GetY() - ((AliL3ConfMapPoint*)hit)->GetY(); + dx = ((AliL3ConfMapPoint*)closesthit)->GetX() - ((AliL3ConfMapPoint*)hit)->GetX(); + dy = ((AliL3ConfMapPoint*)closesthit)->GetY() - ((AliL3ConfMapPoint*)hit)->GetY(); //track->fLength += (Double_t)sqrt ( dx * dx + dy * dy ) ; Double_t length = track->GetLength()+(Double_t)sqrt ( dx * dx + dy * dy ); track->SetLength(length); - //closest_hit->SetS(track->fLength); - closest_hit->SetS(track->GetLength()); + //closesthit->SetS(track->fLength); + closesthit->SetS(track->GetLength()); //update fit parameters - track->UpdateParam(closest_hit); - trackhitnumber[track->GetNumberOfPoints()-1] = closest_hit->GetHitNumber(); + track->UpdateParam(closesthit); + trackhitnumber[track->GetNumberOfPoints()-1] = closesthit->GetHitNumber(); - hit = closest_hit; + hit = closesthit; } else { //closest hit does not exist: track->DeleteCandidate(); fTrack->RemoveLast(); - nTracks--; + fNTracks--; point = fTrackletLength[fVertexConstraint]; } } @@ -490,7 +489,7 @@ void AliL3ConfMapper::CreateTrack(AliL3ConfMapPoint *hit) track->SetProperties(false); track->DeleteCandidate(); fTrack->RemoveLast(); - nTracks--; + fNTracks--; } else//good tracklet ->proceed, follow the trackfit @@ -504,29 +503,29 @@ void AliL3ConfMapper::CreateTrack(AliL3ConfMapPoint *hit) for(point = fTrackletLength[fVertexConstraint]; point <= fNumRowSegment; point++) { track->SetChiSq1(fHitChi2Cut[fVertexConstraint]); - closest_hit = GetNextNeighbor((AliL3ConfMapPoint*)track->GetLastHit(),track); + closesthit = GetNextNeighbor((AliL3ConfMapPoint*)track->GetLastHit(),track); - if(closest_hit) + if(closesthit) { //keep total chi: Double_t lxyChi2 = track->GetChiSq1()-track->GetChiSq2(); xyChi2 += lxyChi2; - closest_hit->xyChi2 = lxyChi2; + closesthit->xyChi2 = lxyChi2; //update track length: - //track->fLength = closest_hit->GetS(); - track->SetLength(closest_hit->GetS()); + //track->fLength = closesthit->GetS(); + track->SetLength(closesthit->GetS()); szChi2 += track->GetChiSq2(); - closest_hit->szChi2 = track->GetChiSq2(); + closesthit->szChi2 = track->GetChiSq2(); - track->UpdateParam(closest_hit); - trackhitnumber[track->GetNumberOfPoints()-1] = closest_hit->GetHitNumber(); + track->UpdateParam(closesthit); + trackhitnumber[track->GetNumberOfPoints()-1] = closesthit->GetHitNumber(); //add closest hit to track - closest_hit->SetUsage(true); - closest_hit->SetTrackNumber(tracks-1); + closesthit->SetUsage(true); + closesthit->SetTrackNumber(tracks-1); - }//closest_hit + }//closesthit else { @@ -539,13 +538,13 @@ void AliL3ConfMapper::CreateTrack(AliL3ConfMapPoint *hit) //store track chi2: track->SetChiSq1(xyChi2); track->SetChiSq2(szChi2); - Double_t normalized_chi2 = (track->GetChiSq1()+track->GetChiSq2())/track->GetNumberOfPoints(); + Double_t normalizedchi2 = (track->GetChiSq1()+track->GetChiSq2())/track->GetNumberOfPoints(); //remove tracks with not enough points already now - if(track->GetNumberOfPoints() < fMinPoints[fVertexConstraint] || normalized_chi2 > fTrackChi2Cut[fVertexConstraint]) + if(track->GetNumberOfPoints() < fMinPoints[fVertexConstraint] || normalizedchi2 > fTrackChi2Cut[fVertexConstraint]) { track->SetProperties(false); - nTracks--; + fNTracks--; track->DeleteCandidate(); fTrack->RemoveLast(); tracks--; @@ -570,73 +569,73 @@ void AliL3ConfMapper::CreateTrack(AliL3ConfMapPoint *hit) return; } -AliL3ConfMapPoint *AliL3ConfMapper::GetNextNeighbor(AliL3ConfMapPoint *start_hit, +AliL3ConfMapPoint *AliL3ConfMapper::GetNextNeighbor(AliL3ConfMapPoint *starthit, AliL3ConfMapTrack *track) { //When forming segments: Finds closest hit to input hit //When forming tracks: Find closest hit to track fit. - Double_t dist,closest_dist = fMaxDist[fVertexConstraint]; + Double_t dist,closestdist = fMaxDist[fVertexConstraint]; AliL3ConfMapPoint *hit = NULL; - AliL3ConfMapPoint *closest_hit = NULL; + AliL3ConfMapPoint *closesthit = NULL; - Int_t sub_row_segm; - Int_t sub_phi_segm; - Int_t sub_eta_segm; + Int_t subrowsegm; + Int_t subphisegm; + Int_t subetasegm; Int_t volumeIndex; - Int_t test_hit; + Int_t testhit; - Int_t max_row = start_hit->GetPadRow()-1; - Int_t min_row; + Int_t maxrow = starthit->GetPadRow()-1; + Int_t minrow; if(track) //finding hit close to trackfit { - min_row = start_hit->GetPadRow()-fRowScopeTrack[fVertexConstraint]; + minrow = starthit->GetPadRow()-fRowScopeTrack[fVertexConstraint]; } else { - min_row = start_hit->GetPadRow()-fRowScopeTracklet[fVertexConstraint]; + minrow = starthit->GetPadRow()-fRowScopeTracklet[fVertexConstraint]; } //make a smart loop - Int_t loop_eta[25] = {0,0,0,-1,-1,-1,1,1,1, 0,0,-1,-1,1,1,-2,-2,-2,-2,-2,2,2,2,2,2}; - Int_t loop_phi[25] = {0,-1,1,0,-1,1,0,-1,1, -2,2,-2,2,-2,2,-2,-1,0,1,2,-2,-1,0,1,2}; + Int_t loopeta[25] = {0,0,0,-1,-1,-1,1,1,1, 0,0,-1,-1,1,1,-2,-2,-2,-2,-2,2,2,2,2,2}; + Int_t loopphi[25] = {0,-1,1,0,-1,1,0,-1,1, -2,2,-2,2,-2,2,-2,-1,0,1,2,-2,-1,0,1,2}; - if(min_row < fRowMin) - min_row = fRowMin; - if(max_row < fRowMin) + if(minrow < fRowMin) + minrow = fRowMin; + if(maxrow < fRowMin) return 0; //reached the last padrow under consideration else { //loop over sub rows - for(sub_row_segm=max_row; sub_row_segm>=min_row; sub_row_segm--) + for(subrowsegm=maxrow; subrowsegm>=minrow; subrowsegm--) { //loop over subsegments, in the order defined above. for(Int_t i=0; i<9; i++) { - sub_phi_segm = start_hit->phiIndex + loop_phi[i]; + subphisegm = starthit->phiIndex + loopphi[i]; - if(sub_phi_segm < 0 || sub_phi_segm >= fNumPhiSegment) + if(subphisegm < 0 || subphisegm >= fNumPhiSegment) continue; /* - if(sub_phi_segm<0) - sub_phi_segm += fNumPhiSegment; + if(subphisegm<0) + subphisegm += fNumPhiSegment; - else if(sub_phi_segm >=fNumPhiSegment) - sub_phi_segm -= fNumPhiSegment; + else if(subphisegm >=fNumPhiSegment) + subphisegm -= fNumPhiSegment; */ //loop over sub eta segments - sub_eta_segm = start_hit->etaIndex + loop_eta[i]; + subetasegm = starthit->etaIndex + loopeta[i]; - if(sub_eta_segm < 0 || sub_eta_segm >=fNumEtaSegment) + if(subetasegm < 0 || subetasegm >=fNumEtaSegment) continue;//segment exceeds bounds->skip it //loop over hits in this sub segment: - volumeIndex= (sub_row_segm-fRowMin)*fNumPhiEtaSegmentPlusOne + - sub_phi_segm*fNumEtaSegmentPlusOne + sub_eta_segm; + volumeIndex=(subrowsegm-fRowMin)*fNumPhiEtaSegmentPlusOne + + subphisegm*fNumEtaSegmentPlusOne + subetasegm; if(volumeIndex<0) {//debugging @@ -654,38 +653,38 @@ AliL3ConfMapPoint *AliL3ConfMapper::GetNextNeighbor(AliL3ConfMapPoint *start_hit //set conformal mapping if looking for nonvertex tracks: if(!fVertexConstraint) { - hit->SetAllCoord(start_hit); + hit->SetAllCoord(starthit); } if(track)//track search - look for nearest neighbor to extrapolated track { - if(!VerifyRange(start_hit,hit)) + if(!VerifyRange(starthit,hit)) continue; - test_hit = EvaluateHit(start_hit,hit,track); + testhit = EvaluateHit(starthit,hit,track); - if(test_hit == 0)//chi2 not good enough, keep looking + if(testhit == 0)//chi2 not good enough, keep looking continue; - else if(test_hit==2)//chi2 good enough, return it + else if(testhit==2)//chi2 good enough, return it return hit; else - closest_hit = hit;//chi2 acceptable, but keep looking + closesthit = hit;//chi2 acceptable, but keep looking }//track search else //tracklet search, look for nearest neighbor { - if((dist=CalcDistance(start_hit,hit)) < closest_dist) + if((dist=CalcDistance(starthit,hit)) < closestdist) { - if(!VerifyRange(start_hit,hit)) + if(!VerifyRange(starthit,hit)) continue; - closest_dist = dist; - closest_hit = hit; + closestdist = dist; + closesthit = hit; //if this hit is good enough, return it: - if(closest_dist < fGoodDist) - return closest_hit; + if(closestdist < fGoodDist) + return closesthit; } else continue;//sub hit was farther away than a hit before @@ -705,13 +704,13 @@ AliL3ConfMapPoint *AliL3ConfMapper::GetNextNeighbor(AliL3ConfMapPoint *start_hit }//else //closest hit found: - if(closest_hit)// && closest_dist < mMaxDist) - return closest_hit; + if(closesthit)// && closestdist < mMaxDist) + return closesthit; else return 0; } -Int_t AliL3ConfMapper::EvaluateHit(AliL3ConfMapPoint *start_hit,AliL3ConfMapPoint *hit,AliL3ConfMapTrack *track) +Int_t AliL3ConfMapper::EvaluateHit(AliL3ConfMapPoint *starthit,AliL3ConfMapPoint *hit,AliL3ConfMapTrack *track) { //Check if space point gives a fit with acceptable chi2. @@ -726,8 +725,8 @@ Int_t AliL3ConfMapper::EvaluateHit(AliL3ConfMapPoint *start_hit,AliL3ConfMapPoin return 0; //calculate s and the distance hit-line - dx = start_hit->GetX()-hit->GetX(); - dy = start_hit->GetY()-hit->GetY(); + dx = starthit->GetX()-hit->GetX(); + dy = starthit->GetY()-hit->GetY(); //slocal = track->fLength+sqrt(dx*dx+dy*dy); slocal = track->GetLength()+sqrt(dx*dx+dy*dy); @@ -762,10 +761,11 @@ Double_t AliL3ConfMapper::CalcDistance(const AliL3ConfMapPoint *hit1,const AliL3 { //Return distance between two clusters, defined by Pablo - Double_t phi_diff = fabs( hit1->GetPhi() - hit2->GetPhi() ); - if (phi_diff > AliL3Transform::Pi()) phi_diff = AliL3Transform::TwoPi() - phi_diff; + Double_t phidiff = fabs( hit1->GetPhi() - hit2->GetPhi() ); + if (phidiff > AliL3Transform::Pi()) phidiff = AliL3Transform::TwoPi() - phidiff; - return AliL3Transform::ToDeg()*fabs((Float_t)((hit1->GetPadRow() - hit2->GetPadRow()) * (phi_diff + fabs( hit1->GetEta() - hit2->GetEta())))); + return AliL3Transform::ToDeg()*fabs((Float_t)((hit1->GetPadRow() - hit2->GetPadRow()) * + (phidiff + fabs( hit1->GetEta() - hit2->GetEta())))); } Bool_t AliL3ConfMapper::VerifyRange(const AliL3ConfMapPoint *hit1,const AliL3ConfMapPoint *hit2) const @@ -855,19 +855,19 @@ Int_t AliL3ConfMapper::FillTracks() //Fill track parameters. Which basically means do a fit of helix in real space, //which should be done in order to get nice tracks. - Int_t num_of_tracks = nTracks; - if(nTracks == 0) + Int_t numoftracks = fNTracks; + if(fNTracks == 0) { - LOG(AliL3Log::kError,"AliL3ConfMapper::FillTracks","nTracks")<Sort(); - for(Int_t i=0; iGetTrack(i); track->Fill(fVertex,fMaxDca); diff --git a/HLT/src/AliL3ConfMapper.h b/HLT/src/AliL3ConfMapper.h index 6d17b9f0b46..dc5001c9859 100644 --- a/HLT/src/AliL3ConfMapper.h +++ b/HLT/src/AliL3ConfMapper.h @@ -1,7 +1,7 @@ // @(#) $Id$ -#ifndef ALIL3_ConfMapper -#define ALIL3_ConfMapper +#ifndef ALIL3ConfMapperH +#define ALIL3ConfMapperH #include "AliL3RootTypes.h" #include "AliL3SpacePointData.h" @@ -11,26 +11,25 @@ class AliL3ConfMapTrack; class AliL3Vertex; class AliL3TrackArray; -struct AliL3ConfMapContainer -{ - void *first; - void *last; -}; - // //Conformal mapping base class class AliL3ConfMapper { + struct AliL3ConfMapContainer + { + void *first; // first track + void *last; // last track + }; + private: Bool_t fBench; //run-time measurements - Int_t nTracks; //number of tracks build. + Int_t fNTracks; //number of tracks build. - // AliTPCParam *fParam; AliL3Vertex *fVertex; //! - Bool_t fParamSet[2]; + Bool_t fParamSet[2]; //! Bool_t fVertexFinder; //Include vertexfinding or not (latter case vertex=(0,0,0)) AliL3ConfMapPoint *fHit; //! @@ -44,13 +43,13 @@ class AliL3ConfMapper { Int_t fNumRowSegment; // Total number of padrows Int_t fNumPhiSegment; // number of phi segments Int_t fNumEtaSegment; // number of eta segments - Int_t fNumRowSegmentPlusOne; - Int_t fNumPhiSegmentPlusOne; - Int_t fNumEtaSegmentPlusOne; - Int_t fNumPhiEtaSegmentPlusOne; - Int_t fBounds; - Int_t fPhiHitsOutOfRange; - Int_t fEtaHitsOutOfRange; + Int_t fNumRowSegmentPlusOne; // row+1 + Int_t fNumPhiSegmentPlusOne; // phi+1 + Int_t fNumEtaSegmentPlusOne; // eta+1 + Int_t fNumPhiEtaSegmentPlusOne;// phieta+1 + Int_t fBounds; // bounds + Int_t fPhiHitsOutOfRange; // phi hits out of range + Int_t fEtaHitsOutOfRange; // eta hits out of range //tracking range: Float_t fPhiMin; //MinPhi angle to consider @@ -73,15 +72,15 @@ class AliL3ConfMapper { Double_t fGoodHitChi2[2]; //Chi2 to stop looking for next hit Double_t fTrackChi2Cut[2]; //Maximum track chi2 Double_t fGoodDist; //In segment building, distance consider good enough - Double_t fMaxPhi; - Double_t fMaxEta; + Double_t fMaxPhi; //Maximum phi + Double_t fMaxEta; //Maximum eta // Tracking informtion Int_t fMainVertexTracks; //number of tracks coming from the main vertex Int_t fClustersUnused; //number of unused clusters //setter: - void SetMinPoints(Int_t f,Bool_t vertex_constraint) {fMinPoints[(Int_t)vertex_constraint] = f; } + void SetMinPoints(Int_t f,Bool_t vconstraint) {fMinPoints[(Int_t)vconstraint] = f; } void SetVertexConstraint(Bool_t f) {fVertexConstraint =f;} void SetHitChi2Cut(Double_t f,Bool_t vert) {fHitChi2Cut[(Int_t)vert]=f;} @@ -89,14 +88,13 @@ class AliL3ConfMapper { void SetTrackChi2Cut(Double_t f,Bool_t vert) {fTrackChi2Cut[(Int_t)vert]=f;} void SetMaxDist(Int_t f,Bool_t vert) {fMaxDist[(Int_t)vert]=f;} void SetTrackletLength(Int_t f,Bool_t vert) {fTrackletLength[(Int_t)vert]=f;} - void SetRowScopeTrack(Int_t f, Bool_t vertex_constraint) { fRowScopeTrack[(Int_t)vertex_constraint] = f; } // sets one row scope for tracks - void SetRowScopeTracklet(Int_t f, Bool_t vertex_constraint) { fRowScopeTracklet[(Int_t)vertex_constraint] = f; } // sets one row scope for tracklets - void SetMaxAngleTracklet(Double_t f, Bool_t vertex_constraint) { fMaxAngleTracklet[(Int_t)vertex_constraint] = f; } // sets one angle cut + void SetRowScopeTrack(Int_t f, Bool_t vc){fRowScopeTrack[(Int_t)vc] = f;} // sets one row scope for tracks + void SetRowScopeTracklet(Int_t f, Bool_t vc){fRowScopeTracklet[(Int_t)vc] = f;} // sets one row scope for tracklets + void SetMaxAngleTracklet(Double_t f, Bool_t vc){fMaxAngleTracklet[(Int_t)vc] = f;} // sets one angle cut void SetPointers(); Double_t CpuTime(); - void SetParamDone(Bool_t vertex_constraint) {fParamSet[(Int_t)vertex_constraint] = kTRUE;} - + void SetParamDone(Bool_t vconstraint) {fParamSet[(Int_t)vconstraint] = kTRUE;} public: @@ -127,14 +125,14 @@ class AliL3ConfMapper { Int_t FillTracks(); //getters - Int_t GetNumberOfTracks() {return nTracks;} - AliL3TrackArray *GetTracks() {return fTrack;} - Double_t GetMaxDca() const {return fMaxDca;} - AliL3Vertex* GetVertex() const {return fVertex;} + Int_t GetNumberOfTracks() const {return fNTracks;} + AliL3TrackArray *GetTracks() const {return fTrack;} + Double_t GetMaxDca() const {return fMaxDca;} + AliL3Vertex* GetVertex() const {return fVertex;} //setters void SetTrackCuts(Double_t hitChi2Cut, Double_t goodHitChi2, Double_t trackChi2Cut, Int_t maxdist,Bool_t vertexconstraint); - void SetTrackletCuts(Double_t maxangle,Double_t goodDist,Bool_t vertex_constraint); //Set cut of tracklet for the given vertex_constraint + void SetTrackletCuts(Double_t maxangle,Double_t goodDist,Bool_t vc); //Set cut of tracklet for the given vertex_constraint void SetNSegments(Int_t f,Int_t g) {fNumPhiSegment=f,fNumEtaSegment=g;} //Set number of subvolumes (#segments in (phi,eta) void SetMaxDca(Double_t f) {fMaxDca = f;} diff --git a/HLT/src/AliL3MemHandler.cxx b/HLT/src/AliL3MemHandler.cxx index efa5edd3893..8f289a8ffca 100644 --- a/HLT/src/AliL3MemHandler.cxx +++ b/HLT/src/AliL3MemHandler.cxx @@ -455,16 +455,16 @@ Bool_t AliL3MemHandler::Memory2Binary(UInt_t nrow,AliL3DigitRowData *data) return kFALSE; } - AliL3DigitRowData *row_pt = data; + AliL3DigitRowData *rowPt = data; Int_t outsize = 0; for(UInt_t i=0;ifNDigit + Int_t size = sizeof(AliL3DigitData) * rowPt->fNDigit + sizeof(AliL3DigitRowData); outsize += size; - fwrite(row_pt,size,1,fOutBinary); - Byte_t *byte_pt =(Byte_t *) row_pt; - byte_pt += size; - row_pt = (AliL3DigitRowData *) byte_pt; + fwrite(rowPt,size,1,fOutBinary); + Byte_t *bytePt =(Byte_t *) rowPt; + bytePt += size; + rowPt = (AliL3DigitRowData *) bytePt; } LOG(AliL3Log::kDebug,"AliL3MemHandler::Memory2Binary","Memory") <fNDigit; + Int_t size = sizeof(AliL3DigitData) * rowPt->fNDigit; - //if(fread(byte_pt,size,1,fInBinary)!=1) break; - fread(byte_pt,size,1,fInBinary); - byte_pt += size; + //if(fread(bytePt,size,1,fInBinary)!=1) break; + fread(bytePt,size,1,fInBinary); + bytePt += size; outsize += size; - row_pt = (AliL3DigitRowData *) byte_pt; + rowPt = (AliL3DigitRowData *) bytePt; rowcount++; } nrow= rowcount; @@ -618,20 +618,20 @@ Int_t AliL3MemHandler::Memory2CompMemory(UInt_t nrow, <<"Pointer to AliL3DigitRowData = 0x0 "<fRow; + UShort_t value = rowPt->fRow; Write(comp,index,subindex,value); UShort_t maxpad=0; UShort_t npad=0; Int_t ddd[1000]; for(Int_t d=0;d<200;d++) ddd[d]=0; - for(UInt_t dig=0;digfNDigit;dig++){ - if(row_pt->fDigitData[dig].fPad <200){ - ddd[row_pt->fDigitData[dig].fPad]++; + for(UInt_t dig=0;digfNDigit;dig++){ + if(rowPt->fDigitData[dig].fPad <200){ + ddd[rowPt->fDigitData[dig].fPad]++; } } for(Int_t d=0;d<200;d++){ @@ -643,28 +643,28 @@ Int_t AliL3MemHandler::Memory2CompMemory(UInt_t nrow, Write(comp,index,subindex,npad); UInt_t digit=0; for(UShort_t pad=0;pad <= maxpad;pad++){ - if(digit>=row_pt->fNDigit || row_pt->fDigitData[digit].fPad != pad) + if(digit>=rowPt->fNDigit || rowPt->fDigitData[digit].fPad != pad) continue; Write(comp,index,subindex,pad); // write zero if time != 0 - if(digitfNDigit && row_pt->fDigitData[digit].fPad == pad){ - if(row_pt->fDigitData[digit].fTime>0){ + if(digitfNDigit && rowPt->fDigitData[digit].fPad == pad){ + if(rowPt->fDigitData[digit].fTime>0){ Write(comp,index,subindex,0); - Write(comp,index,subindex,row_pt->fDigitData[digit].fTime); + Write(comp,index,subindex,rowPt->fDigitData[digit].fTime); } } - while(digitfNDigit && row_pt->fDigitData[digit].fPad == pad){ - UShort_t charge = row_pt->fDigitData[digit].fCharge; + while(digitfNDigit && rowPt->fDigitData[digit].fPad == pad){ + UShort_t charge = rowPt->fDigitData[digit].fCharge; if(charge>=1023){ charge=1023; } Write(comp,index,subindex,charge); - if(digit+1fNDigit&&row_pt->fDigitData[digit+1].fPad == pad){ - if(row_pt->fDigitData[digit].fTime +1 != - row_pt->fDigitData[digit+1].fTime){ + if(digit+1fNDigit&&rowPt->fDigitData[digit+1].fPad == pad){ + if(rowPt->fDigitData[digit].fTime +1 != + rowPt->fDigitData[digit+1].fTime){ Write(comp,index,subindex,0); - UShort_t nzero = row_pt->fDigitData[digit+1].fTime - - (row_pt->fDigitData[digit].fTime +1); + UShort_t nzero = rowPt->fDigitData[digit+1].fTime - + (rowPt->fDigitData[digit].fTime +1); Write(comp,index,subindex,nzero); } } @@ -674,11 +674,11 @@ Int_t AliL3MemHandler::Memory2CompMemory(UInt_t nrow, Write(comp,index,subindex,0); } - Int_t size = sizeof(AliL3DigitData) * row_pt->fNDigit+ + Int_t size = sizeof(AliL3DigitData) * rowPt->fNDigit+ sizeof(AliL3DigitRowData); - Byte_t *byte_pt =(Byte_t *) row_pt; - byte_pt += size; - row_pt = (AliL3DigitRowData *) byte_pt; + Byte_t *bytePt =(Byte_t *) rowPt; + bytePt += size; + rowPt = (AliL3DigitRowData *) bytePt; } while(subindex) Write(comp,index,subindex,0); @@ -703,14 +703,14 @@ Int_t AliL3MemHandler::CompMemory2Memory(UInt_t nrow, } Int_t outsize=0; - AliL3DigitRowData *row_pt = data; + AliL3DigitRowData *rowPt = data; UInt_t index=0; UInt_t subindex=0; for(UInt_t i=0;ifRow=row; + rowPt->fRow=row; Generate(row); UShort_t npad = Read(comp,index,subindex); for(UShort_t p=0;p=fEtaMinTimeBin[row]&&time<=fEtaMaxTimeBin[row]) - //AddData(row_pt->fDigitData,ndigit,row,pad,time,charge); + //AddData(rowPt->fDigitData,ndigit,row,pad,time,charge); //seems we are using this function... but dont know why - AddDataRandom(row_pt->fDigitData,ndigit,row,pad,time,charge); + AddDataRandom(rowPt->fDigitData,ndigit,row,pad,time,charge); time++; } UShort_t tshift = Read(comp,index,subindex); @@ -736,13 +736,13 @@ Int_t AliL3MemHandler::CompMemory2Memory(UInt_t nrow, time += tshift; } } - row_pt->fNDigit = ndigit; - Int_t size = sizeof(AliL3DigitData) * row_pt->fNDigit+ + rowPt->fNDigit = ndigit; + Int_t size = sizeof(AliL3DigitData) * rowPt->fNDigit+ sizeof(AliL3DigitRowData); - Byte_t *byte_pt =(Byte_t *) row_pt; - byte_pt += size; + Byte_t *bytePt =(Byte_t *) rowPt; + bytePt += size; outsize += size; - row_pt = (AliL3DigitRowData *) byte_pt; + rowPt = (AliL3DigitRowData *) bytePt; } return outsize; } @@ -756,7 +756,7 @@ UInt_t AliL3MemHandler::GetCompMemorySize(UInt_t nrow,AliL3DigitRowData *data) c <<"Pointer to AliL3DigitRowData = 0x0 "<fNDigit;dig++){ - if(row_pt->fDigitData[dig].fPad <200){ - ddd[row_pt->fDigitData[dig].fPad]++; + for(UInt_t dig=0;digfNDigit;dig++){ + if(rowPt->fDigitData[dig].fPad <200){ + ddd[rowPt->fDigitData[dig].fPad]++; } } for(Int_t d=0;d<200;d++){ @@ -779,21 +779,21 @@ UInt_t AliL3MemHandler::GetCompMemorySize(UInt_t nrow,AliL3DigitRowData *data) c index++; UInt_t digit=0; for(UShort_t pad=0;pad <= maxpad;pad++){ - if(digit>=row_pt->fNDigit || row_pt->fDigitData[digit].fPad != pad) + if(digit>=rowPt->fNDigit || rowPt->fDigitData[digit].fPad != pad) continue; index++; // write zero if time != 0 - if(digitfNDigit && row_pt->fDigitData[digit].fPad == pad){ - if(row_pt->fDigitData[digit].fTime>0){ + if(digitfNDigit && rowPt->fDigitData[digit].fPad == pad){ + if(rowPt->fDigitData[digit].fTime>0){ index++; index++; } } - while(digitfNDigit && row_pt->fDigitData[digit].fPad == pad){ + while(digitfNDigit && rowPt->fDigitData[digit].fPad == pad){ index++; - if(digit+1fNDigit&&row_pt->fDigitData[digit+1].fPad == pad){ - if(row_pt->fDigitData[digit].fTime +1 != - row_pt->fDigitData[digit+1].fTime){ + if(digit+1fNDigit&&rowPt->fDigitData[digit+1].fPad == pad){ + if(rowPt->fDigitData[digit].fTime +1 != + rowPt->fDigitData[digit+1].fTime){ index++; index++; } @@ -804,11 +804,11 @@ UInt_t AliL3MemHandler::GetCompMemorySize(UInt_t nrow,AliL3DigitRowData *data) c index++; } - Int_t size = sizeof(AliL3DigitData) * row_pt->fNDigit+ + Int_t size = sizeof(AliL3DigitData) * rowPt->fNDigit+ sizeof(AliL3DigitRowData); - Byte_t *byte_pt =(Byte_t *) row_pt; - byte_pt += size; - row_pt = (AliL3DigitRowData *) byte_pt; + Byte_t *bytePt =(Byte_t *) rowPt; + bytePt += size; + rowPt = (AliL3DigitRowData *) bytePt; } while(index%3) index++; @@ -1063,13 +1063,13 @@ Bool_t AliL3MemHandler::Memory2Binary(UInt_t ntrack,AliL3TrackSegmentData *data) <<"Pointer to AliL3TrackSegmentData = 0x0 "<fNPoints*sizeof(UInt_t); - fwrite(track_pt,size,1,fOutBinary); - Byte_t *byte_pt = (Byte_t*) track_pt; - byte_pt += size; - track_pt = (AliL3TrackSegmentData*) byte_pt; + Int_t size=sizeof(AliL3TrackSegmentData)+trackPt->fNPoints*sizeof(UInt_t); + fwrite(trackPt,size,1,fOutBinary); + Byte_t *bytePt = (Byte_t*) trackPt; + bytePt += size; + trackPt = (AliL3TrackSegmentData*) bytePt; } LOG(AliL3Log::kDebug,"AliL3MemHandler::Memory2Binary","File") <fNPoints*sizeof(UInt_t); - if(fread(track_pt->fPointIDs,size,1,fInBinary)!=1) break; - Byte_t *byte_pt = (Byte_t*) track_pt; - byte_pt += sizeof(AliL3TrackSegmentData)+size; - track_pt = (AliL3TrackSegmentData*) byte_pt; + if(fread(trackPt,sizeof(AliL3TrackSegmentData),1,fInBinary)!=1) break; + Int_t size=trackPt->fNPoints*sizeof(UInt_t); + if(fread(trackPt->fPointIDs,size,1,fInBinary)!=1) break; + Byte_t *bytePt = (Byte_t*) trackPt; + bytePt += sizeof(AliL3TrackSegmentData)+size; + trackPt = (AliL3TrackSegmentData*) bytePt; ntrack++; } LOG(AliL3Log::kDebug,"AliL3MemHandler::Binary2Memory","File") -- 2.39.3