]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - RICH/AliRICH.h
TVector.h missing
[u/mrichter/AliRoot.git] / RICH / AliRICH.h
index 66b4161495fa05a41a39e7c995254d9c8296e667..bba4b603e05590f436f6dbf4620091c1c87b2669 100644 (file)
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-#include <TObjArray.h>
+#include <Riostream.h>
 #include <TClonesArray.h>
-#include <TLorentzVector.h>
-#include <AliDetector.h>
-#include <AliHit.h>
-#include <AliDigit.h>
+#include <TObjArray.h>
+#include <TVector.h>
+#include <TVector3.h>
 
-#include "AliRICHConst.h"
-#include "AliRICHChamber.h"
+#include "AliRICHDigitizer.h"
 #include "AliRICHParam.h"
-
-
-#include "AliRICHDigit.h"
-#include "AliRICHSDigit.h"
-#include "AliRICHRawCluster.h"
+#include <AliDetector.h>
+#include <AliDigit.h>
+#include <AliHit.h>
 
 //__________________AliRICHhit______________________________________________________________________
-//__________________________________________________________________________________________________
-//__________________________________________________________________________________________________
 class AliRICHhit : public AliHit
 {
 public:
-  inline   AliRICHhit();
-  inline   AliRICHhit(Int_t fIshunt, Int_t track, Int_t *vol, Float_t *hits);
-  inline   AliRICHhit(Int_t track,Int_t iPID,Int_t iChamber,TLorentzVector x4,Float_t eloss);
-  virtual ~AliRICHhit()         {;}
-    
-  Int_t   C()                   {return fChamber;}
-  Int_t   Chamber()             {return fChamber;}
-  Int_t   Pid()                 {return fPid;}    
-  Int_t   Particle()            {return fPid;}
-  Float_t Theta()               {return fTheta;}
-  Float_t Phi()                 {return fPhi;}
-  Float_t Tlength()             {return fTlength;}
-  Float_t Eloss()               {return fEloss;}
-  Float_t Loss()                {return fLoss;}
-  Float_t PHfirst()             {return fPHfirst;}
-  Float_t PHlast()              {return fPHlast;}
-  Float_t MomX()                {return fMomX;}
-  Float_t MomY()                {return fMomY;}
-  Float_t MomZ()                {return fMomZ;}
-  Float_t CerenkovAngle()       {return fCerenkovAngle;}
-  Float_t MomFreoX()            {return fMomFreoX;}
-  Float_t MomFreoY()            {return fMomFreoY;}
-  Float_t MomFreoZ()            {return fMomFreoZ;}
-  void    Print(Option_t *option="")const;      //virtual
+           AliRICHhit():AliHit(),fChamber(kBad),fEloss(kBad) {fInX3.SetXYZ(0,0,0);fOutX3.SetXYZ(0,0,0);}
+           AliRICHhit(Int_t c,Int_t tid,TVector3 in,TVector3 out,Double_t e):AliHit(0,tid)
+                                          {fChamber=c;fInX3=in; fOutX3=out;fEloss=e; fX=out.X();fY=out.Y();fZ=out.Z();}
+  virtual ~AliRICHhit()                   {;}
+
+  Int_t    C()                       const{return fChamber;}              //chamber number 
+  Int_t    Chamber()                 const{return fChamber;}              //chamber number 
+  Float_t  Eloss()                   const{return fEloss;}                //energy lost by track inside amplification gap  
+  TVector3 InX3()                    const{return fInX3;}                 //track position at the faceplane of the gap 
+  TVector3 OutX3()                   const{return fOutX3;}                //track position at the backplane of the gap 
+  Double_t Length()                  const{return (fOutX3-fInX3).Mag();}  //track length inside the amplification gap
+  void     Print(Option_t *option="")const;                               //virtual
 protected:
   Int_t     fChamber;                      //chamber number
-  Int_t     fPid;                          //particle code
-  Float_t   fTheta,fPhi ;                  //incident theta phi angles in degrees
-  Float_t   fTlength;                      //track length inside the chamber
-  Float_t   fEloss;                        //ionisation energy loss in gas
-  Float_t   fPHfirst;                      //first padhit
-  Float_t   fPHlast;                       //last padhit
-  Float_t   fLoss;                         // did it hit the freon?
-  Float_t   fMomX,fMomY,fMomZ;             //momentum at photochatode entry point
-  Float_t   fNPads;                        // Pads hit
-  Float_t   fCerenkovAngle;                // Dummy cerenkov angle
-  Float_t   fMomFreoX,fMomFreoY,fMomFreoZ; //momentum at freon entry point
-  ClassDef(AliRICHhit,1)                   //RICH hit class
+  Double_t  fEloss;                        //ionisation energy lost in GAP
+  TVector3  fInX3;                         //position at the entrance of the GAP   
+  TVector3  fOutX3;                        //position at the exit of the GAP
+  ClassDef(AliRICHhit,2)                   //RICH hit class
 };//class AliRICHhit
 
