]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HMPID/AliHMPIDCluster.h
Cluster improvements + drawing of digits like TBox.
[u/mrichter/AliRoot.git] / HMPID / AliHMPIDCluster.h
index bfbfcb8497619634cf4ff6d5af647282b7dd452a..63f14d2880b9daee9cdbc309c3046c3889741a2a 100644 (file)
@@ -10,19 +10,19 @@ class TClonesArray;        //Solve()
 class AliHMPIDCluster :public TObject
 {
 public:
-  enum EClusterStatus {kFrm,kCoG,kLo1,kUnf,kMax,kAbn,kNot,kEdg,kSi1,kNoLoc,kEmp=-1};      //status flags    
-  AliHMPIDCluster():TObject( ),fCh(-1),fSi(-1),fSt(kEmp),fBox(-1),fNlocMax(-1),fMaxQpad(-1),fMaxQ(-1),fQ(-1),fQi(-1),fQe(-1),fX(-1),fXi(-1),fXe(-1),fY(-1),fYi(-1),fYe(-1),fChi2(-1),fDigs(0) {} //empty ctor
+  enum EClusterStatus {kFrm,kCoG,kLo1,kUnf,kMax,kNot,kEdg,kSi1,kNoLoc,kEmp=-1};      //status flags    
+  AliHMPIDCluster():TObject( ),fCh(-1),fSi(-1),fSt(kEmp),fBox(-1),fNlocMax(-1),fMaxQpad(-1),fMaxQ(-1),fQRaw(0),fQ(0),fErrQ(-1),fX(0),fErrX(-1),fY(0),fErrY(-1),fChi2(-1),fDigs(0) {} //empty ctor
   
   
-  AliHMPIDCluster           (const AliHMPIDCluster &c):TObject(c),fCh(c.fCh),fSi(c.fSi),fSt(c.fSt),fBox(c.fBox),fNlocMax(c.fNlocMax),fMaxQpad(c.fMaxQpad),fMaxQ(c.fMaxQ),
-                                                                  fQ (c.fQ ),fQi(c.fQi),fQe(c.fQe),
-                                                                  fX (c.fX ),fXi(c.fXi),fXe(c.fXe),
-                                                                  fY (c.fY ),fYi(c.fYi),fYe(c.fYe),fChi2(c.fChi2),fDigs(0)                  {}//copy ctor
+  AliHMPIDCluster           (const AliHMPIDCluster &c):TObject(c),fCh(c.fCh),fSi(c.fSi),fSt(c.fSt),fBox(c.fBox),fNlocMax(c.fNlocMax),fMaxQpad(c.fMaxQpad),fMaxQ(c.fMaxQ),fQRaw(c.fQRaw),
+                                                                  fQ (c.fQ ),fErrQ(c.fErrQ),
+                                                                  fX (c.fX ),fErrX(c.fErrX),
+                                                                  fY (c.fY ),fErrY(c.fErrY),fChi2(c.fChi2),fDigs(0)                  {}//copy ctor
   AliHMPIDCluster &operator=(const AliHMPIDCluster &c) {if(this == &c)return *this;TObject::operator=(c);          
-                                                        fSi=c.fSi;  fSt=c.fSt; fCh=c.fCh; fBox=c.fBox;fNlocMax=c.fNlocMax;fMaxQpad=c.fMaxQpad; fMaxQ=c.fMaxQ;
-                                                        fQ=c.fQ; fQi=c.fQi;fQe=c.fQe
-                                                        fX=c.fX; fXi=c.fXi;fXe=c.fXe;
-                                                        fY=c.fY; fYi=c.fYi;fYe=c.fYe; fChi2=c.fChi2;fDigs=c.fDigs ? new TObjArray(*c.fDigs):0; return *this;}
+                                                        fSi=c.fSi;  fSt=c.fSt; fCh=c.fCh; fBox=c.fBox;fNlocMax=c.fNlocMax;fMaxQpad=c.fMaxQpad; fMaxQ=c.fMaxQ;fQRaw=c.fQRaw;
+                                                        fQ=c.fQ; fErrQ=c.fErrQ
+                                                        fX=c.fX; fErrX=c.fErrX;
+                                                        fY=c.fY; fErrY=c.fErrY; fChi2=c.fChi2;fDigs=c.fDigs ? new TObjArray(*c.fDigs):0; return *this;}
     
   virtual ~AliHMPIDCluster(                                     )                                                                        {if(fDigs) delete fDigs; fDigs=0;}
 //framework part                   
