Fixing ompilation warnings

[u/mrichter/AliRoot.git] / PHOS / AliPHOSCPVGeometry.h

diff --git a/PHOS/AliPHOSCPVGeometry.h b/PHOS/AliPHOSCPVGeometry.h
index e7df43a8a97c52f691bac49df2a19d060c58b9b0..cec160d5c5526f3f3744fcd6dd4a22ad27337a89 100644 (file)
--- a/PHOS/AliPHOSCPVGeometry.h
+++ b/PHOS/AliPHOSCPVGeometry.h
@@ -7,15 +7,15 @@
 
 //_________________________________________________________________________
 // Geometry derived class for PHOS:CPV (Charged particle veto, IHEP version)
-//
-//*-- Author:  Yuri Kharlov (IHEP, Protvino)
-//    14 September 2000
+// Its data members provide geometry parametrization of CPV
+// which can be changed in the constructor only.
+// 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: 
 
@@ -24,46 +24,26 @@ public:
 
   // CPV functions
 
-  Int_t   GetNumberOfCPVLayers(void)        const { return  fNumberOfCPVLayers;        }
-  Bool_t  IsLeadConverterExists(void)       const { return  fLeadConverterExists;      }
-  Int_t   GetNumberOfCPVPadsPhi(void)       const { return  fNumberOfCPVPadsPhi ;      }
-  Int_t   GetNumberOfCPVPadsZ(void)         const { return  fNumberOfCPVPadsZ ;        }
-  Float_t GetCPVPadSizePhi(void)            const { return  fCPVPadSizePhi;            }
-  Float_t GetCPVPadSizeZ(void)              const { return  fCPVPadSizeZ;              }
-  Float_t GetCPVBoxSize(Int_t index)        const { return  fCPVBoxSize[index];        }
-  Float_t GetCPVActiveSize(Int_t index)     const { return  fCPVActiveSize[index];     }
-  Int_t   GetNumberOfCPVChipsPhi(void)      const { return  fNumberOfCPVChipsPhi;      }
-  Int_t   GetNumberOfCPVChipsZ(void)        const { return  fNumberOfCPVChipsZ;        }
-  Float_t GetGassiplexChipSize(Int_t index) const { return  fGassiplexChipSize[index]; }
-  Float_t GetCPVGasThickness(void)          const { return  fCPVGasThickness;          }
-  Float_t GetCPVTextoliteThickness(void)    const { return  fCPVTextoliteThickness;    }
-  Float_t GetCPVCuNiFoilThickness(void)     const { return  fCPVCuNiFoilThickness;     }
-  Float_t GetFTPosition(Int_t index)        const { return  fFTPosition[index];        }
-  Float_t GetCPVFrameSize(Int_t index)      const { 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];      }
 
-  Float_t GetAnodeThickness(void)          { AssertPPSD(); return 0; }
-  Float_t GetAvalancheGap(void)            { AssertPPSD(); return 0; }
-  Float_t GetCathodeThickness(void)        { AssertPPSD(); return 0; }
-  Float_t GetCompositeThickness(void)      { AssertPPSD(); return 0; }
-  Float_t GetConversionGap(void)           { AssertPPSD(); return 0; }
-  Float_t GetLeadConverterThickness(void)  { AssertPPSD(); return 0; }
-  Float_t GetLeadToMicro2Gap(void)         { AssertPPSD(); return 0; }
-  Float_t GetLidThickness(void)            { AssertPPSD(); return 0; }
-  Float_t GetMicromegas1Thickness(void)    { AssertPPSD(); return 0; }
-  Float_t GetMicromegas2Thickness(void)    { AssertPPSD(); return 0; }
-  Float_t GetMicromegasWallThickness(void) { AssertPPSD(); return 0; }
-  Float_t GetMicro1ToLeadGap(void)         { AssertPPSD(); return 0; }
-  Float_t GetPCThickness(void)             { AssertPPSD(); return 0; }
-  Float_t GetPhiDisplacement(void)         { AssertPPSD(); return 0; }
-  Float_t GetPPSDModuleSize(Int_t index)   { AssertPPSD(); return 0; }
-  Float_t GetZDisplacement(void)           { AssertPPSD(); 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
@@ -79,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() {
-    printf("Function %s should not be called for CPV geometry\n",__PRETTY_FUNCTION__);
-    assert(0==1) ;
-  }
 
-  ClassDef(AliPHOSCPVGeometry,1)       // CPV geometry base class 
+  ClassDef(AliPHOSCPVGeometry,2)       // CPV geometry base class 
 
 } ;