-  //__________________________________________________________________________________________________
-AliRICHhit::AliRICHhit()
-           :AliHit() 
-{//default ctor  
-  fChamber=fPid=kBad;
-  fTheta=fPhi=fTlength=fEloss=fPHfirst=fPHlast=fLoss=kBad;
-  fMomX=fMomY=fMomZ=fNPads=fCerenkovAngle=fMomFreoX=fMomFreoY=fMomFreoZ=kBad;
-}
-//__________________________________________________________________________________________________
-AliRICHhit::AliRICHhit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hit):
-            AliHit(shunt, track)
-{//ctor
-  fChamber=vol[0];
-  fPid=(Int_t)hit[0];
-  fX=hit[1];fY=hit[2];fZ=hit[3];
-  fTheta=hit[4];fPhi=hit[5];
-  fTlength=hit[6];
-  fEloss=hit[7];
-  fPHfirst=(Int_t)hit[8];
-  fPHlast=(Int_t)hit[9];
-  fLoss=hit[13];
-  fMomX=hit[14];fMomY=hit[15];fMomZ=hit[16];
-  fNPads=hit[17];
-  fCerenkovAngle=hit[18];
-  fMomFreoX=hit[19];fMomFreoY=hit[20];fMomFreoZ=hit[21];
-}
-//__________________________________________________________________________________________________
-AliRICHhit::AliRICHhit(Int_t track,Int_t iPID,Int_t iChamber,TLorentzVector x4,Float_t eloss):
-            AliHit(0, track)
-{//ctor
-  fChamber=iChamber;
-  fPid=iPID;
-  fX=x4.X();fY=x4.Y();fZ=x4.Z();
-  fEloss=eloss;
-}
-
-//__________________AliRICHCerenkov_________________________________________________________________
-//__________________________________________________________________________________________________
-//__________________________________________________________________________________________________
-class AliRICHCerenkov: public AliHit 
-{
-public:
-  inline   AliRICHCerenkov();
-  inline   AliRICHCerenkov(Int_t fIshunt, Int_t track, Int_t *vol, Float_t *Cerenkovs);
-  virtual ~AliRICHCerenkov() {;}
-public:
-  Int_t     fChamber;          //chamber number
-  Float_t   fTheta,fPhi;       //incident theta phi angles in degrees      
-  Float_t   fTlength;          //track length inside the chamber
-  Float_t   fEloss;            //ionisation energy loss in gas
-  Int_t     fPHfirst;          //first padhit
-  Int_t     fPHlast;           //last padhit
-  Int_t     fCMother;          //index of mother particle
-  Float_t   fLoss;             //nature of particle loss
-  Float_t   fIndex;            //index of photon
-  Float_t   fProduction;       //point of production
-  Float_t   fMomX,fMomY,fMomZ; //local Momentum
-  Float_t   fNPads;           // Pads hit
-  Float_t   fCerenkovAngle;   // Cerenkov Angle
-    
-  ClassDef(AliRICHCerenkov,1)  //RICH cerenkov class
-};//class AliRICHCerenkov
-
-//__________________________________________________________________________________________________
-AliRICHCerenkov::AliRICHCerenkov()
-{//ctor
-    fChamber=kBad;
-    fX=fY=fZ=fTheta=fPhi=fTlength=fEloss=kBad;
-    fPHfirst=fPHlast=fCMother=kBad;
-    fLoss=fIndex=fProduction=fMomX=fMomY=fMomZ=fNPads=fCerenkovAngle=kBad;
-}
-//__________________________________________________________________________________________________
-AliRICHCerenkov::AliRICHCerenkov(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits)
-                :AliHit(shunt, track)
-{//ctor
-    fChamber=vol[0];
-    fX=hits[1];fY=hits[2];fZ=hits[3];
-    fTheta=hits[4];fPhi=hits[5];
-    fTlength=hits[6];
-    fEloss=hits[7];
-    fPHfirst=(Int_t)hits[8];fPHlast=(Int_t)hits[9];
-    fCMother=Int_t(hits[10]);
-    fIndex = hits[11];
-    fProduction = hits[12];  
-    fLoss=hits[13];
-    fMomX=hits[14];fMomY=hits[15];fMomZ=hits[16];
-    fNPads=hits[17];
-    fCerenkovAngle=hits[18];
-}
-
 //__________________AliRICHdigit____________________________________________________________________
