Added cast to Color_t - needed by GCC 4.3

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

diff --git a/MUON/AliMUONRawClusterV2.cxx b/MUON/AliMUONRawClusterV2.cxx
index ccb0f050b2d80dd3ef298145b486ed1ab53dba4d..ec54b21d04a432ad773c6b17c336a72e20c16d7a 100644 (file)
--- a/MUON/AliMUONRawClusterV2.cxx
+++ b/MUON/AliMUONRawClusterV2.cxx
@@ -25,10 +25,12 @@
 
 
 #include "AliMUONRawClusterV2.h"
+#include "AliMUONConstants.h"
 
 #include "AliLog.h"
 
-#include "Riostream.h"
+#include <TClonesArray.h>
+#include <Riostream.h>
 
 /// \cond CLASSIMP
 ClassImp(AliMUONRawClusterV2)
@@ -41,8 +43,8 @@ AliMUONRawClusterV2::AliMUONRawClusterV2()
     fX(FLT_MAX),
     fY(FLT_MAX),
     fZ(FLT_MAX),
-    fErrX2(fgkDefaultNonBendingReso * fgkDefaultNonBendingReso),
-    fErrY2(fgkDefaultBendingReso * fgkDefaultBendingReso),
+    fErrX2(AliMUONConstants::DefaultNonBendingReso2()),
+    fErrY2(AliMUONConstants::DefaultBendingReso2()),
     fQ(0.),
     fChi2(0.),
     fNDigits(0),
@@ -57,8 +59,8 @@ AliMUONRawClusterV2::AliMUONRawClusterV2(Int_t chamberId, Int_t detElemId, Int_t
     fX(FLT_MAX),
     fY(FLT_MAX),
     fZ(FLT_MAX),
-    fErrX2(fgkDefaultNonBendingReso * fgkDefaultNonBendingReso),
-    fErrY2(fgkDefaultBendingReso * fgkDefaultBendingReso),
+    fErrX2(AliMUONConstants::DefaultNonBendingReso2()),
+    fErrY2(AliMUONConstants::DefaultBendingReso2()),
     fQ(0.),
     fChi2(0.),
     fNDigits(0),
@@ -123,18 +125,10 @@ AliMUONRawClusterV2 & AliMUONRawClusterV2::operator=(const AliMUONRawClusterV2&
 //____________________________________________________
 void AliMUONRawClusterV2::Clear(Option_t*)
 {
-  /// Reset this cluster, in particular the internal arrays are deleted.
-  
-  fX = FLT_MAX;
-  fY = FLT_MAX;
-  fZ = FLT_MAX;
-  fErrX2 = fgkDefaultNonBendingReso * fgkDefaultNonBendingReso;
-  fErrY2 = fgkDefaultBendingReso * fgkDefaultBendingReso;
-  fQ = 0.;
-  fChi2 = 0.;
-  fNDigits = 0;
+  /// clear memory
   delete [] fDigitsId;
   fDigitsId = 0x0;
+  fNDigits = 0;
 }
 
 //____________________________________________________
@@ -164,7 +158,7 @@ void AliMUONRawClusterV2::AddDigitId(UInt_t id)
   UInt_t *digitsIdNew = new UInt_t[fNDigits+1];
   memcpy(digitsIdNew,fDigitsId, fNDigits*sizeof(UInt_t));
   digitsIdNew[fNDigits++] = id;
-  delete fDigitsId;
+  delete[] fDigitsId;
   fDigitsId = digitsIdNew;
 }