X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSCPVGeometry.h;h=cec160d5c5526f3f3744fcd6dd4a22ad27337a89;hb=7e4263f54928e9c49ee74bf3dd56cd69f6495ea0;hp=58d2d1a7b8a737609beb19ceac6f7c0ea0f8581e;hpb=85218d13a9b0bb9151e4dc96512f762f96f9e8e4;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSCPVGeometry.h b/PHOS/AliPHOSCPVGeometry.h
index 58d2d1a7b8a..cec160d5c55 100644
--- a/PHOS/AliPHOSCPVGeometry.h
+++ b/PHOS/AliPHOSCPVGeometry.h
@@ -12,11 +12,10 @@
 // Author:  Yuri Kharlov (IHEP, Protvino)
 // 7 November 2000
 
-#include <assert.h> 
+//#include "AliPHOSCPVBaseGeometry.h"
+#include "TObject.h"
 
-#include "AliPHOSCPVBaseGeometry.h"
-
-class AliPHOSCPVGeometry : public AliPHOSCPVBaseGeometry {
+class AliPHOSCPVGeometry : public TObject {
 
 public: 
 
@@ -25,21 +24,21 @@ public:
 
   // CPV functions
 
-  virtual Int_t   GetNumberOfCPVLayers(void)        { return  fNumberOfCPVLayers;        }
-  virtual Int_t   GetNumberOfCPVPadsPhi(void)       { return  fNumberOfCPVPadsPhi ;      }
-  virtual Int_t   GetNumberOfCPVPadsZ(void)         { return  fNumberOfCPVPadsZ ;        }
-  virtual Float_t GetCPVPadSizePhi(void)            { return  fCPVPadSizePhi;            }
-  virtual Float_t GetCPVPadSizeZ(void)              { return  fCPVPadSizeZ;              }
-  virtual Float_t GetCPVBoxSize(Int_t index)        { return  fCPVBoxSize[index];        }
-  virtual Float_t GetCPVActiveSize(Int_t index)     { return  fCPVActiveSize[index];     }
-  virtual Int_t   GetNumberOfCPVChipsPhi(void)      { return  fNumberOfCPVChipsPhi;      }
-  virtual Int_t   GetNumberOfCPVChipsZ(void)        { return  fNumberOfCPVChipsZ;        }
-  virtual Float_t GetGassiplexChipSize(Int_t index) { return  fGassiplexChipSize[index]; }
-  virtual Float_t GetCPVGasThickness(void)          { return  fCPVGasThickness;          }
-  virtual Float_t GetCPVTextoliteThickness(void)    { return  fCPVTextoliteThickness;    }
-  virtual Float_t GetCPVCuNiFoilThickness(void)     { return  fCPVCuNiFoilThickness;     }
-  virtual Float_t GetFTPosition(Int_t index)        { return  fFTPosition[index];        }
-  virtual Float_t GetCPVFrameSize(Int_t index)      { return  fCPVFrameSize[index];      }
+  virtual Int_t   GetNumberOfCPVLayers(void)        const { return  fNumberOfCPVLayers;        }
+  virtual Int_t   GetNumberOfCPVPadsPhi(void)       const { return  fNumberOfCPVPadsPhi ;      }
+  virtual Int_t   GetNumberOfCPVPadsZ(void)         const { return  fNumberOfCPVPadsZ ;        }
+  virtual Float_t GetCPVPadSizePhi(void)            const { return  fCPVPadSizePhi;            }
+  virtual Float_t GetCPVPadSizeZ(void)              const { return  fCPVPadSizeZ;              }
+  virtual Float_t GetCPVBoxSize(Int_t index)        const { return  fCPVBoxSize[index];        }
+  virtual Float_t GetCPVActiveSize(Int_t index)     const { return  fCPVActiveSize[index];     }
+  virtual Int_t   GetNumberOfCPVChipsPhi(void)      const { return  fNumberOfCPVChipsPhi;      }
+  virtual Int_t   GetNumberOfCPVChipsZ(void)        const { return  fNumberOfCPVChipsZ;        }
+  virtual Float_t GetGassiplexChipSize(Int_t index) const { return  fGassiplexChipSize[index]; }
+  virtual Float_t GetCPVGasThickness(void)          const { return  fCPVGasThickness;          }
+  virtual Float_t GetCPVTextoliteThickness(void)    const { return  fCPVTextoliteThickness;    }
+  virtual Float_t GetCPVCuNiFoilThickness(void)     const { return  fCPVCuNiFoilThickness;     }
+  virtual Float_t GetFTPosition(Int_t index)        const { return  fFTPosition[index];        }
+  virtual Float_t GetCPVFrameSize(Int_t index)      const { return  fCPVFrameSize[index];      }
 
  
 private:
@@ -61,7 +60,7 @@ private:
   Float_t fCPVFrameSize[3];        // CPV frame size (0 - in phi, 1 - in z, 2 - thickness (along ALICE radius))
 
 
-  ClassDef(AliPHOSCPVGeometry,1)       // CPV geometry base class 
+  ClassDef(AliPHOSCPVGeometry,2)       // CPV geometry base class 
 
 } ;