-//__________________________________________________________________________________________________
-//__________________________________________________________________________________________________
 class AliRICHdigit :public AliDigit
 {
 public:
-           AliRICHdigit() {fPadX=fPadY=fChamber=fTracks[0]=fTracks[1]=fTracks[2]=kBad;fQdc=kBad;}
-  inline   AliRICHdigit(Int_t iC,Int_t iX,Int_t iY,Double_t iQdc,Int_t iT1,Int_t iT2,Int_t iT3);
+  AliRICHdigit():AliDigit(),fCFM(0),fChamber(0),fPadX(0),fPadY(0),fQdc(kBad){fTracks[0]=fTracks[1]=fTracks[2]=kBad;}
+  AliRICHdigit(Int_t c,TVector pad,Double_t q,Int_t cfm,Int_t tid0,Int_t tid1,Int_t tid2)  
+       {fPadX=(Int_t)pad[0];fPadY=(Int_t)pad[1];fQdc=q;fChamber=10*c+AliRICHParam::Pad2Sec(pad);fCFM=cfm;fTracks[0]=tid0;fTracks[1]=tid1;fTracks[2]=tid2;}
   virtual ~AliRICHdigit() {;}  
-  inline   Int_t    Compare(const TObject *pObj) const;                               //virtual
-           Bool_t   IsSortable()                                  const{return kTRUE;}//virtual
-           Int_t    C()                                           const{return fChamber/10;}
-           Int_t    S()                                           const{return fChamber-(fChamber/10)*10;} 
-           Int_t    Chamber()                                     const{return C();}
-           Int_t    Sector()                                      const{return S();}
-           Int_t    X()                                           const{return fPadX;}
-           Int_t    Y()                                           const{return fPadY;}
-           Int_t    Id()                                          const{return fChamber*10000000+fPadX*1000+fPadY;}
-           Double_t Q()                                           const{return fQdc;}
-           Int_t    T(Int_t i)                                    const{return fTracks[i];}
-           void  Print(Option_t *option="")const;                 //virtual
+  Int_t    Compare(const TObject *pObj) const
+                 {if(Id()==((AliRICHdigit*)pObj)->Id())return 0;else if(Id()>((AliRICHdigit*)pObj)->Id())return 1;else return -1;}  //virtual      
+  virtual Bool_t   IsSortable()                 const{return kTRUE;}                              //sort interface
+  virtual void     Print(Option_t *option="")   const;                                            //virtual
+  Int_t    ChFbMi()                     const{return fCFM;}                               //particle mixture for this digit
+  Int_t    C()                          const{return fChamber/10;}                        //chamber number
+  Int_t    S()                          const{return fChamber-(fChamber/10)*10;}          //sector number
+  Int_t    X()                          const{return fPadX;}                              //x position of the pad
+  Int_t    Y()                          const{return fPadY;}                              //y postion of the pad
+  TVector  Pad()                        const{Float_t v[2]={fPadX,fPadY}; return TVector(2,v);}
+  Int_t    Id()                         const{return fChamber*10000000+fPadX*1000+fPadY;} //absolute id of this pad
+  Double_t Q()                          const{return fQdc;}                               //charge in terms of ADC channels
+  void     AddTidOffset(Int_t offset) 
+    {for (Int_t i=0; i<3; i++) if (fTracks[i]>0) fTracks[i]+=offset;};
 protected:
-  Int_t    fChamber;  //10*module number+ sector number 
+  Int_t    fCFM;  //1000000*Ncerenkovs+1000*Nfeedbacks+Nmips  
+  Int_t    fChamber;  //10*chamber number+ sector number 
   Int_t    fPadX;     //pad number along X
   Int_t    fPadY;     //pad number along Y
-  Double_t fQdc;      //QDC value, fractions are permitted for summable procedure
-  ClassDef(AliRICHdigit,1) //RICH digit class       
+  Double_t fQdc;      //QDC value, fractions are permitted for summable procedure  
+  ClassDef(AliRICHdigit,3) //RICH digit class       
 };//class AliRICHdigit
-//__________________________________________________________________________________________________
-AliRICHdigit::AliRICHdigit(Int_t iC,Int_t iPadX,Int_t iPadY,Double_t q,Int_t iT0,Int_t iT1,Int_t iT2)
-{
-  fPadX=iPadX;fPadY=iPadY;fQdc=q;  
-  fChamber=10*iC+AliRICHParam::Pad2Sec(iPadX,iPadY);
-  fTracks[0]=iT0;fTracks[1]=iT1;fTracks[2]=iT2;
-}
-//__________________________________________________________________________________________________
-Int_t AliRICHdigit::Compare(const TObject *pObj)const
-{
-  if(Id()==((AliRICHdigit*)pObj)->Id()) 
-    return 0;
-  else if(Id()>((AliRICHdigit*)pObj)->Id()) 
-    return 1;
-  else
-    return -1;
-} 
-//__________________AliRICHcluster__________________________________________________________________
-//__________________________________________________________________________________________________
-
-enum ClusterStatus {kOK,kEdge,kShape,kSize,kRaw};
 
