PID probability calculated using refractive index evaluated from OCDB information...
[u/mrichter/AliRoot.git] / HMPID / AliHMPIDTracker.cxx
index 3febf90..72a9c8f 100644 (file)
@@ -4,15 +4,20 @@
 #include "AliHMPIDParam.h"       //GetTrackPoint(),PropagateBack()
 #include "AliHMPIDPid.h"         //Recon(),reconHTA()
 #include "AliHMPIDRecon.h"       //Recon()
+#include "AliHMPIDRecoParamV1.h"   //Recon()
+#include "AliHMPIDReconstructor.h"//Recon()
 #include "AliHMPIDReconHTA.h"    //ReconHTA()
+#include <AliLog.h>              //Recon()  
 #include <AliESDEvent.h>         //PropagateBack(),Recon()  
-#include <AliESDtrack.h>         //Intersect()  
+#include <AliESDtrack.h>         //Intersect() 
+#include <AliTracker.h> 
 #include <AliRun.h>              //GetTrackPoint(),PropagateBack()  
 #include <AliTrackPointArray.h>  //GetTrackPoint()
 #include <AliAlignObj.h>         //GetTrackPoint()
 #include <AliCDBManager.h>       //PropageteBack()
 #include <AliCDBEntry.h>         //PropageteBack()
-//.
+#include "TTreeStream.h"         // debug streamer
+//
 // HMPID base class fo tracking
 //.
 //.
@@ -21,14 +26,27 @@ ClassImp(AliHMPIDTracker)
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliHMPIDTracker::AliHMPIDTracker():
   AliTracker(),
-  fClu(new TObjArray(AliHMPIDParam::kMaxCh+1))  
+  fClu(new TObjArray(AliHMPIDParam::kMaxCh+1)),
+  fDebugStreamer(0)
 {
 // ctor. Create TObjArray of TClonesArray of AliHMPIDCluster  
 // 
 //  
   fClu->SetOwner(kTRUE);
   for(int i=AliHMPIDParam::kMinCh;i<=AliHMPIDParam::kMaxCh;i++) fClu->AddAt(new TClonesArray("AliHMPIDCluster"),i);
+  fDebugStreamer = new TTreeSRedirector("HMPIDdebug.root");
+
 }//ctor
