X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSTrackSegmentMakerv1.cxx;h=ba31b3cc1f3c683d97bf5fdba2511598bf578f93;hb=25312a8ed5d33f78b0423d6e0c7ee3869142528f;hp=69b0bb019ebf1d5399ffbe6944ea691064c594f1;hpb=f74a631d6827b4cb664cac9673859c7cf88cedfd;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx index 69b0bb019eb..ba31b3cc1f3 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx @@ -17,6 +17,57 @@ /* History of cvs commits: * * $Log$ + * Revision 1.93 2007/10/10 09:05:10 schutz + * Changing name QualAss to QA + * + * Revision 1.92 2007/08/28 12:55:08 policheh + * Loaders removed from the reconstruction code (C.Cheshkov) + * + * Revision 1.91 2007/08/07 14:12:03 kharlov + * Quality assurance added (Yves Schutz) + * + * Revision 1.90 2007/07/11 13:43:30 hristov + * New class AliESDEvent, backward compatibility with the old AliESD (Christian) + * + * Revision 1.89 2007/07/03 08:13:04 kharlov + * Bug fix in CPV local coordinates + * + * Revision 1.88 2007/06/27 09:11:07 kharlov + * Bug fix for CPV-EMC distance + * + * Revision 1.87 2007/05/04 14:49:29 policheh + * AliPHOSRecPoint inheritance from AliCluster + * + * Revision 1.86 2007/04/02 15:00:16 cvetan + * No more calls to gAlice in the reconstruction + * + * Revision 1.85 2007/03/28 19:18:15 kharlov + * RecPoints recalculation in TSM removed + * + * Revision 1.84 2007/03/07 07:01:21 hristov + * Fixing copy/paste erro. Additional protections + * + * Revision 1.83 2007/03/06 21:07:37 kharlov + * DP: xz CPV-EMC distance filled to TS + * + * Revision 1.82 2007/03/06 06:54:48 kharlov + * DP:Calculation of cluster properties dep. on vertex added + * + * Revision 1.81 2007/02/05 10:02:40 kharlov + * Module numbering is corrected + * + * Revision 1.80 2006/08/28 10:01:56 kharlov + * Effective C++ warnings fixed (Timur Pocheptsov) + * + * Revision 1.79 2006/04/25 12:41:15 hristov + * Moving non-persistent data to AliESDfriend (Yu.Belikov) + * + * Revision 1.78 2005/11/18 13:04:51 hristov + * Bug fix + * + * Revision 1.77 2005/11/17 23:34:36 hristov + * Corrected logics + * * Revision 1.76 2005/11/17 22:29:12 hristov * Faster version, no attempt to match tracks outside the PHOS acceptance * @@ -61,6 +112,7 @@ // // --- ROOT system --- +#include "TVector3.h" #include "TTree.h" #include "TBenchmark.h" @@ -71,34 +123,91 @@ #include "AliPHOSTrackSegmentMakerv1.h" #include "AliPHOSTrackSegment.h" #include "AliPHOSLink.h" -#include "AliPHOSGetter.h" -#include "AliESD.h" +#include "AliESDEvent.h" #include "AliESDtrack.h" +#include "AliPHOSEmcRecPoint.h" +#include "AliPHOSCpvRecPoint.h" +#include "AliLog.h" +#include "AliMagF.h" +#include "AliMagF.h" +#include "AliTracker.h" +#include "AliGeomManager.h" +#include "AliCluster.h" +#include "AliKalmanTrack.h" +#include "AliGlobalQADataMaker.h" +#include "AliVParticle.h" + ClassImp( AliPHOSTrackSegmentMakerv1) //____________________________________________________________________________ - AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1() : AliPHOSTrackSegmentMaker() +AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1() : + AliPHOSTrackSegmentMaker(), + fDefaultInit(kTRUE), + fWrite(kFALSE), + fNTrackSegments(0), + fRcpv(0.f), + fRtpc(0.f), + fVtx(0.f), + fLinkUpArray(0), + fEmcFirst(0), + fEmcLast(0), + fCpvFirst(0), + fCpvLast(0), + fModule(0), + fTrackSegments(NULL) { // default ctor (to be used mainly by Streamer) - InitParameters() ; - fDefaultInit = kTRUE ; } //____________________________________________________________________________ - AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1(const TString alirunFileName, const TString eventFolderName) - :AliPHOSTrackSegmentMaker(alirunFileName, eventFolderName) +AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1(AliPHOSGeometry *geom) : + AliPHOSTrackSegmentMaker(geom), + fDefaultInit(kFALSE), + fWrite(kFALSE), + fNTrackSegments(0), + fRcpv(0.f), + fRtpc(0.f), + fVtx(0.f), + fLinkUpArray(0), + fEmcFirst(0), + fEmcLast(0), + fCpvFirst(0), + fCpvLast(0), + fModule(0), + fTrackSegments(NULL) { // ctor - InitParameters() ; Init() ; - fDefaultInit = kFALSE ; fESD = 0; } + +AliPHOSTrackSegmentMakerv1::AliPHOSTrackSegmentMakerv1(const AliPHOSTrackSegmentMakerv1 & tsm) : + AliPHOSTrackSegmentMaker(tsm), + fDefaultInit(kFALSE), + fWrite(kFALSE), + fNTrackSegments(0), + fRcpv(0.f), + fRtpc(0.f), + fVtx(0.f), + fLinkUpArray(0), + fEmcFirst(0), + fEmcLast(0), + fCpvFirst(0), + fCpvLast(0), + fModule(0), + fTrackSegments(NULL) +{ + // cpy ctor: no implementation yet + // requested by the Coding Convention + Fatal("cpy ctor", "not implemented") ; +} + + //____________________________________________________________________________ AliPHOSTrackSegmentMakerv1::~AliPHOSTrackSegmentMakerv1() { @@ -106,14 +215,10 @@ ClassImp( AliPHOSTrackSegmentMakerv1) // fDefaultInit = kTRUE if TrackSegmentMaker created by default ctor (to get just the parameters) if (!fDefaultInit) delete fLinkUpArray ; -} - - -//____________________________________________________________________________ -const TString AliPHOSTrackSegmentMakerv1::BranchName() const -{ - - return GetName() ; + if (fTrackSegments) { + fTrackSegments->Delete(); + delete fTrackSegments; + } } //____________________________________________________________________________ @@ -122,194 +227,265 @@ void AliPHOSTrackSegmentMakerv1::FillOneModule() // Finds first and last indexes between which // clusters from one PHOS module are - AliPHOSGetter * gime = AliPHOSGetter::Instance() ; - - TObjArray * emcRecPoints = gime->EmcRecPoints() ; - TObjArray * cpvRecPoints = gime->CpvRecPoints() ; - //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 CPV clusters - Int_t totalCpv = cpvRecPoints->GetEntriesFast() ; + Int_t totalCpv = fCPVRecPoints->GetEntriesFast() ; for(fCpvFirst = fCpvLast; (fCpvLast < totalCpv) && - ((dynamic_cast(cpvRecPoints->At(fCpvLast)))->GetPHOSMod() == fModule ); + ((dynamic_cast(fCPVRecPoints->At(fCpvLast)))->GetPHOSMod() == fModule ); fCpvLast ++) ; } //____________________________________________________________________________ -Float_t AliPHOSTrackSegmentMakerv1::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * emcClu,AliPHOSCpvRecPoint * cpvClu, Int_t &trackindex) const +void AliPHOSTrackSegmentMakerv1::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * emcClu, + AliPHOSCpvRecPoint * cpvClu, + Int_t &trackindex, + Float_t &dx, Float_t &dz) const { // Calculates the distance between the EMC RecPoint and the CPV RecPoint + // If no CPV, calculates the distance between the EMC RecPoint and the track + // prolongation to the PHOS module plane. // Clusters are sorted in "rows" and "columns" of width 1 cm - //Float_t delta = 1 ; // Width of the rows in sorting of RecPoints (in cm) - // if you change this value, change it as well in xxxRecPoint::Compare() - Float_t distance2Cpv = fRcpv ; - Float_t distance2Track = fRtpc ; +// Float_t delta = 1 ; // Width of the rows in sorting of RecPoints (in cm) +// // if you change this value, change it as well in xxxRecPoint::Compare() - trackindex = -1 ; // closest track within fRCpv + trackindex = -1; + dx = 999.; + dz = 999.; - TVector3 vecEmc ; // Local position of EMC recpoint - TVector3 vecCpv ; // Local position of CPV recpoint propagated to EMC - TVector3 vecDist ; // Distance between local positions of two points - - emcClu->GetLocalPosition(vecEmc) ; - cpvClu->GetLocalPosition(vecCpv) ; + if(!cpvClu) { + + if(!emcClu) { + return; + } - //toofar = kTRUE ; - if(emcClu->GetPHOSMod() == cpvClu->GetPHOSMod()){ + // *** Start the matching + Int_t nt=fESD->GetNumberOfTracks(); + Int_t iPHOSMod = emcClu->GetPHOSMod() ; + //Calculate actual distance to PHOS module + TVector3 globaPos ; + fGeom->Local2Global(iPHOSMod, 0.,0., globaPos) ; + const Double_t rPHOS = globaPos.Pt() ; //Distance to center of PHOS module + const Double_t kYmax = 72.+10. ; //Size of the module (with some reserve) in phi direction + const Double_t kZmax = 64.+10. ; //Size of the module (with some reserve) in z direction + const Double_t kAlpha0=330./180.*TMath::Pi() ; //First PHOS module angular direction + const Double_t kAlpha= 20./180.*TMath::Pi() ; //PHOS module angular size + Double_t minDistance = 1.e6; + + TVector3 vecEmc ; // Local position of EMC recpoint + emcClu->GetLocalPosition(vecEmc) ; + + Double_t gposTrack[3] ; + Double_t bz = AliTracker::GetBz() ; //B-Field for approximate matching + Double_t b[3]; + for (Int_t i=0; iGetTrack(i); + + // Skip the tracks having "wrong" status (has to be checked/tuned) + ULong_t status = esdTrack->GetStatus(); + if ((status & AliESDtrack::kTPCout) == 0) continue; +// if ((status & AliESDtrack::kTRDout) == 0) continue; +// if ((status & AliESDtrack::kTRDrefit) == 1) continue; + + //Continue extrapolation from TPC outer surface + const AliExternalTrackParam *outerParam=esdTrack->GetOuterParam(); + if (!outerParam) continue; + AliExternalTrackParam t(*outerParam); + + t.GetBxByBz(b) ; + //Direction to the current PHOS module + Double_t phiMod=kAlpha0-kAlpha*iPHOSMod ; + if(!t.Rotate(phiMod)) + continue ; + + Double_t y; // Some tracks do not reach the PHOS + if (!t.GetYAt(rPHOS,bz,y)) continue; // because of the bending + + Double_t z; + if(!t.GetZAt(rPHOS,bz,z)) + continue ; + if (TMath::Abs(z) > kZmax) + continue; // Some tracks miss the PHOS in Z + if(TMath::Abs(y) < kYmax){ + t.PropagateToBxByBz(rPHOS,b); // Propagate to the matching module + //t.CorrectForMaterial(...); // Correct for the TOF material, if needed + t.GetXYZ(gposTrack) ; + TVector3 globalPositionTr(gposTrack) ; + TVector3 localPositionTr ; + fGeom->Global2Local(localPositionTr,globalPositionTr,iPHOSMod) ; + Double_t ddx = vecEmc.X()-localPositionTr.X(); + Double_t ddz = vecEmc.Z()-localPositionTr.Z(); + Double_t d2 = ddx*ddx + ddz*ddz; + if(d2 < minDistance) { + dx = ddx ; + dz = ddz ; + trackindex=i; + minDistance=d2 ; + } + } + } //Scanned all tracks + return ; + } - // Find EMC-CPV distance - distance2Cpv = (vecCpv - vecEmc).Mag() ; + + TVector3 emcGlobal; + fGeom->GetGlobalPHOS((AliPHOSRecPoint*)emcClu,emcGlobal); + + // Radius from IP to current point + Double_t rEMC = TMath::Abs(emcGlobal.Pt()); + + // Extrapolate the global track direction to EMC + // and find the closest track + + Int_t nTracks = fESD->GetNumberOfTracks(); + + AliESDtrack *track; + Double_t xyz[] = {-1,-1,-1}; + Double_t pxyz[3]; + Double_t zEMC,xEMC; + Int_t module; + TVector3 vecP; + TVector3 locClu; + + Float_t minDistance = 1.e6; + Float_t dr; + + for (Int_t iTrack=0; iTrackGetTrack(iTrack); + if (!track->GetXYZAt(rEMC, fESD->GetMagneticField(), xyz)) continue; - if (fESD != 0x0) { - AliPHOSGetter * gime = AliPHOSGetter::Instance() ; - const AliPHOSGeometry * geom = gime->PHOSGeometry() ; - - Double_t rPHOS = geom->GetIPtoCrystalSurface(); - - //PH Acceptance boundaries for each PHOS module - Int_t nModules = geom->GetNModules(); - Double_t * thmin = new Double_t[nModules];// theta min - Double_t * thmax = new Double_t[nModules];// theta max - Double_t * phmin = new Double_t[nModules];// phi min - Double_t * phmax = new Double_t[nModules];// phi max + AliDebug(1,Form("Event %d, iTrack: %d, (%.3f,%.3f,%.3f)", + fESD->GetEventNumberInFile(),iTrack,xyz[0],xyz[1],xyz[2])); - for (Int_t imod=0; imodEmcModuleCoverage(imod, - thmin[imod],thmax[imod], - phmin[imod],phmax[imod]); + if (track->GetPxPyPzAt(rEMC,fESD->GetMagneticField(),pxyz)) { + + vecP.SetXYZ(pxyz[0],pxyz[1],pxyz[2]); + fGeom->ImpactOnEmc(xyz,vecP.Theta(),vecP.Phi(),module,zEMC,xEMC) ; + + if(!module) continue; + AliDebug(1,Form("\t\tTrack hit PHOS! Module: %d, (x,z)=(%.3f,%.3f)",module,xEMC,zEMC)); + + if(emcClu->GetPHOSMod() != module) continue; + + // match track to EMC cluster + emcClu->GetLocalPosition(locClu); + + Float_t delta_x = xEMC - locClu.X(); + Float_t delta_z = zEMC - locClu.Z(); + dr = TMath::Sqrt(delta_x*delta_x + delta_z*delta_z); + AliDebug(1,Form("\tMatch iTrack=%d: (dx,dz)=(%.3f,%.3f)",iTrack,delta_x,delta_z)); + + if(drGetNumberOfTracks(); - Int_t iClosestTrack = -1; - Double_t minDistance = 1e6; - Double_t pxyz[3], xyz[3]; - TVector3 inPHOS; //PH Used to calculate theta and phi - - //PH Loop on tracks - AliESDtrack *track; - for (Int_t iTrack=0; iTrackGetTrack(iTrack); - if (track->IsPHOS()) - continue ; //Skip the PHOS tracks - if (!track->GetXYZAt(rPHOS, 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; - //PH Here one has to cut out the tracks which are not inside the PHOS - //PH acceptance - inPHOS.SetXYZ(xyz[0],xyz[1],xyz[2]); - Double_t inPhi = inPHOS.Phi(); - Double_t inTheta = inPHOS.Theta(); - - Bool_t skip = kTRUE; - for (Int_t imod=0; nModules; imod++) { - //PH Loop on modules to check if the track enters in the acceptance - if (thmin[imod] < inTheta && thmax[imod] > inTheta && - phmin[imod] < inPhi && phmax[imod] > inPhi) { - skip = kFALSE; - break; - } - } - if (skip) continue; //PH Skip, if not in the PHOS acceptance - - if (!track->GetPxPyPzAt(rPHOS, fESD->GetMagneticField(), pxyz)) - continue; // track momentum ibid. - PropagateToPlane(vecDist,xyz,pxyz,"CPV",cpvClu->GetPHOSMod()); - // Info("GetDistanceInPHOSPlane","Track %d propagation to CPV = (%f,%f,%f)", - // iTrack,vecDist.X(),vecDist.Y(),vecDist.Z()); - vecDist -= vecCpv; - distance2Track = TMath::Sqrt(vecDist.X()*vecDist.X() + vecDist.Z()*vecDist.Z()); - // Find the closest track to the EMC recpoint - if (distance2Track < minDistance) { - minDistance = distance2Track; - iClosestTrack = iTrack; - } + } + + } + + if(trackindex>=0) + AliDebug(1,Form("\t\tBest match for (xClu,zClu,eClu)=(%.3f,%.3f,%.3f): iTrack=%d, dR=%.3f", + locClu.X(),locClu.Z(),emcClu->GetEnergy(), + trackindex,TMath::Sqrt(dx*dx+dz*dz))); + return; + + Float_t distance2Track = fRtpc ; + + trackindex = -1 ; // closest track within fRCpv + + TVector3 vecEmc ; // Local position of EMC recpoint + TVector3 vecPloc ; // Momentum direction at CPV plain + + //toofar = kTRUE ; + if(emcClu->GetPHOSMod() != cpvClu->GetPHOSMod()){ + dx=999. ; + dz=999. ; + return ; + } + + emcClu->GetLocalPosition(vecEmc) ; + + Double_t xCPV,zCPV ; //EMC-projected coordinates of CPV cluster + TVector3 cpvGlobal; // Global position of the CPV recpoint + fGeom->GetGlobalPHOS((AliPHOSRecPoint*)cpvClu,cpvGlobal); + Double_t vtxCPV[3]={cpvGlobal.X(),cpvGlobal.Y(),cpvGlobal.Z()} ; + Int_t dummyMod ; + + if (fESD == 0x0) { + //if no track information available, assume straight line from IP to emcal + fGeom->ImpactOnEmc(vtxCPV,cpvGlobal.Theta(),cpvGlobal.Phi(),dummyMod,zCPV,xCPV) ; + dx=xCPV - vecEmc.X() ; + dz=zCPV - vecEmc.Z() ; + return ; + } + + //if there is ESD try to correct distance using TPC information on particle direct in CPV + if (fESD != 0x0) { + + Double_t rCPV = cpvGlobal.Pt() ;// Radius from IP to current point + + // Extrapolate the global track direction if any to CPV and find the closest track + Int_t iClosestTrack = -1; + TVector3 inPHOS ; + + for (Int_t iTrack=0; iTrackGetTrack(iTrack); + if (!track->GetXYZAt(rCPV, 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]); + distance2Track = inPHOS.Angle(cpvGlobal) ; + // Find the closest track to the CPV recpoint + if (distance2Track < minDistance) { + minDistance = distance2Track; + iClosestTrack = iTrack; } + } - delete [] thmin; - delete [] thmax; - delete [] phmin; - delete [] phmax; - - if (iClosestTrack != -1) { - track = fESD->GetTrack(iClosestTrack); - if (track->GetPxPyPzAt(rPHOS, fESD->GetMagneticField(), pxyz)) { // track momentum ibid. - TVector3 vecCpvGlobal; // Global position of the CPV recpoint - geom->GetGlobal((AliRecPoint*)cpvClu,vecCpvGlobal); - for (Int_t ixyz=0; ixyz<3; ixyz++) - xyz[ixyz] = vecCpvGlobal[ixyz]; - PropagateToPlane(vecDist,xyz,pxyz,"EMC",cpvClu->GetPHOSMod()); -// Info("GetDistanceInPHOSPlane","Track %d propagation to EMC = (%f,%f,%f)", -// iClosestTrack,vecDist.X(),vecDist.Y(),vecDist.Z()); - vecDist -= vecEmc; - distance2Track = TMath::Sqrt(vecDist.X()*vecDist.X() + vecDist.Z()*vecDist.Z()); - } + if (iClosestTrack != -1) { + track = fESD->GetTrack(iClosestTrack); + if (track->GetPxPyPzAt(rCPV, fESD->GetMagneticField(), pxyz)) { // track momentum ibid. + vecP.SetXYZ(pxyz[0],pxyz[1],pxyz[2]); + fGeom->ImpactOnEmc(vtxCPV,vecP.Theta(),vecP.Phi(),dummyMod,zCPV,xCPV) ; } -// } else { -// // If no ESD exists, than simply find EMC-CPV distance -// distance = (vecCpv - vecEmc).Mag() ; + } - //if(distance2Track < fRcpv + 2*delta ) - if(distance2Track < fRtpc ) - trackindex = iClosestTrack ; - // toofar = kFALSE ; + if(minDistance < fRtpc ){ + trackindex = iClosestTrack ; } - // Info("GetDistanceInPHOSPlane","cpv-emc distance is %f cm", - // distance); } - - return distance2Cpv ; -} - -//____________________________________________________________________________ -void AliPHOSTrackSegmentMakerv1::PropagateToPlane(TVector3& globalIntersection, - Double_t *x, - Double_t *p, - const char *det, - Int_t moduleNumber) const -{ - // Propagate a straight-line track from the origin point x - // along the direction p to the CPV or EMC module moduleNumber - // Returns a local position of such a propagation - - AliPHOSGetter * gime = AliPHOSGetter::Instance() ; - const AliPHOSGeometry * geom = gime->PHOSGeometry() ; - TVector3 moduleCenter; - geom->GetModuleCenter(moduleCenter,det,moduleNumber); - TVector3 vertex; vertex.SetXYZ(x[0],x[1],x[2]); - TVector3 direction; direction.SetXYZ(p[0],p[1],p[2]); - -// Info("PropagateToCPV","Center of the %s module %d is (%f,%f,%f)", -// det,moduleNumber,moduleCenter[0],moduleCenter[1],moduleCenter[2]); - - Double_t time = (moduleCenter.Mag2() - vertex.Dot(moduleCenter)) / - (direction.Dot(moduleCenter)); - vertex += direction*time; - geom->Global2Local(globalIntersection,vertex,moduleNumber); + if(trackindex!=-1){ + // If the closest global track is found, calculate EMC-CPV distance from it + dx=xCPV - vecEmc.X() ; + dz=zCPV - vecEmc.Z() ; + } + else{ + // If no global track was found, just take the nearest CPV point + fGeom->ImpactOnEmc(vtxCPV,cpvGlobal.Theta(),cpvGlobal.Phi(),dummyMod,zCPV,xCPV) ; + dx=xCPV - vecEmc.X() ; + dz=zCPV - vecEmc.Z() ; + } + return ; } - //____________________________________________________________________________ void AliPHOSTrackSegmentMakerv1::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); - } + fTrackSegments = new TClonesArray("AliPHOSTrackSegment",100); + fTrackSegments->SetName("TRACKS"); } //____________________________________________________________________________ @@ -324,8 +500,6 @@ void AliPHOSTrackSegmentMakerv1::InitParameters() fCpvLast = 0 ; fLinkUpArray = 0 ; fWrite = kTRUE ; - fTrackSegmentsInRun = 0 ; - SetEventRange(0,-1) ; } @@ -336,10 +510,6 @@ void AliPHOSTrackSegmentMakerv1::MakeLinks()const // which are not further apart from each other than fRcpv // and sort them in accordance with this distance - AliPHOSGetter * gime = AliPHOSGetter::Instance() ; - TObjArray * emcRecPoints = gime->EmcRecPoints() ; - TObjArray * cpvRecPoints = gime->CpvRecPoints() ; - fLinkUpArray->Clear() ; AliPHOSCpvRecPoint * cpv ; @@ -349,19 +519,18 @@ void AliPHOSTrackSegmentMakerv1::MakeLinks()const Int_t iEmcRP; for(iEmcRP = fEmcFirst; iEmcRP < fEmcLast; iEmcRP++ ) { - emcclu = dynamic_cast(emcRecPoints->At(iEmcRP)) ; + emcclu = dynamic_cast(fEMCRecPoints->At(iEmcRP)) ; //Bool_t toofar ; Int_t iCpv = 0 ; for(iCpv = fCpvFirst; iCpv < fCpvLast;iCpv++ ) { - cpv = dynamic_cast(cpvRecPoints->At(iCpv)) ; + cpv = dynamic_cast(fCPVRecPoints->At(iCpv)) ; Int_t track = -1 ; - Float_t r = GetDistanceInPHOSPlane(emcclu, cpv, track) ; - // if(toofar) - // continue ; - if(r < fRcpv) { - new ((*fLinkUpArray)[iLinkUp++]) AliPHOSLink(r, iEmcRP, iCpv, track) ; + Float_t dx,dz ; + GetDistanceInPHOSPlane(emcclu, cpv, track,dx,dz) ; + if(TMath::Sqrt(dx*dx+dz*dz) < fRcpv ){ + new ((*fLinkUpArray)[iLinkUp++]) AliPHOSLink(dx, dz, iEmcRP, iCpv, track) ; } } } @@ -377,12 +546,6 @@ void AliPHOSTrackSegmentMakerv1::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() ; - TObjArray * cpvRecPoints = gime->CpvRecPoints() ; - TClonesArray * trackSegments = gime->TrackSegments(); - //Make arrays to mark clusters already chosen Int_t * emcExist = 0; if(fEmcLast > fEmcFirst) @@ -411,12 +574,14 @@ void AliPHOSTrackSegmentMakerv1::MakePairs() if(emcExist[linkUp->GetEmc()-fEmcFirst] != -1){ if(cpvExist[linkUp->GetCpv()-fCpvFirst]){ //CPV still exist - new ((* trackSegments)[fNTrackSegments]) - AliPHOSTrackSegment(dynamic_cast(emcRecPoints->At(linkUp->GetEmc())) , - dynamic_cast(cpvRecPoints->At(linkUp->GetCpv())) , - linkUp->GetTrack()) ; + Float_t dx,dz ; + linkUp->GetXZ(dx,dz) ; + new ((* fTrackSegments)[fNTrackSegments]) + AliPHOSTrackSegment(dynamic_cast(fEMCRecPoints->At(linkUp->GetEmc())) , + dynamic_cast(fCPVRecPoints->At(linkUp->GetCpv())) , + 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 CPV recpoint as already used @@ -430,11 +595,16 @@ void AliPHOSTrackSegmentMakerv1::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)), - nullpointer) ; - (dynamic_cast(trackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments); - fNTrackSegments++; + Int_t track = -1 ; + Float_t dx,dz ; + AliPHOSEmcRecPoint *emcclu = dynamic_cast(fEMCRecPoints->At(iEmcRP+fEmcFirst)); + GetDistanceInPHOSPlane(emcclu, 0, track,dx,dz); + if(track<0) + new ((*fTrackSegments)[fNTrackSegments]) AliPHOSTrackSegment(emcclu,nullpointer) ; + else + new ((*fTrackSegments)[fNTrackSegments]) AliPHOSTrackSegment(emcclu,0,track,dx,dz); + (dynamic_cast(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments); + fNTrackSegments++; } } } @@ -443,12 +613,10 @@ void AliPHOSTrackSegmentMakerv1::MakePairs() } //____________________________________________________________________________ -void AliPHOSTrackSegmentMakerv1::Exec(Option_t *option) +void AliPHOSTrackSegmentMakerv1::Clusters2TrackSegments(Option_t *option) { - // Steering method to perform track segment construction for events - // in the range from fFirstEvent to fLastEvent. - // This range is optionally set by SetEventRange(). - // if fLastEvent=-1 (by default), then process events until the end. + // Steering method to perform track segment construction for the current event + // Returns an array with the found track-segments. if(strstr(option,"tim")) gBenchmark->Start("PHOSTSMaker"); @@ -458,62 +626,31 @@ void AliPHOSTrackSegmentMakerv1::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,"R") ; - //Make some initializations - fNTrackSegments = 0 ; - fEmcFirst = 0 ; - fEmcLast = 0 ; - fCpvFirst = 0 ; - fCpvLast = 0 ; - - gime->TrackSegments()->Clear(); + //Make some initializations + fNTrackSegments = 0 ; + fEmcFirst = 0 ; + fEmcLast = 0 ; + fCpvFirst = 0 ; + fCpvLast = 0 ; - // if(!ReadRecPoints(ievent)) continue; //reads RecPoints for event ievent - - for(fModule = 1; fModule <= geom->GetNModules() ; fModule++ ) { - FillOneModule() ; - MakeLinks() ; - MakePairs() ; - } + fTrackSegments->Clear(); - WriteTrackSegments() ; + // if(!ReadRecPoints(ievent)) continue; //reads RecPoints for event ievent - if(strstr(option,"deb")) - PrintTrackSegments(option); - - //increment the total number of track segments per run - fTrackSegmentsInRun += gime->TrackSegments()->GetEntriesFast() ; + for(fModule = 1; fModule <= fGeom->GetNModules() ; fModule++ ) { + FillOneModule() ; + MakeLinks() ; + MakePairs() ; } - + + if(strstr(option,"deb")) + PrintTrackSegments(option); + 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 AliPHOSTrackSegmentMakerv1::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")); + } } //____________________________________________________________________________ @@ -534,54 +671,22 @@ void AliPHOSTrackSegmentMakerv1::Print(const Option_t *)const Info("Print", "AliPHOSTrackSegmentMakerv1 not initialized ") ; } -//____________________________________________________________________________ -void AliPHOSTrackSegmentMakerv1::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 AliPHOSTrackSegmentMakerv1::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->GetCpvIndex() ) ; } } } +