#include <TH2.h>
#include <TMinuit.h>
#include <TCanvas.h>
-#include <TStopwatch.h>
#include <TMath.h>
-#include <TROOT.h>
-//#include "AliCodeTimer.h"
+#include "AliCodeTimer.h"
/// \cond CLASSIMP
ClassImp(AliMUONClusterFinderMLEM)
/// \endcond
-const Double_t AliMUONClusterFinderMLEM::fgkZeroSuppression = 6; // average zero suppression value
-const Double_t AliMUONClusterFinderMLEM::fgkSaturation = 3000; // average saturation level
-const Double_t AliMUONClusterFinderMLEM::fgkDistancePrecision = 1e-6; // (cm) used to check overlaps and so on
+const Double_t AliMUONClusterFinderMLEM::fgkDistancePrecision = 1e-3; // (cm) used to check overlaps and so on
const TVector2 AliMUONClusterFinderMLEM::fgkIncreaseSize(-AliMUONClusterFinderMLEM::fgkDistancePrecision,-AliMUONClusterFinderMLEM::fgkDistancePrecision);
const TVector2 AliMUONClusterFinderMLEM::fgkDecreaseSize(AliMUONClusterFinderMLEM::fgkDistancePrecision,AliMUONClusterFinderMLEM::fgkDistancePrecision);
- TMinuit* AliMUONClusterFinderMLEM::fgMinuit = 0x0;
+// Status flags for pads
+const Int_t AliMUONClusterFinderMLEM::fgkZero = 0x0; ///< pad "basic" state
+const Int_t AliMUONClusterFinderMLEM::fgkMustKeep = 0x1; ///< do not kill (for pixels)
+const Int_t AliMUONClusterFinderMLEM::fgkUseForFit = 0x10; ///< should be used for fit
+const Int_t AliMUONClusterFinderMLEM::fgkOver = 0x100; ///< processing is over
+const Int_t AliMUONClusterFinderMLEM::fgkModified = 0x1000; ///< modified pad charge
+const Int_t AliMUONClusterFinderMLEM::fgkCoupled = 0x10000; ///< coupled pad
//_____________________________________________________________________________
AliMUONClusterFinderMLEM::AliMUONClusterFinderMLEM(Bool_t plot, AliMUONVClusterFinder* clusterFinder)
fEventNumber(0),
fDetElemId(-1),
fClusterNumber(0),
-fZpad(0.0),
-fReco(1),
-fCathBeg(0),
+fHistMlem(0x0),
+fHistAnode(0x0),
fPixArray(new TObjArray(20)),
fDebug(0),
fPlot(plot),
-fTimers(new TObjArray(kLast)),
fSplitter(0x0),
fNClusters(0),
-fNAddVirtualPads(0)
+fNAddVirtualPads(0),
+fLowestPixelCharge(0),
+fLowestPadCharge(0),
+fLowestClusterCharge(0)
{
/// Constructor
-
- fSegmentation[1] = fSegmentation[0] = 0x0;
-
- fPadBeg[0] = fPadBeg[1] = fCathBeg;
- if (!fgMinuit) fgMinuit = new TMinuit(8);
+ fkSegmentation[1] = fkSegmentation[0] = 0x0;
- fTimers->SetOwner(kTRUE);
-
- for ( Int_t i = 0; i < kLast; ++i )
- {
- TStopwatch* t = new TStopwatch;
- fTimers->AddLast(new TStopwatch);
- t->Start(kTRUE);
- t->Stop();
- }
if (fPlot) fDebug = 1;
}
AliMUONClusterFinderMLEM::~AliMUONClusterFinderMLEM()
{
/// Destructor
- delete fgMinuit; fgMinuit = 0; delete fPixArray; fPixArray = 0;
+ delete fPixArray; fPixArray = 0;
// delete fDraw;
delete fPreClusterFinder;
- for ( Int_t i = 0; i < kLast; ++i )
- {
- AliInfo(Form("Timer %d",i));
- Timer(i)->Print();
- }
- delete fTimers;
delete fSplitter;
AliInfo(Form("Total clusters %d AddVirtualPad needed %d",
fNClusters,fNAddVirtualPads));
//_____________________________________________________________________________
Bool_t
-AliMUONClusterFinderMLEM::Prepare(const AliMpVSegmentation* segmentations[2],
- const AliMUONVDigitStore& digitStore)
+AliMUONClusterFinderMLEM::Prepare(Int_t detElemId,
+ TObjArray* pads[2],
+ const AliMpArea& area,
+ const AliMpVSegmentation* seg[2])
{
/// Prepare for clustering
-// AliCodeTimerAuto("")
+// AliCodeTimerAuto("",0)
for ( Int_t i = 0; i < 2; ++i )
{
- fSegmentation[i] = segmentations[i];
+ fkSegmentation[i] = seg[i];
}
// Find out the DetElemId
- fDetElemId = -1;
-
- TIter next(digitStore.CreateIterator());
- AliMUONVDigit* d = static_cast<AliMUONVDigit*>(next());
-
- if (d)
- {
- fDetElemId = d->DetElemId();
- }
-
- if ( fDetElemId < 0 )
- {
- AliWarning("Could not find DE. Probably no digits at all ?");
- return kFALSE;
- }
+ fDetElemId = detElemId;
delete fSplitter;
- fSplitter = new AliMUONClusterSplitterMLEM(fDetElemId,fPixArray);
+ fSplitter = new AliMUONClusterSplitterMLEM(fDetElemId,
+ fPixArray,
+ fLowestPixelCharge,
+ fLowestPadCharge,
+ fLowestClusterCharge);
fSplitter->SetDebug(fDebug);
// find out current event number, and reset the cluster number
- fEventNumber = AliRunLoader::GetRunLoader()->GetEventNumber();
+ AliRunLoader *runLoader = AliRunLoader::Instance();
+ fEventNumber = runLoader ? runLoader->GetEventNumber() : 0;
fClusterNumber = -1;
fClusterList.Delete();
-
+ fPixArray->Delete();
+
AliDebug(3,Form("EVT %d DE %d",fEventNumber,fDetElemId));
- return fPreClusterFinder->Prepare(segmentations,digitStore);
+ if ( fPreClusterFinder->NeedSegmentation() )
+ {
+ return fPreClusterFinder->Prepare(detElemId,pads,area,seg);
+ }
+ else
+ {
+ return fPreClusterFinder->Prepare(detElemId,pads,area);
+ }
}
//_____________________________________________________________________________
AliMUONClusterFinderMLEM::NextCluster()
{
/// Return next cluster
-// AliCodeTimerAuto("clustering + pre-clustering")
+// AliCodeTimerAuto("",0)
// if the list of clusters is not void, pick one from there
- TObject* o = fClusterList.At(++fClusterNumber);
+ TObject* o(0x0);
+
+ // do we have clusters in our list ?
+ if ( fClusterNumber < fClusterList.GetLast() )
+ {
+ o = fClusterList.At(++fClusterNumber);
+ }
+
if ( o != 0x0 ) return static_cast<AliMUONCluster*>(o);
//FIXME : at this point, must check whether we've used all the digits
// pre-cluster and treat it
fPreCluster = fPreClusterFinder->NextCluster();
-
+
+ fPixArray->Delete();
+ fClusterList.Delete(); // reset the list of clusters for this pre-cluster
+ fClusterNumber = -1; //AZ
+
if (!fPreCluster)
{
// we are done
return 0x0;
}
- fClusterList.Delete(); // reset the list of clusters for this pre-cluster
- fClusterNumber = -1; //AZ
-
WorkOnPreCluster();
// WorkOnPreCluster may have used only part of the pads, so we check that
// now, and let the unused pads be reused by the preclustering...
- for ( Int_t i = 0; i < fPreCluster->Multiplicity(); ++i )
+ Int_t mult = fPreCluster->Multiplicity();
+ for ( Int_t i = 0; i < mult; ++i )
{
AliMUONPad* pad = fPreCluster->Pad(i);
if ( !pad->IsUsed() )
/// Starting from a precluster, builds a pixel array, and then
/// extract clusters from this array
- // Set saturation flag - it is not set if working directly with MC digits (w/out
- // creating raw data) !!!
- for (Int_t j = 0; j < fPreCluster->Multiplicity(); ++j) {
- AliMUONPad* pad = fPreCluster->Pad(j);
- if (pad->IsSaturated()) break;
- if (pad->Charge() > fgkSaturation-1) pad->SetSaturated(kTRUE); //FIXME : remove usage of fgkSaturation
- }
+ // AliCodeTimerAuto("",0)
if (fDebug) {
- cout << " *** Event # " << AliRunLoader::GetRunLoader()->GetEventNumber()
+ cout << " *** Event # " << fEventNumber
<< " det. elem.: " << fDetElemId << endl;
- for (Int_t j=0; j<fPreCluster->Multiplicity(); ++j) {
+ for (Int_t j = 0; j < fPreCluster->Multiplicity(); ++j) {
AliMUONPad* pad = fPreCluster->Pad(j);
printf(" bbb %3d %1d %8.4f %8.4f %8.4f %8.4f %6.1f %3d %3d %2d %1d %1d \n",
j, pad->Cathode(), pad->Coord(0), pad->Coord(1), pad->DX()*2, pad->DY()*2,
Int_t nMax = 1, localMax[100], maxPos[100];
Double_t maxVal[100];
- if (cluster->Multiplicity() > 50)
- {
- nMax = FindLocalMaxima(fPixArray, localMax, maxVal);
- }
-
- if (nMax > 1)
- {
- TMath::Sort(nMax, maxVal, maxPos, kTRUE); // in decreasing order
- }
-
Int_t iSimple = 0, nInX = -1, nInY;
PadsInXandY(*cluster,nInX, nInY);
- if (nMax == 1 && nInX < 4 && nInY < 4)
+ if (nInX < 4 && nInY < 4)
+ {
+ iSimple = 1; // simple cluster
+ }
+ else
{
- iSimple = 1; //1; // simple cluster
+ nMax = FindLocalMaxima(fPixArray, localMax, maxVal); // for small clusters just to tag pixels
+ if (nMax > 1) {
+ if (cluster->Multiplicity() <= 50) nMax = 1; // for small clusters
+ if (nMax > 1) TMath::Sort(nMax, maxVal, maxPos, kTRUE); // in descending order
+ }
}
- for (Int_t i=0; i<nMax; ++i)
+ for (Int_t i = 0; i < nMax; ++i)
{
if (nMax > 1)
{
FindCluster(*cluster,localMax, maxPos[i]);
}
- Timer(kMainLoop)->Start(kFALSE);
+
MainLoop(*cluster,iSimple);
- Timer(kMainLoop)->Stop();
+
if (i < nMax-1)
{
- for (Int_t j=0; j<cluster->Multiplicity(); ++j)
+ Int_t mult = cluster->Multiplicity();
+ for (Int_t j = 0; j < mult; ++j)
{
AliMUONPad* pad = cluster->Pad(j);
- if ( pad->Status() == 0 ) continue; // pad charge was not modified
- pad->SetStatus(0);
+ //if ( pad->Status() == 0 ) continue; // pad charge was not modified
+ if ( pad->Status() != fgkOver ) continue; // pad was not used
+ //pad->SetStatus(0);
+ pad->SetStatus(fgkZero);
pad->RevertCharge(); // use backup charge value
}
}
} // for (Int_t i=0; i<nMax;
- if (nMax > 1) ((TH2D*) gROOT->FindObject("anode"))->Delete();
- TH2D *mlem = (TH2D*) gROOT->FindObject("mlem");
- if (mlem) mlem->Delete();
+ delete fHistMlem;
+ delete fHistAnode;
+ fHistMlem = fHistAnode = 0x0;
delete cluster;
return kTRUE;
}
/// Check precluster in order to attempt to simplify it (mostly for
/// two-cathode preclusters)
- if (origCluster.Multiplicity()==1)
+ AliCodeTimerAuto("",0)
+
+ // Disregard small clusters (leftovers from splitting or noise)
+ if ((origCluster.Multiplicity()==1 || origCluster.Multiplicity()==2) &&
+ origCluster.Charge(0)+origCluster.Charge(1) < fLowestClusterCharge )
{
- // Disregard one-pad clusters (leftovers from splitting)
return 0x0;
}
- Timer(kCheckPreCluster)->Start(kFALSE);
-
-
- AliMUONCluster* cluster = static_cast<AliMUONCluster*>(origCluster.Clone());
+ AliMUONCluster* cluster = new AliMUONCluster(origCluster);
AliDebug(2,"Start of CheckPreCluster=");
-// StdoutToAliDebug(2,cluster->Print("full"));
+ //StdoutToAliDebug(2,cluster->Print("full"));
- // Check if one-cathode precluster
- Int_t i1 = cluster->Multiplicity(0) ? 0 : 1;
- Int_t i2 = cluster->Multiplicity(1) ? 1 : 0;
-
AliMUONCluster* rv(0x0);
- if (i1 != i2)
+ if (cluster->Multiplicity(0) && cluster->Multiplicity(1))
{
rv = CheckPreclusterTwoCathodes(cluster);
}
else
{
- rv = CheckPreclusterOneCathode(cluster);
+ rv = cluster;
}
- Timer(kCheckPreCluster)->Stop();
return rv;
}
-//_____________________________________________________________________________
-AliMUONCluster*
-AliMUONClusterFinderMLEM::CheckPreclusterOneCathode(AliMUONCluster* cluster)
-{
- /// Check single-cathode precluster
- AliWarning("Reimplement me!");
- AliDebug(2,"End of CheckPreClusterOneCathode=");
-// StdoutToAliDebug(2,cluster->Print("full"));
-
- return cluster;
-}
-
//_____________________________________________________________________________
AliMUONCluster*
AliMUONClusterFinderMLEM::CheckPreclusterTwoCathodes(AliMUONCluster* cluster)
{
/// Check two-cathode cluster
- Int_t i1 = cluster->Multiplicity(0) ? 0 : 1;
- Int_t i2 = cluster->Multiplicity(1) ? 1 : 0;
-
Int_t npad = cluster->Multiplicity();
Int_t* flags = new Int_t[npad];
- memset(flags,0,npad*sizeof(Int_t));
+ for (Int_t j = 0; j < npad; ++j) flags[j] = 0;
// Check pad overlaps
- for ( Int_t i=0; i<npad; ++i)
+ for ( Int_t i = 0; i < npad; ++i)
{
AliMUONPad* padi = cluster->Pad(i);
- if ( padi->Cathode() != i1 ) continue;
- for (Int_t j=i+1; j<npad; ++j)
+ if ( padi->Cathode() != 0 ) continue;
+ for (Int_t j = i+1; j < npad; ++j)
{
AliMUONPad* padj = cluster->Pad(j);
- if ( padj->Cathode() != i2 ) continue;
+ if ( padj->Cathode() != 1 ) continue;
if ( !AliMUONPad::AreOverlapping(*padi,*padj,fgkDecreaseSize) ) continue;
flags[i] = flags[j] = 1; // mark overlapped pads
}
// Check if all pads overlap
Int_t nFlags=0;
- for (Int_t i=0; i<npad; ++i)
+ for (Int_t i = 0; i < npad; ++i)
{
- if (flags[i]) continue;
- ++nFlags;
+ if (!flags[i]) ++nFlags;
}
if (nFlags > 0)
// not all pads overlap.
if (fDebug) cout << " nFlags: " << nFlags << endl;
TObjArray toBeRemoved;
- for (Int_t i=0; i<npad; ++i)
+ for (Int_t i = 0; i < npad; ++i)
{
AliMUONPad* pad = cluster->Pad(i);
if (flags[i]) continue;
Int_t cath = pad->Cathode();
Int_t cath1 = TMath::Even(cath);
// Check for edge effect (missing pads on the _other_ cathode)
- AliMpPad mpPad = fSegmentation[cath1]->PadByPosition(pad->Position(),kFALSE);
+ AliMpPad mpPad =
+ fkSegmentation[cath1]->PadByPosition(pad->Position().X(),
+ pad->Position().Y(),kFALSE);
if (!mpPad.IsValid()) continue;
- if (nFlags == 1 && pad->Charge() < fgkZeroSuppression * 3) continue;
+ if (nFlags == 1 && pad->Charge() < fLowestPadCharge) continue;
AliDebug(2,Form("Releasing the following pad : de,cath,ix,iy %d,%d,%d,%d charge %e",
fDetElemId,pad->Cathode(),pad->Ix(),pad->Iy(),pad->Charge()));
toBeRemoved.AddLast(pad);
- //AZ cluster->RemovePad(pad);
fPreCluster->Pad(i)->Release();
- //AZ --npad;
}
- for ( Int_t i = 0; i <= toBeRemoved.GetLast(); ++i )
+ Int_t nRemove = toBeRemoved.GetEntriesFast();
+ for ( Int_t i = 0; i < nRemove; ++i )
{
- cluster->RemovePad(static_cast<AliMUONPad*>(toBeRemoved.At(i)));
+ cluster->RemovePad(static_cast<AliMUONPad*>(toBeRemoved.UncheckedAt(i)));
}
}
{
// big difference
Int_t cathode = cluster->MaxRawChargeCathode();
- Int_t imin(0);
- Int_t imax(0);
+ Int_t imin(-1);
+ Int_t imax(-1);
Double_t cmax(0);
Double_t cmin(1E9);
// get min and max pad charges on the cathode opposite to the
// max pad (given by MaxRawChargeCathode())
//
- for ( Int_t i = 0; i < cluster->Multiplicity(); ++i )
+ Int_t mult = cluster->Multiplicity();
+ for ( Int_t i = 0; i < mult; ++i )
{
AliMUONPad* pad = cluster->Pad(i);
if ( pad->Cathode() != cathode || !pad->IsReal() )
{
// only consider pads in the opposite cathode, and
- // onyl consider real pads (i.e. exclude the virtual ones)
+ // only consider real pads (i.e. exclude the virtual ones)
continue;
}
if ( pad->Charge() < cmin )
{
cmin = pad->Charge();
imin = i;
+ if (imax < 0) {
+ imax = imin;
+ cmax = cmin;
+ }
}
- if ( pad->Charge() > cmax )
+ else if ( pad->Charge() > cmax )
{
cmax = pad->Charge();
imax = i;
//
// arrange pads according to their distance to the max, normalized
// to the pad size
- Double_t* dist = new Double_t[cluster->Multiplicity()];
+ Double_t* dist = new Double_t[mult];
Double_t dxMin(1E9);
Double_t dyMin(1E9);
Double_t dmin(0);
AliMUONPad* padmax = cluster->Pad(imax);
- for ( Int_t i = 0; i < cluster->Multiplicity(); ++i )
+ for ( Int_t i = 0; i < mult; ++i )
{
dist[i] = 0.0;
if ( i == imax) continue;
}
}
- TMath::Sort(cluster->Multiplicity(),dist,flags,kFALSE); // in ascending order
- Double_t xmax(-1);
+ TMath::Sort(mult,dist,flags,kFALSE); // in ascending order
+ Double_t xmax(-1), distPrev(999);
TObjArray toBeRemoved;
- for ( Int_t i = 0; i < cluster->Multiplicity(); ++i )
+ for ( Int_t i = 0; i < mult; ++i )
{
Int_t indx = flags[i];
AliMUONPad* pad = cluster->Pad(indx);
if (TMath::Abs(dx) > TMath::Abs(dy) && dx >= 0) continue;
if (TMath::Abs(dy) > TMath::Abs(dx) && dy >= 0) continue;
}
+ if (dist[indx] > distPrev + 1) break; // overstepping empty pads
if ( pad->Charge() <= cmax || TMath::Abs(dist[indx]-xmax) < 1E-3 )
{
// release pad
cmax = pad->Charge();
}
xmax = dist[indx];
+ distPrev = dist[indx];
AliDebug(2,Form("Releasing the following pad : de,cath,ix,iy %d,%d,%d,%d charge %e",
fDetElemId,pad->Cathode(),pad->Ix(),pad->Iy(),
pad->Charge()));
fPreCluster->Pad(indx)->Release();
}
}
- for ( Int_t i = 0; i <= toBeRemoved.GetLast(); ++i )
+ Int_t nRemove = toBeRemoved.GetEntriesFast();
+ for ( Int_t i = 0; i < nRemove; ++i )
{
- cluster->RemovePad(static_cast<AliMUONPad*>(toBeRemoved.At(i)));
+ cluster->RemovePad(static_cast<AliMUONPad*>(toBeRemoved.UncheckedAt(i)));
}
delete[] dist;
}
delete[] flags;
AliDebug(2,"End of CheckPreClusterTwoCathodes=");
-// StdoutToAliDebug(2,cluster->Print("full"));
+ //StdoutToAliDebug(2,cluster->Print("full"));
return cluster;
}
if ( AliMUONPad::AreOverlapping(pi,pj,fgkDecreaseSize,area) )
{
AliInfo(Form("The following 2 pixels (%d and %d) overlap !",i,j));
+ /*
StdoutToAliInfo(pixelI->Print();
cout << " Surface = " << pixelI->Size(0)*pixelI->Size(1)*4 << endl;
pixelJ->Print();
cout << " Surface = " << pixelJ->Size(0)*pixelJ->Size(1)*4 << endl;
- cout << " Area surface = " << area.Dimensions().X()*area.Dimensions().Y()*4 << endl;
+ cout << " Area surface = " << area.GetDimensionX()*area.GetDimensionY()*4 << endl;
cout << "-------" << endl;
);
-
+ */
}
}
}
}
fPixArray->Delete();
-
- if ( !cluster.Multiplicity(0) || !cluster.Multiplicity(1) )
- {
- BuildPixArrayOneCathode(cluster);
- }
- else
- {
- BuildPixArrayTwoCathodes(cluster);
- }
-
- fPixArray->Sort(); // FIXME : not really needed, only to compare with ClusterFinderAZ
+ BuildPixArrayOneCathode(cluster);
Int_t nPix = fPixArray->GetLast()+1;
- AliDebug(2,Form("nPix after BuildPixArray=%d",nPix));
-
- Double_t xPadMin(1E9);
- Double_t yPadMin(1E9);
-
- for ( Int_t i = 0; i < cluster.Multiplicity(); ++i )
- {
- AliMUONPad* pad = cluster.Pad(i);
- xPadMin = TMath::Min (xPadMin, pad->DX());
- yPadMin = TMath::Min (yPadMin, pad->DY());
- }
-
- Double_t wxmin(1E9);
- Double_t wymin(1E9);
-
- for ( Int_t i = 0; i < nPix; ++i )
- {
- AliMUONPad* pixPtr = Pixel(i);
- wxmin = TMath::Min(wxmin, pixPtr->Size(0));
- wymin = TMath::Min(wymin, pixPtr->Size(1));
- }
-
- wxmin = TMath::Abs (wxmin - xPadMin/2) > 0.001 ? xPadMin : xPadMin / 2;
- wymin = TMath::Abs (wymin - yPadMin/2) > 0.001 ? yPadMin : yPadMin / 2;
-
- // Check if small pixel X-size
- AdjustPixel(cluster,wxmin, 0);
- // Check if small pixel Y-size
- AdjustPixel(cluster,wymin, 1);
- // Check if large pixel size
- AdjustPixel(wxmin, wymin);
+// AliDebug(2,Form("nPix after BuildPixArray=%d",nPix));
- // Remove discarded pixels
- for (Int_t i=0; i<nPix; ++i)
+ if ( nPix > npad )
{
- AliMUONPad* pixPtr = Pixel(i);
- if (pixPtr->Charge() < 1)
- {
- AliDebug(2,Form("Removing pixel %d with charge<1 : ",i));
-// StdoutToAliDebug(2,pixPtr->Print());
- RemovePixel(i);
- }
- }
-
- fPixArray->Compress();
- nPix = fPixArray->GetEntriesFast();
-
- AliDebug(2,Form("nPix after AdjustPixel=%d",nPix));
-
- if ( nPix > cluster.Multiplicity() )
- {
- AliDebug(2,Form("Will trim number of pixels to number of pads"));
+// AliDebug(2,Form("Will trim number of pixels to number of pads"));
// Too many pixels - sort and remove pixels with the lowest signal
fPixArray->Sort();
- for ( Int_t i = cluster.Multiplicity(); i<nPix; ++i )
+ for ( Int_t i = npad; i < nPix; ++i )
{
RemovePixel(i);
}
fPixArray->Compress();
- nPix = fPixArray->GetEntriesFast();
} // if (nPix > npad)
// StdoutToAliDebug(2,cout << "End of BuildPixelArray:" << endl;
// fPixArray->Print(););
-// CheckOverlaps();//FIXME : this is for debug only. Remove it.
+ //CheckOverlaps();//FIXME : this is for debug only. Remove it.
}
//_____________________________________________________________________________
void AliMUONClusterFinderMLEM::BuildPixArrayOneCathode(AliMUONCluster& cluster)
{
- /// From a single-cathode cluster, build the pixel array
+ /// Build the pixel array
- AliDebug(2,Form("cluster.Multiplicity=%d",cluster.Multiplicity()));
+// AliDebug(2,Form("cluster.Multiplicity=%d",cluster.Multiplicity()));
- for ( Int_t j=0; j<cluster.Multiplicity(); ++j)
- {
- AliMUONPad* pad = cluster.Pad(j);
- AliMUONPad* pixPtr = new AliMUONPad(pad->Position(),pad->Dimensions(),
- pad->Charge());
- fPixArray->Add(pixPtr);
- }
-}
-
-//_____________________________________________________________________________
-void AliMUONClusterFinderMLEM::BuildPixArrayTwoCathodes(AliMUONCluster& cluster)
-{
- /// From a two-cathodes cluster, build the pixel array
-
- AliDebug(2,Form("cluster.Multiplicity=%d",cluster.Multiplicity()));
-
- Int_t i1 = cluster.Pad(0)->Cathode();
- Int_t i2 = TMath::Even(i1);
-
- for ( Int_t i = 0; i < cluster.Multiplicity(); ++i)
- {
- AliMUONPad* padi = cluster.Pad(i);
- if (padi->Cathode() != i1) continue;
+ TVector2 dim = cluster.MinPadDimensions (-1, kFALSE);
+ Double_t width[2] = {dim.X(), dim.Y()}, xy0[2]={99999,99999};
+ Int_t found[2] = {0,0}, mult = cluster.Multiplicity();
- for ( Int_t j = 1; j < cluster.Multiplicity(); ++j)
- {
- AliMUONPad* padj = cluster.Pad(j);
- if (padj->Cathode() != i2) continue;
-
- AliMpArea overlap;
-
- if ( AliMUONPad::AreOverlapping(*padi,*padj,fgkDecreaseSize,overlap) )
- {
- AliMUONPad* pixPtr = new AliMUONPad(overlap.Position(),
- overlap.Dimensions(),
- TMath::Min(padi->Charge(),padj->Charge()));
- if ( ( padi->Charge() <= padj->Charge() && padi->IsSaturated() ) ||
- ( padj->Charge() < padi->Charge() && padj->IsSaturated() ) )
- {
- // if smallest charge of the 2 pads is already above saturation, then
- // the pixel is saturated...
- pixPtr->SetSaturated(kTRUE);
- }
- pixPtr->SetReal(kFALSE);
- fPixArray->Add(pixPtr);
+ for ( Int_t i = 0; i < mult; ++i) {
+ AliMUONPad* pad = cluster.Pad(i);
+ for (Int_t j = 0; j < 2; ++j) {
+ if (found[j] == 0 && TMath::Abs(pad->Size(j)-width[j]) < fgkDistancePrecision) {
+ xy0[j] = pad->Coord(j);
+ found[j] = 1;
}
- }
- }
-}
+ }
+ if (found[0] && found[1]) break;
+ }
-//_____________________________________________________________________________
-void AliMUONClusterFinderMLEM::AdjustPixel(AliMUONCluster& cluster,
- Float_t width, Int_t ixy)
-{
- /// Check if some pixels have small size (adjust if necessary)
+ Double_t min[2], max[2];
+ Int_t cath0 = 0, cath1 = 1;
+ if (cluster.Multiplicity(0) == 0) cath0 = 1;
+ else if (cluster.Multiplicity(1) == 0) cath1 = 0;
+
+
+ Double_t leftDownX, leftDownY;
+ cluster.Area(cath0).LeftDownCorner(leftDownX, leftDownY);
+ Double_t rightUpX, rightUpY;
+ cluster.Area(cath0).RightUpCorner(rightUpX, rightUpY);
+ min[0] = leftDownX;
+ min[1] = leftDownY;
+ max[0] = rightUpX;
+ max[1] = rightUpY;;
+ if (cath1 != cath0) {
+ cluster.Area(cath1).LeftDownCorner(leftDownX, leftDownY);
+ cluster.Area(cath1).RightUpCorner(rightUpX, rightUpY);
+ min[0] = TMath::Max (min[0], leftDownX);
+ min[1] = TMath::Max (min[1], leftDownY);
+ max[0] = TMath::Min (max[0], rightUpX);
+ max[1] = TMath::Min (max[1], rightUpY);
+ }
- AliDebug(2,Form("width=%e ixy=%d",width,ixy));
-
- AliMUONPad *pixPtr, *pixPtr1 = 0;
- Int_t ixy1 = TMath::Even(ixy);
- Int_t nPix = fPixArray->GetEntriesFast();
+ // Adjust limits
+ //width[0] /= 2; width[1] /= 2; // just for check
+ Int_t nbins[2]={0,0};
+ for (Int_t i = 0; i < 2; ++i) {
+ Double_t dist = (min[i] - xy0[i]) / width[i] / 2;
+ if (TMath::Abs(dist) < 1.e-6) dist = -1.e-6;
+ min[i] = xy0[i] + (TMath::Nint(dist-TMath::Sign(1.e-6,dist))
+ + TMath::Sign(0.5,dist)) * width[i] * 2;
+ nbins[i] = TMath::Nint ((max[i] - min[i]) / width[i] / 2);
+ if (nbins[i] == 0) ++nbins[i];
+ max[i] = min[i] + nbins[i] * width[i] * 2;
+ //cout << dist << " " << min[i] << " " << max[i] << " " << nbins[i] << endl;
+ }
- for (Int_t i=0; i<nPix; i++)
- {
- pixPtr = Pixel(i);
- if (pixPtr->Charge() < 1) continue; // discarded pixel
- if (pixPtr->Size(ixy)-width < -1.e-4)
- {
- // try to merge
- for (Int_t j=i+1; j<nPix; j++)
- {
- pixPtr1 = Pixel(j);
- if (pixPtr1->Charge() < 1) continue; // discarded pixel
- if (TMath::Abs(pixPtr1->Size(ixy)-width) < fgkDistancePrecision) continue; // right size
- if (TMath::Abs(pixPtr1->Coord(ixy1)-pixPtr->Coord(ixy1)) > fgkDistancePrecision) continue; // different rows/columns
- if (TMath::Abs(pixPtr1->Coord(ixy)-pixPtr->Coord(ixy)) < 2*width)
- {
- // merge
- Double_t tmp = pixPtr->Coord(ixy) + pixPtr1->Size(ixy)*
- TMath::Sign (1., pixPtr1->Coord(ixy) - pixPtr->Coord(ixy));
- pixPtr->SetCoord(ixy, tmp);
- pixPtr->SetSize(ixy, width);
- pixPtr->SetCharge(TMath::Min (pixPtr->Charge(),pixPtr1->Charge()));
- pixPtr1->SetCharge(0);
- pixPtr1 = 0;
- break;
- }
- } // for (Int_t j=i+1;
- if (pixPtr1 || i == nPix-1)
- {
- // edge pixel - just increase its size
- for (Int_t j=0; j<cluster.Multiplicity(); ++j)
- {
- AliMUONPad* pad = cluster.Pad(j);
- Double_t d = ( ixy == 0 ) ? pad->X() : ( ixy == 1 ) ? pad->Y() : -1E9;
-
- if (pixPtr->Coord(ixy) < d)
- {
- pixPtr->Shift(ixy, pixPtr->Size(ixy)-width);
- }
- else
- {
- pixPtr->Shift(ixy, -pixPtr->Size(ixy)+width);
- }
- pixPtr->SetSize(ixy, width);
- break;
- }
+ // Book histogram
+ TH2D *hist1 = new TH2D ("Grid", "", nbins[0], min[0], max[0], nbins[1], min[1], max[1]);
+ TH2D *hist2 = new TH2D ("Entries", "", nbins[0], min[0], max[0], nbins[1], min[1], max[1]);
+ TAxis *xaxis = hist1->GetXaxis();
+ TAxis *yaxis = hist1->GetYaxis();
+
+ // Fill histogram
+ for ( Int_t i = 0; i < mult; ++i) {
+ AliMUONPad* pad = cluster.Pad(i);
+ Int_t ix0 = xaxis->FindBin(pad->X());
+ Int_t iy0 = yaxis->FindBin(pad->Y());
+ PadOverHist(0, ix0, iy0, pad, hist1, hist2);
+ }
+
+ // Store pixels
+ for (Int_t i = 1; i <= nbins[0]; ++i) {
+ Double_t x = xaxis->GetBinCenter(i);
+ for (Int_t j = 1; j <= nbins[1]; ++j) {
+ if (hist2->GetCellContent(i,j) < 0.1) continue;
+ //if (hist2->GetCellContent(i,j) < 1.1 && cluster.Multiplicity(0) &&
+ // cluster.Multiplicity(1)) continue;
+ if (cath0 != cath1) {
+ // Two-sided cluster
+ Double_t cont = hist2->GetCellContent(i,j);
+ if (cont < 999.) continue;
+ if (cont-Int_t(cont/1000.)*1000. < 0.5) continue;
}
- } // if (pixPtr->Size(ixy)-width < -1.e-4)
- } // for (Int_t i=0; i<nPix;
+ Double_t y = yaxis->GetBinCenter(j);
+ Double_t charge = hist1->GetCellContent(i,j);
+ AliMUONPad* pixPtr = new AliMUONPad(x, y, width[0], width[1], charge);
+ fPixArray->Add(pixPtr);
+ }
+ }
+ //*
+ if (fPixArray->GetEntriesFast() == 1) {
+ // Split pixel into 2
+ AliMUONPad* pixPtr = static_cast<AliMUONPad*> (fPixArray->UncheckedAt(0));
+ pixPtr->SetSize(0,width[0]/2.);
+ pixPtr->Shift(0,-width[0]/4.);
+ pixPtr = new AliMUONPad(pixPtr->X()+width[0], pixPtr->Y(), width[0]/2., width[1], pixPtr->Charge());
+ fPixArray->Add(pixPtr);
+ }
+ //*/
+ //fPixArray->Print();
+ delete hist1;
+ delete hist2;
}
//_____________________________________________________________________________
-void AliMUONClusterFinderMLEM::AdjustPixel(Double_t wxmin, Double_t wymin)
+void AliMUONClusterFinderMLEM::PadOverHist(Int_t idir, Int_t ix0, Int_t iy0, AliMUONPad *pad,
+ TH2D *hist1, TH2D *hist2)
{
-/// Check if some pixels have large size (adjust if necessary)
-
- AliDebug(2,Form("wxmin=%e wymin=%e",wxmin,wymin));
-
- Int_t n1[2], n2[2], iOK = 1, nPix = fPixArray->GetEntriesFast();
- AliMUONPad *pixPtr, pix;
- Double_t xy0[2] = {9999, 9999}, wxy[2], dist[2] = {0};
-
- // Check if large pixel size
- for (Int_t i = 0; i < nPix; i++) {
- pixPtr = (AliMUONPad*) fPixArray->UncheckedAt(i);
- if (pixPtr->Charge() < 1) continue; // discarded pixel
- if (pixPtr->Size(0) - wxmin < 1.e-4) {
- if (xy0[0] > 9998) xy0[0] = pixPtr->Coord(0); // position of a "normal" pixel
- if (pixPtr->Size(1) - wymin < 1.e-4) {
- if (xy0[1] > 9998) xy0[1] = pixPtr->Coord(1); // position of a "normal" pixel
- continue;
- } else iOK = 0; // large pixel
- } else {
- iOK = 0; // large pixel
- if (xy0[1] > 9998 && pixPtr->Size(1) - wymin < 1.e-4) xy0[1] = pixPtr->Coord(1); // "normal" pixel
- }
- if (xy0[0] < 9998 && xy0[1] < 9998) break;
+ /// "Span" pad over histogram in the direction idir
+
+ TAxis *axis = idir == 0 ? hist1->GetXaxis() : hist1->GetYaxis();
+ Int_t nbins = axis->GetNbins(), cath = pad->Cathode();
+ Double_t bin = axis->GetBinWidth(1), amask = TMath::Power(1000.,cath*1.);
+
+ Int_t nbinPad = (Int_t)(pad->Size(idir)/bin*2+fgkDistancePrecision) + 1; // number of bins covered by pad
+
+ for (Int_t i = 0; i < nbinPad; ++i) {
+ Int_t ixy = idir == 0 ? ix0 + i : iy0 + i;
+ if (ixy > nbins) break;
+ Double_t lowEdge = axis->GetBinLowEdge(ixy);
+ if (lowEdge + fgkDistancePrecision > pad->Coord(idir) + pad->Size(idir)) break;
+ if (idir == 0) PadOverHist(1, ixy, iy0, pad, hist1, hist2); // span in the other direction
+ else {
+ // Fill histogram
+ Double_t cont = pad->Charge();
+ if (hist2->GetCellContent(ix0, ixy) > 0.1)
+ cont = TMath::Min (hist1->GetCellContent(ix0, ixy), cont);
+ hist1->SetCellContent(ix0, ixy, cont);
+ //hist2->SetCellContent(ix0, ixy, hist2->GetCellContent(ix0, ixy)+1);
+ hist2->SetCellContent(ix0, ixy, hist2->GetCellContent(ix0, ixy)+amask);
+ }
}
- if (iOK) return;
- wxy[0] = wxmin;
- wxy[1] = wymin;
- //cout << xy0[0] << " " << xy0[1] << endl;
- for (Int_t i = 0; i < nPix; i++) {
- pixPtr = (AliMUONPad*) fPixArray->UncheckedAt(i);
- if (pixPtr->Charge() < 1) continue; // discarded pixel
- n1[0] = n1[1] = 999;
- n2[0] = n2[1] = 1;
- for (Int_t j = 0; j < 2; j++) {
- if (pixPtr->Size(j) - wxy[j] < 1.e-4) continue;
- dist[j] = (pixPtr->Coord(j) - xy0[j]) / wxy[j] / 2; // normalized distance to "normal" pixel
- n2[j] = TMath::Nint (pixPtr->Size(j) / wxy[j]);
- n1[j] = n2[j] == 1 ? TMath::Nint(dist[j]) : (Int_t)dist[j];
- }
- if (n1[0] > 998 && n1[1] > 998) continue;
- if (fDebug) cout << " Different " << pixPtr->Size(0) << " " << wxy[0] << " "
- << pixPtr->Size(1) << " " << wxy[1] <<endl;
-
- if (n2[0] > 2 || n2[1] > 2) {
- //cout << n2[0] << " " << n2[1] << endl;
- if (n2[0] > 2 && n1[0] < 999) n1[0]--;
- if (n2[1] > 2 && n1[1] < 999) n1[1]--;
- }
- //cout << n1[0] << " " << n2[0] << " " << n1[1] << " " << n2[1] << endl;
- pix = *pixPtr;
- pix.SetSize(0, wxy[0]); pix.SetSize(1, wxy[1]);
- //pixPtr->Print();
- for (Int_t ii = 0; ii < n2[0]; ii++) {
- if (n1[0] < 999) pix.SetCoord(0, xy0[0] + (n1[0] + TMath::Sign(1.,dist[0]) * ii) * 2 * wxy[0]);
- for (Int_t jj = 0; jj < n2[1]; jj++) {
- if (n1[1] < 999) pix.SetCoord(1, xy0[1] + (n1[1] + TMath::Sign(1.,dist[1]) * jj) * 2 * wxy[1]);
- fPixArray->Add(new AliMUONPad(pix));
- //pix.Print();
- }
+ for (Int_t i = -1; i > -nbinPad; --i) {
+ Int_t ixy = idir == 0 ? ix0 + i : iy0 + i;
+ if (ixy < 1) break;
+ Double_t upEdge = axis->GetBinUpEdge(ixy);
+ if (upEdge - fgkDistancePrecision < pad->Coord(idir) - pad->Size(idir)) break;
+ if (idir == 0) PadOverHist(1, ixy, iy0, pad, hist1, hist2); // span in the other direction
+ else {
+ // Fill histogram
+ Double_t cont = pad->Charge();
+ if (hist2->GetCellContent(ix0, ixy) > 0.1)
+ cont = TMath::Min (hist1->GetCellContent(ix0, ixy), cont);
+ hist1->SetCellContent(ix0, ixy, cont);
+ //hist2->SetCellContent(ix0, ixy, hist2->GetCellContent(ix0, ixy)+1);
+ hist2->SetCellContent(ix0, ixy, hist2->GetCellContent(ix0, ixy)+amask);
}
- pixPtr->SetCharge(0);
- } // for (Int_t i = 0; i < nPix;
+ }
}
//_____________________________________________________________________________
void
-AliMUONClusterFinderMLEM::Plot(const char* basename)
+AliMUONClusterFinderMLEM::Plot(const char* /*basename*/)
{
/// Make a plot and save it as png
return; //AZ
- if (!fPlot) return;
-
- TCanvas* c = new TCanvas("MLEM","MLEM",800,600);
- c->Draw();
- Draw();
- c->Modified();
- c->Update();
- c->Print(Form("%s.EVT%d.DE%d.CLU%d.png",basename,fEventNumber,
- fDetElemId,fClusterNumber));
+// if (!fPlot) return;
+//
+// TCanvas* c = new TCanvas("MLEM","MLEM",800,600);
+// c->Draw();
+// Draw();
+// c->Modified();
+// c->Update();
+// c->Print(Form("%s.EVT%d.DE%d.CLU%d.png",basename,fEventNumber,
+// fDetElemId,fClusterNumber));
}
//_____________________________________________________________________________
{
/// Compute coefficients needed for MLEM algorithm
+ Int_t npadTot = cluster.Multiplicity();
Int_t nPix = fPixArray->GetLast()+1;
- memset(probi,0,nPix*sizeof(Double_t));
+ //memset(probi,0,nPix*sizeof(Double_t));
+ for (Int_t j = 0; j < npadTot*nPix; ++j) coef[j] = 0.;
+ for (Int_t j = 0; j < nPix; ++j) probi[j] = 0.;
- for ( Int_t j=0; j<cluster.Multiplicity(); ++j )
+ Int_t mult = cluster.Multiplicity();
+ for ( Int_t j = 0; j < mult; ++j )
{
AliMUONPad* pad = cluster.Pad(j);
Int_t indx = j*nPix;
- for ( Int_t ipix=0; ipix<nPix; ++ipix )
+ for ( Int_t ipix = 0; ipix < nPix; ++ipix )
{
Int_t indx1 = indx + ipix;
- if (pad->Status() < 0)
+ //if (pad->Status() < 0)
+ if (pad->Status() != fgkZero)
{
coef[indx1] = 0;
continue;
// coef is the charge (given by Mathieson integral) on pad, assuming
// the Mathieson is center at pixel.
coef[indx1] = fSplitter->ChargeIntegration(pixPtr->Coord(0), pixPtr->Coord(1), *pad);
- AliDebug(2,Form("pad=(%d,%d,%e,%e,%e,%e) pix=(%e,%e,%e,%e) coef %e",
- pad->Ix(),pad->Iy(),
- pad->X(),pad->Y(),
- pad->DX(),pad->DY(),
- pixPtr->Coord(0),pixPtr->Coord(1),
- pixPtr->Size(0),pixPtr->Size(1),
- coef[indx1]));
+// AliDebug(2,Form("pad=(%d,%d,%e,%e,%e,%e) pix=(%e,%e,%e,%e) coef %e",
+// pad->Ix(),pad->Iy(),
+// pad->X(),pad->Y(),
+// pad->DX(),pad->DY(),
+// pixPtr->Coord(0),pixPtr->Coord(1),
+// pixPtr->Size(0),pixPtr->Size(1),
+// coef[indx1]));
probi[ipix] += coef[indx1];
}
{
/// Repeat MLEM algorithm until pixel size becomes sufficiently small
+ // AliCodeTimerAuto("",0)
+
Int_t nPix = fPixArray->GetLast()+1;
AliDebug(2,Form("nPix=%d iSimple=%d, precluster=",nPix,iSimple));
-// StdoutToAliDebug(2,cluster.Print("full"););
+ //StdoutToAliDebug(2,cluster.Print("full"););
if ( nPix < 0 )
{
Int_t npadOK = 0;
for (Int_t i = 0; i < npadTot; ++i)
{
- if (cluster.Pad(i)->Status() == 0) ++npadOK;
+ //if (cluster.Pad(i)->Status() == 0) ++npadOK;
+ if (cluster.Pad(i)->Status() == fgkZero) ++npadOK;
}
- TH2D* mlem(0x0);
Double_t* coef(0x0);
Double_t* probi(0x0);
- Int_t lc(0); // loop counter (for debug)
-
-// Plot("mlem.start");
+ Int_t lc(0); // loop counter
+ //Plot("mlem.start");
+ AliMUONPad* pixPtr = Pixel(0);
+ Double_t xylim[4] = {pixPtr->X(), -pixPtr->X(), pixPtr->Y(), -pixPtr->Y()};
+
while (1)
{
++lc;
- mlem = (TH2D*) gROOT->FindObject("mlem");
- delete mlem;
+ delete fHistMlem;
+ fHistMlem = 0x0;
AliDebug(2,Form("lc %d nPix %d(%d) npadTot %d npadOK %d",lc,nPix,fPixArray->GetLast()+1,npadTot,npadOK));
AliDebug(2,Form("EVT%d PixArray=",fEventNumber));
-// StdoutToAliDebug(2,fPixArray->Print("","full"));
+ //StdoutToAliDebug(2,fPixArray->Print("full"));
coef = new Double_t [npadTot*nPix];
probi = new Double_t [nPix];
// Calculate coefficients and pixel visibilities
ComputeCoefficients(cluster,coef,probi);
- for (Int_t ipix=0; ipix<nPix; ++ipix)
+ for (Int_t ipix = 0; ipix < nPix; ++ipix)
{
if (probi[ipix] < 0.01)
{
AliMUONPad* pixel = Pixel(ipix);
AliDebug(2,Form("Setting the following pixel to invisible as its probi<0.01:"));
-// StdoutToAliDebug(2,cout << Form(" -- ipix %3d --- "); pixel->Print(););
+ //StdoutToAliDebug(2,cout << Form(" -- ipix %3d --- "); pixel->Print(););
pixel->SetCharge(0); // "invisible" pixel
}
}
// MLEM algorithm
Mlem(cluster,coef, probi, 15);
- Double_t xylim[4] = {999, 999, 999, 999};
- AliMUONPad* pixPtr(0x0);
-
- for ( Int_t ipix=0; ipix<nPix; ++ipix )
- {
- pixPtr = Pixel(ipix);
- for ( Int_t i=0; i<4; ++i )
- {
- xylim[i] = TMath::Min (xylim[i], (i%2 ? -1 : 1)*pixPtr->Coord(i/2));
- }
- }
- for (Int_t i=0; i<4; i++)
+ // Find histogram limits for the 1'st pass only - for others computed below
+ if (lc == 1) {
+ for ( Int_t ipix = 1; ipix < nPix; ++ipix )
+ {
+ pixPtr = Pixel(ipix);
+ for ( Int_t i = 0; i < 2; ++i )
+ {
+ Int_t indx = i * 2;
+ if (pixPtr->Coord(i) < xylim[indx]) xylim[indx] = pixPtr->Coord(i);
+ else if (-pixPtr->Coord(i) < xylim[indx+1]) xylim[indx+1] = -pixPtr->Coord(i);
+ }
+ }
+ } else pixPtr = Pixel(0);
+
+ for (Int_t i = 0; i < 4; i++)
{
xylim[i] -= pixPtr->Size(i/2);
}
-
Int_t nx = TMath::Nint ((-xylim[1]-xylim[0])/pixPtr->Size(0)/2);
Int_t ny = TMath::Nint ((-xylim[3]-xylim[2])/pixPtr->Size(1)/2);
-// StdoutToAliDebug(2,cout << "pixel used for nx,ny computation : "; pixPtr->Print(););
+ //StdoutToAliDebug(2,cout << "pixel used for nx,ny computation : "; pixPtr->Print(););
AliDebug(2,Form("lc %d pixPtr size = %e,%e nx,ny=%d,%d xylim=%e,%e,%e,%e",
lc,pixPtr->Size(0),pixPtr->Size(1),nx,ny,
xylim[0],-xylim[1],xylim[2],-xylim[3]
));
- mlem = new TH2D("mlem","mlem",nx,xylim[0],-xylim[1],ny,xylim[2],-xylim[3]);
+ AliDebug(2,Form("LowestPadCharge=%e",fLowestPadCharge));
+
+ delete fHistMlem;
+
+ fHistMlem = new TH2D("mlem","mlem",nx,xylim[0],-xylim[1],ny,xylim[2],-xylim[3]);
- for (Int_t ipix=0; ipix<nPix; ++ipix)
+ for (Int_t ipix = 0; ipix < nPix; ++ipix)
{
- AliMUONPad* pixPtr = Pixel(ipix);
- mlem->Fill(pixPtr->Coord(0),pixPtr->Coord(1),pixPtr->Charge());
+ AliMUONPad* pixPtr2 = Pixel(ipix);
+ fHistMlem->Fill(pixPtr2->Coord(0),pixPtr2->Coord(1),pixPtr2->Charge());
}
// Check if the total charge of pixels is too low
Double_t qTot = 0;
- for ( Int_t i=0; i<nPix; ++i)
+ for ( Int_t i = 0; i < nPix; ++i)
{
qTot += Pixel(i)->Charge();
}
- if ( qTot < 1.e-4 || ( npadOK < 3 && qTot < 7 ) )
+ if ( qTot < 1.e-4 || ( npadOK < 3 && qTot < fLowestClusterCharge ) )
{
AliDebug(1,Form("Deleting the above cluster (charge %e too low, npadOK=%d)",qTot,npadOK));
delete [] coef;
delete [] probi;
- coef = 0;
- probi = 0;
fPixArray->Delete();
- for ( Int_t i=0; i<npadTot; ++i)
+ for ( Int_t i = 0; i < npadTot; ++i)
{
AliMUONPad* pad = cluster.Pad(i);
- if ( pad->Status() == 0) pad->SetStatus(-1);
+ //if ( pad->Status() == 0) pad->SetStatus(-1);
+ if ( pad->Status() == fgkZero) pad->SetStatus(fgkOver);
}
return kFALSE;
}
Simple(cluster);
delete [] coef;
delete [] probi;
- coef = 0;
- probi = 0;
fPixArray->Delete();
return kTRUE;
}
// Calculate position of the center-of-gravity around the maximum pixel
Double_t xyCOG[2];
- FindCOG(mlem, xyCOG);
+ FindCOG(xyCOG);
if (TMath::Min(pixPtr->Size(0),pixPtr->Size(1)) < 0.07 &&
pixPtr->Size(0) > pixPtr->Size(1)) break;
// Sort pixels according to the charge
+ MaskPeaks(1); // mask local maxima
fPixArray->Sort();
+ MaskPeaks(0); // unmask local maxima
Double_t pixMin = 0.01*Pixel(0)->Charge();
- pixMin = TMath::Min(pixMin,50.);
+ pixMin = TMath::Min(pixMin,100*fLowestPixelCharge);
// Decrease pixel size and shift pixels to make them centered at
// the maximum one
Int_t ix(1);
Double_t width = 0;
Double_t shift[2] = { 0.0, 0.0 };
- for (Int_t i=0; i<4; i++) xylim[i] = 999;
+ for (Int_t i = 0; i < 4; ++i) xylim[i] = 999;
Int_t nPix1 = nPix;
nPix = 0;
- for (Int_t ipix=0; ipix<nPix1; ++ipix)
+ for (Int_t ipix = 0; ipix < nPix1; ++ipix)
{
- AliMUONPad* pixPtr = Pixel(ipix);
+ AliMUONPad* pixPtr2 = Pixel(ipix);
if ( nPix >= npadOK // too many pixels already
||
- pixPtr->Charge() < pixMin // too low charge
+ ((pixPtr2->Charge() < pixMin) && (pixPtr2->Status() != fgkMustKeep)) // too low charge
)
{
RemovePixel(ipix);
continue;
}
- for (Int_t i=0; i<2; ++i)
+ for (Int_t i = 0; i < 2; ++i)
{
if (!i)
{
- pixPtr->SetCharge(10);
- pixPtr->SetSize(indx, pixPtr->Size(indx)/2);
- width = -pixPtr->Size(indx);
- pixPtr->Shift(indx, width);
+ pixPtr2->SetCharge(fLowestPadCharge);
+ pixPtr2->SetSize(indx, pixPtr2->Size(indx)/2);
+ width = -pixPtr2->Size(indx);
+ pixPtr2->Shift(indx, width);
// Shift pixel position
if (ix)
{
ix = 0;
- for (Int_t j=0; j<2; ++j)
+ for (Int_t j = 0; j < 2; ++j)
{
- shift[j] = pixPtr->Coord(j) - xyCOG[j];
- shift[j] -= ((Int_t)(shift[j]/pixPtr->Size(j)/2))*pixPtr->Size(j)*2;
+ shift[j] = pixPtr2->Coord(j) - xyCOG[j];
+ shift[j] -= ((Int_t)(shift[j]/pixPtr2->Size(j)/2))*pixPtr2->Size(j)*2;
}
} // if (ix)
- pixPtr->Shift(0, -shift[0]);
- pixPtr->Shift(1, -shift[1]);
+ pixPtr2->Shift(0, -shift[0]);
+ pixPtr2->Shift(1, -shift[1]);
+ ++nPix;
}
- else
+ else if (nPix < npadOK)
{
- pixPtr = new AliMUONPad(*pixPtr);
- pixPtr->Shift(indx, -2*width);
- fPixArray->Add(pixPtr);
+ pixPtr2 = new AliMUONPad(*pixPtr2);
+ pixPtr2->Shift(indx, -2*width);
+ pixPtr2->SetStatus(fgkZero);
+ fPixArray->Add(pixPtr2);
+ ++nPix;
}
- for (Int_t i=0; i<4; ++i)
+ else continue; // skip adjustment of histo limits
+ for (Int_t j = 0; j < 4; ++j)
{
- xylim[i] = TMath::Min (xylim[i], (i%2 ? -1 : 1)*pixPtr->Coord(i/2));
+ xylim[j] = TMath::Min (xylim[j], (j%2 ? -1 : 1)*pixPtr2->Coord(j/2));
}
} // for (Int_t i=0; i<2;
- nPix += 2;
} // for (Int_t ipix=0;
fPixArray->Compress();
- nPix = fPixArray->GetEntriesFast();
AliDebug(2,Form("After shift:"));
-// StdoutToAliDebug(2,fPixArray->Print("","full"););
-// Plot(Form("mlem.lc%d",lc+1));
+ //StdoutToAliDebug(2,fPixArray->Print("","full"););
+ //Plot(Form("mlem.lc%d",lc+1));
AliDebug(2,Form(" xyCOG=%9.6f %9.6f xylim=%9.6f,%9.6f,%9.6f,%9.6f",
xyCOG[0],xyCOG[1],
xylim[0],xylim[1],
xylim[2],xylim[3]));
- // Remove excessive pixels
- if (nPix > npadOK)
- {
- for (Int_t ipix=npadOK; ipix<nPix; ++ipix)
- {
- RemovePixel(ipix);
- }
- }
- else
+ if (nPix < npadOK)
{
- AliMUONPad* pixPtr = Pixel(0);
- // add pixels if the maximum is at the limit of pixel area
+ AliMUONPad* pixPtr2 = Pixel(0);
+ // add pixels if the maximum is at the limit of pixel area:
// start from Y-direction
Int_t j = 0;
- for (Int_t i=3; i>-1; --i)
+ for (Int_t i = 3; i > -1; --i)
{
if (nPix < npadOK &&
- TMath::Abs((i%2 ? -1 : 1)*xylim[i]-xyCOG[i/2]) < pixPtr->Size(i/2))
+ TMath::Abs((i%2 ? -1 : 1)*xylim[i]-xyCOG[i/2]) < pixPtr2->Size(i/2))
{
- AliMUONPad* p = static_cast<AliMUONPad*>(pixPtr->Clone());
- p->SetCoord(i/2, xyCOG[i/2]+(i%2 ? 2:-2)*pixPtr->Size(i/2));
+ //AliMUONPad* p = static_cast<AliMUONPad*>(pixPtr->Clone());
+ AliMUONPad* p = new AliMUONPad(*pixPtr2);
+ p->SetCoord(i/2, xyCOG[i/2]+(i%2 ? 2:-2)*pixPtr2->Size(i/2));
+ xylim[i] = p->Coord(i/2) * (i%2 ? -1 : 1); // update histo limits
j = TMath::Even (i/2);
p->SetCoord(j, xyCOG[j]);
AliDebug(2,Form("Adding pixel on the edge (i=%d) ",i));
-// StdoutToAliDebug(2,cout << " ---- ";
-// p->Print("corners"););
+ //StdoutToAliDebug(2,cout << " ---- ";
+ // p->Print("corners"););
fPixArray->Add(p);
++nPix;
}
}
}
- fPixArray->Compress();
nPix = fPixArray->GetEntriesFast();
delete [] coef;
delete [] probi;
- coef = 0;
- probi = 0;
} // while (1)
AliDebug(2,Form("At the end of while loop nPix=%d : ",fPixArray->GetLast()+1));
-// StdoutToAliDebug(2,fPixArray->Print("","full"););
+ //StdoutToAliDebug(2,fPixArray->Print("","full"););
// remove pixels with low signal or low visibility
// Cuts are empirical !!!
- Double_t thresh = TMath::Max (mlem->GetMaximum()/100.,1.);
- thresh = TMath::Min (thresh,50.);
- Double_t cmax = -1;
+ Double_t thresh = TMath::Max (fHistMlem->GetMaximum()/100.,2.0*fLowestPixelCharge);
+ thresh = TMath::Min (thresh,100.0*fLowestPixelCharge);
Double_t charge = 0;
- for ( Int_t i=0; i<nPix; ++i)
- {
- cmax = TMath::Max (cmax,probi[i]);
- }
-
// Mark pixels which should be removed
- for (Int_t i=0; i<nPix; ++i)
+ for (Int_t i = 0; i < nPix; ++i)
{
- AliMUONPad* pixPtr = Pixel(i);
- charge = pixPtr->Charge();
+ AliMUONPad* pixPtr2 = Pixel(i);
+ charge = pixPtr2->Charge();
if (charge < thresh)
{
- pixPtr->SetCharge(-charge);
+ pixPtr2->SetCharge(-charge);
}
}
// Move charge of removed pixels to their nearest neighbour (to keep total charge the same)
Int_t near = 0;
- for (Int_t i=0; i<nPix; ++i)
+ for (Int_t i = 0; i < nPix; ++i)
{
- AliMUONPad* pixPtr = Pixel(i);
- charge = pixPtr->Charge();
+ AliMUONPad* pixPtr2 = Pixel(i);
+ charge = pixPtr2->Charge();
if (charge > 0) continue;
- near = FindNearest(pixPtr);
- pixPtr->SetCharge(0);
+ near = FindNearest(pixPtr2);
+ pixPtr2->SetCharge(0);
probi[i] = 0; // make it "invisible"
AliMUONPad* pnear = Pixel(near);
pnear->SetCharge(pnear->Charge() + (-charge));
Mlem(cluster,coef,probi,2);
AliDebug(2,Form("Before splitting nPix=%d EVT %d DE %d",fPixArray->GetLast()+1,fEventNumber,fDetElemId));
-// StdoutToAliDebug(2,fPixArray->Print("","full"););
-// Plot("mlem.beforesplit");
+ //StdoutToAliDebug(2,fPixArray->Print("","full"););
+ //Plot("mlem.beforesplit");
- // Update histogram
- for (Int_t i=0; i<nPix; ++i)
+ // Update histogram
+ for (Int_t i = 0; i < nPix; ++i)
{
- AliMUONPad* pixPtr = Pixel(i);
- Int_t ix = mlem->GetXaxis()->FindBin(pixPtr->Coord(0));
- Int_t iy = mlem->GetYaxis()->FindBin(pixPtr->Coord(1));
- mlem->SetBinContent(ix, iy, pixPtr->Charge());
+ AliMUONPad* pixPtr2 = Pixel(i);
+ Int_t ix = fHistMlem->GetXaxis()->FindBin(pixPtr2->Coord(0));
+ Int_t iy = fHistMlem->GetYaxis()->FindBin(pixPtr2->Coord(1));
+ fHistMlem->SetBinContent(ix, iy, pixPtr2->Charge());
}
// Try to split into clusters
Bool_t ok = kTRUE;
- if (mlem->GetSum() < 1)
+ if (fHistMlem->GetSum() < 2.0*fLowestPixelCharge)
{
ok = kFALSE;
}
else
{
- fSplitter->Split(cluster,mlem,coef,fClusterList);
+ fSplitter->Split(cluster,fHistMlem,coef,fClusterList);
}
delete [] coef;
delete [] probi;
- coef = 0;
- probi = 0;
fPixArray->Delete();
return ok;
}
+//_____________________________________________________________________________
+void AliMUONClusterFinderMLEM::MaskPeaks(Int_t mask)
+{
+ /// Mask/unmask pixels corresponding to local maxima (add/subtract 10000 to their charge
+ /// - to avoid loosing low charge pixels after sorting)
+
+ for (Int_t i = 0; i < fPixArray->GetEntriesFast(); ++i) {
+ AliMUONPad* pix = Pixel(i);
+ if (pix->Status() == fgkMustKeep) {
+ if (mask == 1) pix->SetCharge(pix->Charge()+10000.);
+ else pix->SetCharge(pix->Charge()-10000.);
+ }
+ }
+}
+
//_____________________________________________________________________________
void AliMUONClusterFinderMLEM::Mlem(AliMUONCluster& cluster,
- Double_t* coef, Double_t* probi,
+ const Double_t* coef, Double_t* probi,
Int_t nIter)
{
/// Use MLEM to find pixel charges
Int_t npad = cluster.Multiplicity();
Double_t* probi1 = new Double_t[nPix];
- Double_t probMax = 0;
- Double_t tmp = TMath::MaxElement(nPix,probi);
+ Double_t probMax = TMath::MaxElement(nPix,probi);
- for (Int_t ipix=0; ipix<nPix; ++ipix)
- {
- probMax = TMath::Max(probMax,probi[ipix]);
- }
-
- if (probMax!=tmp) { AliWarning(Form("probMax=%e tmp=%e",probMax,tmp)); }
-
- for (Int_t iter=0; iter<nIter; ++iter)
+ for (Int_t iter = 0; iter < nIter; ++iter)
{
// Do iterations
- for (Int_t ipix=0; ipix<nPix; ++ipix)
+ for (Int_t ipix = 0; ipix < nPix; ++ipix)
{
Pixel(ipix)->SetChargeBackup(0);
// Correct each pixel
+ probi1[ipix] = 0;
if (probi[ipix] < 0.01) continue; // skip "invisible" pixel
Double_t sum = 0;
probi1[ipix] = probMax;
- for (Int_t j=0; j<npad; j++)
+ for (Int_t j = 0; j < npad; ++j)
{
AliMUONPad* pad = cluster.Pad(j);
- if (pad->Status() < 0) continue;
+ //if (pad->Status() < 0) continue;
+ if (pad->Status() != fgkZero) continue;
Double_t sum1 = 0;
Int_t indx1 = j*nPix;
Int_t indx = indx1 + ipix;
// Calculate expectation
- for (Int_t i=0; i<nPix; i++)
+ for (Int_t i = 0; i < nPix; ++i)
{
sum1 += Pixel(i)->Charge()*coef[indx1+i];
+ //cout << i << " " << Pixel(i)->Charge() << " " << coef[indx1+i] << endl;
}
- if ( pad->Charge() > fgkSaturation-1 && sum1 > pad->Charge() ) //FIXME : remove usage of fgkSaturation
+ if ( pad->IsSaturated() && sum1 > pad->Charge() )
{
- if ( !pad->IsSaturated() )
- {
- AliWarning("Got a pad charge above saturation not backed-up by pad->IsSaturated() function : ");
- StdoutToAliWarning(pad->Print("full"));
- }
// correct for pad charge overflows
probi1[ipix] -= coef[indx];
continue;
+ //sum1 = pad->Charge();
}
- if (sum1 > 1.e-6)
- {
- sum += pad->Charge()*coef[indx]/sum1;
- }
+ if (sum1 > 1.e-6) sum += pad->Charge()*coef[indx]/sum1;
} // for (Int_t j=0;
AliMUONPad* pixPtr = Pixel(ipix);
if (probi1[ipix] > 1.e-6)
//AZ pixPtr->SetCharge(pixPtr->Charge()*sum/probi1[ipix]);
pixPtr->SetChargeBackup(pixPtr->Charge()*sum/probi1[ipix]);
}
+ //cout << " xxx " << ipix << " " << pixPtr->Charge() << " " << pixPtr->ChargeBackup() << " " << sum << " " << probi1[ipix] << endl;
} // for (Int_t ipix=0;
+ Double_t qTot = 0;
for (Int_t i = 0; i < nPix; ++i) {
AliMUONPad* pixPtr = Pixel(i);
- pixPtr->SetCharge(pixPtr->ChargeBackup());
+ pixPtr->RevertCharge();
+ qTot += pixPtr->Charge();
+ }
+ if (qTot < 1.e-6) {
+ // Can happen in clusters with large number of overflows - speeding up
+ delete [] probi1;
+ return;
}
} // for (Int_t iter=0;
delete [] probi1;
}
//_____________________________________________________________________________
-void AliMUONClusterFinderMLEM::FindCOG(TH2D *mlem, Double_t *xyc)
+void AliMUONClusterFinderMLEM::FindCOG(Double_t *xyc)
{
/// Calculate position of the center-of-gravity around the maximum pixel
Int_t ixmax, iymax, ix, nsumx=0, nsumy=0, nsum=0;
Int_t i1 = -9, j1 = -9;
- mlem->GetMaximumBin(ixmax,iymax,ix);
- Int_t nx = mlem->GetNbinsX();
- Int_t ny = mlem->GetNbinsY();
- Double_t thresh = mlem->GetMaximum()/10;
+ fHistMlem->GetMaximumBin(ixmax,iymax,ix);
+ Int_t nx = fHistMlem->GetNbinsX();
+ Int_t ny = fHistMlem->GetNbinsY();
+ Double_t thresh = fHistMlem->GetMaximum()/10;
Double_t x, y, cont, xq=0, yq=0, qq=0;
- for (Int_t i=TMath::Max(1,iymax-1); i<=TMath::Min(ny,iymax+1); i++) {
- y = mlem->GetYaxis()->GetBinCenter(i);
- for (Int_t j=TMath::Max(1,ixmax-1); j<=TMath::Min(nx,ixmax+1); j++) {
- cont = mlem->GetCellContent(j,i);
+ Int_t ie = TMath::Min(ny,iymax+1), je = TMath::Min(nx,ixmax+1);
+ for (Int_t i = TMath::Max(1,iymax-1); i <= ie; ++i) {
+ y = fHistMlem->GetYaxis()->GetBinCenter(i);
+ for (Int_t j = TMath::Max(1,ixmax-1); j <= je; ++j) {
+ cont = fHistMlem->GetCellContent(j,i);
if (cont < thresh) continue;
if (i != i1) {i1 = i; nsumy++;}
if (j != j1) {j1 = j; nsumx++;}
- x = mlem->GetXaxis()->GetBinCenter(j);
+ x = fHistMlem->GetXaxis()->GetBinCenter(j);
xq += x*cont;
yq += y*cont;
qq += cont;
x = y = 0;
if (nsumy == 1) {
// one bin in Y - add one more (with the largest signal)
- for (Int_t i=TMath::Max(1,iymax-1); i<=TMath::Min(ny,iymax+1); i++) {
+ for (Int_t i = TMath::Max(1,iymax-1); i <= ie; ++i) {
if (i == iymax) continue;
- for (Int_t j=TMath::Max(1,ixmax-1); j<=TMath::Min(nx,ixmax+1); j++) {
- cont = mlem->GetCellContent(j,i);
+ for (Int_t j = TMath::Max(1,ixmax-1); j <= je; ++j) {
+ cont = fHistMlem->GetCellContent(j,i);
if (cont > cmax) {
cmax = cont;
- x = mlem->GetXaxis()->GetBinCenter(j);
- y = mlem->GetYaxis()->GetBinCenter(i);
+ x = fHistMlem->GetXaxis()->GetBinCenter(j);
+ y = fHistMlem->GetYaxis()->GetBinCenter(i);
i2 = i;
j2 = j;
}
if (nsumx == 1) {
// one bin in X - add one more (with the largest signal)
cmax = x = y = 0;
- for (Int_t j=TMath::Max(1,ixmax-1); j<=TMath::Min(nx,ixmax+1); j++) {
+ for (Int_t j = TMath::Max(1,ixmax-1); j <= je; ++j) {
if (j == ixmax) continue;
- for (Int_t i=TMath::Max(1,iymax-1); i<=TMath::Min(ny,iymax+1); i++) {
- cont = mlem->GetCellContent(j,i);
+ for (Int_t i = TMath::Max(1,iymax-1); i <= ie; ++i) {
+ cont = fHistMlem->GetCellContent(j,i);
if (cont > cmax) {
cmax = cont;
- x = mlem->GetXaxis()->GetBinCenter(j);
- y = mlem->GetYaxis()->GetBinCenter(i);
+ x = fHistMlem->GetXaxis()->GetBinCenter(j);
+ y = fHistMlem->GetYaxis()->GetBinCenter(i);
i2 = i;
j2 = j;
}
}
//_____________________________________________________________________________
-Int_t AliMUONClusterFinderMLEM::FindNearest(AliMUONPad *pixPtr0)
+Int_t AliMUONClusterFinderMLEM::FindNearest(const AliMUONPad *pixPtr0)
{
/// Find the pixel nearest to the given one
/// (algorithm may be not very efficient)
Double_t xc = pixPtr0->Coord(0), yc = pixPtr0->Coord(1);
AliMUONPad *pixPtr;
- for (Int_t i=0; i<nPix; i++) {
+ for (Int_t i = 0; i < nPix; ++i) {
pixPtr = (AliMUONPad*) fPixArray->UncheckedAt(i);
- if (pixPtr->Charge() < 0.5) continue;
+ if (pixPtr == pixPtr0 || pixPtr->Charge() < fLowestPixelCharge) continue;
dx = (xc - pixPtr->Coord(0)) / pixPtr->Size(0);
dy = (yc - pixPtr->Coord(1)) / pixPtr->Size(1);
r = dx *dx + dy * dy;
return imin;
}
-
-//_____________________________________________________________________________
-TStopwatch*
-AliMUONClusterFinderMLEM::Timer(Int_t i) const
-{
- /// Return timer at index i
- return static_cast<TStopwatch*>(fTimers->At(i));
-}
-
//_____________________________________________________________________________
void
AliMUONClusterFinderMLEM::Paint(Option_t*)
AliDebug(1,Form("nPix=%d",pixArray->GetLast()+1));
- TH2D *hist = NULL;
- //if (pixArray == fPixArray) hist = (TH2D*) gROOT->FindObject("anode");
- //else { hist = (TH2D*) gROOT->FindObject("anode1"); cout << hist << endl; }
- //if (hist) hist->Delete();
-
Double_t xylim[4] = {999, 999, 999, 999};
Int_t nPix = pixArray->GetEntriesFast();
+
+ if ( nPix <= 0 ) return 0;
+
AliMUONPad *pixPtr = 0;
- for (Int_t ipix=0; ipix<nPix; ipix++) {
+ for (Int_t ipix = 0; ipix < nPix; ++ipix) {
pixPtr = (AliMUONPad*) pixArray->UncheckedAt(ipix);
- for (Int_t i=0; i<4; i++)
+ for (Int_t i = 0; i < 4; ++i)
xylim[i] = TMath::Min (xylim[i], (i%2 ? -1 : 1)*pixPtr->Coord(i/2));
}
- for (Int_t i=0; i<4; i++) xylim[i] -= pixPtr->Size(i/2);
+ for (Int_t i = 0; i < 4; ++i) xylim[i] -= pixPtr->Size(i/2);
Int_t nx = TMath::Nint ((-xylim[1]-xylim[0])/pixPtr->Size(0)/2);
Int_t ny = TMath::Nint ((-xylim[3]-xylim[2])/pixPtr->Size(1)/2);
- if (pixArray == fPixArray) hist = new TH2D("anode","anode",nx,xylim[0],-xylim[1],ny,xylim[2],-xylim[3]);
- else hist = new TH2D("anode1","anode1",nx,xylim[0],-xylim[1],ny,xylim[2],-xylim[3]);
- for (Int_t ipix=0; ipix<nPix; ipix++) {
+ if (pixArray == fPixArray) fHistAnode = new TH2D("anode","anode",nx,xylim[0],-xylim[1],ny,xylim[2],-xylim[3]);
+ else fHistAnode = new TH2D("anode1","anode1",nx,xylim[0],-xylim[1],ny,xylim[2],-xylim[3]);
+ for (Int_t ipix = 0; ipix < nPix; ++ipix) {
pixPtr = (AliMUONPad*) pixArray->UncheckedAt(ipix);
- hist->Fill(pixPtr->Coord(0), pixPtr->Coord(1), pixPtr->Charge());
+ fHistAnode->Fill(pixPtr->Coord(0), pixPtr->Coord(1), pixPtr->Charge());
}
// if (fDraw && pixArray == fPixArray) fDraw->DrawHist("c2", hist);
- Int_t nMax = 0, indx;
- Int_t *isLocalMax = new Int_t[ny*nx];
- for (Int_t i=0; i<ny*nx; i++) isLocalMax[i] = 0;
+ Int_t nMax = 0, indx, nxy = ny * nx;
+ Int_t *isLocalMax = new Int_t[nxy];
+ for (Int_t i = 0; i < nxy; ++i) isLocalMax[i] = 0;
- for (Int_t i=1; i<=ny; i++) {
+ for (Int_t i = 1; i <= ny; ++i) {
indx = (i-1) * nx;
- for (Int_t j=1; j<=nx; j++) {
- if (hist->GetCellContent(j,i) < 0.5) continue;
+ for (Int_t j = 1; j <= nx; ++j) {
+ if (fHistAnode->GetCellContent(j,i) < fLowestPixelCharge) continue;
//if (isLocalMax[indx+j-1] < 0) continue;
if (isLocalMax[indx+j-1] != 0) continue;
- FlagLocalMax(hist, i, j, isLocalMax);
+ FlagLocalMax(fHistAnode, i, j, isLocalMax);
}
}
- for (Int_t i=1; i<=ny; i++) {
+ for (Int_t i = 1; i <= ny; ++i) {
indx = (i-1) * nx;
- for (Int_t j=1; j<=nx; j++) {
+ for (Int_t j = 1; j <= nx; ++j) {
if (isLocalMax[indx+j-1] > 0) {
localMax[nMax] = indx + j - 1;
- maxVal[nMax++] = hist->GetCellContent(j,i);
- if (nMax > 99) AliFatal(" Too many local maxima !!!");
+ maxVal[nMax++] = fHistAnode->GetCellContent(j,i);
+ ((AliMUONPad*)fSplitter->BinToPix(fHistAnode, j, i))->SetStatus(fgkMustKeep);
+ if (nMax > 99) break;
}
}
+ if (nMax > 99) {
+ AliError(" Too many local maxima !!!");
+ break;
+ }
}
if (fDebug) cout << " Local max: " << nMax << endl;
- delete [] isLocalMax; isLocalMax = 0;
+ delete [] isLocalMax;
return nMax;
}
Int_t cont = TMath::Nint (hist->GetCellContent(j,i));
Int_t cont1 = 0, indx = (i-1)*nx+j-1, indx1 = 0, indx2 = 0;
- for (Int_t i1=i-1; i1<i+2; i1++) {
+ Int_t ie = i + 2, je = j + 2;
+ for (Int_t i1 = i-1; i1 < ie; ++i1) {
if (i1 < 1 || i1 > ny) continue;
indx1 = (i1 - 1) * nx;
- for (Int_t j1=j-1; j1<j+2; j1++) {
+ for (Int_t j1 = j-1; j1 < je; ++j1) {
if (j1 < 1 || j1 > nx) continue;
if (i == i1 && j == j1) continue;
indx2 = indx1 + j1 - 1;
//_____________________________________________________________________________
void AliMUONClusterFinderMLEM::FindCluster(AliMUONCluster& cluster,
- Int_t *localMax, Int_t iMax)
+ const Int_t *localMax, Int_t iMax)
{
/// Find pixel cluster around local maximum \a iMax and pick up pads
/// overlapping with it
- TH2D *hist = (TH2D*) gROOT->FindObject("anode");
- Int_t nx = hist->GetNbinsX();
- Int_t ny = hist->GetNbinsY();
+ /* Just for check
+ TCanvas* c = new TCanvas("Anode","Anode",800,600);
+ c->cd();
+ hist->Draw("lego1Fb"); // debug
+ c->Update();
+ Int_t tmp;
+ cin >> tmp;
+ */
+ Int_t nx = fHistAnode->GetNbinsX();
+ Int_t ny = fHistAnode->GetNbinsY();
Int_t ic = localMax[iMax] / nx + 1;
Int_t jc = localMax[iMax] % nx + 1;
- Bool_t *used = new Bool_t[ny*nx];
- for (Int_t i=0; i<ny*nx; i++) used[i] = kFALSE;
+ Int_t nxy = ny * nx;
+ Bool_t *used = new Bool_t[nxy];
+ for (Int_t i = 0; i < nxy; ++i) used[i] = kFALSE;
// Drop all pixels from the array - pick up only the ones from the cluster
fPixArray->Delete();
- Double_t wx = hist->GetXaxis()->GetBinWidth(1)/2;
- Double_t wy = hist->GetYaxis()->GetBinWidth(1)/2;
- Double_t yc = hist->GetYaxis()->GetBinCenter(ic);
- Double_t xc = hist->GetXaxis()->GetBinCenter(jc);
- Double_t cont = hist->GetCellContent(jc,ic);
+ Double_t wx = fHistAnode->GetXaxis()->GetBinWidth(1)/2;
+ Double_t wy = fHistAnode->GetYaxis()->GetBinWidth(1)/2;
+ Double_t yc = fHistAnode->GetYaxis()->GetBinCenter(ic);
+ Double_t xc = fHistAnode->GetXaxis()->GetBinCenter(jc);
+ Double_t cont = fHistAnode->GetCellContent(jc,ic);
fPixArray->Add(new AliMUONPad (xc, yc, wx, wy, cont));
used[(ic-1)*nx+jc-1] = kTRUE;
- fSplitter->AddBin(hist, ic, jc, 1, used, (TObjArray*)0); // recursive call
+ AddBinSimple(fHistAnode, ic, jc);
+ //fSplitter->AddBin(hist, ic, jc, 1, used, (TObjArray*)0); // recursive call
Int_t nPix = fPixArray->GetEntriesFast();
Int_t npad = cluster.Multiplicity();
- for (Int_t i=0; i<nPix; ++i)
+ for (Int_t i = 0; i < nPix; ++i)
{
AliMUONPad* pixPtr = Pixel(i);
pixPtr->SetSize(0,wx);
}
// Pick up pads which overlap with found pixels
- for (Int_t i=0; i<npad; i++)
+ for (Int_t i = 0; i < npad; ++i)
{
- cluster.Pad(i)->SetStatus(-1);
+ //cluster.Pad(i)->SetStatus(-1);
+ cluster.Pad(i)->SetStatus(fgkOver); // just the dirty trick
}
- for (Int_t i=0; i<nPix; i++)
+ for (Int_t i = 0; i < nPix; ++i)
{
AliMUONPad* pixPtr = Pixel(i);
- for (Int_t j=0; j<npad; ++j)
+ for (Int_t j = 0; j < npad; ++j)
{
AliMUONPad* pad = cluster.Pad(j);
+ //if (pad->Status() == 0) continue;
+ if (pad->Status() == fgkZero) continue;
if ( Overlap(*pad,*pixPtr) )
{
- pad->SetStatus(0);
+ //pad->SetStatus(0);
+ pad->SetStatus(fgkZero);
+ if (fDebug) { cout << j << " "; pad->Print("full"); }
}
}
}
- delete [] used; used = 0;
+ delete [] used;
+}
+
+//_____________________________________________________________________________
+void
+AliMUONClusterFinderMLEM::AddBinSimple(TH2D *hist, Int_t ic, Int_t jc)
+{
+ /// Add adjacent bins (+-1 in X and Y) to the cluster
+
+ Int_t nx = hist->GetNbinsX();
+ Int_t ny = hist->GetNbinsY();
+ Double_t cont1, cont = hist->GetCellContent(jc,ic);
+ AliMUONPad *pixPtr = 0;
+
+ Int_t ie = TMath::Min(ic+1,ny), je = TMath::Min(jc+1,nx);
+ for (Int_t i = TMath::Max(ic-1,1); i <= ie; ++i) {
+ for (Int_t j = TMath::Max(jc-1,1); j <= je; ++j) {
+ cont1 = hist->GetCellContent(j,i);
+ if (cont1 > cont) continue;
+ if (cont1 < fLowestPixelCharge) continue;
+ pixPtr = new AliMUONPad (hist->GetXaxis()->GetBinCenter(j),
+ hist->GetYaxis()->GetBinCenter(i), 0, 0, cont1);
+ fPixArray->Add(pixPtr);
+ }
+ }
}
//_____________________________________________________________________________
return *this;
}
-//_____________________________________________________________________________
-void
-AliMUONClusterFinderMLEM::Neighbours(Int_t cathode, Int_t ix, Int_t iy,
- Int_t& n, Int_t* xList, Int_t* yList)
-{
- /// Get the list of neighbours of pad at (cathode,ix,iy)
- n = 0;
-
- const AliMpVSegmentation* seg = fSegmentation[cathode];
-
- AliMpPad pad = seg->PadByIndices(AliMpIntPair(ix,iy),kTRUE);
-
- // Define the region to look into : a region slightly bigger
- // than the pad itself (5% bigger), in order to catch first neighbours.
-
- AliMpArea area(pad.Position(),pad.Dimensions()*1.05);
-
- AliMpVPadIterator* it = seg->CreateIterator(area);
- it->First();
- while ( !it->IsDone() && n < 10 )
- {
- AliMpPad p = it->CurrentItem();
- if ( p != pad ) // skip self
- {
- xList[n] = p.GetIndices().GetFirst();
- yList[n] = p.GetIndices().GetSecond();
- ++n;
- }
- it->Next();
- }
- delete it;
-}
-
//_____________________________________________________________________________
void AliMUONClusterFinderMLEM::AddVirtualPad(AliMUONCluster& cluster)
{
- /// Add virtual pad (with small charge) to improve fit for some
- /// clusters (when pad with max charge is at the extreme of the cluster)
+ /// Add virtual pad (with small charge) to improve fit for clusters
+ /// with number of pads == 2 per direction
- // Get number of pads in X and Y-directions
- Int_t nInX = -1, nInY;
- PadsInXandY(cluster,nInX, nInY);
- ++fNClusters;
+ // Find out non-bending and bending planes
+ Int_t nonb[2] = {1, 0}; // non-bending and bending cathodes
- // Add virtual pad only if number of pads per direction == 2
- if (nInX != 2 && nInY != 2) return;
-
- ++fNAddVirtualPads;
-
- // Find pads with max charge
- Int_t maxpad[2][2] = {{-1, -1}, {-1, -1}}, cath;
- Double_t sigmax[2] = {0}, aamax[2] = {0};
- for (Int_t j=0; j<cluster.Multiplicity(); ++j)
- {
- AliMUONPad* pad = cluster.Pad(j);
- if (pad->Status() != 0) continue;
- cath = pad->Cathode();
- if (pad->Charge() > sigmax[cath])
- {
- maxpad[cath][1] = maxpad[cath][0];
- aamax[cath] = sigmax[cath];
- sigmax[cath] = pad->Charge();
- maxpad[cath][0] = j;
+ TVector2 dim0 = cluster.MinPadDimensions(0, 0, kTRUE);
+ TVector2 dim1 = cluster.MinPadDimensions(1, 0, kTRUE);
+ if (dim0.X() < dim1.X() - fgkDistancePrecision) {
+ nonb[0] = 0;
+ nonb[1] = 1;
+ }
+
+ Bool_t same = kFALSE;
+ if (TMath::Abs(dim0.Y()-dim1.Y()) < fgkDistancePrecision) same = kTRUE; // the same pad size on both planes
+
+ Long_t cn;
+ Bool_t check[2] = {kFALSE, kFALSE};
+ Int_t nxy[2];
+ nxy[0] = nxy[1] = 0;
+ for (Int_t inb = 0; inb < 2; ++inb) {
+ cn = cluster.NofPads(nonb[inb], 0, kTRUE);
+ if (inb == 0 && AliMp::PairFirst(cn) == 2) check[inb] = kTRUE; // check non-bending plane
+ else if (inb == 1 && AliMp::PairSecond(cn) == 2) check[inb] = kTRUE; // check bending plane
+ if (same) {
+ nxy[0] = TMath::Max (nxy[0], AliMp::PairFirst(cn));
+ nxy[1] = TMath::Max (nxy[1], AliMp::PairSecond(cn));
+ if (inb == 0 && nxy[0] < 2) nonb[inb] = !nonb[inb];
+ else if (inb == 1 && AliMp::PairSecond(cn) < 2) nonb[inb] = !nonb[inb];
}
}
-
- if (maxpad[0][0] >= 0 && maxpad[0][1] < 0 || maxpad[1][0] >= 0 && maxpad[1][1] < 0)
- {
- for (Int_t j=0; j<cluster.Multiplicity(); ++j)
- {
- AliMUONPad* pad = cluster.Pad(j);
- if (pad->Status() != 0) continue;
- cath = pad->Cathode();
- if (j == maxpad[cath][0] || j == maxpad[cath][1]) continue;
- if ( pad->Charge() > aamax[cath])
- {
- aamax[cath] = pad->Charge();
- maxpad[cath][1] = j;
+ if (same) {
+ if (nxy[0] > 2) check[0] = kFALSE;
+ if (nxy[1] > 2) check[1] = kFALSE;
+ }
+ if (!check[0] && !check[1]) return;
+
+ for (Int_t inb = 0; inb < 2; ++inb) {
+ if (!check[inb]) continue;
+
+ // Find pads with maximum and next to maximum charges
+ Int_t maxPads[2] = {-1, -1};
+ Double_t amax[2] = {0};
+ Int_t mult = cluster.Multiplicity();
+ for (Int_t j = 0; j < mult; ++j) {
+ AliMUONPad *pad = cluster.Pad(j);
+ if (pad->Cathode() != nonb[inb]) continue;
+ for (Int_t j2 = 0; j2 < 2; ++j2) {
+ if (pad->Charge() > amax[j2]) {
+ if (j2 == 0) { amax[1] = amax[0]; maxPads[1] = maxPads[0]; }
+ amax[j2] = pad->Charge();
+ maxPads[j2] = j;
+ break;
+ }
}
}
- }
- // cout << "-------AddVirtualPad" << endl;
-// cout << Form("nInX %2d nInY %2d",nInX,nInY) << endl;
-//
-// cluster.Print("full");
-//
-// for ( Int_t i = 0; i < 2; ++i )
-// {
-// for ( Int_t j = 0; j < 2; ++j )
-// {
-// cout << Form("maxpad[%d][%d]=%d",i,j,maxpad[i][j]) << endl;
-// }
-// }
-
- // Check for mirrors (side X on cathode 0)
- Bool_t mirror = kFALSE;
- if (maxpad[0][0] >= 0 && maxpad[1][0] >= 0)
- {
- AliMUONPad* maxPadCath[] = { cluster.Pad(maxpad[0][0]), cluster.Pad(maxpad[1][0]) };
- mirror = maxPadCath[0]->DX() < maxPadCath[0]->DY();
- if (!mirror && TMath::Abs( maxPadCath[0]->DX() - maxPadCath[1]->DX()) < 0.001)
- {
- // Special case when pads on both cathodes have the same size
- Int_t yud[2] = {0};
- for (Int_t j = 0; j < cluster.Multiplicity(); ++j)
- {
- AliMUONPad* pad = cluster.Pad(j);
- cath = pad->Cathode();
- if (j == maxpad[cath][0]) continue;
- if ( pad->Ix() != maxPadCath[cath]->Ix() ) continue;
- if ( TMath::Abs(pad->Iy() - maxPadCath[cath]->Iy()) == 1 )
- {
- yud[cath]++;
- }
- }
- if (!yud[0]) mirror = kTRUE; // take the other cathode
- } // if (!mirror &&...
- } // if (maxpad[0][0] >= 0 && maxpad[1][0] >= 0)
-
-// // Find neughbours of pads with max charges
- Int_t nn, xList[10], yList[10], ix0, iy0, ix, iy, neighb;
- for (cath=0; cath<2; cath++)
- {
- if (!cath && maxpad[0][0] < 0) continue; // one-sided cluster - cathode 1
- if (cath && maxpad[1][0] < 0) break; // one-sided cluster - cathode 0
- if (maxpad[1][0] >= 0)
- {
- if (!mirror)
- {
- if (!cath && nInY != 2) continue;
- if (cath && nInX != 2 && (maxpad[0][0] >= 0 || nInY != 2)) continue;
- }
- else
- {
- if (!cath && nInX != 2) continue;
- if (cath && nInY != 2 && (maxpad[0][0] >= 0 || nInX != 2)) continue;
- }
+ // Find min and max dimensions of the cluster
+ Double_t limits[2] = {9999, -9999};
+ for (Int_t j = 0; j < mult; ++j) {
+ AliMUONPad *pad = cluster.Pad(j);
+ if (pad->Cathode() != nonb[inb]) continue;
+ if (pad->Coord(inb) < limits[0]) limits[0] = pad->Coord(inb);
+ if (pad->Coord(inb) > limits[1]) limits[1] = pad->Coord(inb);
}
-
- Int_t iAddX = 0, iAddY = 0, ix1 = 0, iy1 = 0, iPad = 0;
- if (maxpad[0][0] < 0) iPad = 1;
-
- for (iPad=0; iPad<2; iPad++)
- {
- if (maxpad[cath][iPad] < 0) continue;
- if (iPad && !iAddX && !iAddY) break;
- if (iPad && cluster.Pad(maxpad[cath][1])->Charge() / sigmax[cath] < 0.5) break;
-
- Int_t neighbx = 0, neighby = 0;
- ix0 = cluster.Pad(maxpad[cath][iPad])->Ix();
- iy0 = cluster.Pad(maxpad[cath][iPad])->Iy();
- Neighbours(cath,ix0,iy0,nn,xList,yList);
- //Float_t zpad;
- for (Int_t j=0; j<nn; j++) {
- if (TMath::Abs(xList[j]-ix0) == 1 || xList[j]*ix0 == -1) neighbx++;
- if (TMath::Abs(yList[j]-iy0) == 1 || yList[j]*iy0 == -1) neighby++;
+
+ // Loop over max and next to max pads
+ Bool_t add = kFALSE;
+ Int_t idirAdd = 0;
+ for (Int_t j = 0; j < 2; ++j) {
+ if (j == 1) {
+ if (maxPads[j] < 0) continue;
+ if (!add) break;
+ if (amax[1] / amax[0] < 0.5) break;
}
- if (!mirror) {
- if (cath) neighb = neighbx;
- else neighb = neighby;
- if (maxpad[0][0] < 0) neighb += neighby;
- else if (maxpad[1][0] < 0) neighb += neighbx;
- } else {
- if (!cath) neighb = neighbx;
- else neighb = neighby;
- if (maxpad[0][0] < 0) neighb += neighbx;
- else if (maxpad[1][0] < 0) neighb += neighby;
+ // Check if pad at the cluster limit
+ AliMUONPad *pad = cluster.Pad(maxPads[j]);
+ Int_t idir = 0;
+ if (TMath::Abs(pad->Coord(inb)-limits[0]) < fgkDistancePrecision) idir = -1;
+ else if (TMath::Abs(pad->Coord(inb)-limits[1]) < fgkDistancePrecision) idir = 1;
+ else {
+ //cout << " *** Pad not at the cluster limit: " << j << endl;
+ break;
}
-
- for (Int_t j=0; j< cluster.Multiplicity(); ++j)
- {
- AliMUONPad* pad = cluster.Pad(j);
- if ( pad->Cathode() != cath) continue;
- ix = pad->Ix();
- iy = pad->Iy();
- if (iy == iy0 && ix == ix0) continue;
- for (Int_t k=0; k<nn; ++k)
- {
- if (xList[k] != ix || yList[k] != iy) continue;
- if (!mirror)
- {
- if ((!cath || maxpad[0][0] < 0) &&
- (TMath::Abs(iy-iy0) == 1 || iy*iy0 == -1)) {
- if (!iPad && TMath::Abs(ix-ix0) == 1 || ix*ix0 == -1) ix1 = xList[k]; //19-12-05
- xList[k] = yList[k] = 0;
- neighb--;
- break;
- }
- if ((cath || maxpad[1][0] < 0) &&
- (TMath::Abs(ix-ix0) == 1 || ix*ix0 == -1)) {
- if (!iPad) ix1 = xList[k]; //19-12-05
- xList[k] = yList[k] = 0;
- neighb--;
- }
- } else {
- if ((!cath || maxpad[0][0] < 0) &&
- (TMath::Abs(ix-ix0) == 1 || ix*ix0 == -1)) {
- if (!iPad) ix1 = xList[k]; //19-12-05
- xList[k] = yList[k] = 0;
- neighb--;
- break;
- }
- if ((cath || maxpad[1][0] < 0) &&
- (TMath::Abs(iy-iy0) == 1 || iy*iy0 == -1)) {
- xList[k] = yList[k] = 0;
- neighb--;
- }
- }
- break;
- } // for (Int_t k=0; k<nn;
- if (!neighb) break;
- } // for (Int_t j=0; j< cluster.Multiplicity();
- if (!neighb) continue;
-
- // Add virtual pad
- Int_t npads, isec;
- isec = npads = 0;
- for (Int_t j=0; j<nn; j++)
- {
- if (xList[j] == 0 && yList[j] == 0) continue;
- // npads = fnPads[0] + fnPads[1];
- // fPadIJ[0][npads] = cath;
- // fPadIJ[1][npads] = 0;
- ix = xList[j];
- iy = yList[j];
- if (TMath::Abs(ix-ix0) == 1 || ix*ix0 == -1) {
- if (iy != iy0) continue; // new segmentation - check
- if (nInX != 2) continue; // new
- if (!mirror) {
- if (!cath && maxpad[1][0] >= 0) continue;
- } else {
- if (cath && maxpad[0][0] >= 0) continue;
- }
- if (iPad && !iAddX) continue;
- AliMpPad pad = fSegmentation[cath]->PadByIndices(AliMpIntPair(ix,iy),kTRUE);
- // fXyq[0][npads] = pad.Position().X();
- // fXyq[1][npads] = pad.Position().Y();
- AliMUONPad muonPad(fDetElemId, cath, ix, iy, pad.Position().X(), pad.Position().Y(),
- pad.Dimensions().X(), pad.Dimensions().Y(), 0);
- // fSegmentation[cath]->GetPadC(ix, iy, fXyq[0][npads], fXyq[1][npads], zpad);
- // if (fXyq[0][npads] > 1.e+5) continue; // temporary fix
- if (muonPad.Coord(0) > 1.e+5) continue; // temporary fix
- if (ix == ix1) continue; //19-12-05
- if (ix1 == ix0) continue;
- if (maxpad[1][0] < 0 || mirror && maxpad[0][0] >= 0) {
- // if (!iPad) fXyq[2][npads] = TMath::Min (sigmax[0]/100, 5.);
- // else fXyq[2][npads] = TMath::Min (aamax[0]/100, 5.);
- if (!iPad) muonPad.SetCharge(TMath::Min (sigmax[0]/100, 5.));
- else muonPad.SetCharge(TMath::Min (aamax[0]/100, 5.));
- }
- else {
- // if (!iPad) fXyq[2][npads] = TMath::Min (sigmax[1]/100, 5.);
- // else fXyq[2][npads] = TMath::Min (aamax[1]/100, 5.);
- if (!iPad) muonPad.SetCharge(TMath::Min (sigmax[1]/100, 5.));
- else muonPad.SetCharge(TMath::Min (aamax[1]/100, 5.));
- }
- // fXyq[2][npads] = TMath::Max (fXyq[2][npads], (float)1);
- if (muonPad.Charge() < 1.) muonPad.SetCharge(1.);
- // fXyq[3][npads] = -2; // flag
- // fPadIJ[2][npads] = ix;
- // fPadIJ[3][npads] = iy;
- muonPad.SetReal(kFALSE);
- // fnPads[1]++;
- // iAddX = npads;
- iAddX = 1;
- if (fDebug) printf(" ***** Add virtual pad in X ***** %f %f %f %3d %3d %f %f \n",
- muonPad.Charge(), muonPad.Coord(0), muonPad.Coord(1), ix, iy,
- muonPad.DX(), muonPad.DY());
- cluster.AddPad(muonPad); // add pad to the cluster
- ix1 = ix0;
- continue;
- }
- if (nInY != 2) continue;
- if (!mirror && cath && maxpad[0][0] >= 0) continue;
- if (mirror && !cath && maxpad[1][0] >= 0) continue;
- if (TMath::Abs(iy-iy0) == 1 || TMath::Abs(iy*iy0) == 1) {
- if (ix != ix0) continue; // new segmentation - check
- if (iPad && !iAddY) continue;
- AliMpPad pad = fSegmentation[cath]->PadByIndices(AliMpIntPair(ix,iy),kTRUE);
- // fXyq[0][npads] = pad.Position().X();
- // fXyq[1][npads] = pad.Position().Y();
- // fSegmentation[cath]->GetPadC(ix, iy, fXyq[0][npads], fXyq[1][npads], zpad);
- AliMUONPad muonPad(fDetElemId, cath, ix, iy, pad.Position().X(), pad.Position().Y(),
- pad.Dimensions().X(), pad.Dimensions().Y(), 0);
- if (iy1 == iy0) continue;
- //if (iPad && iy1 == iy0) continue;
- if (maxpad[0][0] < 0 || mirror && maxpad[1][0] >= 0) {
- // if (!iPad) fXyq[2][npads] = TMath::Min (sigmax[1]/15, fgkZeroSuppression);
- // else fXyq[2][npads] = TMath::Min (aamax[1]/15, fgkZeroSuppression);
- if (!iPad) muonPad.SetCharge(TMath::Min (sigmax[1]/15, fgkZeroSuppression));
- else muonPad.SetCharge(TMath::Min (aamax[1]/15, fgkZeroSuppression));
- }
- else {
- // if (!iPad) fXyq[2][npads] = TMath::Min (sigmax[0]/15, fgkZeroSuppression);
- // else fXyq[2][npads] = TMath::Min (aamax[0]/15, fgkZeroSuppression);
- if (!iPad) muonPad.SetCharge(TMath::Min (sigmax[0]/15, fgkZeroSuppression));
- else muonPad.SetCharge(TMath::Min (aamax[0]/15, fgkZeroSuppression));
- }
- // fXyq[2][npads] = TMath::Max (fXyq[2][npads], (float)1);
- if (muonPad.Charge() < 1.) muonPad.SetCharge(1.);
- // fXyq[3][npads] = -2; // flag
- // fPadIJ[2][npads] = ix;
- // fPadIJ[3][npads] = iy;
- muonPad.SetReal(kFALSE);
- // fnPads[1]++;
- // iAddY = npads;
- iAddY = 1;
- if (fDebug) printf(" ***** Add virtual pad in Y ***** %f %f %f %3d %3d %f %f \n",
- muonPad.Charge(), muonPad.Coord(0), muonPad.Coord(1), ix, iy,
- muonPad.DX(), muonPad.DY());
- cluster.AddPad(muonPad); // add pad to the cluster
- iy1 = iy0;
- }
- } // for (Int_t j=0; j<nn;
- } // for (Int_t iPad=0;
- } // for (cath=0; cath<2;
+ if (j == 1 && idir == idirAdd) break; // this pad has been already added
+
+ // Add pad (if it exists)
+ TVector2 pos;
+ if (inb == 0) pos.Set (pad->X() + idir * (pad->DX()+fgkDistancePrecision), pad->Y());
+ else pos.Set (pad->X(), pad->Y() + idir * (pad->DY()+fgkDistancePrecision));
+ //AliMpPad mppad = fkSegmentation[nonb[inb]]->PadByPosition(pos,kTRUE);
+ AliMpPad mppad = fkSegmentation[nonb[inb]]->PadByPosition(pos.X(), pos.Y(),kFALSE);
+ if (!mppad.IsValid()) continue; // non-existing pad
+ AliMUONPad muonPad(fDetElemId, nonb[inb], mppad.GetIx(), mppad.GetIy(),
+ mppad.GetPositionX(), mppad.GetPositionY(),
+ mppad.GetDimensionX(), mppad.GetDimensionY(), 0);
+ if (inb == 0) muonPad.SetCharge(TMath::Min (amax[j]/100, fLowestPadCharge));
+ //else muonPad.SetCharge(TMath::Min (amax[j]/15, fgkZeroSuppression));
+ else muonPad.SetCharge(TMath::Min (amax[j]/15, fLowestPadCharge));
+ if (muonPad.Charge() < 2.0*fLowestPixelCharge) muonPad.SetCharge(2.0*fLowestPixelCharge);
+ muonPad.SetReal(kFALSE);
+ if (fDebug) printf(" ***** Add virtual pad in %d direction ***** %f %f %f %3d %3d %f %f \n",
+ inb, muonPad.Charge(), muonPad.X(), muonPad.Y(), muonPad.Ix(),
+ muonPad.Iy(), muonPad.DX(), muonPad.DY());
+ cluster.AddPad(muonPad); // add pad to the cluster
+ add = kTRUE;
+ idirAdd = idir;
+ }
+ }
}
//_____________________________________________________________________________
/// Find number of pads in X and Y-directions (excluding virtual ones and
/// overflows)
- Int_t statusToTest = 1;
+ //Int_t statusToTest = 1;
+ Int_t statusToTest = fgkUseForFit;
- if ( nInX < 0 ) statusToTest = 0;
+ //if ( nInX < 0 ) statusToTest = 0;
+ if ( nInX < 0 ) statusToTest = fgkZero;
Bool_t mustMatch(kTRUE);
- AliMpIntPair cn = cluster.NofPads(statusToTest,mustMatch);
+ Long_t cn = cluster.NofPads(statusToTest,mustMatch);
- nInX = cn.GetFirst();
- nInY = cn.GetSecond();
+ nInX = AliMp::PairFirst(cn);
+ nInY = AliMp::PairSecond(cn);
}
//_____________________________________________________________________________
AliDebug(1,Form("nPix=%d",fPixArray->GetLast()+1));
- for (Int_t i = 0; i < cluster.Multiplicity(); ++i)
+ Int_t mult = cluster.Multiplicity();
+ for (Int_t i = 0; i < mult; ++i)
{
AliMUONPad* pad = cluster.Pad(i);
+ /*
if ( pad->IsSaturated())
{
pad->SetStatus(-9);
{
pad->SetStatus(1);
}
+ */
+ if (!pad->IsSaturated()) pad->SetStatus(fgkUseForFit);
}
- nfit = fSplitter->Fit(cluster,1, nForFit, clustFit, clusters, parOk, fClusterList);
+ nfit = fSplitter->Fit(cluster,1, nForFit, clustFit, clusters, parOk, fClusterList, fHistMlem);
}
//_____________________________________________________________________________
}
}
+//_____________________________________________________________________________
+void
+AliMUONClusterFinderMLEM::SetChargeHints(Double_t lowestPadCharge, Double_t lowestClusterCharge)
+{
+ /// Set some thresholds we use later on in the algorithm
+ fLowestPadCharge=lowestPadCharge;
+ fLowestClusterCharge=lowestClusterCharge;
+ fLowestPixelCharge=fLowestPadCharge/12.0;
+}
+
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff