X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSEmcCalibData.cxx;h=6c09b8fa2cbb6889b1e327bd768b11ea730739b5;hb=0e46ed2ecd0902914a7826f016b30bdb41ce8810;hp=8498d768b9a9d68a54340ed6e527472802747825;hpb=1fdb1c5e59cfeb91f00ef26784c129843b0a881d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSEmcCalibData.cxx b/PHOS/AliPHOSEmcCalibData.cxx
index 8498d768b9a..6c09b8fa2cb 100644
--- a/PHOS/AliPHOSEmcCalibData.cxx
+++ b/PHOS/AliPHOSEmcCalibData.cxx
@@ -24,7 +24,7 @@
 ClassImp(AliPHOSEmcCalibData)
 
 //________________________________________________________________
-AliPHOSEmcCalibData::AliPHOSEmcCalibData()
+  AliPHOSEmcCalibData::AliPHOSEmcCalibData(): TNamed()
 {
   // Default constructor
   Reset();
@@ -48,12 +48,12 @@ AliPHOSEmcCalibData::AliPHOSEmcCalibData(const AliPHOSEmcCalibData& calibda) :
   // copy constructor
   SetName(calibda.GetName());
   SetTitle(calibda.GetName());
-  Reset();
+
   for(Int_t module=0; module<5; module++) {
     for(Int_t column=0; column<56; column++) {
       for(Int_t row=0; row<64; row++) {
-	fADCchannelEmc[module][column][row] = calibda.GetADCchannelEmc(module,column,row);
-	fADCpedestalEmc[module][column][row] = calibda.GetADCpedestalEmc(module,column,row);
+	fADCchannelEmc[module][column][row] = calibda.fADCchannelEmc[module][column][row];
+	fADCpedestalEmc[module][column][row] = calibda.fADCpedestalEmc[module][column][row];
       }
     }
   }
@@ -63,17 +63,22 @@ AliPHOSEmcCalibData::AliPHOSEmcCalibData(const AliPHOSEmcCalibData& calibda) :
 AliPHOSEmcCalibData &AliPHOSEmcCalibData::operator =(const AliPHOSEmcCalibData& calibda)
 {
   // assignment operator
-  SetName(calibda.GetName());
-  SetTitle(calibda.GetName());
-  Reset();
-  for(Int_t module=0; module<5; module++) {
-    for(Int_t column=0; column<56; column++) {
-      for(Int_t row=0; row<64; row++) {
-	fADCchannelEmc[module][column][row] = calibda.GetADCchannelEmc(module,column,row);
-	fADCpedestalEmc[module][column][row] = calibda.GetADCpedestalEmc(module,column,row);
+
+  if(this != &calibda) { 
+
+    SetName(calibda.GetName());
+    SetTitle(calibda.GetName());
+
+    for(Int_t module=0; module<5; module++) {
+      for(Int_t column=0; column<56; column++) {
+	for(Int_t row=0; row<64; row++) {
+	  fADCchannelEmc[module][column][row] = calibda.fADCchannelEmc[module][column][row];
+	  fADCpedestalEmc[module][column][row] = calibda.fADCpedestalEmc[module][column][row];
+	}
       }
     }
   }
+
   return *this;
 }
 
@@ -86,13 +91,13 @@ AliPHOSEmcCalibData::~AliPHOSEmcCalibData()
 //________________________________________________________________
 void AliPHOSEmcCalibData::Reset()
 {
-  // Set all pedestals and all ADC channels to its default values.
+  // Set all pedestals and all ADC channels to its ideal values = 1.
 
   for (Int_t module=0; module<5; module++){
     for (Int_t column=0; column<56; column++){
       for (Int_t row=0; row<64; row++){
-	fADCpedestalEmc[module][column][row] = 0.005;
-	fADCchannelEmc[module][column][row] = 0.0015;
+	fADCpedestalEmc[module][column][row] = 0.;
+	fADCchannelEmc[module][column][row]  = 1.;
       }
     }
   }