X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=MUON%2FAliMUONRawCluster.cxx;h=1d4e6eebcab1942a017b70b17c472f19aa85f445;hb=823152abfcb68985c8355abcdbcd93273cd8f4c7;hp=ed0616513a0b230befa7feea9f2fd10d2c138bdf;hpb=af344e5ad7b02484308b3e71049bcd9c3b102e05;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONRawCluster.cxx b/MUON/AliMUONRawCluster.cxx
index ed0616513a0..1d4e6eebcab 100644
--- a/MUON/AliMUONRawCluster.cxx
+++ b/MUON/AliMUONRawCluster.cxx
@@ -15,12 +15,13 @@
 
 /* $Id$ */
 
-// -------------------------
+//-----------------------------------------------------------------------------
 // Class AliMUONRawCluster
 // -------------------------
 // Class for the MUON RecPoint
 // It contains the properties of the physics cluters found in the tracking chambers
 // RawCluster contains also the information from the both cathode of the chambers.
+//-----------------------------------------------------------------------------
 
 
 #include "Riostream.h"
@@ -29,14 +30,16 @@
 #include <TString.h>
 
 #include "AliMUONRawCluster.h"
+#include "AliMUONConstants.h"
 
 /// \cond CLASSIMP
 ClassImp(AliMUONRawCluster)
 /// \endcond
 
+
 //____________________________________________________
 AliMUONRawCluster::AliMUONRawCluster() 
-  : TObject(),
+  : AliMUONVCluster(),
     fClusterType(0),
     fGhost(0),
     fDetElemId(0)   
@@ -59,8 +62,8 @@ AliMUONRawCluster::AliMUONRawCluster()
 	}
     }
     fNcluster[0]=fNcluster[1]=-1;
-    fErrXY[0] = 0.144;
-    fErrXY[1] = 0.01;
+    fErrXY[0] = AliMUONConstants::DefaultNonBendingReso();
+    fErrXY[1] = AliMUONConstants::DefaultBendingReso();
 }
 
 //____________________________________________________
@@ -69,6 +72,21 @@ AliMUONRawCluster::~AliMUONRawCluster()
 /// Destructor
 }
 
+//____________________________________________________
+void AliMUONRawCluster::SetDigitsId(Int_t nDigits, const UInt_t *digitsId)
+{
+  /// Set the array of digit Id
+  /// if digitsId is not given the array is filled with id=0
+  
+  fMultiplicity[0] = (nDigits < 50) ? nDigits : 50;
+  
+  if (fMultiplicity[0] == 0) return;
+  if (digitsId == 0)
+    for (Int_t i=0; i<fMultiplicity[0]; i++) fIndexMap[i][0] = 0;
+  else
+    for (Int_t i=0; i<fMultiplicity[0]; i++) fIndexMap[i][0] = (Int_t) digitsId[i];
+}
+
 //____________________________________________________
 Int_t AliMUONRawCluster::Compare(const TObject *obj) const
 {
@@ -82,14 +100,27 @@ Int_t AliMUONRawCluster::Compare(const TObject *obj) const
          else if (r<ro) return -1;
          else return 0;
   */
+  /*
          AliMUONRawCluster *raw=(AliMUONRawCluster *)obj;
 	 Float_t y=fY[0];
          Float_t yo=raw->fY[0];
          if (y>yo) return 1;
          else if (y<yo) return -1;
          else return 0;
-
+   */
+  
+  const AliMUONRawCluster* raw = static_cast<const AliMUONRawCluster*>(obj);
+  if ( GetCharge() > raw->GetCharge() ) 
+  {
+    return 1;
+  }
+  else if ( GetCharge() < raw->GetCharge() ) 
+  {
+    return -1;
+  }
+  return 0;
 }
+
 //____________________________________________________
 Int_t AliMUONRawCluster::BinarySearch(Float_t y, TArrayF coord, Int_t from, Int_t upto)
 {
@@ -194,11 +225,11 @@ void AliMUONRawCluster::Print(Option_t* opt) const
   TString sopt(opt);
   sopt.ToUpper();
  
-  cout << "<AliMUONRawCluster>: DetEle="        << setw(4)  << GetDetElemId() << 
-    ", (x,y,z)=(" << setw(8) << setprecision(5) << GetX() << "," << setw(8) 
-    << setprecision(5) << GetY() <<  "," << setw(8) << setprecision(5) << GetZ() << 
-    ") cm, Chi2=" << setw(8) << setprecision(3) << GetChi2() << 
-    ", Q=" << setw(4) << GetCharge();
+  cout << Form("<AliMUONRawCluster>: DetEle=%4d (x,y,z)=(%7.4f,%7.4f,%7.4f) cm"
+               " Chi2=%7.2f Q=%7.2f",
+               GetDetElemId(),GetX(),GetY(),GetZ(),GetChi2(),
+               GetCharge());
+               
   if ( sopt.Contains("FULL") )
   {
     cout << ", Hit=" << setw(4)  << GetTrack(0) <<
@@ -441,3 +472,4 @@ Int_t AliMUONRawCluster::SetChi2(Int_t i, Float_t chi2)
   else return 0;
 }
 
+