X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSCPVGeometry.h;h=cec160d5c5526f3f3744fcd6dd4a22ad27337a89;hb=897b6b23d8cafb676d80d175fcd64321b7ef41b0;hp=1d3d7a99aa44d86a1f211ebe87b3bb565497fef3;hpb=a3dfe79c4e5773dbe4515549b51fd0bbea23a321;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSCPVGeometry.h b/PHOS/AliPHOSCPVGeometry.h
index 1d3d7a99aa4..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,50 +24,26 @@ public:
 
   // CPV functions
 
-  virtual Int_t   GetNumberOfCPVLayers(void)        { return  fNumberOfCPVLayers;        }
-  virtual Bool_t  IsLeadConverterExists(void)       { return  fLeadConverterExists;      }
-  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];      }
-
-  // PPSD functions cannot be used for CPV
+  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];      }
 
-  virtual Float_t GetAnodeThickness(void)          { AssertPPSD("GetAnodeThickness");          return 0; }
-  virtual Float_t GetAvalancheGap(void)            { AssertPPSD("GetAvalancheGap");            return 0; }
-  virtual Float_t GetCathodeThickness(void)        { AssertPPSD("GetCathodeThickness");        return 0; }
-  virtual Float_t GetCompositeThickness(void)      { AssertPPSD("GetCompositeThickness");      return 0; }
-  virtual Float_t GetConversionGap(void)           { AssertPPSD("GetConversionGap");           return 0; }
-  virtual Float_t GetLeadConverterThickness(void)  { AssertPPSD("GetLeadConverterThickness");  return 0; }
-  virtual Float_t GetLeadToMicro2Gap(void)         { AssertPPSD("GetLeadToMicro2Gap");         return 0; }
-  virtual Float_t GetLidThickness(void)            { AssertPPSD("GetLidThickness");            return 0; }
-  virtual Float_t GetMicromegas1Thickness(void)    { AssertPPSD("GetMicromegas1Thickness");    return 0; }
-  virtual Float_t GetMicromegas2Thickness(void)    { AssertPPSD("GetMicromegas2Thickness");    return 0; }
-  virtual Float_t GetMicromegasWallThickness(void) { AssertPPSD("GetMicromegasWallThickness"); return 0; }
-  virtual Float_t GetMicro1ToLeadGap(void)         { AssertPPSD("GetMicro1ToLeadGap");         return 0; }
-  virtual Float_t GetPCThickness(void)             { AssertPPSD("GetPCThickness");             return 0; }
-  virtual Float_t GetPhiDisplacement(void)         { AssertPPSD("GetPhiDisplacement");         return 0; }
-  virtual Float_t GetPPSDModuleSize(Int_t index)   { AssertPPSD("GetPPSDModuleSize");          return 0; }
-  virtual Float_t GetZDisplacement(void)           { AssertPPSD("GetZDisplacement");           return 0; }
-  virtual Int_t   GetNumberOfPadsPhi(void)         { AssertPPSD("GetNumberOfPadsPhi");         return 0; }
-  virtual Int_t   GetNumberOfPadsZ(void)           { AssertPPSD("GetNumberOfPadsZ");           return 0; }
-  virtual Int_t   GetNumberOfModulesPhi(void)      { AssertPPSD("GetNumberOfModulesPhi");      return 0; }
-  virtual Int_t   GetNumberOfModulesZ(void)        { AssertPPSD("GetNumberOfModulesZ");        return 0; }
  
 private:
 
   Int_t   fNumberOfCPVLayers;      // Number of CPV identical layers
-  Bool_t  fLeadConverterExists;    // kTRUE if the lead converter between CPV layers exists
   Int_t   fNumberOfCPVPadsPhi;     // Number of CPV pads in phi
   Int_t   fNumberOfCPVPadsZ;       // Number of CPV pads in z
   Float_t fCPVPadSizePhi;          // CPV pad size in phi
@@ -84,12 +59,8 @@ private:
   Float_t fFTPosition[4];          // Positions of the 4 PCB vs the CPV box center
   Float_t fCPVFrameSize[3];        // CPV frame size (0 - in phi, 1 - in z, 2 - thickness (along ALICE radius))
 
-  void    AssertPPSD(char* name) {
-    printf("Function AliCPVGeometry::%s should not be called for CPV geometry\n",name);
-    assert(0==1) ;
-  }
 
-  ClassDef(AliPHOSCPVGeometry,1)       // CPV geometry base class 
+  ClassDef(AliPHOSCPVGeometry,2)       // CPV geometry base class 
 
 } ;