@@ -40,36 +40,32 @@ public:
          Int_t          Size     (                                         )const{return fSi;                                    } //returns number of pads in formed cluster 
          Int_t          Solve    (TClonesArray *pCluLst,Bool_t isUnfold    );                                                      //solve cluster: MINUIT fit or CoG
          Int_t          Status  (                                          ) const{return fSt;}                                   //Status of cluster                                  
-         Double_t       Q        (                                         )const{return fQ;                                     } //cluster charge in QDC channels 
-         Double_t       Qi       (                                         )const{return fQi;                                    } //cluster charge in QDC channels 
-         Double_t       Qe       (                                         )const{return fQe;                                    } //cluster charge in QDC channels 
+         Double_t       QRaw     (                                         )const{return fQRaw;                                  } //raw cluster charge in QDC channels 
+         Double_t       Q        (                                         )const{return fQ;                                     } //given cluster charge in QDC channels 
+         Double_t       Qe       (                                         )const{return fErrQ;                                  } //Error in cluster charge in QDC channels 
          Double_t       X        (                                         )const{return fX;                                     } //cluster x position in LRS
-         Double_t       Xi       (                                         )const{return fXi;                                    } //cluster charge in QDC channels 
-         Double_t       Xe       (                                         )const{return fXe;                                    } //cluster charge in QDC channels 
+         Double_t       Xe       (                                         )const{return fErrX;                                  } //cluster charge in QDC channels 
          Double_t       Y        (                                         )const{return fY;                                     } //cluster y position in LRS 
-         Double_t       Yi       (                                         )const{return fYi;                                    } //cluster charge in QDC channels 
-         Double_t       Ye       (                                         )const{return fYe;                                    } //cluster charge in QDC channels 
+         Double_t       Ye       (                                         )const{return fErrY;                                    } //cluster charge in QDC channels 
          Double_t       Chi2     (                                         )const{return fChi2;                                  } 
 protected:
   Int_t         fCh;          //chamber number
-  Int_t         fSi;          //size of the formed cluster from which this cluster deduced  
-  Int_t         fSt;          //flag to mark the quality of the cluster   
-  Int_t         fBox;         //box contaning this cluster  
-  Int_t         fNlocMax;     //number of local maxima in formed cluster        
+  Int_t         fSi;          //size of the formed cluster from which this cluster deduced
+  Int_t         fSt;          //flag to mark the quality of the cluster
+  Int_t         fBox;         //box contaning this cluster
+  Int_t         fNlocMax;     //number of local maxima in formed cluster
   Int_t         fMaxQpad;     //abs pad number of a pad with the highest charge
-  Double_t      fMaxQ;        //that max charge value             
-  Double_t      fQ;           //QDC value
-  Double_t      fQi;          //initial Q of local maximum
-  Double_t      fQe;          //error on Q 
-  Double_t      fX;           //local x postion, [cm] 
-  Double_t      fXi;          //initial x of local maximum, [cm] 
-  Double_t      fXe;          //error on x postion, [cm] 
-  Double_t      fY;           //local y postion, [cm]  
-  Double_t      fYi;          //initial y of local maximum, [cm] 
-  Double_t      fYe;          //error on y postion, [cm] 
-  Double_t      fChi2;        //some estimatore of fit quality  
+  Double_t      fMaxQ;        //that max charge value
+  Double_t      fQRaw;        //QDC value of the raw cluster
+  Double_t      fQ;           //QDC value of the actual cluster
+  Double_t      fErrQ;        //error on Q
+  Double_t      fX;           //local x postion, [cm]
+  Double_t      fErrX;        //error on x postion, [cm]
+  Double_t      fY;           //local y postion, [cm]
+  Double_t      fErrY;        //error on y postion, [cm]
+  Double_t      fChi2;        //some estimator of the fit quality
   TObjArray    *fDigs;        //! list of digits forming this cluster
-  ClassDef(AliHMPIDCluster,5) //HMPID cluster class       
+  ClassDef(AliHMPIDCluster,6) //HMPID cluster class
 };//class AliHMPIDCluster
 
 typedef AliHMPIDCluster AliRICHCluster; // for backward compatibility
@@ -90,7 +86,11 @@ void AliHMPIDCluster::Reset()
 {
   if(fDigs) delete fDigs; 
   fDigs=0; 
-  fQ=fCh=fSi=-1;fX=fY=-1;fSt=kEmp;      
+  fSt=kEmp;
+  fQRaw=fQ=0;
+  fX=fY=0;
+  fCh=fSi=fBox=fNlocMax=fMaxQpad=-1;
+  fMaxQ=fErrQ=fErrX=fErrY=fChi2=-1; //empty ctor
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Bool_t AliHMPIDCluster::IsInPc()