Compliance with Effective C++

diff --git a/PHOS/AliPHOSClusterizer.cxx b/PHOS/AliPHOSClusterizer.cxx
index 1fd2aaa36f997dbe17df0d51edd97cfab5cabfb9..7ea97e4d9567ffdac1dbc445835ef5edf022f23e 100644 (file)
--- a/PHOS/AliPHOSClusterizer.cxx
+++ b/PHOS/AliPHOSClusterizer.cxx
@@ -32,29 +32,36 @@
 ClassImp(AliPHOSClusterizer)
 
 //____________________________________________________________________________
-  AliPHOSClusterizer::AliPHOSClusterizer():TTask("","")
+AliPHOSClusterizer::AliPHOSClusterizer():
+  TTask("",""),
+  fEventFolderName(""),
+  fFirstEvent(0),
+  fLastEvent(-1),
+  fRawReader(0)
 {
   // ctor
-
-  fEventFolderName = "" ; 
-  fFirstEvent = 0 ; 
-  fLastEvent  = -1 ; 
-  fRawReader  = 0 ;
 }
 
 //____________________________________________________________________________
 AliPHOSClusterizer::AliPHOSClusterizer(const TString alirunFileName, 
                                       const TString eventFolderName):
   TTask("PHOS"+AliConfig::Instance()->GetReconstructionerTaskName(), 
-       alirunFileName), fEventFolderName(eventFolderName)
+       alirunFileName), fEventFolderName(eventFolderName),
+  fFirstEvent(0),
+  fLastEvent(-1),
+  fRawReader(0)
 {
   // ctor
- 
-  fFirstEvent = 0 ; 
-  fLastEvent  = -1 ; 
-  fRawReader  = 0 ;
 }
 
