added proper handling of EMCAL calibration events

[u/mrichter/AliRoot.git] / MUON / AliMUONDigit.cxx

diff --git a/MUON/AliMUONDigit.cxx b/MUON/AliMUONDigit.cxx
index 5d682aafb6a5310d901d005572c53c226da6c978..56907450e1980c7c99e2f7cb21eef1c4a15cec8d 100644 (file)
--- a/MUON/AliMUONDigit.cxx
+++ b/MUON/AliMUONDigit.cxx
@@ -51,6 +51,7 @@ fNtracks(0),
 fTcharges(0x0),
 fTracks(0x0),
 fHit(0),
+fTime(0),
 fStatusMap(0)
 {
   /// Default constructor
@@ -74,6 +75,7 @@ fNtracks(0),
 fTcharges(0x0),
 fTracks(0x0),
 fHit(0),
+fTime(0),
 fStatusMap(0)
 {
   /// Normal constructor
@@ -96,6 +98,7 @@ fNtracks(0),
 fTcharges(0x0),
 fTracks(0x0),
 fHit(0),
+fTime(0),
 fStatusMap(0)
 {
   /// Copy constructor
@@ -204,6 +207,7 @@ AliMUONDigit::Copy(TObject& obj) const
   }
   
   digit.fHit = fHit;
+  digit.fTime = fTime;
   digit.fStatusMap = fStatusMap;
 }
 
@@ -235,6 +239,24 @@ AliMUONDigit::IsCalibrated() const
   return (fFlags & fgkCalibratedMask );
 }
 
+//_____________________________________________________________________________
+Bool_t
+AliMUONDigit::IsConverted() const
+{
+  /// Whether this digit is converted or not
+  
+  return (fFlags & fgkConverted);
+}
+
+//_____________________________________________________________________________
+Bool_t
+AliMUONDigit::IsChargeInFC() const
+{
+  /// Whether this digit is converted or not
+  
+  return (fFlags & fgkChargeInFC);
+}
+
 
 //_____________________________________________________________________________
 Bool_t
@@ -266,7 +288,7 @@ AliMUONDigit::Used(Bool_t value)
   }
   else
   {
-    fFlags ^= fgkUsedMask;
+    fFlags &= ~fgkUsedMask;
   }
 }
 
@@ -282,7 +304,7 @@ AliMUONDigit::Calibrated(Bool_t value)
   }
   else
   {
-    fFlags ^= fgkCalibratedMask;
+    fFlags &= ~fgkCalibratedMask;
   }
 }
 
@@ -298,7 +320,7 @@ AliMUONDigit::EfficiencyApplied(Bool_t value)
   }
   else
   {
-    fFlags ^= fgkEfficiencyMask;
+    fFlags &= ~fgkEfficiencyMask;
   }
 }
 
@@ -337,7 +359,7 @@ AliMUONDigit::NoiseOnly(Bool_t value)
   }
   else
   {
-    fFlags ^= fgkNoiseOnlyMask;
+    fFlags &= ~fgkNoiseOnlyMask;
   }
 }
 
@@ -347,8 +369,10 @@ AliMUONDigit::operator=(const AliMUONDigit& digit)
 {
   /// Assignement operator.
 
-  AliMUONDigit a(digit);
-  a.Copy(*this);
+  if ( this != &digit ) 
+  {
+    digit.Copy(*this);
+  }
   return *this;
 }
 
@@ -376,7 +400,39 @@ AliMUONDigit::Saturated(Bool_t value)
   }
   else
   {
-    fFlags ^= fgkSaturatedMask;
+    fFlags &= ~fgkSaturatedMask;
+  }
+}
+
+//_____________________________________________________________________________
+void
+AliMUONDigit::Converted(Bool_t value)
+{
+  /// Set the convertion status of this digit.
+  
+  if ( value )
+  {
+    fFlags |= fgkConverted;
+  }
+  else
+  {
+    fFlags &= ~fgkConverted;
+  }
+}
+
+//_____________________________________________________________________________
+void
+AliMUONDigit::ChargeInFC(Bool_t value)
+{
+  /// Set the convertion status of this digit.
+  
+  if ( value )
+  {
+    fFlags |= fgkChargeInFC;
+  }
+  else
+  {
+    fFlags &= ~fgkChargeInFC;
   }
 }