#include "AliLog.h"
#include "AliMUONCluster.h"
#include "AliMpVSegmentation.h"
-#include "TClonesArray.h"
+#include "TObjArray.h"
#include "AliMpArea.h"
#include "TVector2.h"
#include "AliMUONPad.h"
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(),
fIterator(0x0)
{
/// ctor
- AliInfo("")
+ AliInfo("");
for ( Int_t i = 0; i < 2; ++i )
{
fPreClusters[i] = new TClonesArray("AliMUONCluster",10);
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(Int_t detElemId,
- TClonesArray* pads[2],
+ TObjArray* pads[2],
const AliMpArea& area,
const AliMpVSegmentation* seg[2])
{
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 )
{