New code for EMCAL (B.Nilsen)

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALv0.h

diff --git a/EMCAL/AliEMCALv0.h b/EMCAL/AliEMCALv0.h
index 16c8aed92e35adfff6697d697d514de456d03252..e1297b3741a21ce5c31209aca32337cf782d0520 100644 (file)
--- a/EMCAL/AliEMCALv0.h
+++ b/EMCAL/AliEMCALv0.h
@@ -9,30 +9,45 @@
 // Implementation version v0 of EMCAL Manager class 
 //*--                  
 //*-- Author: Yves Schutz (SUBATECH)
 // Implementation version v0 of EMCAL Manager class 
 //*--                  
 //*-- Author: Yves Schutz (SUBATECH)

-
-#include <assert.h>
+//*-- and   : Sahal Yacoob (LBL / UCT) 
+//#include <assert.h>

 
 // --- ROOT system ---
 
 
 // --- ROOT system ---
 

+class TFile;
+

 // --- AliRoot header files ---
 #include "AliEMCAL.h"
 // --- AliRoot header files ---
 #include "AliEMCAL.h"

-class AliEMCALGeometry ; 
+
+//class AliEMCALGeometry ; 

 
 class AliEMCALv0 : public AliEMCAL {
 
  public:
 
 
 class AliEMCALv0 : public AliEMCAL {
 
  public:
 

-  AliEMCALv0() {fGeom=0;}
+  AliEMCALv0():AliEMCAL() {}

   AliEMCALv0(const char *name, const char *title="") ;
   AliEMCALv0(const AliEMCALv0 & emcal) {
     // cpy ctor: no implementation yet
     // requested by the Coding Convention
   AliEMCALv0(const char *name, const char *title="") ;
   AliEMCALv0(const AliEMCALv0 & emcal) {
     // cpy ctor: no implementation yet
     // requested by the Coding Convention

-    assert(0==1) ; 
+    abort() ; 

   } 
   } 

-  virtual ~AliEMCALv0(void){} 
+  virtual ~AliEMCALv0(){} 
+
+  virtual void  AddHit( Int_t shunt, Int_t primary, Int_t track, 
+                       Int_t id, Float_t *hits ) {
+    // no hits - useless
+  }
+
+  virtual void BuildGeometry();// creates the geometry for the ROOT display
+  virtual void CreateGeometry() ;// creates the geometry for GEANT
+
+  virtual AliEMCALGeometry * GetGeometry() {
+    // gets the pointer to the AliEMCALGeometry unique instance
+    return fGeom ;
+  }
+

 
 

-  virtual void   BuildGeometry(void) ;             // creates the geometry for the ROOT display
-  virtual void   CreateGeometry(void) ;            // creates the geometry for GEANT

 
   virtual void   Init(void) ;                                       // does nothing
   virtual Int_t  IsVersion(void) const { 
 
   virtual void   Init(void) ;                                       // does nothing
   virtual Int_t  IsVersion(void) const { 


@@ -46,12 +61,12 @@ class AliEMCALv0 : public AliEMCAL {
   
   AliEMCALv0 & operator = (const AliEMCALv0 & rvalue)  {
     // assignement operator requested by coding convention but not needed
   
   AliEMCALv0 & operator = (const AliEMCALv0 & rvalue)  {
     // assignement operator requested by coding convention but not needed

-    assert(0==1) ;
+    abort() ;

     return *this ; 
   }
   
  protected:
     return *this ; 
   }
   
  protected:

-    
+

   ClassDef(AliEMCALv0,1)  // Implementation of EMCAL manager class for layout EMC+PPSD
     
     };
   ClassDef(AliEMCALv0,1)  // Implementation of EMCAL manager class for layout EMC+PPSD
     
     };