X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSEMCAGeometry.h;h=94145c11b38390b6ab6c57437f397645d98f1e79;hb=eba66a50a19323ba81a4a8571eb6c65d494fa811;hp=9ca7dcf8cd4d4d4297897f59d256eeaeea0f3434;hpb=e957fea89c462908a01dcfa4f611e99a98080071;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSEMCAGeometry.h b/PHOS/AliPHOSEMCAGeometry.h
index 9ca7dcf8cd4..94145c11b38 100644
--- a/PHOS/AliPHOSEMCAGeometry.h
+++ b/PHOS/AliPHOSEMCAGeometry.h
@@ -24,17 +24,9 @@ class AliPHOSEMCAGeometry : public TObject {
 public: 
 
   AliPHOSEMCAGeometry();
-  AliPHOSEMCAGeometry(const AliPHOSEMCAGeometry & cpv) : TObject(cpv) {
-    // cpy ctor requested by Coding Convention but not yet needed
-    Fatal("Copy ctor","Not implemented yet");
-  } 
-  virtual ~AliPHOSEMCAGeometry(void) {}
+  //Compiler-generated copy ctor and copy-assignment operator _ARE_ OK.
 
-  AliPHOSEMCAGeometry & operator = (const AliPHOSEMCAGeometry  & /*rvalue*/) {
-    // assignement operator requested by coding convention but not needed
-    Fatal("Operator = ","Not implemented yet");
-    return *this ; 
-  }
+  virtual ~AliPHOSEMCAGeometry(void) {}
 
   Float_t * GetStripHalfSize() {return fStripHalfSize ;}
   Float_t   GetStripWallWidthOut() const {return fStripWallWidthOut ;}
@@ -83,14 +75,13 @@ public:
     return fIPtoOuterCoverDistance ; }
   Float_t    GetCrystalSize(Int_t index)  const {return 2.*fCrystalHalfSize[index] ; }
 
-  
-  Int_t     GetNCellsInStrip() const { return fNCellsInStrip;}
-  Int_t     GetNStripX()       const { return fNStripX ; }
-  Int_t     GetNStripZ()       const { return fNStripZ ; }
-  Int_t     GetNTSuppots()     const { return fNTSupports; }
-  Int_t     GetNPhi(void)      const { return fNPhi ; }
-  Int_t     GetNZ(void)        const { return fNZ ; }
-
+  Int_t     GetNCellsXInStrip() const { return fNCellsXInStrip;}
+  Int_t     GetNCellsZInStrip() const { return fNCellsZInStrip;}
+  Int_t     GetNStripX()        const { return fNStripX ; }
+  Int_t     GetNStripZ()        const { return fNStripZ ; }
+  Int_t     GetNTSuppots()      const { return fNTSupports; }
+  Int_t     GetNPhi()           const { return fNPhi ; }
+  Int_t     GetNZ()             const { return fNZ ; }
  
 private:
 
@@ -176,7 +167,8 @@ private:
 
   Float_t fSupportPlateThickness ;        // Thickness of the Aluminium support plate for Strip   
 
-  Int_t  fNCellsInStrip ;              // Number of cells in a strip unit
+  Int_t  fNCellsXInStrip ;              // Number of cells in a strip unit in X
+  Int_t  fNCellsZInStrip ;              // Number of cells in a strip unit in Z
   Int_t  fNStripX ;                    // Number of strip units in X
   Int_t  fNStripZ ;                    // Number of strip units in Z
   Int_t  fNTSupports ;                 // geometry parameter