X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSTrackSegmentMakerv2.cxx;h=6eb292078266396f8b02ce2087d4754828cc06c8;hb=bc91440482c43b27d361587086ddee7929aa261a;hp=929115f911e8ab7d04962fae45509588dd23880c;hpb=4b598bb1380ac8fcb8a2310be0f30dcfdb900f5d;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSTrackSegmentMakerv2.cxx b/PHOS/AliPHOSTrackSegmentMakerv2.cxx index 929115f911e..6eb29207826 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv2.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv2.cxx @@ -17,6 +17,21 @@ /* History of cvs commits: * * $Log$ + * Revision 1.6 2007/08/22 09:20:50 hristov + * Updated QA classes (Yves) + * + * Revision 1.5 2007/07/11 13:43:30 hristov + * New class AliESDEvent, backward compatibility with the old AliESD (Christian) + * + * Revision 1.4 2007/05/04 14:49:29 policheh + * AliPHOSRecPoint inheritance from AliCluster + * + * Revision 1.3 2007/04/25 19:39:42 kharlov + * Track extracpolation improved + * + * Revision 1.2 2007/04/01 19:16:52 kharlov + * D.P.: Produce EMCTrackSegments using TPC/ITS tracks (no CPV) + * * */ @@ -61,8 +76,10 @@ #include "AliPHOSTrackSegmentMakerv2.h" #include "AliPHOSTrackSegment.h" #include "AliPHOSLink.h" -#include "AliPHOSGetter.h" -#include "AliESD.h" +#include "AliPHOSEmcRecPoint.h" +#include "AliPHOSCpvRecPoint.h" + +#include "AliESDEvent.h" #include "AliESDtrack.h" ClassImp( AliPHOSTrackSegmentMakerv2) @@ -75,30 +92,32 @@ AliPHOSTrackSegmentMakerv2::AliPHOSTrackSegmentMakerv2() : fWrite(kFALSE), fNTrackSegments(0), fRtpc(0.f), + fVtx(0.,0.,0.), fLinkUpArray(0), + fTPCtracks(), fEmcFirst(0), fEmcLast(0), fModule(0), - fTrackSegmentsInRun(0) - + fTrackSegments(NULL) { // default ctor (to be used mainly by Streamer) InitParameters() ; - for(Int_t i =0 ; i<5; i++)fTPC[i]=0 ; } //____________________________________________________________________________ -AliPHOSTrackSegmentMakerv2::AliPHOSTrackSegmentMakerv2(const TString & alirunFileName, const TString & eventFolderName) : - AliPHOSTrackSegmentMaker(alirunFileName, eventFolderName), +AliPHOSTrackSegmentMakerv2::AliPHOSTrackSegmentMakerv2(AliPHOSGeometry *geom) : + AliPHOSTrackSegmentMaker(geom), fDefaultInit(kFALSE), fWrite(kFALSE), fNTrackSegments(0), fRtpc(0.f), + fVtx(0.,0.,0.), fLinkUpArray(0), + fTPCtracks(), fEmcFirst(0), fEmcLast(0), fModule(0), - fTrackSegmentsInRun(0) + fTrackSegments(NULL) { // ctor InitParameters() ; @@ -113,11 +132,13 @@ AliPHOSTrackSegmentMakerv2::AliPHOSTrackSegmentMakerv2(const AliPHOSTrackSegment fWrite(kFALSE), fNTrackSegments(0), fRtpc(0.f), + fVtx(0.,0.,0.), fLinkUpArray(0), + fTPCtracks(), fEmcFirst(0), fEmcLast(0), fModule(0), - fTrackSegmentsInRun(0) + fTrackSegments(NULL) { // cpy ctor: no implementation yet // requested by the Coding Convention @@ -132,33 +153,22 @@ AliPHOSTrackSegmentMakerv2::AliPHOSTrackSegmentMakerv2(const AliPHOSTrackSegment // fDefaultInit = kTRUE if TrackSegmentMaker created by default ctor (to get just the parameters) if (!fDefaultInit) delete fLinkUpArray ; - for(Int_t imod=0; imod<5; imod++){ - if(fTPC[imod]) delete fTPC[imod] ; + if (fTrackSegments) { + fTrackSegments->Delete(); + delete fTrackSegments; } } -//____________________________________________________________________________ -const TString AliPHOSTrackSegmentMakerv2::BranchName() const -{ - - return GetName() ; -} - //____________________________________________________________________________ void AliPHOSTrackSegmentMakerv2::FillOneModule() { // Finds first and last indexes between which // clusters from one PHOS module are - AliPHOSGetter * gime = AliPHOSGetter::Instance() ; - const AliPHOSGeometry * geom = gime->PHOSGeometry() ; - - TObjArray * emcRecPoints = gime->EmcRecPoints() ; - //First EMC clusters - Int_t totalEmc = emcRecPoints->GetEntriesFast() ; + Int_t totalEmc = fEMCRecPoints->GetEntriesFast() ; for(fEmcFirst = fEmcLast; (fEmcLast < totalEmc) && - ((dynamic_cast(emcRecPoints->At(fEmcLast)))->GetPHOSMod() == fModule ); + ((dynamic_cast(fEMCRecPoints->At(fEmcLast)))->GetPHOSMod() == fModule ); fEmcLast ++) ; //Now TPC tracks @@ -166,31 +176,43 @@ void AliPHOSTrackSegmentMakerv2::FillOneModule() //Do it ones, only first time if(fModule==1){ Int_t nTracks = fESD->GetNumberOfTracks(); + + Int_t nPHOSmod = fGeom->GetNModules() ; + if(fTPCtracks[0].size()<(UInt_t)nTracks){ + for(Int_t i=0; iGetNModules() ; - for(Int_t imod=0 ; imod< nPHOSmod; imod++){ - fTPC[imod]->Clear() ; - } - Double_t rEMC = geom->GetIPtoCrystalSurface() ; //Use here ideal geometry + Double_t rEMC = fGeom->GetIPtoCrystalSurface() ; //Use here ideal geometry for (Int_t iTrack=0; iTrackGetTrack(iTrack); - if (!track->GetXYZAt(rEMC, fESD->GetMagneticField(), xyz)) - continue; //track coord on the cylinder of PHOS radius - if ((TMath::Abs(xyz[0])+TMath::Abs(xyz[1])+TMath::Abs(xyz[2]))<=0) - continue; - //Check if this track hits PHOS - inPHOS.SetXYZ(xyz[0],xyz[1],xyz[2]); - Int_t modNum ; - Double_t x,z ; - geom->ImpactOnEmc(vtx, inPHOS.Theta(), inPHOS.Phi(), modNum, x,z) ; - if(modNum>0 && modNum<=nPHOSmod){ - //Mark this track as one belonging to module - fTPC[modNum-1]->AddLast(track) ; + for(Int_t iTestMod=1; iTestMod<=nPHOSmod; iTestMod++){ + Double_t modAngle=270.+fGeom->GetPHOSAngle(iTestMod) ; + modAngle*=TMath::Pi()/180. ; + track->Rotate(modAngle); + if (!track->GetXYZAt(rEMC, fESD->GetMagneticField(), xyz)) + continue; //track coord on the cylinder of PHOS radius + if ((TMath::Abs(xyz[0])+TMath::Abs(xyz[1])+TMath::Abs(xyz[2]))<=0) + continue; + //Check if this track hits PHOS + inPHOS.SetXYZ(xyz[0],xyz[1],xyz[2]); + Int_t modNum ; + Double_t x,z ; + fGeom->ImpactOnEmc(vtx, inPHOS.Theta(), inPHOS.Phi(), modNum, z, x) ; + if(modNum==iTestMod){ + //Mark this track as one belonging to module + TrackInPHOS_t &t = fTPCtracks[modNum-1][fNtpcTracks[modNum-1]++] ; + t.track = track ; + t.x = x ; + t.z = z ; + break ; + } } } } @@ -206,25 +228,29 @@ void AliPHOSTrackSegmentMakerv2::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * em // Calculates the distance between the EMC RecPoint and the CPV RecPoint // Clusters are sorted in "rows" and "columns" of width 1 cm - const AliPHOSGeometry * geom = AliPHOSGeometry::GetInstance() ; - TVector3 emcGlobal; // Global position of the CPV recpoint - geom->GetGlobal((AliRecPoint*)emcClu,emcGlobal); - Double_t rEMC = emcGlobal.Pt() ;// Radius from IP to current point - -// printf("EMC: x=%f, y=%f, z=%f \n",emcGlobal.X(),emcGlobal.Y(),emcGlobal.Z()) ; + TVector3 emcGlobal; // Global position of the EMC recpoint + fGeom->GetGlobalPHOS((AliPHOSRecPoint*)emcClu,emcGlobal); + //Calculate actual distance to the PHOS surface + Double_t modAngle=270.+fGeom->GetPHOSAngle(emcClu->GetPHOSMod()) ; + modAngle*=TMath::Pi()/180. ; + Double_t rEMC = emcGlobal.X()*TMath::Cos(modAngle)+emcGlobal.Y()*TMath::Sin(modAngle) ; + track->Rotate(modAngle); Double_t xyz[3] ; - if (track->GetXYZAt(rEMC, fESD->GetMagneticField(), xyz)){ //calculate distance -// printf("xyz: x=%f, y=%f, z=%f \n",xyz[0],xyz[1],xyz[2]) ; - dx=TMath::Sqrt((emcGlobal.X()-xyz[0])*(emcGlobal.X()-xyz[0])+(emcGlobal.Y()-xyz[1])*(emcGlobal.Y()-xyz[1])) ; - dx=TMath::Sign(dx,(Float_t)(emcGlobal.X()-xyz[0])) ; //set direction - dz=emcGlobal.Z()-xyz[2] ; -// printf(" dx=%f, dz=%f \n",dx,dz) ; + if(!track->GetXYZAt(rEMC, fESD->GetMagneticField(), xyz)){ + dx=999. ; + dz=999. ; + return ; //track coord on the cylinder of PHOS radius } - else{ + if((TMath::Abs(xyz[0])+TMath::Abs(xyz[1])+TMath::Abs(xyz[2]))<=0){ dx=999. ; dz=999. ; - } + return ; + } + + dx=(emcGlobal.X()-xyz[0])*TMath::Sin(modAngle)-(emcGlobal.Y()-xyz[1])*TMath::Cos(modAngle) ; + dx=TMath::Sign(dx,(Float_t)(emcGlobal.X()-xyz[0])) ; //set direction + dz=emcGlobal.Z()-xyz[2] ; return ; } @@ -233,19 +259,8 @@ void AliPHOSTrackSegmentMakerv2::Init() { // Make all memory allocations that are not possible in default constructor - AliPHOSGetter* gime = AliPHOSGetter::Instance(); - if(!gime) - gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName.Data()); - fLinkUpArray = new TClonesArray("AliPHOSLink", 1000); - if ( !gime->TrackSegmentMaker() ) { - gime->PostTrackSegmentMaker(this); - } - AliPHOSGeometry * geom = gime->PHOSGeometry() ; - Int_t nMod = geom->GetNModules() ; - for(Int_t imod=0; imodEmcRecPoints() ; - fLinkUpArray->Clear() ; AliPHOSEmcRecPoint * emcclu ; @@ -280,21 +290,24 @@ void AliPHOSTrackSegmentMakerv2::MakeLinks()const Int_t iEmcRP; for(iEmcRP = fEmcFirst; iEmcRP < fEmcLast; iEmcRP++ ) { - emcclu = dynamic_cast(emcRecPoints->At(iEmcRP)) ; + emcclu = dynamic_cast(fEMCRecPoints->At(iEmcRP)) ; + TVector3 vecEmc ; + emcclu->GetLocalPosition(vecEmc) ; Int_t mod=emcclu->GetPHOSMod() ; - TIter next(fTPC[mod-1]) ; - AliESDtrack *track ; - Int_t itrack=0 ; - while((track= static_cast(next()))){ - itrack = track->GetID() ; - Float_t dx,dz ; - GetDistanceInPHOSPlane(emcclu, track, dx,dz) ; - if(TMath::Sqrt(dx*dx+dz*dz) < fRtpc ){ + for(Int_t itr=0; itrGetID() ; new ((*fLinkUpArray)[iLinkUp++]) AliPHOSLink(dx, dz, iEmcRP, itrack, -1) ; } } } - fLinkUpArray->Sort() ; //first links with smallest distances } @@ -306,11 +319,6 @@ void AliPHOSTrackSegmentMakerv2::MakePairs() // unassigned RecParticles. We assign these RecPoints to TrackSegment and // remove them from the list of "unassigned". - AliPHOSGetter * gime = AliPHOSGetter::Instance() ; - - TObjArray * emcRecPoints = gime->EmcRecPoints() ; - TClonesArray * trackSegments = gime->TrackSegments(); - //Make arrays to mark clusters already chosen Int_t * emcExist = 0; if(fEmcLast > fEmcFirst) @@ -321,10 +329,10 @@ void AliPHOSTrackSegmentMakerv2::MakePairs() emcExist[index] = 1 ; - Int_t * tpcExist = 0; - Int_t nTracks = fTPC[fModule-1]->GetSize() ; + Bool_t * tpcExist = 0; + Int_t nTracks = fESD->GetNumberOfTracks(); if(nTracks>0) - tpcExist = new Int_t[nTracks] ; + tpcExist = new Bool_t[nTracks] ; for(index = 0; index GetCpv()]){ //Track still exist Float_t dx,dz ; linkUp->GetXZ(dx,dz) ; - new ((* trackSegments)[fNTrackSegments]) - AliPHOSTrackSegment(dynamic_cast(emcRecPoints->At(linkUp->GetEmc())) , + new ((* fTrackSegments)[fNTrackSegments]) + AliPHOSTrackSegment(dynamic_cast(fEMCRecPoints->At(linkUp->GetEmc())) , nullpointer, linkUp->GetTrack(),dx,dz) ; - (dynamic_cast(trackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments); + (dynamic_cast(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments); fNTrackSegments++ ; emcExist[linkUp->GetEmc()-fEmcFirst] = -1 ; //Mark emc that Cpv was found //mark track as already used @@ -362,10 +370,10 @@ void AliPHOSTrackSegmentMakerv2::MakePairs() Int_t iEmcRP ; for(iEmcRP = 0; iEmcRP < fEmcLast-fEmcFirst ; iEmcRP++ ){ if(emcExist[iEmcRP] > 0 ){ - new ((*trackSegments)[fNTrackSegments]) - AliPHOSTrackSegment(dynamic_cast(emcRecPoints->At(iEmcRP+fEmcFirst)), + new ((*fTrackSegments)[fNTrackSegments]) + AliPHOSTrackSegment(dynamic_cast(fEMCRecPoints->At(iEmcRP+fEmcFirst)), nullpointer) ; - (dynamic_cast(trackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments); + (dynamic_cast(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments); fNTrackSegments++; } } @@ -375,7 +383,7 @@ void AliPHOSTrackSegmentMakerv2::MakePairs() } //____________________________________________________________________________ -void AliPHOSTrackSegmentMakerv2::Exec(Option_t *option) +void AliPHOSTrackSegmentMakerv2::Clusters2TrackSegments(Option_t *option) { // Steering method to perform track segment construction for events // in the range from fFirstEvent to fLastEvent. @@ -390,59 +398,29 @@ void AliPHOSTrackSegmentMakerv2::Exec(Option_t *option) return ; } - AliPHOSGetter * gime = AliPHOSGetter::Instance() ; - - const AliPHOSGeometry * geom = gime->PHOSGeometry() ; - - if (fLastEvent == -1) - fLastEvent = gime->MaxEvent() - 1 ; - else - fLastEvent = TMath::Min(fFirstEvent,gime->MaxEvent()); - Int_t nEvents = fLastEvent - fFirstEvent + 1; - - Int_t ievent ; - for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) { - gime->Event(ievent,"DR") ; - //Make some initializations - fNTrackSegments = 0 ; - fEmcFirst = 0 ; - fEmcLast = 0 ; + //Make some initializations + fNTrackSegments = 0 ; + fEmcFirst = 0 ; + fEmcLast = 0 ; - gime->TrackSegments()->Clear(); + fTrackSegments->Clear(); - // if(!ReadRecPoints(ievent)) continue; //reads RecPoints for event ievent + // if(!ReadRecPoints(ievent)) continue; //reads RecPoints for event ievent - for(fModule = 1; fModule <= geom->GetNModules() ; fModule++ ) { - FillOneModule() ; - MakeLinks() ; - MakePairs() ; - } - - WriteTrackSegments() ; + for(fModule = 1; fModule <= fGeom->GetNModules() ; fModule++ ) { + FillOneModule() ; + MakeLinks() ; + MakePairs() ; + } - if(strstr(option,"deb")) - PrintTrackSegments(option); + if(strstr(option,"deb")) + PrintTrackSegments(option); - //increment the total number of track segments per run - fTrackSegmentsInRun += gime->TrackSegments()->GetEntriesFast() ; - } - if(strstr(option,"tim")){ gBenchmark->Stop("PHOSTSMaker"); - Info("Exec", "took %f seconds for making TS %f seconds per event", - gBenchmark->GetCpuTime("PHOSTSMaker"), - gBenchmark->GetCpuTime("PHOSTSMaker")/nEvents) ; - } - if(fWrite) //do not unload in "on flight" mode - Unload(); -} -//____________________________________________________________________________ -void AliPHOSTrackSegmentMakerv2::Unload() -{ - // Unloads the task from the folder - AliPHOSGetter * gime = AliPHOSGetter::Instance() ; - gime->PhosLoader()->UnloadRecPoints() ; - gime->PhosLoader()->UnloadTracks() ; + Info("Exec", "took %f seconds for making TS", + gBenchmark->GetCpuTime("PHOSTSMaker")); + } } //____________________________________________________________________________ @@ -461,55 +439,23 @@ void AliPHOSTrackSegmentMakerv2::Print(const Option_t *)const } else Info("Print", "AliPHOSTrackSegmentMakerv2 not initialized ") ; -} - -//____________________________________________________________________________ -void AliPHOSTrackSegmentMakerv2::WriteTrackSegments() -{ - // Writes found TrackSegments to TreeR. Creates branches - // "PHOSTS" and "AliPHOSTrackSegmentMaker" with the same title. - // In the former branch found TrackSegments are stored, while - // in the latter all parameters, with which TS were made. - // ROOT does not allow overwriting existing branches, therefore - // first we check, if branches with the same title already exist. - // If yes - exits without writing. - - AliPHOSGetter *gime = AliPHOSGetter::Instance() ; - TClonesArray * trackSegments = gime->TrackSegments() ; - trackSegments->Expand(trackSegments->GetEntriesFast()) ; - - if(fWrite){ //We write TreeT - TTree * treeT = gime->TreeT(); - - //First TS - Int_t bufferSize = 32000 ; - TBranch * tsBranch = treeT->Branch("PHOSTS",&trackSegments,bufferSize); - tsBranch->Fill() ; - - gime->WriteTracks("OVERWRITE"); - gime->WriteTrackSegmentMaker("OVERWRITE"); - } } - //____________________________________________________________________________ void AliPHOSTrackSegmentMakerv2::PrintTrackSegments(Option_t * option) { // option deb - prints # of found TrackSegments // option deb all - prints as well indexed of found RecParticles assigned to the TS - TClonesArray * trackSegments = AliPHOSGetter::Instance()->TrackSegments() ; - Info("PrintTrackSegments", "Results from TrackSegmentMaker:") ; - printf("nevent: %d\n", gAlice->GetEvNumber()) ; - printf(" Found %d TrackSegments\n", trackSegments->GetEntriesFast() ); + printf(" Found %d TrackSegments\n", fTrackSegments->GetEntriesFast() ); if(strstr(option,"all")) { // printing found TS printf("TrackSegment # EMC RP# CPV RP#\n") ; Int_t index; - for (index = 0 ; index GetEntriesFast() ; index++) { - AliPHOSTrackSegment * ts = (AliPHOSTrackSegment * )trackSegments->At(index) ; + for (index = 0 ; index GetEntriesFast() ; index++) { + AliPHOSTrackSegment * ts = (AliPHOSTrackSegment * )fTrackSegments->At(index) ; printf(" %d %d %d \n", ts->GetIndexInList(), ts->GetEmcIndex(), ts->GetTrackIndex() ) ; } }