X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PMD%2FAliPMD.h;h=700489a94608a1b14d87a05a10a88c1994a5fdf0;hb=3006c44be5141f779c71a62a9c40ab2e3386c705;hp=447132c1060c4f2c49c5b19227eec683d38d145f;hpb=c39d2a93469c0e585ec18015585bf1e2074bc498;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PMD/AliPMD.h b/PMD/AliPMD.h
index 447132c1060..700489a9460 100644
--- a/PMD/AliPMD.h
+++ b/PMD/AliPMD.h
@@ -10,8 +10,8 @@
 ////////////////////////////////////////////////
  
 #include "AliDetector.h"
-#include "AliLoader.h"
 
+class AliLoader;
 class TClonesArray;
 class TFile;
 class AliPMDRecPoint;
@@ -28,20 +28,21 @@ public:
 
   virtual      ~AliPMD();
   virtual void  AddHit(Int_t track, Int_t* vol, Float_t* hits);
-  virtual void  BuildGeometry();
   virtual void  CreateGeometry() {}
   virtual void  CreateMaterials() {}
-  Int_t         DistancetoPrimitive(Int_t, Int_t) const;
+  virtual void  Init() {}
   virtual Int_t IsVersion() const =0;
   virtual void  SetPAR(Float_t p1, Float_t p2, Float_t p3, Float_t p4);
   virtual void  SetIN(Float_t p1, Float_t p2, Float_t p3, Float_t p4, Float_t p5);
   virtual void  SetGEO(Float_t p1, Float_t p2, Float_t p3);
   virtual void  SetPadSize(Float_t p1, Float_t p2, Float_t p3, Float_t p4);
   virtual void  StepManager();
-  virtual void  AddRecPoint(const AliPMDRecPoint &p);
   virtual void  MakeBranch(Option_t* option);
   virtual void  SetTreeAddress();
-  virtual void  ResetHits();
+
+  virtual void SetCpvOff();
+  virtual void SetPreOff();
+  virtual void SetModuleOff(Int_t /*imodule*/);
   
   virtual void  Hits2SDigits();
   virtual void  SDigits2Digits();
@@ -50,6 +51,7 @@ public:
   virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
 
   virtual void  Digits2Raw();
+  virtual Bool_t Raw2SDigits(AliRawReader *rawReader);
   
  protected:
   Float_t fPar[4];           // pmdin, pmdout, thgas, thcell
@@ -58,11 +60,6 @@ public:
   Float_t fPadSize[4];       // size of the pads
   Int_t   fNumPads[4];       // number of the pads
 
-
- private:
-  TClonesArray* fRecPoints;   //! List of reconstructed hits
-  Int_t         fNRecPoints;  // Number of reconstructed hits
-  
-  ClassDef(AliPMD,5)  // Base Class for Photon Multiplicity Detector
+  ClassDef(AliPMD,9)  // Base Class for Photon Multiplicity Detector
 };
 #endif