X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSv0.h;h=f29d59e941da832f2aa9cfa48cfbe4344a229d55;hb=b9e5c5ca76f97fc04717557fae9c93ef574dbf67;hp=c2c463bbb6da3773ea5ff49a086c425234a3cfc0;hpb=2ab0c72500f5baaae8a0a5299ab6566b50c278b4;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSv0.h b/PHOS/AliPHOSv0.h
index c2c463bbb6d..f29d59e941d 100644
--- a/PHOS/AliPHOSv0.h
+++ b/PHOS/AliPHOSv0.h
@@ -3,83 +3,80 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+/* $Id$ */
+
+/* History of cvs commits:
+ *
+ * $Log$
+ * Revision 1.44  2006/09/27 19:55:57  kharlov
+ * Alignment object with symbolic volume names are introduced
+ *
+ * Revision 1.43  2005/05/28 14:19:05  schutz
+ * Compilation warnings fixed by T.P.
+ *
+ */
+
 //_________________________________________________________________________
 // Implementation version v0 of PHOS Manager class 
-// Layout EMC + PPSD has name GPS2  
 // Layout EMC + CPV  has name IHEP
 //*--                  
 //*-- Author: Yves Schutz (SUBATECH)
 
 // --- ROOT system ---
-#include "TClonesArray.h"
 
 class TFile;
+class TFolder;
 
 // --- AliRoot header files ---
 #include "AliPHOS.h"
-#include "AliPHOSGeometry.h"
-#include "AliPHOSReconstructioner.h"
-#include "AliPHOSTrackSegmentMaker.h"
-#include "AliPHOSPID.h"
 
 class AliPHOSv0 : public AliPHOS {
 
  public:
 
-  AliPHOSv0() {
-    //ctor
-    fGeom=0;
-  }
+  AliPHOSv0() {}
   AliPHOSv0(const char *name, const char *title="") ;
-  AliPHOSv0(const AliPHOSv0 & phos) {
-    // cpy ctor: no implementation yet
-    // requested by the Coding Convention
-    assert(0==1) ; 
-  } 
   virtual ~AliPHOSv0(void){
     // dtor
   } 
 
-  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) {
+//    virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) {
+  //this function is not a final-overrider for AliPHOS::AddHit, to
+  //supress warning, I use using-declaration :)
+  using AliPHOS::AddHit;
+  virtual void   AddHit( Int_t, Int_t, Int_t, Int_t, Float_t*) {
     // useless since there are no hits
-    assert(0==1) ; 
+    Fatal("AddHit", "not to be used with v0") ;
   }
   virtual void   BuildGeometry(void) ;             // creates the geometry for the ROOT display
-  void           BuildGeometryforPHOS(void) ;      // creates the PHOS geometry for the ROOT display
-  void           BuildGeometryforPPSD(void) ;      // creates the PPSD geometry for the ROOT display
+  void           BuildGeometryforEMC(void) ;      // creates the PHOS geometry for the ROOT display
+  //  void           BuildGeometryforPPSD(void) ;      // creates the PPSD geometry for the ROOT display
   void           BuildGeometryforCPV(void) ;       // creates the CPV  geometry for the ROOT display
   virtual void   CreateGeometry(void) ;            // creates the geometry for GEANT
-  void           CreateGeometryforPHOS(void) ;     // creates the PHOS geometry for GEANT
-  void           CreateGeometryforPPSD(void) ;     // creates the PPSD geometry for GEANT
+  void           CreateGeometryforEMC(void) ;     // creates the PHOS geometry for GEANT
+  //  void           CreateGeometryforPPSD(void) ;     // creates the PPSD geometry for GEANT
   void           CreateGeometryforCPV(void) ;      // creates the CPV  geometry for GEANT
   void           CreateGeometryforSupport(void) ;  // creates the Support geometry for GEANT
+  virtual void   AddAlignableVolumes() const;      // define sym.names for alignable volumes
+
   virtual Float_t ZMin() const;                    // overall dimension of the module (min)
   virtual Float_t ZMax() const;                    // overall dimension of the module (max)
 
-  virtual AliPHOSGeometry * GetGeometry() {
-    // gets the pointer to the AliPHOSGeometry unique instance  
-    return fGeom ; 
-  }  
-  virtual void   Init(void) ;                                       // does nothing
+  virtual void   Init(void) ;                      // does nothing
   virtual Int_t  IsVersion(void) const { 
     // Gives the version number 
     return 0 ; 
   }
-  virtual TString Version(void){ 
+  virtual const TString Version(void)const { 
     // As above
     return TString("v0") ; 
   }
   
-  AliPHOSv0 & operator = (const AliPHOSv0 & rvalue)  {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *this ; 
-  }
-  
- protected:
-  
-  AliPHOSGeometry * fGeom ;                       // Geometry definition
   
+ private:
+  AliPHOSv0(AliPHOSv0 & phos);
+  AliPHOSv0 & operator = (const AliPHOSv0 & /*rvalue*/);
+
   ClassDef(AliPHOSv0,1)  // Implementation of PHOS manager class for layout EMC+PPSD
     
     };