#include "AliLog.h"
#include "AliMUONCluster.h"
#include "AliMpVSegmentation.h"
-#include "TClonesArray.h"
+#include "TObjArray.h"
#include "AliMpArea.h"
#include "TVector2.h"
#include "AliMUONPad.h"
#include <Riostream.h>
//#include "AliCodeTimer.h"
+//-----------------------------------------------------------------------------
/// \class AliMUONPreClusterFinderV3
///
/// Implementation of AliMUONVClusterFinder
/// should not depend on the order of the input digits.
///
/// \author Laurent Aphecetche
+//-----------------------------------------------------------------------------
+using std::endl;
+using std::cout;
ClassImp(AliMUONPreClusterFinderV3)
-namespace
-{
- //___________________________________________________________________________
- Bool_t
- AreOverlapping(const AliMUONPad& pad, const AliMUONCluster& cluster)
- {
- /// Whether the pad overlaps with the cluster
-
- static Double_t precision = 1E-4; // cm
- static TVector2 precisionAdjustment(precision,precision);//-precision,-precision);
- for ( Int_t i = 0; i < cluster.Multiplicity(); ++i )
- {
- AliMUONPad* testPad = cluster.Pad(i);
- // Note: we use negative precision numbers, meaning
- // the area of the pads will be *increased* by these small numbers
- // prior to check the overlap by the AreOverlapping method,
- // so pads touching only by the corners will be considered as
- // overlapping.
- if ( AliMUONPad::AreOverlapping(*testPad,pad,precisionAdjustment) )
- {
- return kTRUE;
- }
- }
- return kFALSE;
- }
-}
-
//_____________________________________________________________________________
AliMUONPreClusterFinderV3::AliMUONPreClusterFinderV3()
: AliMUONVClusterFinder(),
fClusters(new TClonesArray("AliMUONCluster",10)),
- fSegmentations(0x0),
+ fkSegmentations(0x0),
+ fPads(0x0),
fDetElemId(0),
fIterator(0x0)
{
/// ctor
- AliInfo("")
+ AliInfo("");
for ( Int_t i = 0; i < 2; ++i )
{
- fPads[i] = new TClonesArray("AliMUONPad",100);
fPreClusters[i] = new TClonesArray("AliMUONCluster",10);
}
}
//_____________________________________________________________________________
AliMUONPreClusterFinderV3::~AliMUONPreClusterFinderV3()
{
- /// dtor : note we're owner of the pads and the clusters, but not of
- /// the remaining objects (digits, segmentations)
+ /// dtor
delete fClusters;
for ( Int_t i = 0; i < 2; ++i )
{
- delete fPads[i];
delete fPreClusters[i];
}
}
return kFALSE;
}
- AliMUONPad* p = new ((*fPads[pad.Cathode()])[fPads[pad.Cathode()]->GetLast()+1]) AliMUONPad(pad);
+ AliMUONPad* p = new AliMUONPad(pad);
p->SetClusterId(-1);
+ fPads[pad.Cathode()]->Add(p);
return kTRUE;
}
//_____________________________________________________________________________
Bool_t
-AliMUONPreClusterFinderV3::Prepare(const AliMpVSegmentation* segmentations[2],
- const AliMUONVDigitStore& digitStore)
+AliMUONPreClusterFinderV3::Prepare(Int_t detElemId,
+ TObjArray* pads[2],
+ const AliMpArea& area,
+ const AliMpVSegmentation* seg[2])
{
/// Prepare for clustering, by giving access to segmentations and digit lists
- // FIXME : add area on which to look for clusters here.
- fSegmentations = segmentations;
+ if ( area.IsValid() )
+ {
+ AliError("Handling of area not yet implemented for this class. Please check.");
+ }
+
+ fkSegmentations = seg;
+ fPads = pads;
fClusters->Clear("C");
for ( Int_t i = 0; i < 2; ++i )
{
- fPads[i]->Clear("C");
fPreClusters[i]->Clear("C");
}
- fDetElemId = -1;
-
- TIter next(digitStore.CreateIterator());
- AliMUONVDigit* d;
+ fDetElemId = detElemId;
- while ( ( d = static_cast<AliMUONVDigit*>(next()) ) )
- {
- Int_t ix = d->PadX();
- Int_t iy = d->PadY();
- Int_t cathode = d->Cathode();
- AliMpPad pad = fSegmentations[cathode]->PadByIndices(AliMpIntPair(ix,iy));
- TClonesArray& padArray = *(fPads[cathode]);
- if ( fDetElemId == -1 )
- {
- fDetElemId = d->DetElemId();
- }
- else
- {
- if ( d->DetElemId() != fDetElemId )
- {
- AliError("Something is seriously wrong with DE. Aborting clustering");
- return kFALSE;
- }
- }
-
- AliMUONPad mpad(fDetElemId,cathode,
- ix,iy,pad.Position().X(),pad.Position().Y(),
- pad.Dimensions().X(),pad.Dimensions().Y(),
- d->Charge());
- if ( d->IsSaturated() ) mpad.SetSaturated(kTRUE);
- new (padArray[padArray.GetLast()+1]) AliMUONPad(mpad);
- }
if ( fPads[0]->GetLast() < 0 && fPads[1]->GetLast() < 0 )
{
// no pad at all, nothing to do...
AliMUONCluster a(*preCluster);
Int_t cathode = preCluster->Cathode();
+ if ( cathode < 0 ) {
+ AliError(Form("Cathod undefined: %d",cathode));
+ AliFatal("");
+ return;
+ }
+
if ( cathode <=1 && !fPreClusters[cathode]->Remove(preCluster) )
{
AliError(Form("Could not remove %s from preclusters[%d]",
preCluster->AsString().Data(),cathode));
StdoutToAliDebug(1,DumpPreClusters());
AliFatal("");
+ return;
}
cluster.AddCluster(a);
AliMUONPad* addedPad = cluster.AddPad(*pad);
Int_t cathode = pad->Cathode();
- TClonesArray& padArray = *fPads[cathode];
- padArray.Remove(pad);
+ TObjArray& padArray = *fPads[cathode];
+ delete padArray.Remove(pad);
+
TIter next(&padArray);
AliMUONPad* testPad;
{
/// Associate (proto)preclusters to form (pre)clusters
-// AliCodeTimerAuto("")
+// AliCodeTimerAuto("",0)
for ( Int_t cathode = 0; cathode < 2; ++cathode )
{
{
/// Build (proto)preclusters from digits on a given cathode
-// AliCodeTimerAuto(Form("Cathode %d",cathode))
+// AliCodeTimerAuto(Form("Cathode %d",cathode),0)
while ( fPads[cathode]->GetLast() > 0 )
{