+
+
+AliHMPIDTracker::~AliHMPIDTracker(){
+  //
+  // destructor
+  // 
+  delete fClu;
+  if (fDebugStreamer) delete fDebugStreamer;
+}
+
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++    
 Bool_t AliHMPIDTracker::GetTrackPoint(Int_t idx, AliTrackPoint& point) const
 {
@@ -77,8 +95,8 @@ Int_t AliHMPIDTracker::IntTrkCha(Int_t ch,AliHMPIDtrack *pTrk,Float_t &xPc,Float
     Double_t p2[3],n2[3]; 
     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;   
+    if(pTrk->Intersect(p1,n1)==kFALSE) return -1;                                                //try to intersect track with the middle of radiator
+    if(pTrk->Intersect(p2,n2)==kFALSE) return -1;   
     pParam->Mars2LorsVec(ch,n1,theta,phi);                                                       //track angles at RAD
     pParam->Mars2Lors   (ch,p1,xRa,yRa);                                                         //TRKxRAD position
     pParam->Mars2Lors   (ch,p2,xPc,yPc);                                                         //TRKxPC position
@@ -111,34 +129,400 @@ Int_t AliHMPIDTracker::PropagateBack(AliESDEvent *pEsd)
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmean, TObjArray *pQthre)
 {
+// Static method to reconstruct the Cherenkov angle for all valid tracks of a given event.
+// Arguments: pEsd- pointer ESD; pClu- pointer to clusters for all chambers; pNmean - pointer to all function Nmean=f(time)
+// Returns: error code, 0 if no errors   
+//
+// Algortihm: Loop over tracks
+//
+// 1. Find the closest MIP cluster using fast tracks extrapolation method
+// 2. Propagate track to the MIP cluster using the STEER method
+// 3. Update the track information with MIP cluster (Improved angular and position resolution - to be used for Cherenkov angle calculation)
+// 4. Propagate back the constrained track to the radiator radius ( not exact yet)
+// 5. Propagation in the last 10 cm with the fast method 
+// 6. Set ESDtrack information
+// 7. Calculate the Cherenkov angle
+
+  const Double_t kMaxSnp=0.9;   //maximal snp for prolongation
+  const Double_t kdRadiator=10; // distance between radiator and the plane
+  AliHMPIDRecon recon;                                                                           //instance of reconstruction class, nothing important in ctor
+  AliHMPIDParam *pParam = AliHMPIDParam::Instance();                                             //Instance of AliHMPIDParam
+  Float_t xPc,yPc,xRa,yRa,theta,phi;
+  
+  Double_t cluLORS[2]={0};
+  Int_t nMipClusTot=0;
+  
+  Double_t qthre = 0;   Double_t nmean=0; Int_t hvsec=0;
+  Int_t nClusCh[AliHMPIDParam::kMaxCh+1];
+
+  Bool_t tsRight = kTRUE;
+  
+  UInt_t tsmin = (UInt_t)((TF1*)pQthre->At(0))->GetXmin();                                        //
+  UInt_t tsmax = (UInt_t)((TF1*)pQthre->At(0))->GetXmax();                                        //
+  UInt_t ts = pEsd->GetTimeStamp();
+  
+  if(ts<tsmin || ts>tsmax) {
+    AliWarning(Form(" in HMPID time stamp out of range!!! Please check!!! ts = %i",ts));
+    tsRight = kFALSE;
+  }
+   
+  for(Int_t iTrk=0;iTrk<pEsd->GetNumberOfTracks();iTrk++){                                        //loop on the ESD tracks in the event
+           
+    //    Double_t bestChi2=99999;chi2=99999;                                                     //init. track matching params
+    Double_t dmin=999999,bz=0,distCut=1,distParams[5]={1};
+
+    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   
+    
+    if(!pTrk->IsOn(AliESDtrack::kTPCout)) continue;
+    if(pTrk->IsOn(AliESDtrack::kTPCrefit)) continue;
+    AliESDfriendTrack *ftrack= (AliESDfriendTrack *)pTrk->GetFriendTrack();
+    if (!ftrack) continue; 
+    if (!ftrack->GetTPCOut()) continue;
+    AliHMPIDtrack *hmpTrk = new AliHMPIDtrack(*pTrk);                                             //create a hmpid track to be used for propagation and matching 
+    AliHMPIDtrack *hmpTrkConstrained = 0;                                                         //create a hmpid track to be used for propagation and matching 
+    hmpTrk->Set(ftrack->GetTPCOut()->GetX(), ftrack->GetTPCOut()->GetAlpha(),ftrack->GetTPCOut()->GetParameter(), ftrack->GetTPCOut()->GetCovariance());
+    //
+    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) {delete hmpTrk;hmpTrk=0x0;continue;}                                                                         //no intersection at all, go after next track
+
+    pTrk->SetHMPIDtrk(xPc,yPc,theta,phi);                                                        //store initial infos
+    pTrk->SetHMPIDcluIdx(ipCh,9999);                                                             //set chamber, index of cluster + cluster size
+    
+    // track intersects the chamber ipCh: find the MIP          
+    
+    TClonesArray *pMipCluLst=(TClonesArray *)pClus->At(ipCh);                                   //get the list of clusters
+    nMipClusTot = pMipCluLst->GetEntries();                                                     //total number of clusters in the given chamber
+    nClusCh[ipCh] = nMipClusTot;
+    
+    if(nMipClusTot==0) {delete hmpTrk;hmpTrk=0x0;continue;}                                                                         
+    
+    Int_t index=-1;                                                                               //index of the "best" matching cluster
+    //
+    // 1. Find the closest MIP cluster using fast tracks extrapolation method
+    //
+    for (Int_t iClu=0; iClu<nMipClusTot;iClu++) {                                                 //clusters loop
+      
+      AliHMPIDCluster *pClu=(AliHMPIDCluster*)pMipCluLst->UncheckedAt(iClu);                      //get the cluster
+      // evaluate qThre
+      if(tsRight){
+       if(pQthre->GetEntriesFast()==pParam->kMaxCh+1) {
+         qthre=((TF1*)pQthre->At(pClu->Ch()))->Eval(ts);                                          //
+       } else {                                                                                   // in the past just 1 qthre
+         hvsec = pParam->InHVSector(pClu->Y());                                                   //  per chamber
+         if(hvsec>=0) qthre=((TF1*)pQthre->At(6*ipCh+hvsec))->Eval(ts);                                     //
+        } 
+      } else qthre = pParam->QCut();
+      
+      //      
+      if(pClu->Q()<qthre) continue;                                                                      //charge compartible with MIP clusters      
+      isOkQcut = kTRUE;
+      //
+      cluLORS[0]=pClu->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(dist<dmin) {
+        dmin = dist;
+        index=iClu;
+        bestHmpCluster=pClu;
+      }
+    } // clusters loop
+
+    // moved down
+    /*if(!isOkQcut) {
+      pTrk->SetHMPIDsignal(pParam->kMipQdcCut);
+      delete hmpTrk;hmpTrk=0x0; continue;                                                                     
+    }*/
+    
+    //
+    // 2. Propagate track to the MIP cluster using the STEER method
+    //
+        
+    if(!bestHmpCluster) {delete hmpTrk;hmpTrk=0x0; delete hmpTrkConstrained;hmpTrkConstrained=0x0;  continue;}     
+        
+    TVector3 vG = pParam->Lors2Mars(ipCh,bestHmpCluster->X(),bestHmpCluster->Y());    
+    Double_t gx = vG[0];
+    Double_t gy = vG[1];
+    Double_t gz = vG[2];
+    Double_t alpha=TMath::ATan2(gy,gx);
+    Double_t radiusH=TMath::Sqrt(gy*gy+gx*gx);
+    if (!(hmpTrk->Rotate(alpha,kTRUE))) continue;
+    if(!AliTrackerBase::PropagateTrackToBxByBz(hmpTrk,radiusH,pTrk->GetMass(),1,kFALSE,kMaxSnp,-1)) {delete hmpTrk;hmpTrk=0x0; delete hmpTrkConstrained;hmpTrkConstrained=0x0; continue;}    
+    //
+    // 3. Update the track with MIP cluster (Improved angular and position resolution - to be used for Cherenkov angle calculation)
+    //
+    AliExternalTrackParam trackC(*hmpTrk);
+    Double_t posC[2]={0,gz};
+    Double_t covC[3]={0.1*0.1, 0, 0.1*0.1};
+    trackC.Update(posC,covC);
+    //
+    // 4. Propagate back the constrained track to the radiator radius ( not exact yet)
+    //
+    hmpTrkConstrained = new AliHMPIDtrack(*pTrk);
+    hmpTrkConstrained->Set(trackC.GetX(), trackC.GetAlpha(),trackC.GetParameter(), trackC.GetCovariance());
+    if(!AliTrackerBase::PropagateTrackToBxByBz(hmpTrkConstrained,radiusH-kdRadiator,pTrk->GetMass(),1,kFALSE,kMaxSnp,1)) {delete hmpTrk;hmpTrk=0x0; delete hmpTrkConstrained;hmpTrkConstrained=0x0;continue;}
+    //
+    // 5. Propagation in the last 10 cm with the fast method 
+    //
+    Float_t xPc0=0, yPc0=0;
+    
+    IntTrkCha(ipCh, hmpTrk, xPc0,yPc0,xRa,yRa,theta,phi);  
+    IntTrkCha(ipCh, hmpTrkConstrained, xPc,yPc,xRa,yRa,theta,phi);  
+    //
+    // 6. Set ESDtrack information
+    //
+    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    
+    pTrk->SetHMPIDtrk(xPc0,yPc0,theta,phi);
+    //
+    //
+    // Dump debug info if specified
+    // 
+    if (AliHMPIDReconstructor::StreamLevel()>0) {      
+      AliExternalTrackParam * trackTPC=new AliExternalTrackParam(*(ftrack->GetTPCOut()));
+      AliExternalTrackParam * trackCurrent=new AliExternalTrackParam(*pTrk);      
+      if(!trackTPC->Rotate(alpha)) continue;
+      if(!trackCurrent->Rotate(alpha)) continue;      
+      Bool_t statusTPC= AliTracker::PropagateTrackToBxByBz(trackTPC,radiusH,pTrk->GetMass(),1,kFALSE,kMaxSnp,-1);      
+      Bool_t statusCurrent=AliTracker::PropagateTrackToBxByBz(trackCurrent,radiusH,pTrk->GetMass(),1,kFALSE,kMaxSnp,-1);  
+      AliExternalTrackParam * trackTPCNB=new AliExternalTrackParam(*(ftrack->GetTPCOut()));
+      if(!trackTPCNB->Rotate(alpha)) continue;
+      Bool_t statusTPCNB=kTRUE;
+      Double_t bfield[3]={0,0,0};
+      for (Double_t radius=trackTPCNB->GetX(); radius<radiusH; radius+=1){
+       Double_t xyz[3];
+       trackTPCNB->GetXYZ(xyz);
+       GetBxByBz(xyz,bfield);
+       statusTPCNB&=trackTPCNB->PropagateToBxByBz(radius,bfield);
+      }
+      statusTPCNB&=trackTPCNB->PropagateToBxByBz(radiusH,bfield);
+      //        
+      Double_t tanAlpha=TMath::Tan(TMath::ASin(trackTPC->GetSnp()));
+      Double_t deltaC= trackTPC->GetC(AliTrackerBase::GetBz())-ftrack->GetTPCOut()->GetC(AliTrackerBase::GetBz());    
+      //
+      AliExternalTrackParam * trackTPCConstrained= new AliExternalTrackParam(*trackTPC);
+      Double_t pos[2]={0,gz};
+      Double_t cov[3]={0.1*0.1, 0, 0.1*0.1};
+      Double_t chi2C =  trackTPCConstrained->GetPredictedChi2(pos,cov);
+      trackTPCConstrained->Update(pos,cov);
+      (*fDebugStreamer)<<"track"<<
+       "rH="<<radiusH<<                      // radius of cluster
+       "angle="<<tanAlpha<<                  // tan of the local inlination angle
+       "dC="<<deltaC<<                       // delta of the curvature
+       "trackTPC.="<<trackTPC<<              // TPC outer param extrapolated to the HMPID
+       "trackTPCNB.="<<trackTPCNB<<          // TPC track prpagated with material budget correction
+       "chi2C="<<chi2C<<
+       "trackTPCC.="<<trackTPCConstrained<<  // TPC outer param extrapolated to the HMPID constrained
+       "trackCurrent.="<<trackCurrent<<      // current track extrapolated to the HMPID
+       "sTPC="<<statusTPC<<                  // status for the current TPC  track
+       "sCurrent="<<statusCurrent<<          // status for the current global track
+       "cl.="<<bestHmpCluster<<              // HMPID cluster
+       //
+       "t.="<<pTrk<<                        // curent esd track
+       "ft.="<<ftrack<<                     // friend track
+       "hmpTrk.="<<hmpTrk<<                 // hmpid tracks as used in the following code
+       "hmpTrkC.="<<hmpTrkConstrained<<     // constrained hmpid tracks as used in the following code
+       "gx="<<gx<<                          // global cluster position X
+       "gy="<<gy<<                          // Y
+       "gz="<<gz<<                          // Z
+       "\n";
+    }                 
+    //
+    //
+    //    
+    if(!isOkQcut) {
+      pTrk->SetHMPIDsignal(pParam->kMipQdcCut);
+      delete hmpTrk;hmpTrk=0x0; 
+      delete hmpTrkConstrained;hmpTrkConstrained=0x0; 
+      continue;                                                                     
+    }        
+    
+    if(AliHMPIDReconstructor::GetRecoParam())                                                 //retrieve distance cut
+    {
+      if(AliHMPIDReconstructor::GetRecoParam()->IsFixedDistCut()==kTRUE)                      //distance cut is fixed number
+      { 
+        distCut=AliHMPIDReconstructor::GetRecoParam()->GetHmpTrackMatchingDist();
+      }
+      else 
+      {
+        for(Int_t ipar=0;ipar<5;ipar++) distParams[ipar]=AliHMPIDReconstructor::GetRecoParam()->GetHmpTrackMatchingDistParam(ipar);      //prevision: distance cut is function of momentum
+        distCut=distParams[0]+distParams[1]*TMath::Power(distParams[2]*pTrk->GetP(),distParams[3]); //prevision: change functional form to be more precise
+      }
+    }
+    else {distCut=pParam->DistCut();}
+     
+    //dmin recalculated
+    
+    dmin = TMath::Sqrt((xPc0-bestHmpCluster->X())*(xPc0-bestHmpCluster->X())+(yPc0-bestHmpCluster->Y())*(yPc0-bestHmpCluster->Y()));
+             
+    if(dmin < distCut) {
+      isOkDcut = kTRUE;
+    }   
+    //isOkDcut = kTRUE; // switch OFF cut
+    
+    if(!isOkDcut) {
+      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) {delete hmpTrk;hmpTrk=0x0;delete hmpTrkConstrained;hmpTrkConstrained=0x0;continue;}                                           // If matched continue...
+
+    Bool_t isOk = kTRUE; 
+    if(!isOk) {delete hmpTrk;hmpTrk=0x0; delete hmpTrkConstrained;hmpTrkConstrained=0x0; continue;}
+    pTrk->SetOuterHmpParam(hmpTrkConstrained,AliESDtrack::kHMPIDout);                 
+
+    FillResiduals(hmpTrk,bestHmpCluster,kFALSE);
+    Int_t iRad = pParam->Radiator(yRa);                                                          //evaluate the radiator involved
+    
+    //evaluate nMean
+    if(tsRight){
+     if(pNmean->GetEntries()==21) {                                                              //for backward compatibility
+       nmean=((TF1*)pNmean->At(3*ipCh))->Eval(ts);                                               //C6F14 Nmean for this chamber
+     } else {
+       if(iRad < 0) {
+       nmean = -1;
+       } else {
+       Double_t tLow  = ((TF1*)pNmean->At(6*ipCh+2*iRad  ))->Eval(ts);                           //C6F14 low  temp for this chamber
+       Double_t tHigh = ((TF1*)pNmean->At(6*ipCh+2*iRad+1))->Eval(ts);                           //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
+       }
+       if(nmean < 0){                                                                            //track didn' t pass through the radiator
+         pTrk->SetHMPIDsignal(AliHMPIDRecon::kNoRad);                                           //set the appropriate flag
+         pTrk->SetHMPIDcluIdx(ipCh,index+1000*cluSiz);                                          //set index of cluster
+         delete hmpTrk;hmpTrk=0x0; 
+         delete hmpTrkConstrained;hmpTrkConstrained=0x0; 
+         continue;
+        }
+     }
+    } else nmean = pParam->MeanIdxRad();    
+    //
+    // 7. Calculate the Cherenkov angle
+    //
+    recon.SetImpPC(xPc0,yPc0);                                                                     //store track impact to PC           
+    recon.CkovAngle(pTrk,(TClonesArray *)pClus->At(ipCh),index,nmean,xRa,yRa);                   //search for Cerenkov angle of this track
+    
+    Double_t thetaCkov = pTrk->GetHMPIDsignal();
+    
+    if (AliHMPIDReconstructor::StreamLevel()>0) {      
+      AliExternalTrackParam * trackTPC=new AliExternalTrackParam(*(ftrack->GetTPCOut()));
+      AliExternalTrackParam * trackCurrent=new AliExternalTrackParam(*pTrk);      
+      if(!trackTPC->Rotate(alpha)) continue;
+      if(!trackCurrent->Rotate(alpha)) continue;      
+      Bool_t statusTPC= AliTracker::PropagateTrackToBxByBz(trackTPC,radiusH,pTrk->GetMass(),1,kFALSE,kMaxSnp,-1);      
+      Bool_t statusCurrent=AliTracker::PropagateTrackToBxByBz(trackCurrent,radiusH,pTrk->GetMass(),1,kFALSE,kMaxSnp,-1);    
+      Double_t tanAlpha=TMath::Tan(TMath::ASin(trackTPC->GetSnp()));
+      Double_t deltaC= trackTPC->GetC(AliTrackerBase::GetBz())-ftrack->GetTPCOut()->GetC(AliTrackerBase::GetBz());    
+      //
+      AliExternalTrackParam * trackTPCNB=new AliExternalTrackParam(*(ftrack->GetTPCOut()));
+      if(!trackTPCNB->Rotate(alpha)) continue;
+      Bool_t statusTPCNB=kTRUE;
+      Double_t bfield[3]={0,0,0};
+      for (Double_t radius=trackTPCNB->GetX(); radius<radiusH; radius+=1){
+       Double_t xyz[3];
+       trackTPCNB->GetXYZ(xyz);
+       GetBxByBz(xyz,bfield);
+       statusTPCNB&=trackTPCNB->PropagateToBxByBz(radius,bfield);
+      }
+      statusTPCNB&=trackTPCNB->PropagateToBxByBz(radiusH,bfield);
+
+      AliExternalTrackParam * trackTPCConstrained= new AliExternalTrackParam(*trackTPC);
+      Double_t pos[2]={0,gz};
+      Double_t cov[3]={0.1*0.1, 0, 0.1*0.1};
+      Double_t chi2C =  trackTPCConstrained->GetPredictedChi2(pos,cov);
+      trackTPCConstrained->Update(pos,cov);
+      (*fDebugStreamer)<<"track2"<<
+       "rH="<<radiusH<<                      // radius of cluster
+       "angle="<<tanAlpha<<                  // tan of the local inlination angle
+       "dC="<<deltaC<<                       // delta of the curvature
+       "trackTPC.="<<trackTPC<<              // TPC outer param extrapolated to the HMPID
+       "trackTPCNB.="<<trackTPCNB<<          // TPC outer param extrapolated to the HMPID
+       "chi2C="<<chi2C<<
+       "trackTPCC.="<<trackTPCConstrained<<  // TPC outer param extrapolated to the HMPID constrained
+       "trackCurrent.="<<trackCurrent<<      // current track extrapolated to the HMPID
+       "sTPC="<<statusTPC<<                  // status for the current TPC  track
+       "sCurrent="<<statusCurrent<<          // status for the current global track
+       "cl.="<<bestHmpCluster<<              // HMPID cluster
+       //
+       "t.="<<pTrk<<                         // curent esd track
+       "ft.="<<ftrack<<                      // friend track
+       "hmpTrk.="<<hmpTrk<<                  // hmpid tracks as used in the following code
+       "hmpTrkC.="<<hmpTrkConstrained<<      // constrained hmpid tracks as used in the following code
+       "gx="<<gx<<                           // global cluster position X
+       "gy="<<gy<<                           // Y
+       "gz="<<gz<<                           // Z
+        "thetaCkov="<<thetaCkov<<             // Cherenkov angle
+       "\n";
+    } 
+                
+    if(pTrk->GetHMPIDsignal()<0) {
+      delete hmpTrk;hmpTrk=0x0;
+      delete hmpTrkConstrained; hmpTrkConstrained=0x0;
+      continue;}
+        
+    AliHMPIDPid pID;
+    Double_t prob[5];
+    pID.FindPid(pTrk,nmean,5,prob);
+    pTrk->SetHMPIDpid(prob);
+    delete hmpTrk; hmpTrk=0x0;
+    delete hmpTrkConstrained; hmpTrkConstrained=0x0;
+  }//iTrk
+
+  return 0; // error code: 0=no error;
+}//Recon()
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Int_t AliHMPIDTracker::ReconFromKin(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmean, TObjArray *pQthre)
+{
 // Static method to reconstruct Theta Ckov for all valid tracks of a given event.
 // Arguments: pEsd- pointer ESD; pClu- pointer to clusters for all chambers; pNmean - pointer to all function Nmean=f(time)
 //   Returns: error code, 0 if no errors   
   
   AliHMPIDRecon recon;                                                                           //instance of reconstruction class, nothing important in ctor
+  AliHMPIDParam *pParam = AliHMPIDParam::Instance();                                             //Instance of AliHMPIDParam
   Float_t xPc,yPc,xRa,yRa,theta,phi;
   Double_t cluLORS[2]={0};
-//  Double_t cluMARS[3]={0},trkMARS[3]={0};
-//  Double_t bestcluMARS[3]={0,0,0};
-//  Double_t radClu,radInitTrk;   
   Int_t nMipClusTot=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 tsRight = kTRUE;
   
-  AliHMPIDParam *pParam = AliHMPIDParam::Instance();                                             //Instance of AliHMPIDParam
+  UInt_t tsmin = (UInt_t)((TF1*)pQthre->At(0))->GetXmin();                                        //
+  UInt_t tsmax = (UInt_t)((TF1*)pQthre->At(0))->GetXmax();                                        //
+  UInt_t ts = pEsd->GetTimeStamp();
   
+  if(ts<tsmin || ts>tsmax) {
+    AliWarning(Form(" in HMPID time stamp out of range!!! Please check!!! ts = %i",ts));
+    tsRight = kFALSE;
+  }
+   
   for(Int_t iTrk=0;iTrk<pEsd->GetNumberOfTracks();iTrk++){                                        //loop on the ESD tracks in the event
-    
-//    Double_t bestChi2=99999;chi2=99999;                                                          //init. track matching params
-    Double_t dmin=999999,bz=0;
+           
+    Double_t dmin=999999,bz=0,distCut=1,distParams[5]={1};
 
     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    
+    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    
@@ -148,10 +532,9 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea
     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) {delete hmpTrk;hmpTrk=0x0;continue;}                                                                         //no intersection at all, go after next track
 
-    if(ipCh<0) continue;                                                                         //no intersection at all, go after next track
-
-    pTrk->SetHMPIDtrk(xRa,yRa,theta,phi);                                                        //store initial infos
+    pTrk->SetHMPIDtrk(xPc,yPc,theta,phi);                                                        //store initial infos
     pTrk->SetHMPIDcluIdx(ipCh,9999);                                                             //set chamber, index of cluster + cluster size
     
 // track intersects the chamber ipCh: find the MIP          
@@ -160,7 +543,7 @@ 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;                                                                         
+    if(nMipClusTot==0) {delete hmpTrk;hmpTrk=0x0;continue;}                                                                         
     
     Int_t index=-1;                                                                             //index of the "best" matching cluster
     
@@ -168,14 +551,16 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea
       
       AliHMPIDCluster *pClu=(AliHMPIDCluster*)pMipCluLst->UncheckedAt(iClu);                    //get the cluster
 // evaluate qThre
-      if(pQthre->GetEntriesFast()==pParam->kMaxCh+1) {                                             // just for backward compatibility
-        qthre=((TF1*)pQthre->At(pClu->Ch()))->Eval(pEsd->GetTimeStamp());                          //
-      } else {                                                                                     // in the past just 1 qthre
-        hvsec = pParam->InHVSector(pClu->Y());                                              //  per chamber
-        if(hvsec>=0)
-         qthre=((TF1*)pQthre->At(6*ipCh+hvsec))->Eval(pEsd->GetTimeStamp());                      //
-      }                                                                                            //
-//
+      if(tsRight){
+       if(pQthre->GetEntriesFast()==pParam->kMaxCh+1) {
+         qthre=((TF1*)pQthre->At(pClu->Ch()))->Eval(ts);                                         //
+       } else {                                                                                  // in the past just 1 qthre
+         hvsec = pParam->InHVSector(pClu->Y());                                                  //  per chamber
+         if(hvsec>=0) qthre=((TF1*)pQthre->At(6*ipCh+hvsec))->Eval(ts);                                     //
+        } 
+      } else qthre = pParam->QCut();
+            
+//      
       if(pClu->Q()<qthre) continue;                                                                      //charge compartible with MIP clusters      
       isOkQcut = kTRUE;
 //
@@ -187,110 +572,95 @@ Int_t AliHMPIDTracker::Recon(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmea
         index=iClu;
         bestHmpCluster=pClu;
       }
-    }
-/*            
-      pParam->Lors2Mars(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]; 
-      hmpTrk->GetXYZ(trkx0);                                                                 //get track position in MARS
-      radInitTrk=TMath::Sqrt(trkx0[0]*trkx0[0]+trkx0[1]*trkx0[1]);
-      hmpTrk->PropagateToR(radClu,10);
-      hmpTrk->GetXYZ(trkx0);                                                                   //get track position in MARS
-      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...
-        cluSiz = pClu->Size();
-        dmin=d3d;
-        bestHmpCluster=pClu;
-        index=iClu;
-        bestChi2=chi2;
-        cluLORS[0]=pClu->X(); cluLORS[1]=pClu->Y();
-//        pParam->Lors2Mars(ipCh,cluLORS[0],cluLORS[1],bestcluMARS); 
-      }//global dmin cut 
-    }//clus loop
-*/
+    } // clusters loop
+
     if(!isOkQcut) {
       pTrk->SetHMPIDsignal(pParam->kMipQdcCut);
-      continue;                                                                     
+      delete hmpTrk;hmpTrk=0x0; continue;                                                                     
     }
