More comments

(Laurent)

diff --git a/MUON/AliMUONDigitCalibrator.cxx b/MUON/AliMUONDigitCalibrator.cxx
index 767947d48b7077fcef2c2aa7f9689d865c9f849a..f1810928fc00e217362130c52659504504884958 100644 (file)
--- a/MUON/AliMUONDigitCalibrator.cxx
+++ b/MUON/AliMUONDigitCalibrator.cxx
@@ -17,23 +17,30 @@
 
 #include "AliMUONDigitCalibrator.h"
 
-#include "AliCDBEntry.h"
-#include "AliCDBManager.h"
-#include "AliCDBStorage.h"
 #include "AliLog.h"
 #include "AliMUONCalibrationData.h"
 #include "AliMUONConstants.h"
 #include "AliMUONData.h"
 #include "AliMUONDigit.h"
 #include "AliMUONVCalibParam.h"
-#include "AliMpDEManager.h"
-#include "AliMpPad.h"
-#include "AliMpPlaneType.h"
-#include "AliMpStationType.h"
-#include "AliMpVSegmentation.h"
-#include "Riostream.h"
 #include "TClonesArray.h"
 
+///
+/// Class used to calibrate digits (either real or simulated ones).
+///
+/// The calibration consists of subtracting the pedestal
+/// and multiplying by a gain, so that
+/// Signal = (ADC-pedestal)*gain
+///
+/// Please note also that for the moment, if a digit lies on a dead channel
+/// we remove this digit from the list of digits.
+/// FIXME: this has to be revisited. By using the AliMUONDigit::fFlags we
+/// should in principle flag a digit as bad w/o removing it, but this 
+/// then requires some changes in the cluster finder to deal with this extra
+/// information correctly (e.g. to set a quality for the cluster if it contains
+/// bad digits).
+///
+
 ClassImp(AliMUONDigitCalibrator)
 
 //_____________________________________________________________________________
@@ -49,13 +56,19 @@ AliMUONDigitCalibrator::AliMUONDigitCalibrator(AliMUONData* muonData,
     //
 }
 
-//______________________________________________________________________________
-AliMUONDigitCalibrator::AliMUONDigitCalibrator(const AliMUONDigitCalibrator& right) 
-  : TTask(right) 
-{  
-/// Protected copy constructor (not implemented)
+//_____________________________________________________________________________
+AliMUONDigitCalibrator::AliMUONDigitCalibrator(const AliMUONDigitCalibrator&)
+: TTask()
+{
+  AliFatal("Implement me if needed");
+}
 
-  AliFatal("Copy constructor not provided.");
+//_____________________________________________________________________________
+AliMUONDigitCalibrator& 
+AliMUONDigitCalibrator::operator=(const AliMUONDigitCalibrator&)
+{
+  AliFatal("Implement me if needed");
+  return *this;
 }
 
 //_____________________________________________________________________________
@@ -66,20 +79,6 @@ AliMUONDigitCalibrator::~AliMUONDigitCalibrator()
   //
 }
 
-//______________________________________________________________________________
-AliMUONDigitCalibrator& 
-AliMUONDigitCalibrator::operator=(const AliMUONDigitCalibrator& right)
-{
-/// Protected assignement operator (not implemented)
-
-  // check assignement to self
-  if (this == &right) return *this;
-
-  AliFatal("Assignement operator not provided.");
-    
-  return *this;  
-}    
-
 //_____________________________________________________________________________
 void
 AliMUONDigitCalibrator::Exec(Option_t*)
@@ -104,10 +103,10 @@ AliMUONDigitCalibrator::Exec(Option_t*)
       // Very first check is whether this channel is known to be bad,
       // in which case we set the signal to zero.
       AliMUONVCalibParam* dead = static_cast<AliMUONVCalibParam*>
-        (fCalibrationData->DeadChannel(digit->DetElemId(),digit->ManuId()));
+        (fCalibrationData->DeadChannels(digit->DetElemId(),digit->ManuId()));
       if ( dead && dead->ValueAsInt(digit->ManuChannel()) )
       {
-        AliDebug(10,Form("Removing dead channel detElemId %d manuId %d "
+        AliWarning(Form("Removing dead channel detElemId %d manuId %d "
                         "manuChannel %d",digit->DetElemId(),digit->ManuId(),
                         digit->ManuChannel()));
         digit->SetSignal(0);
@@ -117,10 +116,10 @@ AliMUONDigitCalibrator::Exec(Option_t*)
       // If the channel is good, go on with the calibration itself.
       
       AliMUONVCalibParam* pedestal = static_cast<AliMUONVCalibParam*>
-        (fCalibrationData->Pedestal(digit->DetElemId(),digit->ManuId()));
+        (fCalibrationData->Pedestals(digit->DetElemId(),digit->ManuId()));
       
       AliMUONVCalibParam* gain = static_cast<AliMUONVCalibParam*>
-        (fCalibrationData->Gain(digit->DetElemId(),digit->ManuId()));
+        (fCalibrationData->Gains(digit->DetElemId(),digit->ManuId()));
       
       if (!pedestal)
       {

diff --git a/MUON/AliMUONDigitCalibrator.h b/MUON/AliMUONDigitCalibrator.h
index cde53420346d9b760f32ccc4eb53bcfa13ca71a7..cd688651eba7eda5db03e83fe4fe3e7b84b7fb98 100644 (file)
--- a/MUON/AliMUONDigitCalibrator.h
+++ b/MUON/AliMUONDigitCalibrator.h
@@ -26,11 +26,11 @@ public:
   virtual ~AliMUONDigitCalibrator();
   
   virtual void Exec(Option_t*);
-  
-  protected:
-    AliMUONDigitCalibrator(const AliMUONDigitCalibrator& right);
-    AliMUONDigitCalibrator&  operator = (const AliMUONDigitCalibrator& right);
-     
+
+protected:
+  AliMUONDigitCalibrator(const AliMUONDigitCalibrator& other);
+  AliMUONDigitCalibrator& operator=(const AliMUONDigitCalibrator& other);
+       
 private:    
     AliMUONData* fData; //!
     AliMUONCalibrationData* fCalibrationData; //!