-//__________________________________________________________________________________________________
+//__________________AliRICHcluster__________________________________________________________________
 class AliRICHcluster :public TObject
 {
 public:
-           AliRICHcluster()                                     {fSize=fQdc=fStatus=fChamber=fDimXY=kBad;fX=fY=kBad;fDigits=0;}
-  virtual ~AliRICHcluster() {delete fDigits;}  
-         Int_t      Size()                                      const{return fSize;}                       //
-         Int_t      DimXY()                                     const{return fDimXY;}                      //
-         Int_t      C()                                         const{return fChamber/10;}                 //
-         Int_t      S()                                         const{return fChamber-(fChamber/10)*10;}   //
-         Int_t      Chamber()                                   const{return C();}                         //
-         Int_t      Sector()                                    const{return S();}                         //
-         Int_t      Q()                                         const{return fQdc;}                        // 
-         Double_t   X()                                         const{return fX;}                          //
-         Double_t   Y()                                         const{return fY;}                          // 
-         Int_t      Status()                                    const{return fStatus;}                     //
-         void       SetStatus(Int_t status)                          {fStatus=status;}                     //
-         TObjArray* Digits()                                    const{return fDigits;}                     //  
-         void       Print(Option_t *option="")const;                                                       //virtual
-  inline void       AddDigit(AliRICHdigit *pDig);                                                          //
-  inline void       CoG();                                                                                 // 
-         void       Reset() {fSize=fQdc=fStatus=fChamber=fDimXY=kBad;fX=fY=kBad;delete fDigits;fDigits=0;} //                                                                               //
+  enum ClusterStatus {kEdge,kShape,kSize,kRaw,kResolved,kEmpty=kBad};
+                    AliRICHcluster():TObject(),fCFM(0),fSize(0),fShape(0),fQdc(0),fChamber(0),fX(0),fY(0),fStatus(kEmpty),fDigits(0) {}    
+  virtual          ~AliRICHcluster()                 {Reset();}  
+         void       Reset()                          {DeleteDigits();fCFM=fSize=fShape=fQdc=fChamber=0;fX=fY=0;fStatus=kEmpty;} //cleans the cluster
+         void       DeleteDigits()                   {if(fDigits) delete fDigits; fDigits=0;}           //deletes the list of digits  
+  AliRICHcluster&   operator=(const AliRICHcluster&) {return *this;}                                 
+         Int_t      Nlocals()                   const{return fSize-10000*(fSize/10000);}                //number of local maximums
+         Int_t      Size()                      const{return fSize/10000;}                              //number of digits in cluster
+         Int_t      Fsize()                     const{return fSize;}                                    //
+         Int_t      Shape()                     const{return fShape;}                                   //cluster shape rectangulare
+         Int_t      C()                         const{return fChamber/10;}                              //chamber number
+         Int_t      S()                         const{return fChamber-(fChamber/10)*10;}                //sector number
+         Int_t      Fchamber()                  const{return fChamber;}                                 //
+         Int_t      Q()                         const{return fQdc;}                                     //cluster charge in QDC channels 
+         Double_t   X()                         const{return fX;}                                       //cluster x position in LRS
+         Double_t   Y()                         const{return fY;}                                       //cluster y position in LRS 
+         Int_t      Status()                    const{return fStatus;}                                  //
+         void       SetStatus(Int_t status)         {fStatus=status;}                                     //
+         Int_t      Nmips()                     const{return fCFM-1000000*Ncerenkovs()-1000*Nfeedbacks();} //
+         Int_t      Ncerenkovs()                const{return fCFM/1000000;}                                //
+         Int_t      Nfeedbacks()                const{return (fCFM-1000000*Ncerenkovs())/1000;}            //
+         Bool_t     IsPureMip()                 const{return fCFM<1000;}                                   //
+         Bool_t     IsPureCerenkov()            const{return Nmips()==0&&Nfeedbacks()==0;}                 //
+         Bool_t     IsPureFeedback()            const{return Nmips()==0&&Ncerenkovs()==0;}                 //
+         Bool_t     IsSingleMip()               const{return Nmips()==1&&Ncerenkovs()==0&&Nfeedbacks()==0;}  //
+         Bool_t     IsSingleCerenkov()          const{return Nmips()==0&&Ncerenkovs()==1&&Nfeedbacks()==0;}  //
+         Bool_t     IsSingleFeedback()          const{return Nmips()==0&&Ncerenkovs()==0&&Nfeedbacks()==1;}  //
+         Bool_t     IsMip()                     const{return Nmips()!=0;}                                  //
+         Bool_t     IsCerenkov()                const{return Ncerenkovs()!=0;}                             //
+         Bool_t     IsFeedback()                const{return Nfeedbacks()!=0;}                             //
+         Int_t      CombiPid()                  const{return fCFM;}                                        //
+         void       CFM(Int_t c,Int_t f,Int_t m)     {fCFM=1000000*c+1000*f+m;}                            //cluster contributors
+         TObjArray* Digits()                    const{return fDigits;}                                     //  
+  virtual void      Print(Option_t *option="")const;                                                                //
+  inline  void      AddDigit(AliRICHdigit *pDig);                                                                   //
+  inline  void      CoG(Int_t nLocals);                                                                             //calculates center of gravity
+          void      Fill(AliRICHcluster *pRaw,Double_t x,Double_t y,Double_t q,Int_t cfm)                           //form new resolved cluster from raw one
+                    {fCFM=cfm;fChamber=pRaw->Fchamber();fSize=pRaw->Fsize();fQdc=(Int_t)(q*pRaw->Q());fX=x;fY=y;fStatus=kResolved;} //
 protected:
-  Int_t         fSize;        //how many digits belong to this cluster    
-  Int_t         fDimXY;       //100*xdim+ydim box containing the cluster
+  Int_t         fCFM;         //1000000*Ncerenkovs+1000*Nfeedbacks+Nmips  
+  Int_t         fSize;        //10000*(how many digits belong to this cluster) + nLocalMaxima     
+  Int_t         fShape;       //100*xdim+ydim box containing the cluster
   Int_t         fQdc;         //QDC value
   Int_t         fChamber;     //10*module number+sector number 
   Double_t      fX;           //local x postion 
   Double_t      fY;           //local y postion  
   Int_t         fStatus;      //flag to mark the quality of the cluster   
   TObjArray    *fDigits;      //! list of digits forming this cluster
-  ClassDef(AliRICHcluster,1)  //RICH cluster class       
+  ClassDef(AliRICHcluster,2)  //RICH cluster class       
 };//class AliRICHcluster
 //__________________________________________________________________________________________________
 void AliRICHcluster::AddDigit(AliRICHdigit *pDig)
