Moved coordinates

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

diff --git a/EMCAL/AliEMCAL.h b/EMCAL/AliEMCAL.h
index 64a080f15a7d36f872eedd28019e2890f66fee95..a9b2438a635bfbdf35015084104622864028a484 100644 (file)
--- a/EMCAL/AliEMCAL.h
+++ b/EMCAL/AliEMCAL.h
@@ -10,8 +10,6 @@
 //                  
 //*-- Author: Yves Schutz (SUBATECH)
 
-#include <stdlib.h>
-
 // --- ROOT system ---
 
 class TString ;
@@ -22,26 +20,21 @@ class TFolder ;
 
 #include "AliDetector.h"
 class AliEMCALGeometry ; 
-//class AliEMCALQAChecker ;
-
 class AliEMCAL : public AliDetector {
 
  public:
 
   AliEMCAL(); 
   AliEMCAL(const char* name, const char* title="");
-  AliEMCAL(const AliEMCAL & emcal) {
+  AliEMCAL(const AliEMCAL& emcal) : AliDetector(emcal) {
     // cpy ctor: no implementation yet
     // requested by the Coding Convention
-    abort() ; 
+    Fatal("cpy ctor", "not implemented") ;  
   }
   virtual ~AliEMCAL() ; 
   virtual void   AddHit(Int_t, Int_t*, Float_t *) {
-    // do not use this definition but the one below
-    abort() ;
+    Fatal("AddHit(Int_t, Int_t*, Float_t *", "not to be used: use 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 ) = 0 ;
   virtual void  CreateMaterials() ;   
   virtual void  FinishRun() {WriteQA();}                  
   virtual AliEMCALGeometry * GetGeometry() const ;   
@@ -51,19 +44,21 @@ class AliEMCAL : public AliDetector {
   virtual TTree * TreeQA() const {return fTreeQA; }                
   virtual const TString Version() const {return TString(" ") ; }  
   virtual void WriteQA() ; 
-  AliEMCAL & operator = (const AliEMCAL & rvalue)  {
-    // assignement operator requested by coding convention
-    // but not needed
-    abort() ;
-    return *this ; 
-  }
+  AliEMCAL & operator = (const AliEMCAL & /*rvalue*/)  {
+    Fatal("operator =", "not implemented") ;  return *this ; }
  
+  virtual AliLoader* MakeLoader(const char* topfoldername);
+  
+  virtual void    Hits2SDigits();
+  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager);
+
 protected:
 
   //AliEMCALQAChecker * fQATask ; //! PHOS checkers container
   TTree * fTreeQA ;            // the QA tree that contains the alarms
+  AliEMCALGeometry * fGeom ;   // the geometry object
 
-  ClassDef(AliEMCAL,2) // Electromagnetic calorimeter (base class)
+  ClassDef(AliEMCAL,4) // Electromagnetic calorimeter (base class)
 
 } ;