From 68a27388fcf67efe8afefd4f5d1b173a9f9fd4b7 Mon Sep 17 00:00:00 2001 From: vestbo Date: Tue, 3 Sep 2002 12:33:59 +0000 Subject: [PATCH] More changes as a consequence of changing the pad geomtry in the new AliROOT. Some hardcoded values which were set to 176 has now been changed to AliL3Transform::GetNRows() etc. Also the remaining hardcoded AliTPCParam and digits tree object names has been changed in AliL3FileHandler. There were and still are a bug in the AliL3Merger class in FillNTuppel, which I was not able to figure out, so I switched off. This only affects the SlowMerging methods in the track mergers, and should be looked at more if needed in the future. --- HLT/src/AliL3ConfMapper.cxx | 6 ++-- HLT/src/AliL3FileHandler.cxx | 21 +++--------- HLT/src/AliL3FileHandler.h | 2 +- HLT/src/AliL3GlobalMerger.cxx | 2 +- HLT/src/AliL3Merger.cxx | 11 ++++--- HLT/src/AliL3Track.cxx | 2 +- HLT/src/AliL3Track.h | 2 +- HLT/src/AliL3TrackMerger.cxx | 2 +- HLT/src/AliL3VertexFinder.cxx | 3 +- HLT/src/AliLevel3.cxx | 61 ++++++++++++++--------------------- 10 files changed, 47 insertions(+), 65 deletions(-) diff --git a/HLT/src/AliL3ConfMapper.cxx b/HLT/src/AliL3ConfMapper.cxx index f2fcdbc0a64..293e1423f2d 100644 --- a/HLT/src/AliL3ConfMapper.cxx +++ b/HLT/src/AliL3ConfMapper.cxx @@ -66,7 +66,7 @@ void AliL3ConfMapper::InitVolumes() //Should be done after setting the track parameters - fNumRowSegmentPlusOne = 176;//NumRows[0]; //Maximum 32. + fNumRowSegmentPlusOne = AliL3Transform::GetNRows();//NumRows[0]; //Maximum 32. fNumPhiSegmentPlusOne = fNumPhiSegment+1; fNumEtaSegmentPlusOne = fNumEtaSegment+1; fNumPhiEtaSegmentPlusOne = fNumPhiSegmentPlusOne*fNumEtaSegmentPlusOne; @@ -117,7 +117,7 @@ void AliL3ConfMapper::InitSector(Int_t sector,Int_t *rowrange,Float_t *etarange) else //complete sector { fRowMin = 0; - fRowMax = 175; + fRowMax = AliL3Transform::GetNRows() - 1; } if(etarange) { @@ -138,6 +138,8 @@ void AliL3ConfMapper::InitSector(Int_t sector,Int_t *rowrange,Float_t *etarange) nTracks=0; fMainVertexTracks = 0; fClustersUnused = 0; + fEtaHitsOutOfRange=0; + fPhiHitsOutOfRange=0; fNumRowSegment = fRowMax - fRowMin; //number of rows to be considered by tracker LOG(AliL3Log::kInformational,"AliL3ConfMapper::InitSector","B-field") diff --git a/HLT/src/AliL3FileHandler.cxx b/HLT/src/AliL3FileHandler.cxx index d130d81c354..1899a5ab0aa 100644 --- a/HLT/src/AliL3FileHandler.cxx +++ b/HLT/src/AliL3FileHandler.cxx @@ -174,7 +174,7 @@ void AliL3FileHandler::CloseAliInput() } -Bool_t AliL3FileHandler::IsDigit() +Bool_t AliL3FileHandler::IsDigit(Int_t event) { //Check if there is a TPC digit tree in the current file. //Return kTRUE if tree was found, and kFALSE if not found. @@ -184,7 +184,9 @@ Bool_t AliL3FileHandler::IsDigit() <<"Pointer to TFile = 0x0 "<Get("TreeD_75x40_100x60_0"); + Char_t name[1024]; + sprintf(name,"TreeD_75x40_100x60_150x60_%d",event); + TTree *t=(TTree*)fInAli->Get(name); if(t){ LOG(AliL3Log::kInformational,"AliL3FileHandler::IsDigit","File Type") <<"Found Digit Tree -> Use Fast Cluster Finder"<GetDigit(time,pad); if(dig<=fParam->GetZeroSup()) continue; - /* - if(time < fParam->GetMaxTBin()-1 && time > 0) - if(fDigits->GetDigit(time+1,pad) <= fParam->GetZeroSup() - && fDigits->GetDigit(time-1,pad) <= fParam->GetZeroSup()) - continue; - */ - - AliL3Transform::Raw2Local(xyz,sector,row,pad,time); + AliL3Transform::Raw2Local(xyz,sector,row,pad,time); if(fParam->GetPadRowRadii(sector,row)<230./250.*fabs(xyz[2])) continue; @@ -322,12 +317,6 @@ AliL3DigitRowData * AliL3FileHandler::AliDigits2Memory(UInt_t & nrow,Int_t event dig = fDigits->GetDigit(time,pad); if (dig <= fParam->GetZeroSup()) continue; - /* - if(time < fParam->GetMaxTBin()-1 && time > 0) - if(fDigits->GetDigit(time-1,pad) <= fParam->GetZeroSup() && - fDigits->GetDigit(time+1,pad) <= fParam->GetZeroSup()) continue; - */ - //Exclude data outside cone: AliL3Transform::Raw2Local(xyz,sector,row,pad,time); if(fParam->GetPadRowRadii(sector,row)<230./250.*fabs(xyz[2])) diff --git a/HLT/src/AliL3FileHandler.h b/HLT/src/AliL3FileHandler.h index 786a92cb552..79ef271c167 100644 --- a/HLT/src/AliL3FileHandler.h +++ b/HLT/src/AliL3FileHandler.h @@ -34,7 +34,7 @@ class AliL3FileHandler:public AliL3MemHandler{ Bool_t SetAliInput(char *name); Bool_t SetAliInput(TFile *file); void CloseAliInput(); - Bool_t IsDigit(); + Bool_t IsDigit(Int_t event); Bool_t SetMCOutput(char *name); Bool_t SetMCOutput(FILE *file); diff --git a/HLT/src/AliL3GlobalMerger.cxx b/HLT/src/AliL3GlobalMerger.cxx index e97dc608be9..7a309631212 100644 --- a/HLT/src/AliL3GlobalMerger.cxx +++ b/HLT/src/AliL3GlobalMerger.cxx @@ -167,7 +167,7 @@ void AliL3GlobalMerger::SlowMerge(){ track0->CalculateReferencePoint(angle); track1->CalculateReferencePoint(angle); PrintDiff(track0,track1); - FillNtuple(ntuple,track0,track1); + //FillNtuple(ntuple,track0,track1); ttt0->Remove(min0); ttt1->Remove(min1); diff --git a/HLT/src/AliL3Merger.cxx b/HLT/src/AliL3Merger.cxx index 76af24c7ce2..03b8f2651bf 100644 --- a/HLT/src/AliL3Merger.cxx +++ b/HLT/src/AliL3Merger.cxx @@ -172,7 +172,7 @@ AliL3Track * AliL3Merger::MultiMerge(AliL3TrackArray *mergedtracks,AliL3Track ** for(Int_t i=0;iGetNHits(); } - if(nps>176){ + if(nps>AliL3Transform::GetNRows()){ LOG(AliL3Log::kWarning,"AliL3Merger::MultiMerge","Adding Points") <NextTrack(); //copy points - UInt_t nn[176]; + UInt_t nn[AliL3Transform::GetNRows()]; nps = 0; // for(Int_t i=0;iGetNHits(); data[12]= innertrack->GetNHits(); data[13] = Float_t(TrackDiff(innertrack,outertrack)); + data[14]=0; + data[15]=0; + data[16]=0; #ifdef use_root TNtuple *ntuple = (TNtuple *) nt; ntuple->Fill(data); @@ -291,7 +294,7 @@ Bool_t AliL3Merger::IsTrack(AliL3Track *innertrack,AliL3Track *outertrack){ if(innertrack->GetCharge()!=outertrack->GetCharge()) return kFALSE; if( (!innertrack->IsPoint()) || (!outertrack->IsPoint()) ) return kFALSE; - if(innertrack->GetNHits()+outertrack->GetNHits()>176) return kFALSE; + if(innertrack->GetNHits()+outertrack->GetNHits()>AliL3Transform::GetNRows()) 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 3c7a9900e72..6a5a48595cd 100644 --- a/HLT/src/AliL3Track.cxx +++ b/HLT/src/AliL3Track.cxx @@ -49,7 +49,7 @@ AliL3Track::AliL3Track() fIsLocal=true; fRowRange[0]=0; fRowRange[1]=0; - memset(fHitNumbers,0,176*sizeof(UInt_t)); + memset(fHitNumbers,0,159*sizeof(UInt_t)); } void AliL3Track::Set(AliL3Track *tpt){ diff --git a/HLT/src/AliL3Track.h b/HLT/src/AliL3Track.h index e4a8f81367d..c0f1d74c9f3 100644 --- a/HLT/src/AliL3Track.h +++ b/HLT/src/AliL3Track.h @@ -53,7 +53,7 @@ class AliL3Track { Bool_t fIsLocal; //Track given in local coordinates. - UInt_t fHitNumbers[176]; //Array of hit numbers for this track + UInt_t fHitNumbers[159]; //Array of hit numbers for this track protected: diff --git a/HLT/src/AliL3TrackMerger.cxx b/HLT/src/AliL3TrackMerger.cxx index 8ae89fc0941..c23d50b6a19 100644 --- a/HLT/src/AliL3TrackMerger.cxx +++ b/HLT/src/AliL3TrackMerger.cxx @@ -93,7 +93,7 @@ void AliL3TrackMerger::SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *t outertrack->CalculatePoint(xval); innertrack->CalculatePoint(xval); PrintDiff(innertrack,outertrack); - FillNtuple(ntuple,innertrack,outertrack); + //FillNtuple(ntuple,innertrack,outertrack); tracksout->Remove(outmin); tracksin->Remove(inmin); // tracksout->Compress(); diff --git a/HLT/src/AliL3VertexFinder.cxx b/HLT/src/AliL3VertexFinder.cxx index 70cd3591215..64cd428feb4 100644 --- a/HLT/src/AliL3VertexFinder.cxx +++ b/HLT/src/AliL3VertexFinder.cxx @@ -8,6 +8,7 @@ #include "AliL3Vertex.h" #include "AliL3VertexFinder.h" #include "AliL3SpacePointData.h" +#include "AliL3Transform.h" //_____________________________________________________________ // AliL3VertexFinder @@ -60,7 +61,7 @@ void AliL3VertexFinder::Read(Int_t ncluster, AliL3SpacePointData* hits ){ // analyze sector // - const Int_t seedRow = 175; + const Int_t seedRow = AliL3Transform::GetNRows() - 1; const Int_t firstRow = seedRow-32; for(Int_t n=0;nIsDigit()) + if(!fFileHandler->IsDigit(fEvent)) fFileHandler->SetMCOutput(file); #endif } @@ -273,7 +260,7 @@ void AliLevel3::ProcessSlice(Int_t slice){ char name[256]; Bool_t UseCF = kFALSE; #ifdef use_aliroot - UseCF = fFileHandler->IsDigit(); + UseCF = fFileHandler->IsDigit(fEvent); #else if(fUseBinary) UseCF = kTRUE; //In case you are not using aliroot @@ -513,9 +500,9 @@ void AliLevel3::ProcessSlice(Int_t slice){ memory->Free(); } fBenchmark->Start("Patch Merger"); - fTrackMerger->SlowMerge(); + //fTrackMerger->SlowMerge(); //fTrackMerger->AddAllTracks(); - //fTrackMerger->Merge(); + fTrackMerger->Merge(); fBenchmark->Stop("Patch Merger"); /* //write merged tracks -- 2.39.3