]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HMPID/AliHMPIDCluster.cxx
Cluster fitting improved
[u/mrichter/AliRoot.git] / HMPID / AliHMPIDCluster.cxx
index dacba9549b9e86d6ede71b6cd9d776dcc63a2748..3be7737a09ca5e13d3748333d90046dd43ab81b9 100644 (file)
 #include "AliHMPIDCluster.h"  //class header
 #include <TMinuit.h>         //Solve()
 #include <TClonesArray.h>    //Solve()
-
+#include <TMarker.h>         //Draw()
 ClassImp(AliHMPIDCluster)
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDCluster::CoG()
 {
 // Calculates naive cluster position as a center of gravity of its digits.
 // Arguments: none 
-//   Returns: shape of the cluster i.e. the box which fully contains the cluster      
-  if(fDigs==0) return;                                  //no digits in this cluster
-  fX=fY=0;                                              //set cluster position to (0,0) to start to collect contributions
-  for(Int_t iDig=0;iDig<fDigs->GetEntriesFast();iDig++){//digits loop
-    AliHMPIDDigit *pDig=(AliHMPIDDigit*)fDigs->At(iDig);  //get pointer to next digit
-    Float_t q=pDig->Q();                                //get QDC 
-    fX += pDig->LorsX()*q;fY +=pDig->LorsY()*q;         //add digit center weighted by QDC
-  }//digits loop
-  fX/=fQ;fY/=fQ;                                        //final center of gravity
+//   Returns: none
+  Int_t minPadX=999,minPadY=999,maxPadX=-1,maxPadY=-1;      //for box finding  
+  if(fDigs==0) return;                                      //no digits in this cluster
+  fX=fY=fQRaw=0;                                            //init summable parameters
+  Int_t maxQpad=-1,maxQ=-1;                                 //to calculate the pad with the highest charge
+  AliHMPIDDigit *pDig;
+  for(Int_t iDig=0;iDig<fDigs->GetEntriesFast();iDig++){    //digits loop
+    pDig=(AliHMPIDDigit*)fDigs->At(iDig);                   //get pointer to next digit
 
-  CorrSin();
+    if(pDig->PadPcX() > maxPadX) maxPadX = pDig->PadPcX();  // find the minimum box that contain the cluster  MaxX                            
+    if(pDig->PadPcY() > maxPadY) maxPadY = pDig->PadPcY();  //                                                MaxY
+    if(pDig->PadPcX() < minPadX) minPadX = pDig->PadPcX();  //                                                MinX   
+    if(pDig->PadPcY() < minPadY) minPadY = pDig->PadPcY();  //                                                MinY   
+    
+    Float_t q=pDig->Q();                                    //get QDC 
+    fX += pDig->LorsX()*q;fY +=pDig->LorsY()*q;             //add digit center weighted by QDC
+    fQRaw+=q;                                               //increment total charge 
+    if(q>maxQ) {maxQpad = pDig->Pad();maxQ=(Int_t)q;}       // to find pad with highest charge
+  }//digits loop
   
+  fBox=(maxPadX-minPadX+1)*100+maxPadY-minPadY+1;           // dimension of the box: format Xdim*100+Ydim
+  
+  if ( fQRaw != 0 )   fX/=fQRaw;fY/=fQRaw;                  //final center of gravity
+  
+  if(fDigs->GetEntriesFast()>1)CorrSin();                   //correct it by sinoid   
+  
+  fQ  = fQRaw;                                              // Before starting fit procedure, Q and QRaw must be equal
+  fCh=pDig->Ch();                                           //initialize chamber number
+  fMaxQpad = maxQpad; fMaxQ=maxQ;                           //store max charge pad to the field
+  fChi2=0;                                                  // no Chi2 to find
+  fNlocMax=0;                                               // proper status from this method
   fSt=kCoG;
 }//CoG()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -43,11 +63,17 @@ void AliHMPIDCluster::CorrSin()
 // Correction of cluster x position due to sinoid, see HMPID TDR  page 30
 // Arguments: none
 //   Returns: none