+//____________________________________________________________________________
+AliPHOSClusterizer::AliPHOSClusterizer(const AliPHOSClusterizer & clusterizer) :
+  TTask(clusterizer),fEventFolderName(clusterizer.GetEventFolderName()),
+  fFirstEvent(clusterizer.GetFirstEvent()),fLastEvent(clusterizer.GetLastEvent()),
+  fRawReader(clusterizer.GetRawReader())
+{
+  //Copy constructor
+}
 //____________________________________________________________________________
 AliPHOSClusterizer::~AliPHOSClusterizer()
 {

diff --git a/PHOS/AliPHOSClusterizer.h b/PHOS/AliPHOSClusterizer.h
index 748e4fbc1ca3e8e3c4b18d4c4b2b9425cfb69908..f424056f30dbb6f86236224c5125f4ea34d44fd5 100644 (file)
--- a/PHOS/AliPHOSClusterizer.h
+++ b/PHOS/AliPHOSClusterizer.h
@@ -8,6 +8,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.39  2006/03/30 13:04:56  hristov
+ * AliRawReader is not persistent
+ *
  * Revision 1.38  2005/07/25 15:53:09  kharlov
  * Set raw data reader
  *
@@ -37,7 +40,7 @@ public:
 
   AliPHOSClusterizer() ;        // default ctor
   AliPHOSClusterizer(const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ;
-  AliPHOSClusterizer(const AliPHOSClusterizer & clusterizer) : TTask(clusterizer) { ; }
+  AliPHOSClusterizer(const AliPHOSClusterizer & clusterizer);
   virtual ~AliPHOSClusterizer() ; // dtor
   virtual Float_t GetEmcClusteringThreshold()const {Warning("GetEmcClusteringThreshold", "Not Defined" ) ; return 0. ; }  
   virtual Float_t GetEmcLocalMaxCut()const {Warning("GetEmcLocalMaxCut", "Not Defined" ) ; return 0. ; } 
@@ -64,6 +67,11 @@ public:
   void SetEventFolderName(TString name) { fEventFolderName = name ; }
   void SetRawReader(AliRawReader *reader) {fRawReader = reader;}
 
+  TString       GetEventFolderName() const {return fEventFolderName;}
+  Int_t         GetFirstEvent()      const {return fFirstEvent;     }
+  Int_t         GetLastEvent()       const {return fLastEvent;      }
+  AliRawReader *GetRawReader()       const {return fRawReader;      }
+
   AliPHOSClusterizer & operator = (const AliPHOSClusterizer & /*rvalue*/)  {return *this ;} 
  
   virtual const char * Version() const {Warning("Version", "Not Defined" ) ; return 0 ; }  

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index 5532b134f84d6cbfbbf0caee45f883d4501f040a..96ce2649e28afe2462936b53c763607dc7a51c64 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.95  2006/08/11 12:36:26  cvetan
+ * Update of the PHOS code needed in order to read and reconstruct the beam test raw data (i.e. without an existing galice.root)
+ *
  * Revision 1.94  2006/08/07 12:27:49  hristov
  * Removing obsolete code which affected the event numbering scheme
  *
@@ -122,7 +125,16 @@
 ClassImp(AliPHOSClusterizerv1)
   
 //____________________________________________________________________________
-  AliPHOSClusterizerv1::AliPHOSClusterizerv1() : AliPHOSClusterizer()
+AliPHOSClusterizerv1::AliPHOSClusterizerv1() :
+  AliPHOSClusterizer(),
+  fDefaultInit(0),            fEmcCrystals(0),          fToUnfold(0),
+  fWrite(0),                  fNumberOfEmcClusters(0),  fNumberOfCpvClusters(0),
+  fCalibData(0),              fADCchanelEmc(0),         fADCpedestalEmc(0),
+  fADCchanelCpv(0),           fADCpedestalCpv(0),       fEmcClusteringThreshold(0),
+  fCpvClusteringThreshold(0), fEmcMinE(0),              fCpvMinE(0),
+  fEmcLocMaxCut(0),           fW0(0),                   fCpvLocMaxCut(0),
+  fW0CPV(0),                  fRecPointsInRun(0),       fEmcTimeGate(0),
+  fIsOldRCUFormat(0)
 {
   // default ctor (to be used mainly by Streamer)
   
@@ -131,8 +143,16 @@ ClassImp(AliPHOSClusterizerv1)
 }
 
 //____________________________________________________________________________
-AliPHOSClusterizerv1::AliPHOSClusterizerv1(const TString alirunFileName, const TString eventFolderName)
-:AliPHOSClusterizer(alirunFileName, eventFolderName)
+AliPHOSClusterizerv1::AliPHOSClusterizerv1(const TString alirunFileName, const TString eventFolderName) :
+  AliPHOSClusterizer(alirunFileName, eventFolderName),
+  fDefaultInit(0),            fEmcCrystals(0),          fToUnfold(0),
+  fWrite(0),                  fNumberOfEmcClusters(0),  fNumberOfCpvClusters(0),
+  fCalibData(0),              fADCchanelEmc(0),         fADCpedestalEmc(0),
+  fADCchanelCpv(0),           fADCpedestalCpv(0),       fEmcClusteringThreshold(0),
+  fCpvClusteringThreshold(0), fEmcMinE(0),              fCpvMinE(0),
+  fEmcLocMaxCut(0),           fW0(0),                   fCpvLocMaxCut(0),
+  fW0CPV(0),                  fRecPointsInRun(0),       fEmcTimeGate(0),
+  fIsOldRCUFormat(0)
 {
   // ctor with the indication of the file where header Tree and digits Tree are stored
   

diff --git a/PHOS/AliPHOSClusterizerv1.h b/PHOS/AliPHOSClusterizerv1.h
index 80a3a9eeb8868caa1b440f6a8cdfd2d62b3c020e..a9327c9a6a49fc8ff4190a354e73599c5f39000f 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.h
+++ b/PHOS/AliPHOSClusterizerv1.h
@@ -8,6 +8,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.46  2006/08/01 12:20:17  cvetan
+ * 1. Adding a possibility to read and reconstruct an old rcu formatted raw data. This is controlled by an option of AliReconstruction and AliPHOSReconstructor. 2. In case of raw data processing (without galice.root) create the default AliPHOSGeometry object. Most likely this should be moved to the CDB
+ *
  * Revision 1.45  2006/04/29 20:26:46  hristov
  * Separate EMC and CPV calibration (Yu.Kharlov)
  *
@@ -45,13 +48,9 @@ class AliPHOSClusterizerv1 : public AliPHOSClusterizer {
   
 public:
   
-  AliPHOSClusterizerv1() ;         
+  AliPHOSClusterizerv1() ;
   AliPHOSClusterizerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName());
-  AliPHOSClusterizerv1(const AliPHOSClusterizerv1 & clu) : AliPHOSClusterizer(clu) {
-    // cpy ctor: no implementation yet
-    // requested by the Coding Convention
-    Fatal("cpy ctor", "not implemented") ;
-  }
+  AliPHOSClusterizerv1(const AliPHOSClusterizerv1 & clu) ;
   virtual ~AliPHOSClusterizerv1()  ;
   
   virtual Int_t   AreNeighbours(AliPHOSDigit * d1, AliPHOSDigit * d2)const ; 
@@ -106,7 +105,8 @@ protected:
   virtual Bool_t IsInEmc (AliPHOSDigit * digit)const ;     // Tells if id digit is in EMC
   virtual Bool_t IsInCpv (AliPHOSDigit * digit)const ;     // Tells if id digit is in CPV
   void           CleanDigits(TClonesArray * digits) ;
-  
+  AliPHOSClusterizerv1 & operator = (const AliPHOSClusterizerv1 & obj);
+ 
 private:
 
   const   TString BranchName() const ; 

diff --git a/PHOS/AliPHOSPID.cxx b/PHOS/AliPHOSPID.cxx
index 85cc8a57cf006f643b80385cc7d1b1da6131fbe6..8345b8c48c1460ffae3d3a189c6da89ebafb59af 100644 (file)
--- a/PHOS/AliPHOSPID.cxx
+++ b/PHOS/AliPHOSPID.cxx
@@ -38,23 +38,24 @@
 ClassImp(AliPHOSPID)
 
 //____________________________________________________________________________
-AliPHOSPID::AliPHOSPID():TTask("","")
+AliPHOSPID::AliPHOSPID():
+  TTask("",""),
+  fEventFolderName(""),
+  fFirstEvent(0),
+  fLastEvent(-1)
 {
   // ctor
-  fEventFolderName = "" ; 
-  fFirstEvent = 0 ; 
-  fLastEvent  = -1 ; 
 }
 
 
 //____________________________________________________________________________
 AliPHOSPID::AliPHOSPID(const TString alirunFileName, const TString eventFolderName):
   TTask("PHOS"+AliConfig::Instance()->GetPIDTaskName(), alirunFileName), 
-  fEventFolderName(eventFolderName)
+  fEventFolderName(eventFolderName),
+  fFirstEvent(0),
+  fLastEvent(-1)
 {
   // ctor
-  fFirstEvent = 0 ; 
-  fLastEvent  = -1 ;
 }
 
 //____________________________________________________________________________

diff --git a/PHOS/AliPHOSTrackSegmentMaker.cxx b/PHOS/AliPHOSTrackSegmentMaker.cxx
index 3c3f0e5a0b31de6ac706327f566dd574c2daa9bd..3ea319199c4173a12c403b7c0cfafebfd0378590 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMaker.cxx
+++ b/PHOS/AliPHOSTrackSegmentMaker.cxx
@@ -17,6 +17,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.26  2006/08/25 16:00:53  kharlov
+ * Compliance with Effective C++AliPHOSHit.cxx
+ *
  * Revision 1.25  2005/05/28 14:19:05  schutz
  * Compilation warnings fixed by T.P.
  *
@@ -42,29 +45,34 @@ ClassImp( AliPHOSTrackSegmentMaker)
 
 
 //____________________________________________________________________________
-  AliPHOSTrackSegmentMaker:: AliPHOSTrackSegmentMaker() : TTask("","")
+AliPHOSTrackSegmentMaker:: AliPHOSTrackSegmentMaker() : 
+  TTask("",""),
+  fEventFolderName(""),
+  fFirstEvent(0),
+  fLastEvent(-1),
+  fESD(0)
 {
   // ctor
-  fEventFolderName = "" ; 
-  fFirstEvent = 0 ; 
-  fLastEvent  = -1 ; 
 }
 
 //____________________________________________________________________________
 AliPHOSTrackSegmentMaker::AliPHOSTrackSegmentMaker(const TString alirunFileName, 
                                                   const TString eventFolderName):
   TTask("PHOS"+AliConfig::Instance()->GetTrackerTaskName(), alirunFileName), 
-  fEventFolderName(eventFolderName)
+  fEventFolderName(eventFolderName),
+  fFirstEvent(0),
+  fLastEvent(-1),
+  fESD(0)
 {
   // ctor
-  fFirstEvent = 0 ; 
-  fLastEvent  = -1 ; 
 }
 
 //____________________________________________________________________________
 AliPHOSTrackSegmentMaker::AliPHOSTrackSegmentMaker(const AliPHOSTrackSegmentMaker & tsmaker) :
-  TTask(tsmaker),fEventFolderName(tsmaker.GetEventFolderName()),
-  fFirstEvent(tsmaker.GetFirstEvent()),fLastEvent(tsmaker.GetLastEvent()),
+  TTask(tsmaker),
+  fEventFolderName(tsmaker.GetEventFolderName()),
+  fFirstEvent(tsmaker.GetFirstEvent()),
+  fLastEvent(tsmaker.GetLastEvent()),
   fESD(tsmaker.GetESD())
 {
   //Copy constructor