START positions

[u/mrichter/AliRoot.git] / RICH / AliRICH.h

diff --git a/RICH/AliRICH.h b/RICH/AliRICH.h
index 9b3f2525ef6deee8e4bcc121237000aedf9aa17e..b353116f7f7e18aff1d3c9628505d556db9bc0b1 100644 (file)
--- a/RICH/AliRICH.h
+++ b/RICH/AliRICH.h
@@ -3,13 +3,12 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-#include <AliDetector.h>
-#include <TClonesArray.h>
+#include <AliDetector.h>  //inheritance
+#include <TClonesArray.h> 
 #include <TObjArray.h>
 #include <TVector.h>
 #include <TVector3.h>
 
-#include "AliRICHDigitizer.h"
 #include "AliRICHParam.h"
 #include "AliRICHCluster.h"
 #include "AliRICHHit.h"
@@ -30,9 +29,6 @@ public:
 //framework part  
   virtual Int_t         IsVersion()                           const =0;                                  //interface from         
   virtual void          StepManager()                               =0;                                  //interface from AliMC
-  virtual void          Hits2SDigits();                                                                  //interface from AliSimulation
-  virtual void          Digits2Raw();                                                                    //interface from AliSimulation
-  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* man) const {return new AliRICHDigitizer(man);}  //interface from AliSimulation
   virtual void          SetTreeAddress();                                                                //interface from AliLoader
   virtual void          MakeBranch(Option_t *opt=" ");                                                   //interface from AliLoader
   virtual void          CreateMaterials();                                                               //interface from AliMC
@@ -63,6 +59,7 @@ public:
     using AliDetector::Digits;  
          TClonesArray* Digits        (Int_t iC                                               )const{return fDigs ? (TClonesArray *)fDigs->At(iC-1):0;}
   inline void          DigitAdd      (Int_t c,TVector pad,int q,int cfm,int *tid             )     ;                                                 //add new digit
+  inline void          DigitAdd      (AliRICHDigit &dif                                      )     ;                                                 //add new digit
   inline void          DigitsCreate  (                                                       )     ;                                                 //create digits
          void          DigitsReset   (                                                       )     {if(fDigs)for(int i=0;i<kNchambers;i++){fDigs->At(i)->Clear();fNdigs[i]=0;}} //virtual
          void          DigitsPrint   (Int_t iEvent=0                                         )const;                                                 //prints digits
@@ -85,7 +82,6 @@ public:
   void            DisplayEvent(Int_t,Int_t)const; //Display event
   static Int_t     Nparticles(Int_t iPid,Int_t iEventN,AliRunLoader *pRunLoader); //counts total number of particle with iPid
   void            PrintTracks  (Int_t iEvent=0);                        //prints a list of tracks for a given event
-  void            CheckPR      ()const;                                 //utility-> run staff for stack ??????     
   void            ReadESD(Int_t iEventN, Int_t iChamber)const;
   void            DrawRing(TVector3 entrance,TVector3 vectorTrack,Double_t thetaCer)const;
 
@@ -149,6 +145,13 @@ void AliRICH::DigitsCreate()
   for(Int_t i=0;i<kNchambers;i++) {fDigs->AddAt(new TClonesArray("AliRICHDigit",10000), i); fNdigs[i]=0;}
 }
 //__________________________________________________________________________________________________
+void AliRICH::DigitAdd(AliRICHDigit &dig)
+{
+//special for digit formed from raw  
+  TClonesArray &tmp=*((TClonesArray*)fDigs->At(dig.Chamber()-1));
+  new(tmp[fNdigs[dig.Chamber()-1]++])AliRICHDigit(dig);
+}    
+//__________________________________________________________________________________________________
 void AliRICH::DigitAdd(int c,TVector pad,int q,int cfm,int *tid)
 {
   TClonesArray &tmp=*((TClonesArray*)fDigs->At(c-1));