Changes to comply with coding convention (A. Colla)

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index eb07afc594b63db5c7be1655b3a5c748caf0b81f..c951f1740411f67b4c6f4ad8952a2f4db2495487 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -63,9 +63,6 @@ protected:
   ClassDef(AliZDC,4)   // Zero Degree Calorimeter base class
 };
  
-R__EXTERN  AliZDC *gZDC;
-
-
 // Calibration methods (by Alberto Colla)
 //_____________________________________________________________________________
 inline void AliZDC::SetZDCCalibFName(const char *name)  
@@ -73,7 +70,5 @@ inline void AliZDC::SetZDCCalibFName(const char *name)
 //_____________________________________________________________________________
 inline char* AliZDC::GetZDCCalibFName()  const {return (char*)fZDCCalibFName.Data();}
 
-// Calibration methods (by Alberto Colla)
-
 
 #endif

diff --git a/ZDC/AliZDCCalibData.cxx b/ZDC/AliZDCCalibData.cxx
index daebcb16d8771337bff2ecb38d4f39f30ac31299..31424108a7de93c089cf7ab513559af5eb03cead 100644 (file)
--- a/ZDC/AliZDCCalibData.cxx
+++ b/ZDC/AliZDCCalibData.cxx
@@ -43,6 +43,32 @@ AliZDCCalibData::AliZDCCalibData(const char* name)
   Reset();
 }
 
+//________________________________________________________________
+AliZDCCalibData::AliZDCCalibData(const AliZDCCalibData& calibda) :
+  TNamed(calibda)
+{
+// copy constructor
+  SetName(calibda.GetName());
+  SetTitle(calibda.GetName());
+  Reset();
+  for(int t=0; t<47; t++) fMeanPedestal[t] = calibda.GetMeanPed(t);
+  for(int t=0; t<4; t++) fEnCalibration[t] = calibda.GetEnCalib(t);
+  PrepHistos();
+}
+
+//________________________________________________________________
+AliZDCCalibData &AliZDCCalibData::operator =(const AliZDCCalibData& calibda)
+{
+// assignment operator
+  SetName(calibda.GetName());
+  SetTitle(calibda.GetName());
+  Reset();
+  for(int t=0; t<47; t++) fMeanPedestal[t] = calibda.GetMeanPed(t);
+  for(int t=0; t<4; t++) fEnCalibration[t] = calibda.GetEnCalib(t);
+  PrepHistos();
+  return *this;
+}
+
 //________________________________________________________________
 AliZDCCalibData::~AliZDCCalibData()
 {
@@ -65,12 +91,12 @@ void AliZDCCalibData::CleanHistos()
 //________________________________________________________________
 void AliZDCCalibData::PrepHistos()
 {
-  CleanHistos();
-  Int_t   kNChannels = 100;
-  Float_t kMaxPedVal = 400.;
+//  CleanHistos(); // this gives a segm.viol!
+  Int_t   kNChannels = 47;
+  Float_t kMaxPedVal = 47.;
   TString hname = GetName();  hname += "_Pedestals";
   fHistMeanPed   = new TH1F(hname.Data(),hname.Data(),kNChannels,0.,kMaxPedVal);
-  for (int i=0; i<64; i++) {
+  for (int i=0; i<47; i++) {
     fHistMeanPed->SetBinContent(i+1,GetMeanPed(i));
   }
 }

diff --git a/ZDC/AliZDCCalibData.h b/ZDC/AliZDCCalibData.h
index 6dc4094aeb6d612cd7f982e03a6a4e2c132f3273..36edea17ccf5dd20b9afd35ab9dfca029e8ca111 100644 (file)
--- a/ZDC/AliZDCCalibData.h
+++ b/ZDC/AliZDCCalibData.h
@@ -17,6 +17,8 @@ class AliZDCCalibData: public TNamed {
  public:
   AliZDCCalibData();
   AliZDCCalibData(const char* name);
+  AliZDCCalibData(const AliZDCCalibData &calibda);
+  AliZDCCalibData& operator= (const AliZDCCalibData &calibda);
   virtual ~AliZDCCalibData();
   void Reset();
   virtual void  Print() const;