From 23ef18ac17ccdca864277efd881b3644cb9222cb Mon Sep 17 00:00:00 2001
From: pavlinov <pavlinov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Sat, 10 Mar 2007 22:19:01 +0000
Subject: [PATCH] move one varibels from AliEMCALv2 to AliEMCAL

---
 EMCAL/AliEMCAL.cxx   | 11 ++++++++---
 EMCAL/AliEMCAL.h     | 10 ++++++++--
 EMCAL/AliEMCALv2.cxx |  2 --
 EMCAL/AliEMCALv2.h   |  5 -----
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/EMCAL/AliEMCAL.cxx b/EMCAL/AliEMCAL.cxx
index b3cd21d11eb..cfec98f031d 100644
--- a/EMCAL/AliEMCAL.cxx
+++ b/EMCAL/AliEMCAL.cxx
@@ -17,6 +17,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.51  2007/02/24 20:42:35  pavlinov
+ * fixed error of Geant3 parameters initialisation
+ *
  * Revision 1.50  2007/02/05 10:43:25  hristov
  * Changes for correct initialization of Geant4 (Mihaela)
  *
@@ -87,11 +90,13 @@ AliEMCAL::AliEMCAL()
     fHighCharge(0.),
     fHighGain(0.),
     fHighLowGainFactor(0.),
-    fLowGainOffset(0)
+    fLowGainOffset(0),
+    fGeometry(0)
 {
   // Default ctor 
   fName = "EMCAL" ;
   InitConstants();
+  // Should call  AliEMCALGeometry::GetInstance(EMCAL->GetTitle(),"") for getting EMCAL geometry
 }
 
 //____________________________________________________________________________
@@ -103,11 +108,11 @@ AliEMCAL::AliEMCAL(const char* name, const char* title)
     fHighCharge(0.),
     fHighGain(0.),
     fHighLowGainFactor(0.),
-    fLowGainOffset(0)
+    fLowGainOffset(0),
+    fGeometry(0)
 {
   //   ctor : title is used to identify the layout
   InitConstants();
-
 }
 
 //____________________________________________________________________________
diff --git a/EMCAL/AliEMCAL.h b/EMCAL/AliEMCAL.h
index 5e0203ba7d8..1fbfe63be2d 100644
--- a/EMCAL/AliEMCAL.h
+++ b/EMCAL/AliEMCAL.h
@@ -7,6 +7,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.42  2007/02/24 20:42:35  pavlinov
+ * fixed error of Geant3 parameters initialisation
+ *
  * Revision 1.41  2007/02/05 10:43:25  hristov
  * Changes for correct initialization of Geant4 (Mihaela)
  *
@@ -20,7 +23,7 @@
 //  holds all geant information of
 //  materials, etc.
 //                  
-//*-- Author: Yves Schutz (SUBATECH)
+//*-- Author: Yves Schutz (SUBATECH) 
 
 // --- ROOT system ---
 
@@ -30,6 +33,7 @@ class TFolder ;
 class TRandom ; 
 class TGraph;
 class TF1;
+class AliEMCALGeometry;
 
 // --- AliRoot header files ---
 class AliRawReader;
@@ -109,8 +113,10 @@ protected:
   static Double_t fgTimePeak ;          // peaking time of the raw RO signal                                    
   static Double_t fgTimeTrigger ;       // time of the trigger for the RO signal 
   static Int_t fgThreshold;             // threshold
-  static Int_t fgDDLPerSuperModule;        // number of DDL per SuperModule
+  static Int_t fgDDLPerSuperModule;     // number of DDL per SuperModule
  
+  AliEMCALGeometry* fGeometry;          //!
+
 private:
   AliEMCAL(const AliEMCAL& emcal);
   AliEMCAL & operator = (const AliEMCAL & /*rvalue*/);
diff --git a/EMCAL/AliEMCALv2.cxx b/EMCAL/AliEMCALv2.cxx
index cb9e54384d0..c15a2666003 100644
--- a/EMCAL/AliEMCALv2.cxx
+++ b/EMCAL/AliEMCALv2.cxx
@@ -52,7 +52,6 @@ ClassImp(AliEMCALv2)
 //______________________________________________________________________
 AliEMCALv2::AliEMCALv2()
   : AliEMCALv1(), 
-    fGeometry(0),
     fHDe(0),
     fHNhits(0)
 {
@@ -62,7 +61,6 @@ AliEMCALv2::AliEMCALv2()
 //______________________________________________________________________
 AliEMCALv2::AliEMCALv2(const char *name, const char *title)
   : AliEMCALv1(name,title),
-    fGeometry(0),
     fHDe(0),
     fHNhits(0)
 {
diff --git a/EMCAL/AliEMCALv2.h b/EMCAL/AliEMCALv2.h
index 0f4ebe96890..f06dd52b9ad 100644
--- a/EMCAL/AliEMCALv2.h
+++ b/EMCAL/AliEMCALv2.h
@@ -17,14 +17,10 @@ class TFile;
 class TH1F;
 
 class TBrowser;
-class AliEMCALGeometry;
 
 // --- AliRoot header files ---
 #include "AliEMCALv1.h"
 
-// for TRD2 case
-//#include "TGeant3.h"
-
 class AliEMCALv2 : public AliEMCALv1 {
   
 public:
@@ -56,7 +52,6 @@ public:
   void TestIndexTransition(int pri=0, int idmax=0); // *MENU*
 
  protected:
-  AliEMCALGeometry* fGeometry; //!
   TH1F*             fHDe;      //!
   TH1F*             fHNhits;      //!
 
-- 
2.39.3