#include <TVirtualX.h>
#include "AliMUONCluster.h"
+#include "AliMUONPad.h"
+
+#include "AliMpEncodePair.h"
#include "AliLog.h"
-#include "AliMUONPad.h"
//-----------------------------------------------------------------------------
/// \class AliMUONCluster
//_____________________________________________________________________________
AliMUONCluster::AliMUONCluster()
: TObject(),
-fPads(0x0),
+fPads(),
fHasPosition(kFALSE),
fPosition(1E9,1E9),
fPositionError(1E9,1E9),
fRawCharge[0]=fRawCharge[1]=0;
fCharge[0]=fCharge[1]=0;
fIsSaturated[0]=fIsSaturated[1]=kFALSE;
+ fPads.SetOwner(kTRUE);
}
//_____________________________________________________________________________
AliMUONCluster::AliMUONCluster(const AliMUONCluster& src)
: TObject(src),
-fPads(0x0),
+fPads(),
fHasPosition(kFALSE),
fPosition(1E9,1E9),
fPositionError(1E9,1E9),
fChi2(0)
{
/// copy ctor
+ fPads.SetOwner(kTRUE);
src.Copy(*this);
}
AliMUONCluster::operator=(const AliMUONCluster& src)
{
/// assignement operator
- AliMUONCluster c(src);
- c.Copy(*this);
+ if ( this != &src )
+ {
+ src.Copy(*this);
+ }
return *this;
}
AliMUONCluster::~AliMUONCluster()
{
/// dtor : note that we're owner of our pads
- delete fPads;
+// fPads.Delete();
}
//_____________________________________________________________________________
AliMUONCluster::Clear(Option_t*)
{
/// Clear our pad array
- if (fPads) fPads->Clear("C");
+ fPads.Clear();
+// fPads.Delete();
}
//_____________________________________________________________________________
AliMUONCluster::Contains(const AliMUONPad& pad) const
{
/// Whether this cluster contains the pad
- if (!fPads) return kFALSE;
+ if (fPads.IsEmpty()) return kFALSE;
+
for ( Int_t i = 0; i < Multiplicity(); ++i )
{
AliMUONPad* p = Pad(i);
{
/// Add a pad to our pad array, and update some internal information
/// accordingly.
-
- if (!fPads)
- {
- fPads = new TObjArray(10);
- fPads->SetOwner(kTRUE);
- }
+
AliMUONPad* p = new AliMUONPad(pad);
- fPads->AddLast(p);
+ fPads.AddLast(p);
p->SetClusterId(GetUniqueID());
Int_t cathode = p->Cathode();
++(fMultiplicity[cathode]);
}
// then construct the area from those limits
- return AliMpArea((lowerLeft+upperRight)/2,
- (upperRight-lowerLeft)/2);
+ return AliMpArea((lowerLeft+upperRight).X()/2,(lowerLeft+upperRight).Y()/2,
+ (upperRight-lowerLeft).X()/2, (upperRight-lowerLeft).Y()/2);
}
//_____________________________________________________________________________
}
// then construct the area from those limits
- return AliMpArea((lowerLeft+upperRight)/2,
- (upperRight-lowerLeft)/2);
+ return AliMpArea((lowerLeft+upperRight).X()/2,(lowerLeft+upperRight).Y()/2,
+ (upperRight-lowerLeft).X()/2, (upperRight-lowerLeft).Y()/2);
}
//_____________________________________________________________________________
///
TObject::Copy(obj);
AliMUONCluster& dest = static_cast<AliMUONCluster&>(obj);
- dest.fPads = 0x0;
- if ( fPads )
+
+// dest.fPads.Delete();
+ dest.fPads.Clear();
+
+ for ( Int_t i = 0; i <= fPads.GetLast(); ++i )
{
- dest.fPads = static_cast<TObjArray*>(fPads->Clone());
+ AliMUONPad* p = static_cast<AliMUONPad*>(fPads.UncheckedAt(i));
+ dest.fPads.AddLast(new AliMUONPad(*p));
}
dest.fHasPosition = fHasPosition;
dest.fPosition = fPosition;
}
//_____________________________________________________________________________
-AliMpIntPair
+Long_t
AliMUONCluster::NofPads(Int_t statusMask, Bool_t matchMask) const
{
/// Number of pads satisfying (or not, depending matchMask) a
- /// given mask
+ /// given mask
Int_t nx, ny;
TVector2 dim0(MinPadDimensions(0,statusMask,matchMask));
TVector2 dim1(MinPadDimensions(1,statusMask,matchMask));
- AliMpIntPair npad0(NofPads(0,statusMask,matchMask));
- AliMpIntPair npad1(NofPads(1,statusMask,matchMask));
+ Long_t npad0(NofPads(0,statusMask,matchMask));
+ Long_t npad1(NofPads(1,statusMask,matchMask));
if ( TMath::Abs( (dim0-dim1).X() ) < 1E-3 )
{
- nx = TMath::Max( npad0.GetFirst(), npad1.GetFirst() );
+ nx = TMath::Max( AliMp::PairFirst(npad0), AliMp::PairFirst(npad1) );
}
else
{
- nx = dim0.X() < dim1.X() ? npad0.GetFirst() : npad1.GetFirst();
+ nx = dim0.X() < dim1.X() ? AliMp::PairFirst(npad0) : AliMp::PairFirst(npad1);
}
if ( TMath::Abs( (dim0-dim1).Y() ) < 1E-3 )
{
- ny = TMath::Max( npad0.GetSecond(), npad1.GetSecond() );
+ ny = TMath::Max( AliMp::PairSecond(npad0), AliMp::PairSecond(npad1) );
}
else
{
- ny = dim0.Y() < dim1.Y() ? npad0.GetSecond() : npad1.GetSecond();
+ ny = dim0.Y() < dim1.Y() ? AliMp::PairSecond(npad0) : AliMp::PairSecond(npad1);
}
- return AliMpIntPair(nx,ny);
+ return AliMp::Pair(nx,ny);
}
//_____________________________________________________________________________
-AliMpIntPair
+Long_t
AliMUONCluster::NofPads(Int_t cathode,
Int_t statusMask, Bool_t matchMask) const
{
Int_t n = Multiplicity(cathode);
if (!n)
{
- return AliMpIntPair(0,0);
+ return 0;
}
Double_t* x = new Double_t[n];
Double_t* y = new Double_t[n];
delete[] x;
delete[] y;
- return AliMpIntPair(cx,cy);
+ return AliMp::Pair(cx,cy);
}
//_____________________________________________________________________________
{
/// Returns the index-th pad
- if (!fPads) return 0x0;
- if ( index < fPads->GetLast()+1 )
+ if (fPads.IsEmpty()) return 0x0;
+ if ( index < fPads.GetLast()+1 )
{
- return static_cast<AliMUONPad*>(fPads->At(index));
+ return static_cast<AliMUONPad*>(fPads.At(index));
}
else
{
AliError(Form("Requested index %d out of bounds (%d) Mult is %d",index,
- fPads->GetLast(),Multiplicity()));
+ fPads.GetLast(),Multiplicity()));
DumpMe();
}
return 0x0;
}
cout << endl;
// cout << " " << Area() << endl;
- if (fPads)
+ for (Int_t i = 0; i < fPads.GetSize(); ++i)
{
- for (Int_t i = 0; i < fPads->GetSize(); ++i)
- {
- cout << Form("fPads[%d]=%x",i,fPads->At(i)) << endl;
- if ( fPads->At(i) ) fPads->At(i)->Print();
- }
- }
+ cout << Form("fPads[%d]=%x",i,fPads.At(i)) << endl;
+ if ( fPads.At(i) ) fPads.At(i)->Print();
+ }
}
cout << " (errX,errY)=(" << PositionError().X() << "," << PositionError().Y() << ")";
}
cout << " " << Area();
- if (fPads)
- {
- TObjArray* a = static_cast<TObjArray*>(fPads->Clone());
- a->Sort();
- a->Print("",opt);
- delete a;
- }
+
+ TObjArray* a = static_cast<TObjArray*>(fPads.Clone());
+ a->Sort();
+ a->Print("",opt);
+ delete a;
}
//_____________________________________________________________________________
AliMpArea carea(cluster->Area());
AliMpArea area(Area());
- if ( carea.Position().X() > area.Position().X() )
+ if ( carea.GetPositionX() > area.GetPositionX() )
{
return 1;
}
- else if ( carea.Position().X() < area.Position().X() )
+ else if ( carea.GetPositionX() < area.GetPositionX() )
{
return -1;
}
else
{
- if ( carea.Position().Y() > area.Position().Y() )
+ if ( carea.GetPositionY() > area.GetPositionY() )
{
return 1;
}
- else if ( carea.Position().Y() < area.Position().Y() )
+ else if ( carea.GetPositionY() < area.GetPositionY() )
{
return -1;
}
/// Remove a pad.
/// As a consequence, some internal information must be updated
- fPads->Remove(pad);
- fPads->Compress();
+ fPads.Remove(pad);
+ fPads.Compress();
+ delete pad;
// update cluster's data
fIsSaturated[0]=fIsSaturated[1]=kFALSE;
fMultiplicity[0]=fMultiplicity[1]=0;
fRawCharge[0]=fRawCharge[1]=0;
- for ( Int_t i = 0; i <= fPads->GetLast(); ++i )
+ for ( Int_t i = 0; i <= fPads.GetLast(); ++i )
{
AliMUONPad* p = Pad(i);
if ( p->IsSaturated() )
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff