coding conventions corrections

diff --git a/PHOS/AliPHOSCalibrator.h b/PHOS/AliPHOSCalibrator.h
index 0469cf57c7bbd418439751ef859a846c24d3ed8d..33bce39a7f0dea06ba9909ebf0f8313c1005faef 100644 (file)
--- a/PHOS/AliPHOSCalibrator.h
+++ b/PHOS/AliPHOSCalibrator.h
@@ -13,7 +13,7 @@
 // --- ROOT system ---
 #include "TTask.h"
 #include "TObjArray.h"
-class TH1F ; 
+#include "TH1F.h"  
 
 // --- Standard library ---
 

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index 9f2c2735edb51be9be339e1f9aa0e6546575ce21..15fbc29fb12e6b0229c269090bf63972fa312e71 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -27,6 +27,7 @@
 #include "TH2.h"
 #include "TMath.h" 
 #include "TCanvas.h" 
+#include "TGraph.h"
 
 // --- Standard library ---
 
@@ -70,6 +71,22 @@ AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const char * opt) : AliPHOSRecPoint(opt)
   
 }
 
+//____________________________________________________________________________
+AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) : AliPHOSRecPoint(rp)
+{
+  // cpy ctor
+
+  fMulDigit   = rp.fMulDigit ;  
+  fAmp        = rp.fAmp ;   
+  fCoreEnergy = rp.fCoreEnergy ; 
+  fEnergyList = new Float_t[rp.fMulDigit] ;
+  Int_t index ; 
+  for(index = 0 ; index < fMulDigit ; index++) 
+    fEnergyList[index] = rp.fEnergyList[index] ; 
+  fNExMax     = rp.fNExMax ;  
+  fTime       = rp.fTime ;   
+}
+
 //____________________________________________________________________________
 AliPHOSEmcRecPoint::~AliPHOSEmcRecPoint()
 {

diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h
index f61ab7c6642a060e06084e226cb2c702d77ccda5..1e8f4f014bfe5bbbbb39fe251e3e9f1a7ad1fb54 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.h
+++ b/PHOS/AliPHOSEmcRecPoint.h
@@ -29,11 +29,7 @@ public:
 
   AliPHOSEmcRecPoint() ;
   AliPHOSEmcRecPoint(const char * opt) ;
-  AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) {
-    // cpy ctor requested by Coding Convention 
-    // but not yet needed
-    assert(0==1) ; 
-  } 
+  AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) ; 
  
   virtual ~AliPHOSEmcRecPoint() ;  
 
@@ -68,11 +64,7 @@ public:
   void        Print(Option_t * opt = "void")const ; 
   void        Purify(Float_t threshold) ;                          //Removes digits below threshold
 
-  AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & rvalue)  {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *this ; 
-  }
+  AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & rvalue)  { return *this ; }
 
  protected:
           void  EvalCoreEnergy(Float_t logWeight,TClonesArray * digits) ;             

diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx
index 5f262dc29ef4699acd30eb970cbb0c416500886b..d4611e1ff51703bba6949d0086ef6197eefb2d32 100644 (file)
--- a/PHOS/AliPHOSRecPoint.cxx
+++ b/PHOS/AliPHOSRecPoint.cxx
@@ -23,6 +23,8 @@
 // --- ROOT system ---
 #include "TPad.h"
 #include "TClonesArray.h"
+#include "TGraph.h"
+#include "TPaveText.h"
 
 // --- Standard library ---
 
@@ -57,6 +59,16 @@ AliPHOSRecPoint::AliPHOSRecPoint(const char * opt) : AliRecPoint(opt)
   
 }
 
+//____________________________________________________________________________
+AliPHOSRecPoint::AliPHOSRecPoint(const AliPHOSRecPoint & rp ) : AliRecPoint(rp)
+{
+  // cpy ctor
+  
+  fMaxTrack = rp.fMaxTrack;
+  fPHOSMod = rp.fPHOSMod;
+  
+}
+
 //____________________________________________________________________________
 Int_t AliPHOSRecPoint::DistancetoPrimitive(Int_t px, Int_t py)
 {

diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h
index 7de96cb30984d2990fce4fb07a5cedd87ce7a307..abf8627ac018cfdf2d68916dd07131a928eaa996 100644 (file)
--- a/PHOS/AliPHOSRecPoint.h
+++ b/PHOS/AliPHOSRecPoint.h
@@ -7,20 +7,19 @@
 //  A recpoint being equivalent to a cluster in encal terminology                 
 //*-- Author: Gines Martinez (SUBATECH)
 
-#include <assert.h>
 
 // --- ROOT system ---
 
-#include "TMarker.h"
-#include "TGraph.h"
-#include "TPaveText.h"
+//#include "TMarker.h"
+//#include "TGraph.h"
+//#include "TPaveText.h"
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
 #include "AliRecPoint.h"
-#include "AliPHOSDigit.h"
+  class AliPHOSDigit ;
 
 class AliPHOSRecPoint : public AliRecPoint {
 
@@ -30,18 +29,14 @@ class AliPHOSRecPoint : public AliRecPoint {
 
   AliPHOSRecPoint() ;                   // ctor         
   AliPHOSRecPoint(const char * opt) ;   // ctor 
-  AliPHOSRecPoint(const AliPHOSRecPoint & rp) {
-    // cpy ctor requested by Coding Convention 
-    // but not yet needed
-    assert(0==1) ; 
-  } 
+  AliPHOSRecPoint(const AliPHOSRecPoint & rp) ; //cpy ctor
   
   virtual ~AliPHOSRecPoint(){
     // dtor
   }
   virtual  void   AddDigit(AliDigitNew &){
     // do not use this definition but the one below
-    assert(0==1) ; 
+    Fatal("AddDigit", "use  AddDigit(AliPHOSDigit & digit, Float_t Energy)") ; 
   }
   virtual  void   AddDigit(AliPHOSDigit & digit, Float_t Energy) = 0 ; 
   virtual Int_t   Compare(const TObject * obj) const = 0 ;   
@@ -65,11 +60,7 @@ class AliPHOSRecPoint : public AliRecPoint {
     // Print prototype
   } 
 
-  AliPHOSRecPoint & operator = (const AliPHOSRecPoint & )  {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *this ; 
-  }
+  AliPHOSRecPoint & operator = (const AliPHOSRecPoint & )  { return *this ; }
 
 protected: