Changes to comply with coding convention (A. Colla)

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index eb07afc594b63db5c7be1655b3a5c748caf0b81f..2f204e105acb75c78a4b77b0330a442bd206ff7b 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -9,8 +9,6 @@
 //  Manager and classes for set ZDC           //
 ////////////////////////////////////////////////
 
-#include <TSystem.h>
-
 #include "AliDetector.h"
 
 class AliZDCCalibData;
@@ -25,7 +23,7 @@ public:
   virtual void  BuildGeometry();
   virtual void  CreateGeometry() {}
   virtual void  CreateMaterials() {}
-  Int_t         DistancetoPrimitive(Int_t px, Int_t py) const;
+  Int_t         DistancetoPrimitive(Int_t px, Int_t py);
   virtual Int_t IsVersion() const =0;
   virtual Float_t ZMin() const;        // Minimum overall dimension of the ZDC
   virtual Float_t ZMax() const;        // Maximum overall dimension of the ZDC
@@ -42,14 +40,12 @@ public:
 
 
 //Calibration methods (by Alberto Colla)
-  void    SetZDCCalibFName(const char *name="$(ALICE)/AliRoot/data/AliZDCCalib.root");
-  char*   GetZDCCalibFName() const;
-
-  void    CreateCalibData();
-  void    WriteCalibData(Int_t option=TObject::kOverwrite);
-  void    LoadCalibData();
-  void    SetCalibData(AliZDCCalibData* data) {fCalibData = data;}
+  void          CreateCalibData();
+  void          WriteCalibData(Int_t option=TObject::kOverwrite);
+  void          LoadCalibData();
+  void          SetCalibData(AliZDCCalibData* data) {fCalibData = data;}
   AliZDCCalibData* GetCalibData() const  {return fCalibData;}
+//Calibration methods (by Alberto Colla)
 
 
 protected:
@@ -57,23 +53,12 @@ protected:
   Int_t        fNoShower;      // Flag to switch off the shower        
 
 //Calibration methods (by Alberto Colla)
-  AliZDCCalibData* fCalibData;         // Calibration data for ZDC
-  TString          fZDCCalibFName;     //  Name of the ZDC calibration data
+  AliZDCCalibData* fCalibData; // Calibration data for ZDC
+//Calibration methods (by Alberto Colla)
   
   ClassDef(AliZDC,4)   // Zero Degree Calorimeter base class
 };
  
 R__EXTERN  AliZDC *gZDC;
 
-
-// Calibration methods (by Alberto Colla)
-//_____________________________________________________________________________
-inline void AliZDC::SetZDCCalibFName(const char *name)  
-{fZDCCalibFName = name;        gSystem->ExpandPathName(fZDCCalibFName);}
-//_____________________________________________________________________________
-inline char* AliZDC::GetZDCCalibFName()  const {return (char*)fZDCCalibFName.Data();}
-
-// Calibration methods (by Alberto Colla)
-
-
 #endif

diff --git a/ZDC/AliZDCCalibData.h b/ZDC/AliZDCCalibData.h
index 6dc4094aeb6d612cd7f982e03a6a4e2c132f3273..04f307f54ece3f307dad1a87d8d88f60248ae615 100644 (file)
--- a/ZDC/AliZDCCalibData.h
+++ b/ZDC/AliZDCCalibData.h
@@ -12,8 +12,9 @@
 #include "TH1.h"
 #include "AliZDC.h"
 
-class AliZDCCalibData: public TNamed {
-
+class AliZDCCalibData:
+public TNamed {
+ //
  public:
   AliZDCCalibData();
   AliZDCCalibData(const char* name);
@@ -21,26 +22,31 @@ class AliZDCCalibData: public TNamed {
   void Reset();
   virtual void  Print() const; 
   //
-  Float_t  GetMeanPed(Int_t channel)           const {return fMeanPedestal[channel];}
-  Float_t* GetMeanPed()   const {return (float*)fMeanPedestal;}
-  Float_t  GetEnCalib(Int_t channel)   const {return fEnCalibration[channel];}
-  Float_t* GetEnCalib()   const {return (float*)fEnCalibration;}
+  Float_t   GetMeanPed(Int_t channel)   const {return fMeanPedestal[channel];}
+  Float_t*  GetMeanPed()   const {return (float*)fMeanPedestal;}
+  
+  Float_t   GetEnCalib(Int_t channel)    const {return fEnCalibration[channel];}
+  Float_t*  GetEnCalib()   const {return (float*)fEnCalibration;}
+  
   //
   void     SetMeanPed(Float_t val, Int_t channel) {fMeanPedestal[channel]=val;}
   void     SetMeanPed(Float_t* MeanPed);
+
   void            SetEnCalib(Float_t val, Int_t channel) {fEnCalibration[channel]=val;}
   void            SetEnCalib(Float_t* EnCalib);
+  
   //
   void     PrepHistos();
   TH1F*    GetHistMeanPed() const {return fHistMeanPed;}
   void     CleanHistos();
-
+ //
  protected:
   Float_t  fMeanPedestal[47];  // Mean pedestal values
   Float_t  fEnCalibration[4];  // Coeff. for energy calibration (4 different ZDC's?)
+
   TH1F*    fHistMeanPed;        //! histos for drawing mean pedestals
   //
-  ClassDef(AliZDCCalibData,1)    // ZDC Sensor Calibration data
+  ClassDef(AliZDCCalibData,11)    // ZDC Sensor Calibration data
 };
 
 #endif