#include "AliEMCALTrack.h"
#include "AliEMCALLoader.h"
#include "AliEMCALGeometry.h"
+#include "AliEMCALReconstructor.h"
+#include "AliEMCALRecParam.h"
+#include "AliCDBEntry.h"
+#include "AliCDBManager.h"
#include "AliEMCALTracker.h"
ClassImp(AliEMCALTracker)
+
//
//------------------------------------------------------------------------------
//
fCutAlphaMin(-200.0),
fCutAlphaMax(200.0),
fCutAngle(100.0),
- fMaxDist(100.0),
+ fMaxDist(10.0),
+ fCutNITS(3.0),
+ fCutNTPC(20.0),
fRho(1.0),
fX0(1.0),
fTracks(0),
// and all collections to NULL.
// Output file name is set to a default value.
//
+ InitParameters();
}
//
//------------------------------------------------------------------------------
fCutAlphaMax(copy.fCutAlphaMax),
fCutAngle(copy.fCutAngle),
fMaxDist(copy.fMaxDist),
+ fCutNITS(copy.fCutNITS),
+ fCutNTPC(copy.fCutNTPC),
fRho(copy.fRho),
fX0(copy.fX0),
fTracks((TObjArray*)copy.fTracks->Clone()),
fCutAlphaMax = copy.fCutAlphaMax;
fCutAngle = copy.fCutAngle;
fMaxDist = copy.fMaxDist;
+ fCutNITS = copy.fCutNITS;
+ fCutNTPC = copy.fCutNTPC;
fTracks = (TObjArray*)copy.fTracks->Clone();
fClusters = (TObjArray*)copy.fClusters->Clone();
//
//------------------------------------------------------------------------------
//
+void AliEMCALTracker::InitParameters()
+{
+ //
+ // Retrieve initialization parameters
+ //
+
+ // Check if the instance of AliEMCALRecParam exists,
+ const AliEMCALRecParam* recParam = new AliEMCALRecParam();
+
+ if(!recParam){
+ AliFatal("Reconstruction parameters for EMCAL not set!");
+ }
+
+ fCutX = recParam->GetTrkCutX();
+ fCutY = recParam->GetTrkCutY();
+ fCutZ = recParam->GetTrkCutZ();
+ fMaxDist = recParam->GetTrkCutR();
+ fCutAngle = recParam->GetTrkCutAngle();
+ fCutAlphaMin = recParam->GetTrkCutAlphaMin();
+ fCutAlphaMax = recParam->GetTrkCutAlphaMax();
+ fCutNITS = recParam->GetTrkCutNITS();
+ fCutNTPC = recParam->GetTrkCutNTPC();
+
+}
+//
+//------------------------------------------------------------------------------
+//
TTree* AliEMCALTracker::SearchTrueMatches()
{
+ //Search through the list of
+ //track match candidates and clusters
+ //and look for true matches
+ //
+ //
if (!fClusters) return 0;
if (fClusters->IsEmpty()) return 0;
if (!fTracks) return 0;
{
//
// Clearing method
- // Clears all specified arrays and the containers themselves.
+ // Deletes all objects in arrays and the arrays themselves
//
TString opt(option);
- Bool_t doDelete = opt.Contains("DELETE");
Bool_t clearTracks = opt.Contains("TRACKS");
Bool_t clearClusters = opt.Contains("CLUSTERS");
Bool_t clearMatches = opt.Contains("MATCHES");
}
if (fTracks != 0x0 && clearTracks) {
- if (!doDelete) {
- fTracks->Clear();
- }
- else {
- if (!fTracks->IsEmpty()) fTracks->Delete();
- delete fTracks;
- fTracks = 0;
- }
+ fTracks->Delete();
+ delete fTracks;
+ fTracks = 0;
}
if (fClusters != 0x0 && clearClusters) {
- if (!doDelete) {
- fClusters->Clear();
- }
- else {
- if (!fClusters->IsEmpty()) fClusters->Delete();
- delete fClusters;
- fClusters = 0;
- }
+ fClusters->Delete();
+ delete fClusters;
+ fClusters = 0;
}
if (fMatches != 0x0 && clearMatches) {
- if (!doDelete) {
- fMatches->Clear();
- }
- else {
- if (!fMatches->IsEmpty()) fMatches->Delete();
- delete fMatches;
- fMatches = 0;
- }
+ fMatches->Delete();
+ delete fMatches;
+ fMatches = 0;
}
}
//
for (Int_t i = 0; i < nClusters; i++) {
AliEMCALRecPoint *cluster = (AliEMCALRecPoint*)clusters->At(i);
if (!cluster) continue;
- if (cluster->GetClusterType() != AliESDCaloCluster::kClusterv1) continue;
+ if (cluster->GetClusterType() != AliESDCaloCluster::kEMCALClusterv1) continue;
AliEMCALMatchCluster *matchCluster = new AliEMCALMatchCluster(i, cluster);
fClusters->AddLast(matchCluster);
}
- if (fClusters->IsEmpty()) {
- AliError("No clusters collected");
- return 1;
- }
-
+
branch->SetAddress(0);
clusters->Delete();
delete clusters;
+ if (fClusters->IsEmpty())
+ AliWarning("No clusters collected");
- AliInfo(Form("Collected %d clusters", fClusters->GetEntries()));
+ AliInfo(Form("Collected %d clusters (RecPoints)", fClusters->GetEntries()));
return 0;
}
// make sure that tracks/clusters collections are empty
Clear("CLUSTERS");
- Int_t start = esd->GetFirstEMCALCluster();
- Int_t nClustersEMC = esd->GetNumberOfEMCALClusters();
+ Int_t start = 0;
+ Int_t nClustersEMC = esd->GetNumberOfCaloClusters();
Int_t end = start + nClustersEMC;
fClusters = new TObjArray(0);
for (i = start; i < end; i++) {
AliESDCaloCluster *cluster = esd->GetCaloCluster(i);
if (!cluster) continue;
- if (cluster->GetClusterType() != AliESDCaloCluster::kClusterv1) continue;
+ if (!cluster->IsEMCAL()) continue ;
AliEMCALMatchCluster *matchCluster = new AliEMCALMatchCluster(i, cluster);
fClusters->AddLast(matchCluster);
}
- if (fClusters->IsEmpty()) {
- AliError("No clusters collected");
- return 1;
- }
+ if (fClusters->IsEmpty())
+ AliWarning("No clusters collected");
- AliInfo(Form("Collected %d clusters", fClusters->GetEntries()));
+ AliInfo(Form("Collected %d clusters from ESD", fClusters->GetEntries()));
return 0;
}
fTracks->AddLast(track);
}
if (fTracks->IsEmpty()) {
- AliError("No tracks collected");
- return 1;
+ AliWarning("No tracks collected");
}
AliInfo(Form("Collected %d tracks", fTracks->GetEntries()));
// After executing match finding, stores in the same ESD object all infos
// and releases the object for further reconstruction steps.
//
-
+ //
+ // Note: should always return 0=OK, because otherwise all tracking
+ // is aborted for this event
+
if (!esd) {
AliError("NULL ESD passed");
return 1;
Int_t okLoadClusters, nClusters;
if (!fClusters || (fClusters && fClusters->IsEmpty())) {
okLoadClusters = LoadClusters(esd);
- if (okLoadClusters) return 2;
}
nClusters = fClusters->GetEntries();
Int_t nMatches = CreateMatches();
if (!nMatches) {
AliInfo(Form("#clusters = %d -- #tracks = %d --> No good matches found.", nClusters, nTracks));
- return 4;
+ return 0;
}
else {
AliInfo(Form("#clusters = %d -- #tracks = %d --> Found %d matches.", nClusters, nTracks, nMatches));
trackID = track->GetSeedIndex();
AliESDtrack *esdTrack = esd->GetTrack(trackID);
if (!esdTrack) continue;
+
+ // cut on its and tpc track hits
+ if(esdTrack->GetNcls(0)<=fCutNITS)continue;
+ if(esdTrack->GetNcls(1)<=fCutNTPC)continue;
+
if (TMath::Abs(esdTrack->GetLabel()) == cluster->Label()) {
esdTrack->SetEMCALcluster(cluster->Index());
nGood++;
// check against cut on difference 'alpha - phi'
Double_t phi = TMath::ATan2(cl->Y(), cl->X());
phi = AngleDiff(phi, tr->GetAlpha());
- if (phi < fCutAlphaMin || phi > fCutAlphaMax) return distance;
+ if (phi < fCutAlphaMin || phi > fCutAlphaMax){
+ delete tr;
+ return distance;
+ }
// try to propagate to cluster radius
// (return the 'distance' value if it fails)
if (isTrue) cout << "Init : " << rt << ' ' << x << ' ' << y << ' ' << z << endl;
for (i = 0; i < fNPropSteps; i++) {
r = rt + (rc - rt) * ((Double_t)(i+1)/(Double_t)fNPropSteps);
- if (!tr->PropagateTo(r, x0, rho)) return distance;
+ if (!tr->PropagateTo(r, x0, rho)){
+ delete tr;
+ return distance;
+ }
tr->GetXYZ(pos);
if (isTrue) cout << "Step : " << r << ' ' << x << ' ' << y << ' ' << z << endl;
}
else {
// when no steps are used, no correction makes sense
//if (!tr->PropagateTo(rc, 0.0, 0.0)) return distance;
- if (!tr->PropagateToGlobal(cl->X(), cl->Y(), cl->Z(), 0.0, 0.0)) return distance;
+ if (!tr->PropagateToGlobal(cl->X(), cl->Y(), cl->Z(), 0.0, 0.0)){
+ delete tr;
+ return distance;
+ }
/*
Bool_t propOK = kFALSE;
cout << "START" << endl;
if (angle > fCutAngle) {
//cout << "angle" << endl;
+ delete tr;
return distance;
}
x -= cl->X();
if (TMath::Abs(x) > fCutX) {
//cout << "cut X" << endl;
+ delete tr;
return distance;
}
y -= cl->Y();
if (TMath::Abs(y) > fCutY) {
//cout << "cut Y" << endl;
+ delete tr;
return distance;
}
z -= cl->Z();
if (TMath::Abs(z) > fCutZ) {
//cout << "cut Z" << endl;
+ delete tr;
return distance;
}
TVector3 vdiff = vt-vc;
// compute differences wr to each coordinate
+ delete track;
if (vdiff.X() > fCutX) return distance;
if (vdiff.Y() > fCutY) return distance;
if (vdiff.Z() > fCutZ) return distance;
}
*/
+ delete [] usedC;
+ delete [] usedT;
+
return count;
}
//
void AliEMCALTracker::UnloadClusters()
{
//
- // Free memory from clusters
+ // Free memory from all arrays
+ // This method is called after the local tracking step
+ // so we can safely delete everything
//
- Clear("CLUSTERS");
+ Clear();
}
//
//------------------------------------------------------------------------------
//
AliEMCALTracker::AliEMCALMatchCluster::AliEMCALMatchCluster(Int_t index, AliEMCALRecPoint *recPoint)
: fIndex(index),
- fLabel(recPoint->GetPrimaryIndex()),
+ fLabel(recPoint->GetPrimaryIndex()), //wrong! fixed below
fX(0.),
fY(0.),
fZ(0.)
fX = clpos.X();
fY = clpos.Y();
fZ = clpos.Z();
+
+ //AliEMCALRecPoint stores the track labels in the parents
+ //list, sorted according to the fractional contribution to the
+ //RecPoint. The zeroth parent gave the highest contribution
+ Int_t multparent = 0;
+ Int_t *parents = recPoint->GetParents(multparent);
+ if(multparent > 0)
+ fLabel = parents[0];
+ else
+ fLabel = -1;
+
}
//
//------------------------------------------------------------------------------
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff