Improvement in HTA

diff --git a/HMPID/AliHMPIDRecon.cxx b/HMPID/AliHMPIDRecon.cxx
index 0173f0a88ae79250a41c0f75212e786a8d232d1c..d5408a5a43852c738a5ae93a9b665c15701f0fad 100644 (file)
--- a/HMPID/AliHMPIDRecon.cxx
+++ b/HMPID/AliHMPIDRecon.cxx
@@ -54,10 +54,11 @@ AliHMPIDRecon::AliHMPIDRecon():TTask("RichRec","RichPat"),
     fPhotWei [i] =  0;
   }
 //hidden algorithm
-  fMipX=fMipY=fThTrkFit=fPhTrkFit=fCkovFit=-999;
+  fMipX=fMipY=fThTrkFit=fPhTrkFit=fCkovFit=fMipQ=fRadX=fRadY=-999;
   fIdxMip=fNClu=0;
-  for (Int_t i=0; i<1000; i++) {
+  for (Int_t i=0; i<100; i++) {
     fXClu[i] = fYClu[i] = 0;
+    fClCk[i] = kTRUE;
   }
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -439,7 +440,7 @@ Double_t AliHMPIDRecon::SigGeom(Double_t thetaC, Double_t phiC,Double_t betaM)co
 // From here HTA....
 //
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-Int_t AliHMPIDRecon::CkovHiddenTrk(AliESDtrack *pTrk,TClonesArray *pCluLst,Double_t nmean)
+Bool_t AliHMPIDRecon::CkovHiddenTrk(AliESDtrack *pTrk,TClonesArray *pCluLst,Double_t nmean)
 {
 // Pattern recognition method without any infos from tracking:HTA (Hidden Track Algorithm)...
 // The method finds in the chmber the cluster with the highest charge
@@ -454,31 +455,34 @@ Int_t AliHMPIDRecon::CkovHiddenTrk(AliESDtrack *pTrk,TClonesArray *pCluLst,Doubl
   fRadNmean=nmean;
 
   Float_t mipX=-1,mipY=-1;Int_t mipId=-1,mipQ=-1;                                                                           
-  fPhotCnt=0;                                                      
   Double_t qRef = 0;
-  fNClu = pCluLst->GetEntriesFast();
-  for (Int_t iClu=0;iClu<fNClu;iClu++){                                                       //clusters loop
+  for (Int_t iClu=0;iClu<pCluLst->GetEntriesFast();iClu++){                                   //clusters loop
     AliHMPIDCluster *pClu=(AliHMPIDCluster*)pCluLst->UncheckedAt(iClu);                       //get pointer to current cluster    
     fXClu[iClu] = pClu->X();fYClu[iClu] = pClu->Y();                                          //store x,y for fitting procedure
+    fClCk[iClu] = kTRUE;                                                                      //all cluster are accepted at this stage to be reconstructed
     if(pClu->Q()>qRef){                                                                       //searching the highest charge to select a MIP      
       qRef = pClu->Q();
       mipId=iClu; mipX=pClu->X();mipY=pClu->Y();mipQ=(Int_t)pClu->Q();
     }                                                                                    
   }//clusters loop
 
-  if(qRef>pParam->QCut()){                                                                       //charge compartible with MIP clusters      
+  fNClu = pCluLst->GetEntriesFast();
+  if(qRef>pParam->QCut()){                                                                       //charge compartible with MIP clusters
     fIdxMip = mipId;
+    fClCk[mipId] = kFALSE;
     fMipX = mipX; fMipY=mipY; fMipQ = qRef;
-    if(!DoRecHiddenTrk()) return 1;                                                               //Do track and ring reconstruction,if problems returns 1
+    if(!DoRecHiddenTrk(pCluLst)) return kFALSE;                                                  //Do track and ring reconstruction,if problems returns 1
     pTrk->SetHMPIDtrk(fRadX,fRadY,fThTrkFit,fPhTrkFit);                                          //store track intersection info
     pTrk->SetHMPIDmip(fMipX,fMipY,(Int_t)fMipQ,fNClu);                                           //store mip info 
-    pTrk->SetHMPIDcluIdx(pCluLst->GetUniqueID(),fIdxMip);                                        //set cham number and index of cluster
+    pTrk->SetHMPIDcluIdx(pCluLst->GetEntriesFast(),fIdxMip);                                     //set cham number and index of cluster
     pTrk->SetHMPIDsignal(fCkovFit);                                                              //find best Theta ckov for ring i.e. track
+    Printf(" n clusters tot %i accepted %i",pCluLst->GetEntriesFast(),fNClu);
+    return kTRUE;
   }
-  return 0;
+  return kFALSE;
 }//CkovHiddenTrk()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-Bool_t AliHMPIDRecon::DoRecHiddenTrk()
+Bool_t AliHMPIDRecon::DoRecHiddenTrk(TClonesArray *pCluLst)
 {
 // Pattern recognition method without any infos from tracking...
 // First a preclustering filter to avoid part of the noise
@@ -489,17 +493,27 @@ Bool_t AliHMPIDRecon::DoRecHiddenTrk()
 // Arguments:   none
 //   Returns:   none
   Double_t phiRec;
-  CluPreFilter();
+  if(!CluPreFilter(pCluLst)) {return kFALSE;}
   if(!FitEllipse(phiRec)) {return kFALSE;}
-  return FitFree(phiRec);
-}
+  Int_t nClTmp1 = pCluLst->GetEntriesFast()-1;  //minus MIP...
+  Int_t nClTmp2 = 0;
+  while(nClTmp1 != nClTmp2){
+    SetNClu(pCluLst->GetEntriesFast());
+    if(!FitFree(phiRec)) {return kFALSE;}
+    nClTmp2 = NClu();
+    if(nClTmp2!=nClTmp1) {nClTmp1=nClTmp2;nClTmp2=0;}
+  }
+  fNClu = nClTmp2;
+  return kTRUE;
+}//DoRecHiddenTrk()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-void AliHMPIDRecon::CluPreFilter()
+Bool_t AliHMPIDRecon::CluPreFilter(TClonesArray *pCluLst)
 {
 // Filter of bkg clusters
 // based on elliptical-shapes...
 //
-    ;
+  if(pCluLst->GetEntriesFast()>50||pCluLst->GetEntriesFast()<4) return kFALSE; 
+  else return kTRUE;
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Bool_t AliHMPIDRecon::FitEllipse(Double_t &phiRec)
@@ -525,7 +539,6 @@ Bool_t AliHMPIDRecon::FitEllipse(Double_t &phiRec)
   //       HG - AF
   //  b = --------
   //       AB - H^2
-  
   Double_t cA,cB,cF,cG,cH;
   Double_t aArg=-1;      Int_t iErrFlg;                                                //tmp vars for TMinuit
 
@@ -594,9 +607,6 @@ Bool_t AliHMPIDRecon::FitFree(Double_t phiRec)
   TString sName;
   Double_t th,ph;
   
-  gMinuit->mnexcm("SET PRI",&aArg,1,iErrFlg);                                          //suspend all printout from TMinuit
-  gMinuit->mnexcm("SET NOW",&aArg,0,iErrFlg);
-
   gMinuit->mnparm(0," theta ",  0.01,0.01,0,TMath::PiOver2(),iErrFlg);
   gMinuit->mnparm(1," phi   ",phiRec,0.01,0,TMath::TwoPi()  ,iErrFlg);
   
@@ -646,21 +656,42 @@ void AliHMPIDRecon::FunMinPhot(Int_t &/* */,Double_t* /* */,Double_t &f,Double_t
   pRec->SetRadXY(xrad,yrad);
   pRec->SetTrack(xrad,yrad,thTrk,phTrk);
 
-  Double_t meanCkov=0;
+  Double_t meanCkov =0;
   Double_t meanCkov2=0;
   Double_t thetaCer,phiCer;
-  for(Int_t i=0;i<pRec->NClu();i++) {
+  Int_t nClAcc = 0;
+  Int_t nClTot=pRec->NClu();
+    
+  for(Int_t i=0;i<nClTot;i++) {
+    if(!(pRec->ClCk(i))) continue;
     pRec->FindPhotCkov(pRec->XClu(i),pRec->YClu(i),thetaCer,phiCer);  
-
     meanCkov  += thetaCer;
     meanCkov2 += thetaCer*thetaCer;
+    nClAcc++;
   }
-  meanCkov/=pRec->NClu();
-  Double_t rms = TMath::Sqrt(meanCkov2/pRec->NClu() - meanCkov*meanCkov);
-  f = rms/TMath::Sqrt(pRec->NClu());
-  Printf(" mean %f rms/sqrt(n) %f",meanCkov,f);  
-  if(iflag==3) pRec->SetCkovFit(meanCkov);
+  if(nClAcc==0) {f=0;return;}
+  meanCkov/=nClAcc;
+  Double_t rms = TMath::Sqrt(meanCkov2/nClAcc - meanCkov*meanCkov);
+  f = rms/TMath::Sqrt(nClAcc);
   
+  
+  if(iflag==3) {
+    Printf("FunMinPhot before: photons candidates %i used %i",nClTot,nClAcc);
+    nClAcc = 0;
+    Double_t meanCkov1=0;
+    for(Int_t i=0;i<nClTot;i++) {
+      if(!(pRec->ClCk(i))) continue;
+      pRec->FindPhotCkov(pRec->XClu(i),pRec->YClu(i),thetaCer,phiCer);  
+      if(TMath::Abs(thetaCer-meanCkov)<2*rms) {
+        meanCkov1  += thetaCer;
+        nClAcc++;
+      } else pRec->SetClCk(i,kFALSE);
+    }
+    meanCkov1/=nClAcc;
+    Printf("FunMinPhot after: photons candidates %i used %i thetaCer %f",nClTot,nClAcc,meanCkov1);
+    pRec->SetCkovFit(meanCkov1);
+    pRec->SetNClu(nClAcc);
+  }
 }//FunMinPhot()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //

diff --git a/HMPID/AliHMPIDRecon.h b/HMPID/AliHMPIDRecon.h
index 2460e0d73b81a6e58dc99cb8a6ff83af32501a11..b32782a1c5f8f8a40cdd80f3b8678c5a08a3525c 100644 (file)
--- a/HMPID/AliHMPIDRecon.h
+++ b/HMPID/AliHMPIDRecon.h
@@ -47,12 +47,14 @@ public :
   Double_t Sigma2       (Double_t ckovTh,Double_t ckovPh                                    )const;//photon candidate sigma
   enum ETrackingFlags {kMipDistCut=-9,kMipQdcCut=-5,kNoPhotAccept=-11};
 // HTA hidden track algorithm
-  Int_t    CkovHiddenTrk    (AliESDtrack *pTrk,TClonesArray *pCluLst,Double_t nmean);              //Pattern recognition without trackinf information
-  void     CluPreFilter     (                                    );                                //Pre clustering filter to cut bkg clusters
-  Bool_t   DoRecHiddenTrk   (                                    );                                //Calling to the fitted procedures
+  Bool_t   CkovHiddenTrk    (AliESDtrack *pTrk,TClonesArray *pCluLst,Double_t nmean);              //Pattern recognition without trackinf information
+  Bool_t   CluPreFilter     (TClonesArray *pClu               );                                   //Pre clustering filter to cut bkg clusters
+  Bool_t   DoRecHiddenTrk   (TClonesArray *pClu               );                                   //Calling to the fitted procedures
   Bool_t   FitEllipse       (Double_t &phiRec                    );                                //Fit clusters with a conical section (kTRUE only for ellipses)
   Bool_t   FitFree          (Double_t phiRec                     );                                //Fit (th,ph) of the track and ckovFit as result
   Double_t FunConSect       (Double_t *c,Double_t x,Double_t y   );                                //Function of a general conical section
+  void     SetNClu          (Int_t nclu                          ) {fNClu=nclu;}                   //Setter for # of clusters
+  void     SetClCk          (Int_t i,Bool_t what                 ) {fClCk[i]=what;}                //Setter for cluster flags 
   void     SetCkovFit       (Double_t ckov                       ) {fCkovFit=ckov;}                //Setter for ckof fitted
   void     SetTrkFit        (Double_t th,Double_t ph             ) {fThTrkFit = th;fPhTrkFit = ph;}//Setter for (th,ph) of the track
   void     SetRadXY         (Double_t  x,Double_t y              ) {fRadX = x;fRadY = y;}          //Setter for (th,ph) of the track
@@ -67,6 +69,7 @@ public :
   Int_t    NClu         ()const {return fNClu;}                                                    //Getter of cluster multiplicity
   Double_t XClu         (Int_t i)const {return fXClu[i];}                                          //Getter of x clu
   Double_t YClu         (Int_t i)const {return fYClu[i];}                                          //Getter of y clu
+  Bool_t   ClCk         (Int_t i)const {return fClCk[i];}                                          //Getter of cluster flags
   Double_t CkovFit      ()const {return fCkovFit;}                                                 //Getter of ckov angle fitted
   Double_t ThTrkFit     ()const {return fThTrkFit;}                                                //Getter of theta fitted of the track
   Double_t PhTrkFit     ()const {return fPhTrkFit;}                                                //Getter of phi fitted of the track
@@ -95,8 +98,9 @@ protected:
   Double_t fRadY;                              //rad Y position for Hidden Track Algorithm
   Int_t    fIdxMip;                            //mip index in the clus list
   Int_t    fNClu;                              //n clusters to fit
-  Double_t fXClu[1000];                        //container for x clus position
-  Double_t fYClu[1000];                        //container for y clus position
+  Double_t fXClu[100];                         //container for x clus position
+  Double_t fYClu[100];                         //container for y clus position
+  Bool_t   fClCk[100];                         //flag if cluster is used in fitting
   Double_t fThTrkFit;                          //theta fitted of the track
   Double_t fPhTrkFit;                          //phi   fitted of the track
   Double_t fCkovFit;                           //estimated ring Cherenkov angle

diff --git a/HMPID/AliHMPIDTracker.cxx b/HMPID/AliHMPIDTracker.cxx
index 52ea9131251b0ccfbb5dd52375e73dd93e1958dd..de40205a57bac5efc8693a270601747b5d29ec8a 100644 (file)
--- a/HMPID/AliHMPIDTracker.cxx
+++ b/HMPID/AliHMPIDTracker.cxx
@@ -106,16 +106,15 @@ Int_t AliHMPIDTracker::Recon(AliESD *pEsd,TObjArray *pClus,TObjArray *pNmean)
   return 0; // error code: 0=no error;
 }//Recon()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-Int_t AliHMPIDTracker::ReconHiddenTrk(Int_t iCh,AliESDtrack *pTrk,TObjArray *pClusObj,TObjArray *pNmean)
+Int_t AliHMPIDTracker::ReconHiddenTrk(Int_t iCh,AliESDtrack *pTrk,TClonesArray *pCluLst,TObjArray *pNmean)
 {
 // 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
   Double_t nmean=((TF1*)pNmean->At(3*iCh))->Eval(0);                                            //C6F14 Nmean for this chamber
-  TClonesArray *pCluLst = (TClonesArray *)pClusObj->At(iCh);
   if(pCluLst->GetEntriesFast()<4) return 1;                                                     //min 4 clusters (3 + 1 mip) to find a ring! 
-  return recon.CkovHiddenTrk(pTrk,pCluLst,nmean);                                               //search for track parameters and Cerenkov angle of this track
-                                                                                                // error code: 0=no error,1=fit not performed;
+  if(recon.CkovHiddenTrk(pTrk,pCluLst,nmean)) return 0;                                         //search for track parameters and Cerenkov angle of this track
+  else return 1;                                                                                // error code: 0=no error,1=fit not performed;
 }//Recon()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

diff --git a/HMPID/AliHMPIDTracker.h b/HMPID/AliHMPIDTracker.h
index 70156de1f0135891fb79390988ad53f592f58b27..a43bd8ee17ba3bb4567cc863f0eab2df6bc4900d 100644 (file)
--- a/HMPID/AliHMPIDTracker.h
+++ b/HMPID/AliHMPIDTracker.h
@@ -25,9 +25,9 @@ public:
          Int_t       RefitInward    (AliESD *                   )       {return 0;} //pure virtual from AliTracker 
          void        UnloadClusters (                           )       {         } //pure virtual from AliTracker 
 //private part  
-  static Int_t       IntTrkCha     (AliESDtrack *pTrk,Float_t &xPc,Float_t &yPc        );           //find track-PC intersection, retuns chamber ID
-  static Int_t       Recon         (AliESD *pEsd,TObjArray *pCluAll,TObjArray *pNmean=0);           //do actual job, returns status code  
-  static Int_t       ReconHiddenTrk(Int_t iCh,AliESDtrack *pTrk,TObjArray *pClus,TObjArray *pNmean);//do actual job with Hidden Track Algorithm    
+  static Int_t       IntTrkCha     (AliESDtrack *pTrk,Float_t &xPc,Float_t &yPc        );              //find track-PC intersection, retuns chamber ID
+  static Int_t       Recon         (AliESD *pEsd,TObjArray *pCluAll,TObjArray *pNmean=0);              //do actual job, returns status code  
+  static Int_t       ReconHiddenTrk(Int_t iCh,AliESDtrack *pTrk,TClonesArray *pClus,TObjArray *pNmean);//do actual job with Hidden Track Algorithm    
 protected:
   TObjArray            *fClu;                     //! each chamber holds it's one list of clusters 
 ClassDef(AliHMPIDTracker,0)