-{//    
-  if(!fDigits) {fQdc=fSize=0;fDigits = new TObjArray;}
+{
+// Adds a given digit to the list of digits belonging to this cluster    
+  if(!fDigits) {fQdc=fSize=fCFM=0;fDigits = new TObjArray;}
   fQdc+=(Int_t)pDig->Q(); fDigits->Add(pDig);
   fChamber=10*pDig->C()+pDig->S();
-  fSize++;
+  fSize+=10000;
+  fStatus=kRaw;
 }
 //__________________________________________________________________________________________________
-void AliRICHcluster::CoG()
-{//
-  Int_t xmin=999,ymin=999,xmax=0,ymax=0;   
-  Double_t x,y;        
+void AliRICHcluster::CoG(Int_t nLocals)
+{
+// Calculates naive cluster position as a center of gravity of its digits.
+  Float_t xmin=999,ymin=999,xmax=0,ymax=0;   
   fX=fY=0;
   for(Int_t iDig=0;iDig<Size();iDig++) {
     AliRICHdigit *pDig=(AliRICHdigit*)fDigits->At(iDig);
-    Int_t padX = pDig->X();Int_t padY = pDig->Y();Double_t q=pDig->Q();
-    AliRICHParam::Pad2Loc(padX,padY,x,y);
-    fX += x*q;fY +=y*q;
-    if(padX<xmin)xmin=padX;if(padX>xmax)xmax=padX;if(padY<ymin)ymin=padY;if(padY>ymax)ymax=padY;
+    TVector pad=pDig->Pad(); Double_t q=pDig->Q();
+    TVector2 x2=AliRICHParam::Pad2Loc(pad);
+    fX += x2.X()*q;fY +=x2.Y()*q;
+    if(pad[0]<xmin)xmin=pad[0];if(pad[0]>xmax)xmax=pad[0];if(pad[1]<ymin)ymin=pad[1];if(pad[1]>ymax)ymax=pad[1];
    }
    fX/=fQdc;fY/=fQdc;//Center of Gravity
-   fDimXY = 100*(xmax-xmin+1)+ymax-ymin+1;//find box containing cluster
+   fShape=Int_t(100*(xmax-xmin+1)+ymax-ymin+1);//find box containing cluster
+   fSize+=nLocals;
    fStatus=kRaw;
 }//CoG()
+
 //__________________AliRICH_________________________________________________________________________
-//__________________________________________________________________________________________________
-//__________________________________________________________________________________________________
-class AliRICHParam;
-class AliRICHSDigit;
+class AliESD;
 
 class AliRICH : public AliDetector 
 {
 public:
             AliRICH();                                            
-            AliRICH(const char *name, const char *title);         
-            AliRICH(const AliRICH& RICH):AliDetector(RICH) {;}   
+            AliRICH(const char *name, const char *title);
+            AliRICH(const AliRICH& RICH):AliDetector(RICH) {;}  //copy ctor 
   virtual  ~AliRICH();                                            
           
   AliRICH&  operator=(const AliRICH&)                 {return *this;}
-  virtual Int_t   IsVersion()                                            const =0;            
-          void    Hits2SDigits();                                                                                 //virtual
-          void    SDigits2Digits();                                                                               //virtual
-          void    Digits2Reco();                                                                                  //virtual
-  
-  inline  void    CreateHits();    
-  inline  void    CreateSDigits();  
-  inline  void    CreateDigits();  
-  inline  void    CreateClusters();  
-  inline  void    AddHit(Int_t track, Int_t *vol, Float_t *hits);                                                 //virtual
-  inline  void    AddSDigit(Int_t iC,Int_t iX,Int_t iY,Double_t q,Int_t iT0,Int_t iT1=kBad,Int_t iT2=kBad);
-  inline  void    AddDigit (Int_t iC,Int_t iX,Int_t iY,Int_t iQ,Int_t iT0,Int_t iT1=kBad,Int_t iT2=kBad);     
-  inline  void    AddCluster(AliRICHcluster &clus);
-          void    ResetHits()     {AliDetector::ResetHits();fNcerenkovs=0;if(fCerenkovs)fCerenkovs->Clear();fNspecials=0;if(fSpecials)fSpecials->Clear();}  //virtual
-          void    ResetSDigits()  {fNsdigits=0;  if(fSdigits)  fSdigits ->Clear();}                                 
-          void    ResetDigits()   {if(fDigitsNew)for(int i=0;i<kNCH;i++){fDigitsNew->At(i)->Clear();fNdigitsNew[i]=0;}}
-          void    ResetClusters() {if(fClusters) for(int i=0;i<kNCH;i++){fClusters ->At(i)->Clear();fNclusters[i]=0;}}
-                  //Hits provided by AliDetector
+//framework part  
+  virtual Int_t         IsVersion()                           const =0;                                  //interface from         
+  virtual void          StepManager()                               =0;                                  //interface from AliMC
+  virtual void          Hits2SDigits();                                                                  //interface from AliSimulation
+  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* man) const {return new AliRICHDigitizer(man);}  //interface from AliSimulation
+  virtual void          Reconstruct()                         const;                                     //interface from AliReconstruction
+  virtual void          FillESD(AliESD *pESD)                 const;                                     //interface from AliReconstruction          
+  virtual void          Print(Option_t *option)               const;                                     //prints current RICH status
+  virtual void          SetTreeAddress();                                                                //interface from AliLoader
+  virtual void          MakeBranch(Option_t *opt=" ");                                                   //interface from AliLoader
+  virtual void          CreateMaterials();                                                               //interface from AliMC
+  virtual void          CreateGeometry();                                                                //interface from AliMC
+  virtual void          BuildGeometry();                                                                 //interface 
+//private part  
+          Float_t AbsoCH4(Float_t x)const;                               //calculates absorption length for methane
+          Float_t Fresnel(Float_t ene,Float_t pdoti, Bool_t pola)const;  //deals with Fresnel absorption
+  inline  void    CreateHits();                                          //create hits container as a simple list
+  inline  void    CreateSDigits();                                       //create sdigits container as a simple list
+  inline  void    CreateDigits();                                        //create digits container as 7 lists, one per chamber
+  inline  void    CreateClusters();                                      //create clusters container  as 7 lists, one per chamber
+//        void    ResetHits()                {AliDetector::ResetHits();}  //virtual  
+          void    ResetSDigits()             {fNsdigits=0;  if(fSdigits)  fSdigits ->Clear();}                                 
+          void    ResetDigits()              {if(fDigitsNew)for(int i=0;i<kNchambers;i++){fDigitsNew->At(i)->Clear();fNdigitsNew[i]=0;}} //virtual
+          void    ResetClusters()            {if(fClusters) for(int i=0;i<kNchambers;i++){fClusters ->At(i)->Clear();fNclusters[i]=0;}}
   TClonesArray*   SDigits()             const{return fSdigits;}
   TClonesArray*   Digits(Int_t iC)      const{if(fDigitsNew) return (TClonesArray *)fDigitsNew->At(iC-1);else return 0;}
   TClonesArray*   Clusters(Int_t iC)    const{if(fClusters)  return (TClonesArray *)fClusters->At(iC-1);else return 0;}
-          
-  AliRICHChamber* C(Int_t iC)           const{return (AliRICHChamber*)fChambers->At(iC-1);}
-  AliRICHParam*   Param()               const{return fpParam;}
-  
-  //  AliRICHhit*     FirstHit(Int_t iTrkN)      {return (AliRICHhit*)AliDetector::FirstHit(iTrkN);}                   //virtual
-  //  AliRICHhit*     NextHit()                  {return (AliRICHhit*)AliDetector::NextHit();}                         //virtual 
-  
-          void    CreateChambers();         
-          void    CreateMaterials(); //virtual
-  virtual void    BuildGeometry();   //virtual
-  virtual void    CreateGeometry();  //virtual
-          Float_t AbsoCH4(Float_t x);
-          Float_t Fresnel(Float_t ene,Float_t pdoti, Bool_t pola);
-  
-  virtual void    StepManager()=0;
-          void    GenerateFeedbacks(Int_t iChamber,Float_t eloss);
-          void    Print(Option_t *option)const;//virtual
-          void    MakeBranch(Option_t *opt=" ");
-          void    SetTreeAddress();//virtual
-// OLD staff OLD staff    
-  inline  void    AddCerenkov(Int_t track, Int_t *vol, Float_t *cerenkovs);
-  inline  void    AddSpecialOld(Int_t *);      
-  inline  void    AddDigitOld(Int_t id, Int_t *tracks, Int_t *charges, Int_t *digits);          
-  inline  void    AddClusterOld(Int_t iChamber, const AliRICHRawCluster& cluster);
-          
-  inline  void    CreateCerenkovsOld();  
-  inline  void    CreateSpecialsOld();   
-  inline  void    CreateDigitsOld();    
-  inline  void    CreateRawClustersOld();  
-          void    ResetDigitsOld()  {if(fDchambers)  for(int i=0;i<kNCH;i++){fDchambers->At(i)->Clear();fNdch[i]=0;}}   //virtual
-          void    ResetSpecialsOld(){fNspecials=0; if(fSpecials) fSpecials->Clear();}   
-          void    ResetRawClusters(){if(fRawClusters)for(int i=0;i<kNCH;i++){fRawClusters->At(i)->Clear();fNrawch[i]=0;}}
-  
-  TClonesArray*   DigitsOld(Int_t iC)   const{if(fDchambers) return (TClonesArray *)fDchambers->At(iC-1);else return 0;}
-  TClonesArray*   ClustersOld(Int_t iC) const{if(fRawClusters)return (TClonesArray *)fRawClusters->At(iC-1);else return 0;}
-  TClonesArray*   Specials()            const{return fSpecials;}
-  TClonesArray*   Cerenkovs()           const{return fCerenkovs;}
-  
-  
+  AliRICHChamber* C(Int_t iC)           const{return fpParam->C(iC);}                       //provides pointer to a given chamber
+  AliRICHParam*   P()                   const{return fpParam;}                              //provides pointer to a RICH params
+  AliRICH*        R()                        {return this;}                                 //provides pointer to RICH main object
+  TVector         Counters()            const{return fCounters;}                            //provides a set of counters
+  void            ControlPlots();                                                           //utility
+  void            PrintHits    (Int_t iEvent=0);                                            //utility
+  void            PrintSDigits (Int_t iEvent=0);                                            //utility
+  void            PrintDigits  (Int_t iEvent=0);                                            //utility
+  void            PrintClusters(Int_t iEvent=0);                                            //utility
             
-  AliRICHChamber& Chamber(Int_t id)      {return *((AliRICHChamber *) (*fChambers)[id]);}  
-  TObjArray     *Dchambers()                const{return fDchambers;}
-  Int_t         *Ndch()                          {return fNdch;}
-  TClonesArray  *DigitsAddress(Int_t id)    const{return ((TClonesArray *) (*fDchambers)[id]);}
-  TClonesArray  *RawClustAddress(Int_t id)  const{return ((TClonesArray *) (*fRawClusters)[id]);}    
-//          Int_t DistancetoPrimitive(Int_t /*px*/, Int_t /*py*/)      {return 9999;}
-    
+  void AddHit(Int_t c,Int_t tid,TVector3 i3,TVector3 o3,Double_t eloss=0){TClonesArray &tmp=*fHits;new(tmp[fNhits++])AliRICHhit(c,tid,i3,o3,eloss);}
+  inline void AddSDigit(Int_t c,TVector pad,Double_t q,Int_t pid,Int_t tid); 
+  void AddDigit(int c,TVector pad,int q,int cfm,int *tid)//Add simulated digit
+       {TClonesArray &tmp=*((TClonesArray*)fDigitsNew->At(c-1));new(tmp[fNdigitsNew[c-1]++])AliRICHdigit(c,pad,q,cfm,tid[0],tid[1],tid[2]);}  
+  void AddDigit(Int_t c,TVector pad,Int_t q)//for real data digits
+       {TClonesArray &tmp=*((TClonesArray*)fDigitsNew->At(0));new(tmp[fNdigitsNew[0]++])AliRICHdigit(c,pad,q,0,-1,-1,-1);}  
+  void AddCluster(AliRICHcluster &cl)                     
+       {Int_t c=cl.C()-1;TClonesArray &tmp=*((TClonesArray*)fClusters->At(c));new(tmp[fNclusters[c]++])AliRICHcluster(cl);}
+  AliRICHhit* Hit(Int_t tid);           //returns pointer ot RICH hit for a given tid
 protected:  
+  enum                  {kAir=1,kCSI=6,kGAP=9,kAl=10,kCH4=5,kSteel=15,kPerpex=16,kSr90=17};
   AliRICHParam         *fpParam;             //main RICH parametrization     
-  TObjArray            *fChambers;           //list of RICH chambers
-                //fHits and fDigits belong to AliDetector
-  TClonesArray         *fSdigits;            //! List of sdigits  
-  Int_t                 fNsdigits;           //Current number of sdigits
-  TObjArray            *fDigitsNew;          //! Each chamber holds it's one lists of digits
-  Int_t                 fNdigitsNew[kNCH];   //Array of current numbers of digits
-  TObjArray            *fClusters;           //! Each chamber holds it's one lists of clusters 
-  Int_t                 fNclusters[kNCH];    //Array of current numbers of raw clusters
-
-  TClonesArray         *fCerenkovs;          //! ??? List of cerenkovs
-  Int_t                 fNcerenkovs;         //??? Current number of cerenkovs
-  TClonesArray         *fSpecials;           //! ??? List of specials
-  Int_t                 fNspecials;          //??? Current number of specials  
-  TObjArray            *fDchambers;          //! Array of lists of digits  
-  Int_t                 fNdch[kNCH];         //Array of current numbers of digits
-  TObjArray            *fRawClusters;        //! Array of lists of raw clusters 
-  Int_t                 fNrawch[kNCH];       //Array of current numbers of raw clusters
-  Int_t fCkovNumber;                         // Number of Cerenkov photons
-  Int_t fFreonProd;                          // Cerenkovs produced in freon
-  Int_t fFeedbacks;                          // Number of feedback photons
-    
-  ClassDef(AliRICH,3)                        //Main RICH class 
+                                             //fHits and fDigits belong to AliDetector
+  TClonesArray         *fSdigits;            //! list of sdigits  
+  Int_t                 fNsdigits;           //! current number of sdigits
+  
+  TObjArray            *fDigitsNew;          //! each chamber holds it's one lists of digits
+  Int_t                 fNdigitsNew[kNchambers];   //! array of current numbers of digits
+  
+  TObjArray            *fClusters;           //! each chamber holds it's one lists of clusters 
+  Int_t                 fNclusters[kNchambers];    //! array of current numbers of raw clusters
+  
+  TVector               fCounters;           //Photon history conters, explanation in StepManager() 
+  ClassDef(AliRICH,7)                        //Main RICH class 
 };//class AliRICH  
-//__________________________________________________________________________________________________
-void AliRICH::AddHit(Int_t track, Int_t *vol, Float_t *hits)
-{//Adds the current hit to the RICH hits list
-  TClonesArray &tmp=*fHits;
-  new(tmp[fNhits++])AliRICHhit(fIshunt,track,vol,hits);
-}
-//__________________________________________________________________________________________________
-void AliRICH::AddSDigit(Int_t iC,Int_t iX,Int_t iY,Double_t q,Int_t iT0,Int_t iT1,Int_t iT2)
-{//Adds the current Sdigit to the RICH list of Sdigits   
-  TClonesArray &tmp=*fSdigits;
-  new(tmp[fNsdigits++])AliRICHdigit(iC,iX,iY,q,iT0,iT1,iT2);
-} 
-//__________________________________________________________________________________________________
-void AliRICH::AddDigit(Int_t iC,Int_t iX,Int_t iY,Int_t iAdc,Int_t iT0,Int_t iT1,Int_t iT2)
-{//Adds the current digit to the corresponding RICH list of digits (individual list per chamber)
-  TClonesArray &tmp=*((TClonesArray*)fDigitsNew->At(iC-1));
-  new(tmp[fNdigitsNew[iC-1]++]) AliRICHdigit(iC,iX,iY,iAdc,iT0,iT1,iT2);
-}
-//__________________________________________________________________________________________________
-void AliRICH::AddCluster(AliRICHcluster &cluster)
-{//Adds the current cluster to the corresponding RICH list of clusters (individual list per chamber)
-  cluster.Print();
-  TClonesArray &tmp=*((TClonesArray*)fClusters->At(cluster.Chamber()-1));
-  new(tmp[fNclusters[cluster.Chamber()-1]++]) AliRICHcluster(cluster);
-}
+
 //__________________________________________________________________________________________________
 void AliRICH::CreateHits()
 {
@@ -416,73 +248,27 @@ void AliRICH::CreateDigits()
 {
   if(fDigitsNew) return;
   if(GetDebug())Info("CreateDigits","creating digits containers.");
-  fDigitsNew = new TObjArray(kNCH);  
-  for(Int_t i=0;i<kNCH;i++) {fDigitsNew->AddAt(new TClonesArray("AliRICHdigit",10000), i); fNdigitsNew[i]=0;}
+  fDigitsNew = new TObjArray(kNchambers);  
+  for(Int_t i=0;i<kNchambers;i++) {fDigitsNew->AddAt(new TClonesArray("AliRICHdigit",10000), i); fNdigitsNew[i]=0;}
 }
 //__________________________________________________________________________________________________
 void AliRICH::CreateClusters()
 {
   if(fClusters) return;
   if(GetDebug())Info("CreateClusters","creating clusters containers.");
-  fClusters = new TObjArray(kNCH);  
-  for(Int_t i=0;i<kNCH;i++) {fClusters->AddAt(new TClonesArray("AliRICHcluster",10000), i); fNclusters[i]=0;}
-}
-
-
-
-//__________________________________________________________________________________________________
-void AliRICH::CreateCerenkovsOld()
-{
-  if(fCerenkovs) return;
-  if(GetDebug())Info("CreateCerenkovs","creating cerenkovs container.");
-  fCerenkovs=new TClonesArray("AliRICHCerenkov",10000);   fNcerenkovs=0;
-}
-//__________________________________________________________________________________________________
-void AliRICH::CreateSpecialsOld()
-{
-  if(fSpecials) return;
-  if(GetDebug())Info("CreateSpecialsOld","creating SDigits special container.");
-  fSpecials=new TClonesArray("AliRICHSDigit",100000); fNspecials=0;
-}
-//__________________________________________________________________________________________________
-void AliRICH::CreateDigitsOld()
-{
-  if(fDchambers) return;
-  if(GetDebug())Info("CreateDigitsOld","creating digits containers.");
-  fDchambers = new TObjArray(kNCH);  
-  for(Int_t i=0;i<kNCH;i++) fDchambers->AddAt(new TClonesArray("AliRICHDigit",10000), i); 
-}
-//__________________________________________________________________________________________________
-void AliRICH::CreateRawClustersOld()
-{
-  if(fRawClusters) return;
-  if(GetDebug())Info("CreateClustersOld","creating clusters containers.");
-  fRawClusters = new TObjArray(kNCH);
-  for(Int_t i=0; i<kNCH ;i++) fRawClusters->AddAt(new TClonesArray("AliRICHRawCluster",10000), i); 
-}
-//__________________________________________________________________________________________________
-void AliRICH::AddCerenkov(Int_t track, Int_t *vol, Float_t *cerenkovs)
-{//Adds the current RICH cerenkov hit to the Cerenkovs list   
-  TClonesArray &tmp=*fCerenkovs;
-  new(tmp[fNcerenkovs++]) AliRICHCerenkov(fIshunt,track,vol,cerenkovs);
-}
-//__________________________________________________________________________________________________
-void AliRICH::AddSpecialOld(Int_t *aiSDigit)
-{// Adds the current Sdigit to the RICH list of Specials
-  TClonesArray &lSDigits = *fSpecials;
-  new(lSDigits[fNspecials++]) AliRICHSDigit(aiSDigit);
-}
-//__________________________________________________________________________________________________
-void AliRICH::AddDigitOld(Int_t iChamber, Int_t *tracks, Int_t *charges, Int_t *digits)
-{// Adds the current digit to the RICH list of S digits
-   TClonesArray &ldigits = *((TClonesArray*)fDchambers->At(iChamber-1));
-   new(ldigits[fNdch[iChamber-1]++]) AliRICHDigit(tracks,charges,digits);
+  fClusters = new TObjArray(kNchambers);  
+  for(Int_t i=0;i<kNchambers;i++) {fClusters->AddAt(new TClonesArray("AliRICHcluster",10000), i); fNclusters[i]=0;}
 }
 //__________________________________________________________________________________________________
-void AliRICH::AddClusterOld(Int_t iChamber, const AliRICHRawCluster& c)
-{// Add a RICH raw cluster to the list   
-  TClonesArray &tmp= *((TClonesArray*)fRawClusters->At(iChamber-1));
-  new(tmp[fNrawch[iChamber-1]++]) AliRICHRawCluster(c);
+void AliRICH::AddSDigit(Int_t c,TVector pad,Double_t q,Int_t pid,Int_t tid) 
+{ 
+  Int_t cfm;  
+  switch(pid){
+    case 50000050: cfm=1000000;break;//cerenkov
+    case 50000051: cfm=1000;   break;//feedback
+    default:       cfm=1;      break;//mip
+  }   
+  TClonesArray &tmp=*fSdigits; new(tmp[fNsdigits++])AliRICHdigit(c,pad,q,cfm,tid,kBad,kBad);
 }
 //__________________________________________________________________________________________________
 #endif//#ifndef AliRICH_h