X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=HMPID%2FAliHMPIDTracker.cxx;h=4254a582088b9764fea1ca93f52937e89e5927eb;hp=d84fd5c8480c60b75c02ed6e61b3731af0424217;hb=3733ccd2379c46392bcf12253bfeb00fdf7be8ed;hpb=170a4fc50523b5ee3348a8c1218e60f689f090b8 diff --git a/HMPID/AliHMPIDTracker.cxx b/HMPID/AliHMPIDTracker.cxx index d84fd5c8480..4254a582088 100644 --- a/HMPID/AliHMPIDTracker.cxx +++ b/HMPID/AliHMPIDTracker.cxx @@ -39,12 +39,15 @@ Bool_t AliHMPIDTracker::GetTrackPoint(Int_t idx, AliTrackPoint& point) const // Returns: status of operation if FALSE then AliReconstruction::WriteAlignmentData() do not store this point to array of points for current track. if(idx<0) return kFALSE; //no MIP cluster assigned to this track in PropagateBack() Int_t iCham=idx/1000000; Int_t iClu=idx%1000000; - point.SetVolumeID(AliGeomManager::LayerToVolUID(AliGeomManager::kHMPID,iCham-1));//layer and chamber number + iClu = iClu%1000; //GetHMPIDcluIdx -> 1e+6*ch + 1e+3*clusize + cluIdx; + point.SetVolumeID(AliGeomManager::LayerToVolUID(AliGeomManager::kHMPID,iCham));//layer and chamber number TClonesArray *pArr=(TClonesArray*)(*fClu)[iCham]; AliHMPIDCluster *pClu=(AliHMPIDCluster*)pArr->UncheckedAt(iClu);//get pointer to cluster - Double_t mars[3]; - AliHMPIDParam::Instance()->Lors2Mars(iCham,pClu->X(),pClu->Y(),mars); - point.SetXYZ(mars[0],mars[1],mars[2]); + Float_t xyz[3]; + pClu->GetGlobalXYZ(xyz); + Float_t cov[6]; + pClu->GetGlobalCov(cov); + point.SetXYZ(xyz,cov); return kTRUE; }//GetTrackPoint() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -53,17 +56,12 @@ Int_t AliHMPIDTracker::IntTrkCha(AliESDtrack *pTrk,Float_t &xPc,Float_t &yPc,Flo // Static method to find intersection in between given track and HMPID chambers // Arguments: pTrk- ESD track; xPc,yPc- track intersection with PC in LORS [cm] // Returns: intersected chamber ID or -1 - AliHMPIDParam *pParam=AliHMPIDParam::Instance(); + AliHMPIDtrack *hmpTrk = new AliHMPIDtrack(*pTrk); //create a hmpid track to be used for propagation and matching for(Int_t i=AliHMPIDParam::kMinCh;i<=AliHMPIDParam::kMaxCh;i++){ //chambers loop - Double_t p1[3],n1[3]; pParam->Norm(i,n1); pParam->Point(i,p1,AliHMPIDParam::kRad); //point & norm for middle of radiator plane - Double_t p2[3],n2[3]; pParam->Norm(i,n2); pParam->Point(i,p2,AliHMPIDParam::kPc); //point & norm for entrance to PC plane - if(pTrk->Intersect(p1,n1,-GetBz())==kFALSE) continue; //try to intersect track with the middle of radiator - if(pTrk->Intersect(p2,n2,-GetBz())==kFALSE) continue; //try to intersect track with PC - pParam->Mars2LorsVec(i,n1,theta,phi); //track angles at RAD - pParam->Mars2Lors (i,p1,xRa,yRa); //TRKxRAD position - pParam->Mars2Lors (i,p2,xPc,yPc); //TRKxPC position - if(AliHMPIDParam::IsInside(xPc,yPc,pParam->DistCut())==kTRUE) return i; //return intersected chamber + Int_t chInt = IntTrkCha(i,hmpTrk,xPc,yPc,xRa,yRa,theta,phi); + if(chInt>=0) {delete hmpTrk;hmpTrk=0x0;return chInt;} } //chambers loop + delete hmpTrk; hmpTrk=0x0; return -1; //no intersection with HMPID chambers }//IntTrkCha() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -77,7 +75,7 @@ Int_t AliHMPIDTracker::IntTrkCha(Int_t ch,AliHMPIDtrack *pTrk,Float_t &xPc,Float pParam->Norm(ch,n1); pParam->Point(ch,p1,AliHMPIDParam::kRad); //point & norm for middle of radiator plane Double_t p2[3],n2[3]; - pParam->Norm(ch,n2); + pParam->Norm(ch,n2); pParam->Point(ch,p2,AliHMPIDParam::kPc); //point & norm for entrance to PC plane if(pTrk->Intersect(pTrk,p1,n1)==kFALSE) return -1; //try to intersect track with the middle of radiator if(pTrk->Intersect(pTrk,p2,n2)==kFALSE) return -1; @@ -119,38 +117,42 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea AliHMPIDRecon recon; //instance of reconstruction class, nothing important in ctor Float_t xPc,yPc,xRa,yRa,theta,phi; - Double_t cluLORS[2]={0},cluMARS[3]={0},trkMARS[3]={0}; + Double_t cluLORS[2]={0}; +// Double_t cluMARS[3]={0},trkMARS[3]={0}; // Double_t bestcluMARS[3]={0,0,0}; - Double_t radClu,radInitTrk; +// Double_t radClu,radInitTrk; Int_t nMipClusTot=0; - Double_t d3d=0,dmin=999999,bz=0; - Bool_t isMatched=kFALSE; - Int_t cluSiz=0; - Double_t qthre = 0; Double_t nmean=0; Int_t cham=0; Int_t hvsec=0; - Int_t index=0; //index of the "best" matching cluster - Double_t bestChi2=-1; //Chi2 of the "best" matching cluster - Double_t chi2=0; +// Double_t d3d=0; + Double_t qthre = 0; Double_t nmean=0; Int_t hvsec=0; Int_t nClusCh[AliHMPIDParam::kMaxCh+1]; - Bool_t isOkQcut=kFALSE; - Bool_t isOkDcut=kFALSE; AliHMPIDParam *pParam = AliHMPIDParam::Instance(); //Instance of AliHMPIDParam for(Int_t iTrk=0;iTrkGetNumberOfTracks();iTrk++){ //loop on the ESD tracks in the event - isMatched=kFALSE;dmin=999999;bestChi2=99999;chi2=99999;cluSiz=0; //init. track matching params - isOkQcut = kFALSE; + +// Double_t bestChi2=99999;chi2=99999; //init. track matching params + Double_t dmin=999999,bz=0; + + Bool_t isOkDcut=kFALSE; + Bool_t isOkQcut=kFALSE; + Bool_t isMatched=kFALSE; + AliHMPIDCluster *bestHmpCluster=0x0; //the best matching cluster AliESDtrack *pTrk = pEsd->GetTrack(iTrk); //get reconstructed track AliHMPIDtrack *hmpTrk = new AliHMPIDtrack(*pTrk); //create a hmpid track to be used for propagation and matching bz=AliTracker::GetBz(); +//initial flags for HMPID ESD infos + pTrk->SetHMPIDtrk(0,0,0,0); //no intersection found + pTrk->SetHMPIDmip(0,0,0,0); //store mip info in any case + pTrk->SetHMPIDcluIdx(99,99999); //chamber not found, mip not yet considered + pTrk->SetHMPIDsignal(AliHMPIDRecon::kNotPerformed); //ring reconstruction not yet performed Int_t ipCh=IntTrkCha(pTrk,xPc,yPc,xRa,yRa,theta,phi); //find the intersected chamber for this track - if(ipCh<0) { //no intersection at all, go after next track - pTrk->SetHMPIDtrk(0,0,0,0); //no intersection found - pTrk->SetHMPIDcluIdx (99,99999); //chamber not found, mip not yet considered - pTrk->SetHMPIDsignal(AliHMPIDRecon::kNotPerformed); //ring reconstruction not yet performed - continue; - } + + if(ipCh<0) continue; //no intersection at all, go after next track + + pTrk->SetHMPIDtrk(xRa,yRa,theta,phi); //store initial infos + pTrk->SetHMPIDcluIdx(ipCh,9999); //set chamber, index of cluster + cluster size // track intersects the chamber ipCh: find the MIP @@ -158,6 +160,10 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea nMipClusTot = pMipCluLst->GetEntries(); //total number of clusters in the given chamber nClusCh[ipCh] = nMipClusTot; + if(nMipClusTot==0) continue; + + Int_t index=-1; //index of the "best" matching cluster + for (Int_t iClu=0; iCluUncheckedAt(iClu); //get the cluster @@ -167,13 +173,22 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea } else { // in the past just 1 qthre hvsec = pParam->InHVSector(pClu->Y()); // per chamber if(hvsec>=0) - qthre=((TF1*)pQthre->At(6*cham+hvsec))->Eval(pEsd->GetTimeStamp()); // + qthre=((TF1*)pQthre->At(6*ipCh+hvsec))->Eval(pEsd->GetTimeStamp()); // } // // if(pClu->Q()X(); cluLORS[1]=pClu->Y(); //get the LORS coordinates of the cluster + Double_t dist = TMath::Sqrt((xPc-cluLORS[0])*(xPc-cluLORS[0])+(yPc-cluLORS[1])*(yPc-cluLORS[1])); + + if(distLors2Mars(ipCh,cluLORS[0],cluLORS[1],cluMARS); //convert cluster coors. from LORS to MARS radClu=TMath::Sqrt(cluMARS[0]*cluMARS[0]+cluMARS[1]*cluMARS[1]); //radial distance of candidate cluster in MARS Double_t trkx0[3]; @@ -184,7 +199,7 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea hmpTrk->GetXYZAt(radClu,bz,trkMARS); //get the track coordinates at the rad distance after prop. d3d=TMath::Sqrt((cluMARS[0]-trkMARS[0])*(cluMARS[0]-trkMARS[0])+(cluMARS[1]-trkMARS[1])*(cluMARS[1]-trkMARS[1])+(cluMARS[2]-trkMARS[2])*(cluMARS[2]-trkMARS[2])); chi2=hmpTrk->GetPredictedChi2(pClu); - if(dmin > d3d ) { //to be saved for the moment... + if(dmin > d3d ) { + //to be saved for the moment... cluSiz = pClu->Size(); dmin=d3d; bestHmpCluster=pClu; @@ -194,29 +209,33 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea // pParam->Lors2Mars(ipCh,cluLORS[0],cluLORS[1],bestcluMARS); }//global dmin cut }//clus loop - - pTrk->SetHMPIDmip(0,0,0,0); //store mip info in any case - +*/ if(!isOkQcut) { - pTrk->SetHMPIDcluIdx(ipCh,9999); pTrk->SetHMPIDsignal(pParam->kMipQdcCut); continue; } + + Int_t cluSiz = bestHmpCluster->Size(); + pTrk->SetHMPIDmip(bestHmpCluster->X(),bestHmpCluster->Y(),(Int_t)bestHmpCluster->Q(),0); //store mip info in any case + pTrk->SetHMPIDcluIdx(ipCh,index+1000*cluSiz); //set chamber, index of cluster + cluster size if(dmin < pParam->DistCut()) { isOkDcut = kTRUE; } if(!isOkDcut) { - pTrk->SetHMPIDmip(bestHmpCluster->X(),bestHmpCluster->Y(),(Int_t)bestHmpCluster->Q(),0); //store mip info in any case - pTrk->SetHMPIDcluIdx(ipCh,index+1000*cluSiz); //set chamber, index of cluster + cluster size pTrk->SetHMPIDsignal(pParam->kMipDistCut); //closest cluster with enough charge is still too far from intersection } if(isOkQcut*isOkDcut) isMatched = kTRUE; // MIP-Track matched !! if(!isMatched) continue; // If matched continue... + + Bool_t isOk = hmpTrk->Update(bestHmpCluster,0.1,0); + if(!isOk) continue; + pTrk->SetOuterParam(hmpTrk,AliESDtrack::kHMPIDout); + /* Int_t indexAll = 0; for(Int_t iC=0;iCSetOuterParam(hmpTrk,AliESDtrack::kHMPIDout); -// cham=IntTrkCha(ipCh,hmpTrk,xPc,yPc,xRa,yRa,theta,phi); cham=IntTrkCha(pTrk,xPc,yPc,xRa,yRa,theta,phi); + if(cham<0) { //no intersection at all, go after next track pTrk->SetHMPIDtrk(0,0,0,0); //no intersection found pTrk->SetHMPIDcluIdx (99,99999); //chamber not found, mip not yet considered pTrk->SetHMPIDsignal(AliHMPIDRecon::kNotPerformed); //ring reconstruction not yet performed continue; } - - pTrk->SetHMPIDtrk(xRa,yRa,theta,phi); //store initial infos +*/ //evaluate nMean if(pNmean->GetEntries()==21) { //for backward compatibility - nmean=((TF1*)pNmean->At(3*cham))->Eval(pEsd->GetTimeStamp()); //C6F14 Nmean for this chamber + nmean=((TF1*)pNmean->At(3*ipCh))->Eval(pEsd->GetTimeStamp()); //C6F14 Nmean for this chamber } else { Int_t iRad = pParam->Radiator(yRa); //evaluate the radiator involved if(iRad < 0) { nmean = -1; } else { - Double_t tLow = ((TF1*)pNmean->At(6*cham+2*iRad ))->Eval(pEsd->GetTimeStamp()); //C6F14 low temp for this chamber - Double_t tHigh = ((TF1*)pNmean->At(6*cham+2*iRad+1))->Eval(pEsd->GetTimeStamp()); //C6F14 high temp for this chamber + Double_t tLow = ((TF1*)pNmean->At(6*ipCh+2*iRad ))->Eval(pEsd->GetTimeStamp()); //C6F14 low temp for this chamber + Double_t tHigh = ((TF1*)pNmean->At(6*ipCh+2*iRad+1))->Eval(pEsd->GetTimeStamp()); //C6F14 high temp for this chamber Double_t tExp = pParam->FindTemp(tLow,tHigh,yRa); //estimated temp for that chamber at that y nmean = pParam->NIdxRad(AliHMPIDParam::Instance()->GetEPhotMean(),tExp); //mean ref idx @ a given temp } @@ -255,7 +273,7 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea } // recon.SetImpPC(xPc,yPc); //store track impact to PC - recon.CkovAngle(pTrk,(TClonesArray *)pClus->At(cham),index,nmean); //search for Cerenkov angle of this track + recon.CkovAngle(pTrk,(TClonesArray *)pClus->At(ipCh),index,nmean); //search for Cerenkov angle of this track AliHMPIDPid pID; Double_t prob[5]; @@ -263,6 +281,7 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea pTrk->SetHMPIDpid(prob); // Printf(" Prob e- %6.2f mu %6.2f pi %6.2f k %6.2f p %6.2f",prob[0]*100,prob[1]*100,prob[2]*100,prob[3]*100,prob[4]*100); + delete hmpTrk;hmpTrk=0x0; }//iTrk return 0; // error code: 0=no error;