+
+    Double_t radius = (pParam->Lors2Mars(ipCh,pParam->SizeAllX()/2,pParam->SizeAllY()/2)).Mag(); 
+    
+    if(!AliTracker::PropagateTrackToBxByBz(hmpTrk,radius,pTrk->GetMass(),1,kFALSE)) {delete hmpTrk;hmpTrk=0x0;continue;}
               
-    Printf(" Track n. %i Chamber intersected %i dist %f index %i cluster ch %i",iTrk,ipCh,dmin,index,bestHmpCluster->Ch());
+    if(!hmpTrk->PropagateTo(bestHmpCluster)) {delete hmpTrk;hmpTrk=0x0;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()) {
-    if(dmin < 10.) {
-      isOkDcut = kTRUE;
-    }
 
+    if(AliHMPIDReconstructor::GetRecoParam())                                                 //retrieve distance cut
+    {
+      if(AliHMPIDReconstructor::GetRecoParam()->IsFixedDistCut()==kTRUE)                      //distance cut is fixed number
+      { 
+        distCut=AliHMPIDReconstructor::GetRecoParam()->GetHmpTrackMatchingDist();
+      }
+      else 
+      {
+        for(Int_t ipar=0;ipar<5;ipar++) distParams[ipar]=AliHMPIDReconstructor::GetRecoParam()->GetHmpTrackMatchingDistParam(ipar);      //prevision: distance cut is function of momentum
+        distCut=distParams[0]+distParams[1]*TMath::Power(distParams[2]*pTrk->GetP(),distParams[3]); //prevision: change functional form to be more precise
+      }
+    }
+    else {distCut=pParam->DistCut();}
+      
+    if(dmin < distCut) {
+      isOkDcut = kTRUE;
+    }   
+    
     if(!isOkDcut) {
       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...
+    if(!isMatched) {delete hmpTrk;hmpTrk=0x0;continue;}                                           // If matched continue...
 
     Bool_t isOk = hmpTrk->Update(bestHmpCluster,0.1,0);
-    Printf(" status of thracking update %i",isOk);
-    if(!isOk) continue;
-    pTrk->SetOuterParam(hmpTrk,AliESDtrack::kHMPIDout);                 
-    Printf("ok for reconstruction...");
-    
-    /*    
-    Int_t indexAll = 0;
-    for(Int_t iC=0;iC<ipCh;iC++) indexAll+=nClusCh[iC]; indexAll+=index;                        //to be verified...
-
-    Bool_t isOk = hmpTrk->Update(bestHmpCluster,bestChi2,indexAll);
-    if(!isOk) continue;
-    pTrk->SetOuterParam(hmpTrk,AliESDtrack::kHMPIDout);                 
-
-    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;                                                                         
-    }
-*/
+    if(!isOk) {delete hmpTrk;hmpTrk=0x0;continue;}
+    pTrk->SetOuterHmpParam(hmpTrk,AliESDtrack::kHMPIDout);                 
+
+    FillResiduals(hmpTrk,bestHmpCluster,kFALSE);
+    Int_t iRad     = pParam->Radiator(yRa);                                                      //evaluate the radiator involved
+    
     //evaluate nMean
-    if(pNmean->GetEntries()==21) {                                                              //for backward compatibility
-      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) {
+    if(tsRight){
+     if(pNmean->GetEntries()==21) {                                                              //for backward compatibility
+       nmean=((TF1*)pNmean->At(3*ipCh))->Eval(ts);                                               //C6F14 Nmean for this chamber
+     } else {
+       if(iRad < 0) {
        nmean = -1;
-      } else {
-      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
-      }
-      if(nmean < 0){                                                                            //track didn' t pass through the radiator
+       } else {
+       Double_t tLow  = ((TF1*)pNmean->At(6*ipCh+2*iRad  ))->Eval(ts);                           //C6F14 low  temp for this chamber
+       Double_t tHigh = ((TF1*)pNmean->At(6*ipCh+2*iRad+1))->Eval(ts);                           //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
+       }
+       if(nmean < 0){                                                                            //track didn' t pass through the radiator
          pTrk->SetHMPIDsignal(AliHMPIDRecon::kNoRad);                                           //set the appropriate flag
          pTrk->SetHMPIDcluIdx(ipCh,index+1000*cluSiz);                                          //set index of cluster
+         delete hmpTrk;hmpTrk=0x0; 
          continue;
+        }
       }
-    }
+    } else nmean = pParam->MeanIdxRad();
+    
     //
     recon.SetImpPC(xPc,yPc);                                                                     //store track impact to PC
-    recon.CkovAngle(pTrk,(TClonesArray *)pClus->At(ipCh),index,nmean);                           //search for Cerenkov angle of this track
-    
+    recon.CkovAngle(pTrk,(TClonesArray *)pClus->At(ipCh),index,nmean,xRa,yRa);                   //search for Cerenkov angle of this track
+
+    if(pTrk->GetHMPIDsignal()<0) {delete hmpTrk;hmpTrk=0x0;continue;}
+        
     AliHMPIDPid pID;
     Double_t prob[5];
-    pID.FindPid(pTrk,5,prob);
+    pID.FindPid(pTrk,nmean,5,prob);
+  //  Printf("Tracker RefIndex = %f, chmaber = %i, prob1 = %f, prob2 = %f, prob3 = %f, prob4 = %f, prob5 = %f", nmean,ipCh,prob[0],prob[1],prob[2],prob[3],prob[4]);
     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;
-}//Recon()
+}//ReconFromKin()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Int_t AliHMPIDTracker::ReconHiddenTrk(AliESDEvent *pEsd,TObjArray *pClus,TObjArray *pNmean, TObjArray *pQthre)
 {
@@ -301,7 +671,18 @@ Int_t AliHMPIDTracker::ReconHiddenTrk(AliESDEvent *pEsd,TObjArray *pClus,TObjArr
   AliHMPIDReconHTA reconHTA;                                                                     //instance of reconstruction class, nothing important in ctor
   
   AliHMPIDParam *pParam = AliHMPIDParam::Instance();                                             //Instance of AliHMPIDParam
-  
+  Bool_t tsRight = kTRUE;
+  UInt_t tsmin = (UInt_t)((TF1*)pQthre->At(0))->GetXmin();                                        //
+  UInt_t tsmax = (UInt_t)((TF1*)pQthre->At(0))->GetXmax();                                        //
+  UInt_t ts = pEsd->GetTimeStamp();
+
+  if(ts<tsmin || ts>tsmax) {
+    AliWarning(Form(" in HMPID time stamp out of range!!! Please check!!! ts = %i",ts));
+    tsRight = kFALSE;
+  }
+   
   for(Int_t iTrk=0;iTrk<pEsd->GetNumberOfTracks();iTrk++){                                        //loop on the ESD tracks in the event
     
     AliESDtrack *pTrk = pEsd->GetTrack(iTrk);                                                     //here it is simulated or just empty track
@@ -337,16 +718,19 @@ Int_t AliHMPIDTracker::ReconHiddenTrk(AliESDEvent *pEsd,TObjArray *pClus,TObjArr
     
     Int_t hvsec;
     Double_t qthre=0;
+    
 // evaluate qThre
+    if(tsRight){
     if(pQthre->GetEntriesFast()==pParam->kMaxCh+1) {                                              // just for backward compatibility
-      qthre=((TF1*)pQthre->At(chMip))->Eval(pEsd->GetTimeStamp());                                //
+      qthre=((TF1*)pQthre->At(chMip))->Eval(ts);                                                  //
     } else {                                                                                      // in the past just 1 qthre
       hvsec = pParam->InHVSector(yMip);                                                           //  per chamber
-      if(hvsec>=0) qthre=((TF1*)pQthre->At(6*chMip+hvsec))->Eval(pEsd->GetTimeStamp());           //
-    }
+      if(hvsec>=0) qthre=((TF1*)pQthre->At(6*chMip+hvsec))->Eval(ts);                             //
+    } 
+   } else qthre = pParam->QCut();
 //
     if(qMip<qthre) {
-      pTrk->SetHMPIDmip(xMip,yMip,(Int_t)qMip,0);                                                        //store mip info in any case 
+      pTrk->SetHMPIDmip(xMip,yMip,(Int_t)qMip,0);                                                 //store mip info in any case 
       pTrk->SetHMPIDcluIdx(chMip,indMip+1000*cluMipSiz);                                                          
       pTrk->SetHMPIDsignal(pParam->kMipQdcCut);
       return 1;                                                                                   //charge compatible with MIP clusters      
@@ -357,29 +741,33 @@ Int_t AliHMPIDTracker::ReconHiddenTrk(AliESDEvent *pEsd,TObjArray *pClus,TObjArr
 
     Double_t yRa = yMip;                                                                        //just an approx...
     Double_t nmean;
+
+    Int_t iRad     = pParam->Radiator(yRa);                                                   //evaluate the radiator involved
+    
     //evaluate nMean
+    if(tsRight){
     if(pNmean->GetEntries()==21) {                                                              //for backward compatibility
-      nmean=((TF1*)pNmean->At(3*chMip))->Eval(pEsd->GetTimeStamp());                            //C6F14 Nmean for this chamber
+      nmean=((TF1*)pNmean->At(3*chMip))->Eval(ts);                                              //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*chMip+2*iRad  ))->Eval(pEsd->GetTimeStamp());        //C6F14 low  temp for this chamber
-      Double_t tHigh = ((TF1*)pNmean->At(6*chMip+2*iRad+1))->Eval(pEsd->GetTimeStamp());        //C6F14 high temp for this chamber
+      Double_t tLow  = ((TF1*)pNmean->At(6*chMip+2*iRad  ))->Eval(ts);                          //C6F14 low  temp for this chamber
+      Double_t tHigh = ((TF1*)pNmean->At(6*chMip+2*iRad+1))->Eval(ts);                          //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
       }
       if(nmean < 0){                                                                            //track didn' t pass through the radiator
          pTrk->SetHMPIDsignal(AliHMPIDRecon::kNoRad);                                           //set the appropriate flag
          return 1;
-      }
-    }
+        }
+      } 
+    } else nmean = pParam->MeanIdxRad();
     //
     if(!reconHTA.CkovHiddenTrk(pTrk,(TClonesArray *)pClus->At(ipCh),indMip,nmean)) {                 //search for track parameters and Cerenkov angle of this track
       AliHMPIDPid pID;
       Double_t prob[5];
-      pID.FindPid(pTrk,5,prob);
+      pID.FindPid(pTrk,nmean,5,prob);
       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);