-  AliHMPIDDigit dig;dig.Manual1(Ch(),fX,fY);                                               //tmp digit to get it center
-  Float_t x=fX-dig.LorsX();  
+  Int_t pc,px,py;
+  AliHMPIDDigit::Lors2Pad(fX,fY,pc,px,py);             //tmp digit to get it center
+  Float_t x=fX-AliHMPIDDigit::LorsX(pc,px);                    //diff between cluster x and center of the pad contaning this cluster   
   fX+=3.31267e-2*TMath::Sin(2*TMath::Pi()/0.8*x)-2.66575e-3*TMath::Sin(4*TMath::Pi()/0.8*x)+2.80553e-3*TMath::Sin(6*TMath::Pi()/0.8*x)+0.0070;
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void AliHMPIDCluster::Draw(Option_t*)
+{
+  TMarker *pMark=new TMarker(X(),Y(),5); pMark->SetUniqueID(fSt);pMark->SetMarkerColor(kBlue); pMark->Draw();
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDCluster::FitFunc(Int_t &iNpars, Double_t *, Double_t &chi2, Double_t *par, Int_t )
 {
 // Cluster fit function 
@@ -63,13 +89,14 @@ void AliHMPIDCluster::FitFunc(Int_t &iNpars, Double_t *, Double_t &chi2, Double_
   Int_t iNshape = iNpars/3;
     
   chi2 = 0;
-  for(Int_t i=0;i<pClu->Size();i++){                                       //loop on all pads of the cluster
-    Double_t dQpadMath = 0;                                                //pad charge collector  
-    for(Int_t j=0;j<iNshape;j++){                                          //Mathiesons loop as all of them may contribute to this pad
-      dQpadMath+=par[3*j+2]*pClu->Dig(i)->Mathieson(par[3*j],par[3*j+1]);  // par[3*j+2] is charge par[3*j] is x par[3*j+1] is y of current Mathieson
+  for(Int_t i=0;i<pClu->Size();i++){                                                   //loop on all pads of the cluster
+    Double_t dQpadMath = 0;                                                            //pad charge collector  
+    for(Int_t j=0;j<iNshape;j++){                                                      //Mathiesons loop as all of them may contribute to this pad
+      dQpadMath+=par[3*j+2]*pClu->Dig(i)->IntMathieson(par[3*j],par[3*j+1]);           // par[3*j+2] is charge par[3*j] is x par[3*j+1] is y of current Mathieson
     }
-    chi2 +=TMath::Power((pClu->Dig(i)->Q()-dQpadMath),2);                  //
-  }                                                                             //loop on all pads of the cluster     
+//    if(dQpadMath>0)chi2 +=TMath::Power((pClu->Dig(i)->Q()-dQpadMath),2)/dQpadMath;   //
+    if(dQpadMath>0)chi2 +=TMath::Power((pClu->Dig(i)->Q()-dQpadMath),2);               //
+  }                                                                                    //loop on all pads of the cluster     
 }//FitFunction()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDCluster::Print(Option_t* opt)const
@@ -77,14 +104,25 @@ void AliHMPIDCluster::Print(Option_t* opt)const
 //Print current cluster  
   const char *status=0;
   switch(fSt){
-    case      kFor: status="formed"     ;break;
-    case      kUnf: status="unfolded"   ;break;
-    case      kCoG: status="coged"      ;break;
-    case      kEmp: status="empty"      ;break;
+    case        kFrm  : status="formed        "   ;break;
+    case        kUnf  : status="unfolded (fit)"   ;break;
+    case        kCoG  : status="coged         "   ;break;
+    case        kLo1  : status="locmax 1 (fit)"   ;break;
+    case        kMax  : status="exceeded (cog)"   ;break;
+    case        kNot  : status="not done (cog)"   ;break;
+    case        kEmp  : status="empty         "   ;break;
+    case        kEdg  : status="edge     (fit)"   ;break;
+    case       kSi1  : status="size 1   (cog)"   ;break;
+    case       kNoLoc: status="no LocMax(fit)"   ;break;
+    case       kAbn  : status="Abnormal fit  "   ;break;
+    
+    default:            status="??????"          ;break;   
   }
-  Printf("%s ch=%i, Size=%2i        (%7.3f,%7.3f) Q=%4i          %s",
-         opt,Ch(),Size(),            X(),  Y(),   Q(),status);
-  for(Int_t i=0;i<Size();i++) Dig(i)->Print();    
+  Double_t ratio=0;
+  if(Q()>0&&QRaw()>0) ratio = Q()/QRaw()*100;
+  Printf("%sCLU: ch=%i                 (%7.3f,%7.3f) Q=%8.3f Qraw=%8.3f(%3.0f%%) Size=%2i DimBox=%i LocMax=%i Chi2=%7.3f   %s",
+         opt,Ch(),X(),Y(),Q(),QRaw(),ratio,Size(),fBox,fNlocMax,fChi2,status);
+  if(fDigs) fDigs->Print();    
 }//Print()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Int_t AliHMPIDCluster::Solve(TClonesArray *pCluLst,Bool_t isTryUnfold)
@@ -97,52 +135,93 @@ Int_t AliHMPIDCluster::Solve(TClonesArray *pCluLst,Bool_t isTryUnfold)
 //Arguments: pCluLst     - cluster list pointer where to add new cluster(s)
 //           isTryUnfold - flag to switch on/off unfolding   
 //  Returns: number of local maxima of original cluster
-
+  CoG();
+  Int_t iCluCnt=pCluLst->GetEntriesFast();                                               //get current number of clusters already stored in the list by previous operations
+  if(isTryUnfold==kFALSE || Size()==1) {                                                 //if cluster contains single pad there is no way to improve the knowledge 
+    (isTryUnfold)?fSt=kSi1:fSt=kNot;
+    new ((*pCluLst)[iCluCnt++]) AliHMPIDCluster(*this);  //add this raw cluster 
+    return 1;
+  } 
 //Phase 0. Initialise TMinuit  
-  const Int_t kMaxLocMax=6;                                                            //max allowed number of loc max for fitting
-  TMinuit *pMinuit = new TMinuit(3*kMaxLocMax);                                        //init MINUIT with this number of parameters (3 params per mathieson)
-  pMinuit->SetObjectFit((TObject*)this);  pMinuit->SetFCN(AliHMPIDCluster::FitFunc);    //set fit function
-  Double_t aArg=-1,parStart,parStep,parLow,parHigh;     Int_t iErrFlg;                 //tmp vars for TMinuit
-  pMinuit->mnexcm("SET PRI",&aArg,1,iErrFlg);                                          //suspend all printout from TMinuit 
-  pMinuit->mnexcm("SET NOW",&aArg,0,iErrFlg);                                          //suspend all warning printout from TMinuit
-//Phase 1. Find number of local maxima. Strategy is to check if the current pad has QDC more then all neigbours   
-  Int_t iLocMaxCnt=0;
-  for(Int_t iDig1=0;iDig1<Size();iDig1++) {                                             //first digits loop
-    AliHMPIDDigit *pDig1 = Dig(iDig1);                                                   //take next digit
-    Int_t iHowManyMoreCnt = 0;                                                          //counts how many neighbouring pads has QDC more then current one
-    for(Int_t iDig2=0;iDig2<Size();iDig2++) {                                           //loop on all digits again
-      if(iDig1==iDig2) continue;                                                        //the same digit, no need to compare 
+  const Int_t kMaxLocMax=6;                                                              //max allowed number of loc max for fitting
+  TMinuit *pMinuit = new TMinuit(3*kMaxLocMax);                                          //init MINUIT with this number of parameters (3 params per mathieson)
+  pMinuit->SetObjectFit((TObject*)this);  pMinuit->SetFCN(AliHMPIDCluster::FitFunc);     //set fit function
+  Double_t aArg=-1;                                     Int_t iErrFlg;                   //tmp vars for TMinuit
+  pMinuit->mnexcm("SET PRI",&aArg,1,iErrFlg);                                            //suspend all printout from TMinuit 
+  pMinuit->mnexcm("SET NOW",&aArg,0,iErrFlg);                                            //suspend all warning printout from TMinuit
+//Phase 1. Find number of local maxima. Strategy is to check if the current pad has QDC more then all neigbours. Also find the box contaning the cluster   
+  fNlocMax=0;
+
+ for(Int_t iDig1=0;iDig1<Size();iDig1++) {                                               //first digits loop
+    AliHMPIDDigit *pDig1 = Dig(iDig1);                                                   //take next digit    
+    Int_t iCnt = 0;                                                                      //counts how many neighbouring pads has QDC more then current one
+    for(Int_t iDig2=0;iDig2<Size();iDig2++) {                                            //loop on all digits again
+      if(iDig1==iDig2) continue;                                                         //the same digit, no need to compare 
       AliHMPIDDigit *pDig2 = Dig(iDig2);                                                 //take second digit to compare with the first one
       Int_t dist = TMath::Sign(Int_t(pDig1->PadChX()-pDig2->PadChX()),1)+TMath::Sign(Int_t(pDig1->PadChY()-pDig2->PadChY()),1);//distance between pads
-      if(dist==1)                                                                       //means dig2 is a neighbour of dig1
-         if(pDig2->Q()>=pDig1->Q()) iHowManyMoreCnt++;                                 //count number of pads with Q more then Q of current pad
+      if(dist==1)                                                                        //means dig2 is a neighbour of dig1
+         if(pDig2->Q()>=pDig1->Q()) iCnt++;                                              //count number of pads with Q more then Q of current pad
     }//second digits loop
-    if(iHowManyMoreCnt==0&&iLocMaxCnt<kMaxLocMax){                                     //this pad has Q more then any neighbour so it's local maximum
-        pMinuit->mnparm(3*iLocMaxCnt  ,Form("x%i",iLocMaxCnt),parStart=pDig1->LorsX(),parStep=0.01,parLow=0,parHigh=0,iErrFlg);
-        pMinuit->mnparm(3*iLocMaxCnt+1,Form("y%i",iLocMaxCnt),parStart=pDig1->LorsY(),parStep=0.01,parLow=0,parHigh=0,iErrFlg);
-        pMinuit->mnparm(3*iLocMaxCnt+2,Form("q%i",iLocMaxCnt),parStart=pDig1->Q()    ,parStep=0.01,parLow=0,parHigh=0,iErrFlg);
-        iLocMaxCnt++;
+    if(iCnt==0&&fNlocMax<kMaxLocMax){                                                    //this pad has Q more then any neighbour so it's local maximum
+      Double_t xStart=pDig1->LorsX();Double_t yStart=pDig1->LorsY();
+      Double_t xMin=xStart-AliHMPIDDigit::SizePadX();
+      Double_t xMax=xStart+AliHMPIDDigit::SizePadX();
+      Double_t yMin=yStart-AliHMPIDDigit::SizePadY();
+      Double_t yMax=yStart+AliHMPIDDigit::SizePadY();
+      pMinuit->mnparm(3*fNlocMax  ,Form("x%i",fNlocMax),xStart,0.1,xMin,xMax,iErrFlg);   // X,Y,Q initial values of the loc max pad
+      pMinuit->mnparm(3*fNlocMax+1,Form("y%i",fNlocMax),yStart,0.1,yMin,yMax,iErrFlg);   // X, Y constrained to be near the loc max
+      pMinuit->mnparm(3*fNlocMax+2,Form("q%i",fNlocMax),pDig1->Q(),0.1,0,100000,iErrFlg);// Q constrained to be positive
+      fNlocMax++;
     }//if this pad is local maximum
   }//first digits loop
+  
 //Phase 2. Fit loc max number of Mathiesons or add this current cluster to the list
-  Int_t iCluCnt=pCluLst->GetEntriesFast();                                          //get current number of clusters already stored in the list by previous operations
-  if(isTryUnfold==kTRUE && iLocMaxCnt<kMaxLocMax){                                        //resonable number of local maxima to fit and user requested it
-    pMinuit->mnexcm("MIGRAD" ,&aArg,0,iErrFlg);                                     //start fitting
-    if (!iErrFlg) { // Only if MIGRAD converged normally
-      Double_t fitX,fitY,fitQ,d1,d2,d3; TString sName;                                //vars to get results from TMinuit
-      for(Int_t i=0;i<iLocMaxCnt;i++){//local maxima loop
-       pMinuit->mnpout(3*i   ,sName,  fitX, d1 , d2, d3, iErrFlg);
-       pMinuit->mnpout(3*i+1 ,sName,  fitY, d1 , d2, d3, iErrFlg);
-       pMinuit->mnpout(3*i+2 ,sName,  fitQ, d1 , d2, d3, iErrFlg);
-       if (TMath::Abs(fitQ)>2147483647.0) fitQ = TMath::Sign((Double_t)2147483647,fitQ);//???????????????
-       new ((*pCluLst)[iCluCnt++]) AliHMPIDCluster(Ch(),fitX,fitY,(Int_t)fitQ,kUnf);       //add new unfolded clusters
-      }//local maxima loop
-    }
-  }else{//do not unfold since number of loc max is unresonably high or user's baned unfolding 
-    CoG();
-    new ((*pCluLst)[iCluCnt++]) AliHMPIDCluster(Ch(),X(),Y(),Q(),kCoG);  //add this raw cluster 
-  }
-  delete pMinuit;
-  return iLocMaxCnt;
+// case 1 -> no loc max found
+ if ( fNlocMax == 0) {                                                                   // case of no local maxima found: pads with same charge...
+   pMinuit->mnparm(3*fNlocMax  ,Form("x%i",fNlocMax),fX,0.1,0,0,iErrFlg);                // Init values taken from CoG() -> fX,fY,fQRaw
+   pMinuit->mnparm(3*fNlocMax+1,Form("y%i",fNlocMax),fY,0.1,0,0,iErrFlg);                //
+   pMinuit->mnparm(3*fNlocMax+2,Form("q%i",fNlocMax),fQRaw,0.1,0,100000,iErrFlg);        //
+   fNlocMax = 1;
+   fSt=kNoLoc;
+ }
+
+// case 2 -> loc max found. Check # of loc maxima 
+ if ( fNlocMax >= kMaxLocMax)                                                            // if # of local maxima exceeds kMaxLocMax... 
+   {
+     fSt = kMax;   new ((*pCluLst)[iCluCnt++]) AliHMPIDCluster(*this);                   //...add this raw cluster  
+   }                                                                                     //or...
+ else{                                                                                   //...resonable number of local maxima to fit and user requested it
+   Double_t arglist[10];arglist[0] = 10000;arglist[1] = 1.;                              //number of steps and sigma on pads charges  
+   pMinuit->mnexcm("SIMPLEX" ,arglist,2,iErrFlg);                                        //start fitting with Simplex
+   pMinuit->mnexcm("MIGRAD" ,arglist,2,iErrFlg);                                         //fitting improved by Migrad
+   if(iErrFlg) {
+     Double_t strategy=2;
+     pMinuit->mnexcm("SET STR",&strategy,1,iErrFlg);                                     //change level of strategy 
+     if(!iErrFlg) {
+       pMinuit->mnexcm("SIMPLEX" ,arglist,2,iErrFlg);                                    //start fitting with Simplex
+       pMinuit->mnexcm("MIGRAD" ,arglist,2,iErrFlg);                                     //fitting improved by Migrad
+       Printf("Try to improve fit --> err %d",iErrFlg);
+     }
+   }        
+   if(iErrFlg) fSt=kAbn;                                                                 //no convergence of the fit...
+   Double_t dummy; TString sName;                                                        //vars to get results from Minuit
+   for(Int_t i=0;i<fNlocMax;i++){                                                        //store the local maxima parameters
+      pMinuit->mnpout(3*i   ,sName,  fX, fErrX , dummy, dummy, iErrFlg);                 // X 
+      pMinuit->mnpout(3*i+1 ,sName,  fY, fErrY , dummy, dummy, iErrFlg);                 // Y
+      pMinuit->mnpout(3*i+2 ,sName,  fQ, fErrQ , dummy, dummy, iErrFlg);                 // Q
+      pMinuit->mnstat(fChi2,dummy,dummy,iErrFlg,iErrFlg,iErrFlg);                        // Chi2 of the fit
+      if(fSt!=kAbn) {         
+        if(fNlocMax!=1)fSt=kUnf;                                                           // if unfolded
+        if(fNlocMax==1&&fSt!=kNoLoc) fSt=kLo1;                                             // if only 1 loc max
+        if ( !IsInPc()) fSt = kEdg;                                                        // if Out of Pc
+        if(fSt==kNoLoc) fNlocMax=0;                                                        // if with no loc max (pads with same charge..)
+      }
+      new ((*pCluLst)[iCluCnt++]) AliHMPIDCluster(*this);                               //add new unfolded cluster
+   }
+ }
+
+ delete pMinuit;
+ return fNlocMax;
 }//Solve()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++