/* $Id$ */
-#include <stdlib.h> // for exit()
+// Class AliMUONTrackK
+// -------------------------------------
+// Reconstructed track in the muons system based on the extended
+// Kalman filter approach
+//
+// Author: Alexander Zinchenko, JINR Dubna
+
#include <Riostream.h>
#include <TClonesArray.h>
#include <TArrayD.h>
#include <TMatrixD.h>
#include "AliMUONTrackK.h"
-#include "AliCallf77.h"
#include "AliMUON.h"
-#include "AliMUONChamber.h"
-#include "AliMUONEventReconstructor.h"
+
+#include "AliMUONTrackReconstructor.h"
#include "AliMagF.h"
#include "AliMUONSegment.h"
#include "AliMUONHitForRec.h"
#include "AliMUONRawCluster.h"
#include "AliMUONTrackParam.h"
+#include "AliMUONEventRecoCombi.h"
+#include "AliMUONDetElement.h"
#include "AliRun.h"
#include "AliLog.h"
const Int_t AliMUONTrackK::fgkSize = 5;
-const Int_t AliMUONTrackK::fgkNSigma = 6;
-const Double_t AliMUONTrackK::fgkChi2max = 25;
+const Int_t AliMUONTrackK::fgkNSigma = 12;
+const Double_t AliMUONTrackK::fgkChi2max = 100;
const Int_t AliMUONTrackK::fgkTriesMax = 10000;
const Double_t AliMUONTrackK::fgkEpsilon = 0.002;
-void mnvertLocalK(Double_t* a, Int_t l, Int_t m, Int_t n, Int_t& ifail);
+void mnvertLocal(Double_t* a, Int_t l, Int_t m, Int_t n, Int_t& ifail); // from AliMUONTrack
-ClassImp(AliMUONTrackK) // Class implementation in ROOT context
-
-Int_t AliMUONTrackK::fgDebug = -1;
+ Int_t AliMUONTrackK::fgDebug = -1; //-1;
Int_t AliMUONTrackK::fgNOfPoints = 0;
-AliMUON* AliMUONTrackK::fgMUON = NULL;
-AliMUONEventReconstructor* AliMUONTrackK::fgEventReconstructor = NULL;
+AliMUONTrackReconstructor* AliMUONTrackK::fgTrackReconstructor = NULL;
TClonesArray* AliMUONTrackK::fgHitForRec = NULL;
-//FILE *lun1 = fopen("window.dat","w");
+AliMUONEventRecoCombi *AliMUONTrackK::fgCombi = NULL;
+
+ClassImp(AliMUONTrackK) // Class implementation in ROOT context
//__________________________________________________________________________
AliMUONTrackK::AliMUONTrackK()
{
// Default constructor
- fgEventReconstructor = NULL; // pointer to event reconstructor
- fgMUON = NULL; // pointer to Muon module
+ fgTrackReconstructor = NULL; // pointer to event reconstructor
fgHitForRec = NULL; // pointer to points
fgNOfPoints = 0; // number of points
fStartSegment = NULL;
- fTrackHitsPtr = NULL;
- fNTrackHits = 0;
+ fTrackHits = NULL;
+ fNmbTrackHits = 0;
fTrackPar = fTrackParNew = NULL;
fCovariance = fWeight = NULL;
fSkipHit = NULL;
}
//__________________________________________________________________________
-AliMUONTrackK::AliMUONTrackK(AliMUONEventReconstructor *EventReconstructor, TClonesArray *hitForRec)
- //AZ: TObject()
+AliMUONTrackK::AliMUONTrackK(AliMUONTrackReconstructor *TrackReconstructor, TClonesArray *hitForRec)
: AliMUONTrack()
{
// Constructor
- if (!EventReconstructor) return;
- fgEventReconstructor = EventReconstructor; // pointer to event reconstructor
- fgMUON = (AliMUON*) gAlice->GetModule("MUON"); // pointer to Muon module
+ if (!TrackReconstructor) return;
+ fgTrackReconstructor = TrackReconstructor; // pointer to event reconstructor
fgHitForRec = hitForRec; // pointer to points
fgNOfPoints = fgHitForRec->GetEntriesFast(); // number of points
+ fgCombi = NULL;
+ if (fgTrackReconstructor->GetTrackMethod() == 3) fgCombi = AliMUONEventRecoCombi::Instance();
fStartSegment = NULL;
- fTrackHitsPtr = NULL;
- fNTrackHits = 0;
+ fTrackHits = NULL;
+ fNmbTrackHits = 0;
fChi2 = 0;
fTrackPar = fTrackParNew = NULL;
fCovariance = fWeight = NULL;
//__________________________________________________________________________
AliMUONTrackK::AliMUONTrackK(AliMUONSegment *segment)
- //AZ: TObject()
- : AliMUONTrack(segment, segment, fgEventReconstructor)
+ //: AliMUONTrack(segment, segment, fgTrackReconstructor)
+ : AliMUONTrack(NULL, segment, fgTrackReconstructor)
{
// Constructor from a segment
Double_t dX, dY, dZ;
hit2 = segment->GetHitForRec1();
}
// memory allocation for the TObjArray of pointers to reconstructed TrackHit's
- fTrackHitsPtr = new TObjArray(13);
- fNTrackHits = 2;
+ fTrackHits = new TObjArray(13);
+ fNmbTrackHits = 2;
fChi2 = 0;
fBPFlag = kFALSE;
fTrackPar = new TMatrixD(fgkSize,1); // track parameters
(*fTrackPar)(0,0) = hit1->GetBendingCoor(); // y
(*fTrackPar)(1,0) = hit1->GetNonBendingCoor(); // x
fPosition = hit1->GetZ(); // z
- fTrackHitsPtr->Add(hit2); // add hit 2
- fTrackHitsPtr->Add(hit1); // add hit 1
+ fTrackHits->Add(hit2); // add hit 2
+ fTrackHits->Add(hit1); // add hit 1
//AZ(Z->-Z) fTrackDir = -1;
fTrackDir = 1;
} else {
(*fTrackPar)(0,0) = hit2->GetBendingCoor(); // y
(*fTrackPar)(1,0) = hit2->GetNonBendingCoor(); // x
fPosition = hit2->GetZ(); // z
- fTrackHitsPtr->Add(hit1); // add hit 1
- fTrackHitsPtr->Add(hit2); // add hit 2
+ fTrackHits->Add(hit1); // add hit 1
+ fTrackHits->Add(hit2); // add hit 2
//AZ(Z->-Z) fTrackDir = 1;
fTrackDir = -1;
}
dY = hit2->GetBendingCoor() - hit1->GetBendingCoor();
dX = hit2->GetNonBendingCoor() - hit1->GetNonBendingCoor();
(*fTrackPar)(2,0) = TMath::ATan2(dY,dZ); // alpha
- (*fTrackPar)(3,0) = TMath::ATan2(dX,dZ/TMath::Cos((*fTrackPar)(2,0))); // beta
- (*fTrackPar)(4,0) = 1/fgEventReconstructor->GetBendingMomentumFromImpactParam(segment->GetBendingImpact()); // 1/Pt
+ if ((*fTrackPar)(2,0) < 0.) (*fTrackPar)(2,0) += 2*TMath::Pi(); // from 0 to 2*pi
+ (*fTrackPar)(3,0) = TMath::ATan2(-dX,dZ/TMath::Cos((*fTrackPar)(2,0))); // beta
+ (*fTrackPar)(2,0) -= TMath::Pi();
+ (*fTrackPar)(4,0) = 1/fgTrackReconstructor->GetBendingMomentumFromImpactParam(segment->GetBendingImpact()); // 1/Pt
(*fTrackPar)(4,0) *= TMath::Cos((*fTrackPar)(3,0)); // 1/p
// Evaluate covariance (and weight) matrix
EvalCovariance(dZ);
fParSmooth = NULL;
if (fgDebug < 0 ) return;
- cout << fgEventReconstructor->GetBendingMomentumFromImpactParam(segment->GetBendingImpact()) << " " << 1/(*fTrackPar)(4,0) << " ";
- if (fgEventReconstructor->GetRecTrackRefHits()) {
+ cout << fgTrackReconstructor->GetNRecTracks()-1 << " " << fgTrackReconstructor->GetBendingMomentumFromImpactParam(segment->GetBendingImpact()) << " " << 1/(*fTrackPar)(4,0) << " ";
+ if (fgTrackReconstructor->GetRecTrackRefHits()) {
// from track ref. hits
- cout << ((AliMUONHitForRec*)((*fTrackHitsPtr)[0]))->GetTTRTrack() << "<-->" << ((AliMUONHitForRec*)((*fTrackHitsPtr)[1]))->GetTTRTrack() << " @ " << fStartSegment->GetHitForRec1()->GetChamberNumber() << endl;
+ cout << ((AliMUONHitForRec*)((*fTrackHits)[0]))->GetTTRTrack() << "<-->" << ((AliMUONHitForRec*)((*fTrackHits)[1]))->GetTTRTrack() << " @ " << fStartSegment->GetHitForRec1()->GetChamberNumber() << endl;
} else {
// from raw clusters
for (Int_t i=0; i<2; i++) {
- hit1 = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i]);
- rawclusters = fgEventReconstructor->GetMUONData()->RawClusters(hit1->GetChamberNumber());
+ hit1 = (AliMUONHitForRec*) ((*fTrackHits)[i]);
+ rawclusters = fgTrackReconstructor->GetMUONData()->RawClusters(hit1->GetChamberNumber());
clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit1->GetHitNumber());
- cout << clus->GetTrack(1)-1;
- if (clus->GetTrack(2) != 0) cout << " " << clus->GetTrack(2)-1;
+ cout << clus->GetTrack(1);
+ if (clus->GetTrack(2) != -1) cout << " " << clus->GetTrack(2);
if (i == 0) cout << " <--> ";
}
cout << " @ " << fStartSegment->GetHitForRec1()->GetChamberNumber() << endl;
{
// Destructor
- if (fTrackHitsPtr) {
- delete fTrackHitsPtr; // delete the TObjArray of pointers to TrackHit's
- fTrackHitsPtr = NULL;
+ if (fTrackHits) {
+ //cout << fNmbTrackHits << endl;
+ for (Int_t i = 0; i < fNmbTrackHits; i++) {
+ AliMUONHitForRec *hit = (AliMUONHitForRec*) fTrackHits->UncheckedAt(i);
+ hit->SetNTrackHits(hit->GetNTrackHits()-1);
+ }
+ delete fTrackHits; // delete the TObjArray of pointers to TrackHit's
+ fTrackHits = NULL;
}
if (fTrackPar) {
delete fTrackPar; delete fTrackParNew; delete fCovariance;
//__________________________________________________________________________
AliMUONTrackK::AliMUONTrackK (const AliMUONTrackK& source)
- //AZ: TObject(source)
: AliMUONTrack(source)
{
// Protected copy constructor
AliMUONTrack::operator=(source);
fStartSegment = source.fStartSegment;
- fNTrackHits = source.fNTrackHits;
+ fNmbTrackHits = source.fNmbTrackHits;
fChi2 = source.fChi2;
fPosition = source.fPosition;
fPositionNew = source.fPositionNew;
fSkipHit = source.fSkipHit;
// Pointers
- fTrackHitsPtr = new TObjArray(*source.fTrackHitsPtr);
- //source.fTrackHitsPtr->Dump();
- //fTrackHitsPtr->Dump();
+ fTrackHits = new TObjArray(*source.fTrackHits);
+ //source.fTrackHits->Dump();
+ //fTrackHits->Dump();
+ for (Int_t i = 0; i < fNmbTrackHits; i++) {
+ AliMUONHitForRec *hit = (AliMUONHitForRec*) fTrackHits->UncheckedAt(i);
+ hit->SetNTrackHits(hit->GetNTrackHits()+1);
+ }
fTrackPar = new TMatrixD(*source.fTrackPar); // track parameters
fTrackParNew = new TMatrixD(*source.fTrackParNew); // track parameters
// Evaluate covariance (and weight) matrix for track candidate
Double_t sigmaB, sigmaNonB, tanA, tanB, dAdY, rad, dBdX, dBdY;
- sigmaB = fgEventReconstructor->GetBendingResolution(); // bending resolution
- sigmaNonB = fgEventReconstructor->GetNonBendingResolution(); // non-bending resolution
+ dZ = -dZ;
+ sigmaB = fgTrackReconstructor->GetBendingResolution(); // bending resolution
+ sigmaNonB = fgTrackReconstructor->GetNonBendingResolution(); // non-bending resolution
(*fWeight)(0,0) = sigmaB*sigmaB; // <yy>
(*fWeight)(1,3) = dBdX*(*fWeight)(1,1); // <xb>
(*fWeight)(3,1) = (*fWeight)(1,3);
- //(*fWeight)(4,4) = ((*fTrackPar)(4,0)*0.2)*((*fTrackPar)(4,0)*0.2); // error 20%
(*fWeight)(4,4) = ((*fTrackPar)(4,0)*0.5)*((*fTrackPar)(4,0)*0.5); // error 50%
// check whether the Invert method returns flag if matrix cannot be inverted,
// and do not calculate the Determinant in that case !!!!
if (fWeight->Determinant() != 0) {
// fWeight->Invert();
- Int_t ifailWeight;
- mnvertLocalK(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifailWeight);
+ Int_t ifail;
+ mnvertLocal(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
AliWarning(" Determinant fWeight=0:");
}
// Follows track through detector stations
Bool_t miss, success;
Int_t ichamb, iFB, iMin, iMax, dChamb, ichambOK;
- Int_t ihit, firstIndx, lastIndx, currIndx;
+ Int_t ihit, firstIndx = -1, lastIndx = -1, currIndx = -1, iz0 = -1, iz = -1;
Double_t zEnd, dChi2;
- AliMUONHitForRec *hitAdd, *firstHit, *lastHit, *hit;
+ AliMUONHitForRec *hitAdd, *firstHit = NULL, *lastHit = NULL, *hit;
AliMUONRawCluster *clus;
TClonesArray *rawclusters;
hit = 0; clus = 0; rawclusters = 0;
miss = success = kTRUE;
Int_t endOfProp = 0;
- iFB = (ichamEnd == ichamBeg) ? fTrackDir : TMath::Sign(1,ichamEnd-ichamBeg);
+ //iFB = (ichamEnd == ichamBeg) ? fTrackDir : TMath::Sign(1,ichamEnd-ichamBeg);
+ iFB = (ichamEnd == ichamBeg) ? -fTrackDir : TMath::Sign(1,ichamEnd-ichamBeg);
iMin = TMath::Min(ichamEnd,ichamBeg);
iMax = TMath::Max(ichamEnd,ichamBeg);
ichamb = ichamBeg;
if (Back) {
// backpropagation
currIndx = 1;
- if (((AliMUONHitForRec*)fTrackHitsPtr->First())->GetChamberNumber() != ichamb) currIndx = 0;
+ if (((AliMUONHitForRec*)fTrackHits->First())->GetChamberNumber() != ichamb) currIndx = 0;
} else if (fRecover) {
hit = GetHitLastOk();
- currIndx = fTrackHitsPtr->IndexOf(hit);
+ currIndx = fTrackHits->IndexOf(hit);
if (currIndx < 0) hit = fStartSegment->GetHitForRec1(); // for station 3
Back = kTRUE;
ichamb = hit->GetChamberNumber();
if (hit == fSkipHit || fRecover == 2 && currIndx >= 0) {
// start from the last point or outlier
// remove the skipped hit
- fTrackHitsPtr->Remove(fSkipHit); // remove hit
- fNTrackHits --;
+ fTrackHits->Remove(fSkipHit); // remove hit
+ fNmbTrackHits --;
fSkipHit->SetNTrackHits(fSkipHit->GetNTrackHits()-1); // unmark hit
if (fRecover == 1) {
// recovery
Back = kFALSE;
fRecover = 0;
- ichambOK = ((AliMUONHitForRec*)((*fTrackHitsPtr)[fNTrackHits-1]))->GetChamberNumber();
- //if (ichambOK >= 8 && ((AliMUONHitForRec*)((*fTrackHitsPtr)[0]))->GetChamberNumber() == 6) ichambOK = 6;
- currIndx = fgHitForRec->IndexOf(fSkipHit);
+ ichambOK = ((AliMUONHitForRec*)((*fTrackHits)[fNmbTrackHits-1]))->GetChamberNumber();
+ //if (ichambOK >= 8 && ((AliMUONHitForRec*)((*fTrackHits)[0]))->GetChamberNumber() == 6) ichambOK = 6;
+ if (fgTrackReconstructor->GetTrackMethod() == 3 &&
+ fSkipHit->GetHitNumber() < 0) {
+ iz0 = fgCombi->IZfromHit(fSkipHit);
+ currIndx = -1;
+ }
+ else currIndx = fgHitForRec->IndexOf(fSkipHit);
} else {
// outlier
- fTrackHitsPtr->Compress();
+ fTrackHits->Compress();
}
} // if (hit == fSkipHit)
- else if (currIndx < 0) currIndx = fTrackHitsPtr->IndexOf(hit);
+ else if (currIndx < 0) currIndx = fTrackHits->IndexOf(hit);
} // else if (fRecover)
else {
// Get indices of the 1'st and last hits on the track candidate
- firstHit = (AliMUONHitForRec*) fTrackHitsPtr->First();
- lastHit = (AliMUONHitForRec*) fTrackHitsPtr->Last();
- firstIndx = fgHitForRec->IndexOf(firstHit);
- lastIndx = fgHitForRec->IndexOf(lastHit);
- currIndx = TMath::Abs (TMath::Max(firstIndx*iFB,lastIndx*iFB));
+ firstHit = (AliMUONHitForRec*) fTrackHits->First();
+ lastHit = (AliMUONHitForRec*) fTrackHits->Last();
+ if (fgTrackReconstructor->GetTrackMethod() == 3 &&
+ lastHit->GetHitNumber() < 0) iz0 = fgCombi->IZfromHit(lastHit);
+ else {
+ firstIndx = fgHitForRec->IndexOf(firstHit);
+ lastIndx = fgHitForRec->IndexOf(lastHit);
+ currIndx = TMath::Abs (TMath::Max(firstIndx*iFB,lastIndx*iFB));
+ }
}
- while (ichamb>=iMin && ichamb<=iMax) {
+ if (iz0 < 0) iz0 = iFB;
+ while (ichamb >= iMin && ichamb <= iMax) {
// Find the closest hit in Z, not belonging to the current plane
if (Back) {
// backpropagation
- if (currIndx < fNTrackHits) {
- hitAdd = (AliMUONHitForRec*) fTrackHitsPtr->UncheckedAt(currIndx);
+ if (currIndx < fNmbTrackHits) {
+ hitAdd = (AliMUONHitForRec*) fTrackHits->UncheckedAt(currIndx);
zEnd = hitAdd->GetZ();
//AZ(z->-z) } else zEnd = -9999;
} else zEnd = 9999;
break;
}
}
+
+ // Combined cluster / track finder
+ if (zEnd > 999 && iFB < 0 && fgTrackReconstructor->GetTrackMethod() == 3) {
+ currIndx = -2;
+ AliMUONHitForRec hitTmp;
+ for (iz = iz0 - iFB; iz < fgCombi->Nz(); iz++) {
+ if (TMath::Abs(fgCombi->Z(iz)-fPosition) < 0.5) continue;
+ Int_t *pDEatZ = fgCombi->DEatZ(iz);
+ //cout << iz << " " << fgCombi->Z(iz) << endl;
+ zEnd = fgCombi->Z(iz);
+ iz0 = iz;
+ AliMUONDetElement *detElem = fgCombi->DetElem(pDEatZ[0]);
+ hitAdd = &hitTmp;
+ hitAdd->SetChamberNumber(detElem->Chamber());
+ //hitAdd = (AliMUONHitForRec*) detElem->HitsForRec()->First();
+ if (hitAdd) break;
+ }
+ }
}
- //AZ(Z->-Z) if (zEnd<-999 && ichamb==ichamEnd) endOfProp = 1; // end-of-propagation
if (zEnd>999 && ichamb==ichamEnd) endOfProp = 1; // end-of-propagation
else {
// Check if there is a chamber without hits
if (zEnd>999 || TMath::Abs(hitAdd->GetChamberNumber()-ichamb) > 1) {
if (!Back && zEnd<999) currIndx -= iFB;
ichamb += iFB;
- zEnd = (&(fgMUON->Chamber(ichamb)))->Z();
+ zEnd = AliMUONConstants::DefaultChamberZ(ichamb);
miss = kTRUE;
} else {
ichamb = hitAdd->GetChamberNumber();
Int_t dStatMiss = TMath::Abs (ichamb/2 - ichambOK/2);
if (zEnd > 999) dStatMiss++;
if (dStatMiss > 1) {
+ //if (dStatMiss == 2 && ichambOK/2 != 3 || dStatMiss > 2) { // AZ - missing st. 3
// missing station - abandon track
//cout << dChamb << " " << ichambOK << " " << fgNOfPoints << " " << 1/(*fTrackPar)(4,0) << endl;
if (fgDebug >= 10) {
cout << ((AliMUONHitForRec*)((*fgHitForRec)[i1]))->GetTTRTrack() << endl;
}
cout << endl;
- cout << fNTrackHits << endl;
- for (Int_t i1=0; i1<fNTrackHits; i1++) {
- hit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i1]);
+ cout << fNmbTrackHits << endl;
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) {
+ hit = (AliMUONHitForRec*) ((*fTrackHits)[i1]);
printf(" * %d %10.4f %10.4f %10.4f",
hit->GetChamberNumber(), hit->GetBendingCoor(),
hit->GetNonBendingCoor(), hit->GetZ());
- if (fgEventReconstructor->GetRecTrackRefHits()) {
+ if (fgTrackReconstructor->GetRecTrackRefHits()) {
// from track ref. hits
printf(" %3d %3d \n", hit->GetTrackRefSignal(), hit->GetTTRTrack());
} else {
// from raw clusters
- rawclusters = fgEventReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
+ rawclusters = fgTrackReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber());
printf("%3d", clus->GetTrack(1)-1);
if (clus->GetTrack(2) != 0) printf("%3d \n", clus->GetTrack(2)-1);
}
}
} // if (fgDebug >= 10)
- if (fNTrackHits>2 && fRecover==0) Recover(); // try to recover track later
+ if (fNmbTrackHits>2 && fRecover==0) Recover(); // try to recover track later
return kFALSE;
} // if (dStatMiss > 1)
} // if (!Back)
miss = kTRUE;
ichamb = fSkipHit->GetChamberNumber();
// remove the skipped hit
- fTrackHitsPtr->Remove(fSkipHit);
- fNTrackHits --;
- fSkipHit->SetNTrackHits(fSkipHit->GetNTrackHits()-1); // unmark hit
+ fTrackHits->Remove(fSkipHit);
+ fNmbTrackHits --;
+ //AZ fSkipHit->SetNTrackHits(fSkipHit->GetNTrackHits()-1); // unmark hit
Back = kFALSE;
- fRecover =0;
- ichambOK = ((AliMUONHitForRec*)((*fTrackHitsPtr)[fNTrackHits-1]))->GetChamberNumber();
+ fRecover = 0;
+ ichambOK = ((AliMUONHitForRec*)((*fTrackHits)[fNmbTrackHits-1]))->GetChamberNumber();
+ //? if (fgTrackReconstructor->GetTrackMethod() != 3) currIndx = fgHitForRec->IndexOf(fSkipHit);
currIndx = fgHitForRec->IndexOf(fSkipHit);
}
TryPoint(point,pointWeight,trackParTmp,dChi2);
*fTrackPar = trackParTmp;
*fWeight += pointWeight;
- //AZ(z->-z) if (fTrackDir < 0) AddMatrices (this, dChi2, hitAdd);
if (fTrackDir > 0) AddMatrices (this, dChi2, hitAdd);
fChi2 += dChi2; // Chi2
} else *fTrackPar = *fTrackParNew; // adjust end point to the last hit
currIndx ++;
} else {
// forward propagator
- if (miss || !FindPoint(ichamb,zEnd,currIndx,iFB,hitAdd)) {
+ if (miss || !FindPoint(ichamb, zEnd, currIndx, iFB, hitAdd, iz)) {
// missing point
*fTrackPar = *fTrackParNew;
} else {
//add point
- fTrackHitsPtr->Add(hitAdd); // add hit
- fNTrackHits ++;
+ fTrackHits->Add(hitAdd); // add hit
+ fNmbTrackHits ++;
hitAdd->SetNTrackHits(hitAdd->GetNTrackHits()+1); // mark hit as being on track
ichambOK = ichamb;
currIndx = fgHitForRec->IndexOf(hitAdd); // Check
}
}
} // while
- if (fgDebug > 0) cout << fNTrackHits << " " << fChi2 << " " << 1/(*fTrackPar)(4,0) << " " << fPosition << endl;
- if (1/TMath::Abs((*fTrackPar)(4,0)) < fgEventReconstructor->GetMinBendingMomentum()) success = kFALSE; // p < p_min
+ if (fgDebug > 0) cout << fNmbTrackHits << " " << fChi2 << " " << 1/(*fTrackPar)(4,0) << " " << fPosition << endl;
+ if (1/TMath::Abs((*fTrackPar)(4,0)) < fgTrackReconstructor->GetMinBendingMomentum()) success = kFALSE; // p < p_min
return success;
}
Int_t iFB, nTries;
Double_t dZ, step, distance, charge;
Double_t vGeant3[7], vGeant3New[7];
- AliMUONTrackParam* trackParam = 0;
+ AliMUONTrackParam trackParam;
+
nTries = 0;
// First step using linear extrapolation
dZ = zEnd - fPosition;
//AZ(z->-z) charge = iFB*TMath::Sign(Double_t(1.0),(*fTrackPar)(4,0));
charge = -iFB*TMath::Sign(Double_t(1.0),(*fTrackPar)(4,0));
SetGeantParam(vGeant3,iFB);
+ //fTrackParNew->Print();
// Check if overstep
do {
step = TMath::Abs(step);
// Propagate parameters
- trackParam->ExtrapOneStepRungekutta(charge,step,vGeant3,vGeant3New);
- // extrap_onestep_rungekutta(charge,step,vGeant3,vGeant3New);
+ trackParam.ExtrapOneStepRungekutta(charge,step,vGeant3,vGeant3New);
+ //extrap_onestep_rungekutta(charge,step,vGeant3,vGeant3New);
distance = zEnd - vGeant3New[2];
step *= dZ/(vGeant3New[2]-fPositionNew);
nTries ++;
} while (distance*iFB < 0 && TMath::Abs(distance) > fgkEpsilon);
GetFromGeantParam(vGeant3New,iFB);
+ //fTrackParNew->Print();
// Position adjustment (until within tolerance)
while (TMath::Abs(distance) > fgkEpsilon) {
do {
// binary search
// Propagate parameters
- // extrap_onestep_rungekutta(charge,step,vGeant3,vGeant3New);
- trackParam->ExtrapOneStepRungekutta(charge,step,vGeant3,vGeant3New);
-
+ trackParam.ExtrapOneStepRungekutta(charge,step,vGeant3,vGeant3New);
+ //extrap_onestep_rungekutta(charge,step,vGeant3,vGeant3New);
distance = zEnd - vGeant3New[2];
step /= 2;
nTries ++;
- if (nTries > fgkTriesMax) {
- cout << " ***** ParPropagation: too many tries " << nTries << endl;
- AliFatal("Too many tries.");
- }
+ if (nTries > fgkTriesMax) AliError(Form(" Too many tries: %d", nTries));
} while (distance*iFB < 0);
GetFromGeantParam(vGeant3New,iFB);
}
//cout << nTries << endl;
+ //fTrackParNew->Print();
return;
}
-/*
- //__________________________________________________________________________
-void AliMUONTrackK::WeightPropagation(void)
-{
- // Propagation of the weight matrix
- // W = DtWD, where D is Jacobian
- // !!! not implemented TMatrixD weight1(*fJacob,TMatrixD::kAtBA,*fWeight); // DtWD
- TMatrixD weight1(*fWeight,TMatrixD::kMult,*fJacob); // WD
- *fWeight = TMatrixD(*fJacob,TMatrixD::kTransposeMult,weight1); // DtWD
- return;
-}
-*/
//__________________________________________________________________________
void AliMUONTrackK::WeightPropagation(Double_t zEnd, Bool_t smooth)
{
// Save initial and propagated parameters
TMatrixD trackPar0 = *fTrackPar;
TMatrixD trackParNew0 = *fTrackParNew;
- Double_t savePosition = fPositionNew;
// Get covariance matrix
*fCovariance = *fWeight;
// check whether the Invert method returns flag if matrix cannot be inverted,
// and do not calculate the Determinant in that case !!!!
if (fCovariance->Determinant() != 0) {
- // fCovariance->Invert();
- Int_t ifailCov;
- mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
+ //fCovariance->Print();
} else {
AliWarning(" Determinant fCovariance=0:");
}
- // Loop over parameters to find change of the initial vs propagated ones
- zEnd = fPosition;
- fPosition = fPositionNew;
+ // Loop over parameters to find change of the propagated vs initial ones
for (i=0; i<fgkSize; i++) {
dPar = TMath::Sqrt((*fCovariance)(i,i));
- *fTrackPar = trackParNew0;
+ *fTrackPar = trackPar0;
+ if (i == 4) dPar *= TMath::Sign(1.,-trackPar0(4,0)); // 1/p
(*fTrackPar)(i,0) += dPar;
ParPropagation(zEnd);
for (j=0; j<fgkSize; j++) {
- jacob(j,i) = ((*fTrackParNew)(j,0)-trackPar0(j,0))/dPar;
+ jacob(j,i) = ((*fTrackParNew)(j,0)-trackParNew0(j,0))/dPar;
}
}
- //jacob->Print();
//trackParNew0.Print();
//TMatrixD par1(jacob,TMatrixD::kMult,trackPar0); //
//par1.Print();
- /*
+ TMatrixD jacob0 = jacob;
if (jacob.Determinant() != 0) {
- // jacob.Invert();
+ jacob.Invert();
} else {
- cout << " ***** Warning in WeightPropagation: Determinant jacob=0:" << endl;
+ AliWarning(" Determinant jacob=0:");
}
- */
TMatrixD weight1(*fWeight,TMatrixD::kMult,jacob); // WD
*fWeight = TMatrixD(jacob,TMatrixD::kTransposeMult,weight1); // DtWD
- //fWeight->Print();
// Restore initial and propagated parameters
*fTrackPar = trackPar0;
*fTrackParNew = trackParNew0;
- fPosition = zEnd;
- fPositionNew = savePosition;
// Save for smoother
if (!smooth) return; // do not use smoother
- //AZ(z->-z) if (fTrackDir > 0) return; // only for propagation towards int. point
if (fTrackDir < 0) return; // only for propagation towards int. point
TMatrixD *tmp = new TMatrixD(*fTrackParNew); // extrapolated parameters
fParExtrap->Add(tmp);
tmp->SetUniqueID(1);
*fCovariance = *fWeight;
if (fCovariance->Determinant() != 0) {
- Int_t ifailCov;
- mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
AliWarning(" Determinant fCovariance=0:");
}
tmp = new TMatrixD(*fCovariance); // filtered covariance (if no measurement will be found)
fCovFilter->Add(tmp);
tmp->SetUniqueID(1);
- tmp = new TMatrixD(jacob); // Jacobian
- tmp->Invert();
+ tmp = new TMatrixD(jacob0); // Jacobian
fJacob->Add(tmp);
tmp->SetUniqueID(1);
if (fSteps->fN <= fNSteps) fSteps->Set(fSteps->fN+10);
}
//__________________________________________________________________________
-Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int_t iFB, AliMUONHitForRec *&hitAdd)
+Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int_t iFB, AliMUONHitForRec *&hitAdd, Int_t iz)
{
// Picks up point within a window for the chamber No ichamb
// Split the track if there are more than 1 hit
TClonesArray *trackPtr;
AliMUONHitForRec *hit, *hitLoop;
AliMUONTrackK *trackK;
+ AliMUONDetElement *detElem = NULL;
Bool_t ok = kFALSE;
- //sigmaB = fgEventReconstructor->GetBendingResolution(); // bending resolution
- //sigmaNonB = fgEventReconstructor->GetNonBendingResolution(); // non-bending resolution
+
+ if (fgTrackReconstructor->GetTrackMethod() == 3 && iz >= 0) {
+ // Combined cluster / track finder
+ // Check if extrapolated track passes thru det. elems. at iz
+ Int_t *pDEatZ = fgCombi->DEatZ(iz);
+ Int_t nDetElem = pDEatZ[-1];
+ //cout << fgCombi->Z(iz) << " " << nDetElem << endl;
+ for (Int_t i = 0; i < nDetElem; i++) {
+ detElem = fgCombi->DetElem(pDEatZ[i]);
+ if (detElem->Inside((*fTrackParNew)(1,0), (*fTrackParNew)(0,0), fPosition)) {
+ detElem->ClusterReco((*fTrackParNew)(1,0), (*fTrackParNew)(0,0));
+ hitAdd = (AliMUONHitForRec*) detElem->HitsForRec()->First();
+ ok = kTRUE;
+ break;
+ }
+ }
+ if (!ok) return ok; // outside det. elem.
+ ok = kFALSE;
+ }
+
+ //sigmaB = fgTrackReconstructor->GetBendingResolution(); // bending resolution
+ //sigmaNonB = fgTrackReconstructor->GetNonBendingResolution(); // non-bending resolution
*fCovariance = *fWeight;
// check whether the Invert method returns flag if matrix cannot be inverted,
// and do not calculate the Determinant in that case !!!!
if (fCovariance->Determinant() != 0) {
- // fCovariance->Invert();
- Int_t ifailCov;
- mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant fCovariance=0:");
+ AliWarning(" Determinant fCovariance=0:");
}
//windowB = fgkNSigma*TMath::Sqrt((*fCovariance)(0,0)+sigmaB*sigmaB);
//windowNonB = fgkNSigma*TMath::Sqrt((*fCovariance)(1,1)+sigmaNonB*sigmaNonB);
TMatrixD point(fgkSize,1);
TMatrixD trackPar = point;
TMatrixD trackParTmp = point;
- Int_t nHitsOK = 0;
+ Int_t nHitsOK = 0, ihitB = currIndx, ihitE = fgNOfPoints, iDhit = iFB;
Double_t zLast;
- zLast = ((AliMUONHitForRec*)fTrackHitsPtr->Last())->GetZ();
+ zLast = ((AliMUONHitForRec*)fTrackHits->Last())->GetZ();
+ if (fgTrackReconstructor->GetTrackMethod() == 3 && detElem) {
+ ihitB = 0;
+ ihitE = detElem->NHitsForRec();
+ iDhit = 1;
+ }
- for (ihit=currIndx; ihit>=0 && ihit<fgNOfPoints; ihit+=iFB) {
- hit = (AliMUONHitForRec*) ((*fgHitForRec)[ihit]);
+
+ for (ihit = ihitB; ihit >= 0 && ihit < ihitE; ihit+=iDhit) {
+ if (fgTrackReconstructor->GetTrackMethod() != 3 || !detElem)
+ hit = (AliMUONHitForRec*) ((*fgHitForRec)[ihit]);
+ else hit = (AliMUONHitForRec*) detElem->HitsForRec()->UncheckedAt(ihit);
if (hit->GetChamberNumber() == ichamb) {
//if (TMath::Abs(hit->GetZ()-zEnd) < 0.1) {
if (TMath::Abs(hit->GetZ()-zEnd) < 0.5) {
- if (TMath::Abs(hit->GetZ()-zEnd) > 0.1) {
- // adjust position: for multiple hits in the chamber
- // (mostly (only?) for GEANT hits)
- zEnd = hit->GetZ();
- *fTrackPar = *fTrackParNew;
- ParPropagation(zEnd);
- WeightPropagation(zEnd, kTRUE);
- fPosition = fPositionNew;
- *fTrackPar = *fTrackParNew;
- // Get covariance
- *fCovariance = *fWeight;
- if (fCovariance->Determinant() != 0) {
- //fCovariance->Invert();
- Int_t ifailCov;
- mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
- } else {
- AliWarning("Determinant fCovariance=0:" );
- }
- }
y = hit->GetBendingCoor();
x = hit->GetNonBendingCoor();
+ if (hit->GetBendingReso2() < 0) {
+ // Combined cluster / track finder
+ hit->SetBendingReso2(fgTrackReconstructor->GetBendingResolution()*
+ fgTrackReconstructor->GetBendingResolution());
+ hit->SetNonBendingReso2(fgTrackReconstructor->GetNonBendingResolution()*
+ fgTrackReconstructor->GetNonBendingResolution());
+ }
windowB = fgkNSigma*TMath::Sqrt((*fCovariance)(0,0)+hit->GetBendingReso2());
windowNonB = fgkNSigma*TMath::Sqrt((*fCovariance)(1,1)+hit->GetNonBendingReso2());
- //fprintf(lun1,"%3d %10.4f %10.4f %10.4f \n", ichamb, windowB, windowNonB, TMath::Abs(hit->GetZ()-zLast));
- windowB = TMath::Min (windowB,5.);
+ // windowB = TMath::Min (windowB,5.);
+ if (fgkNSigma > 6) windowB = TMath::Min (windowB,5.);
/*
if (TMath::Abs(hit->GetZ()-zLast) < 50) {
windowB = TMath::Min (windowB,0.5);
// TMath::Abs((*fTrackParNew)(1,0)-x) <= windowNonB &&
// hit->GetTrackRefSignal() == 1) { // just for test
// Vector of measurements and covariance matrix
+ //fprintf(lun1,"%3d %3d %10.4f %10.4f \n", gAlice->GetEvNumber(), ichamb, x, y);
+ if (TMath::Abs(hit->GetZ()-zEnd) > 0.05) {
+ // Adjust position: for multiple hits in the chamber or misalignment (Z as a function of X or Y)
+ //AliWarning(Form(" *** adjust %f %f ", zEnd, hit->GetZ()));
+ zEnd = hit->GetZ();
+ *fTrackPar = *fTrackParNew;
+ ParPropagation(zEnd);
+ WeightPropagation(zEnd, kTRUE);
+ fPosition = fPositionNew;
+ *fTrackPar = *fTrackParNew;
+ // Get covariance
+ *fCovariance = *fWeight;
+ if (fCovariance->Determinant() != 0) {
+ Int_t ifail;
+ mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
+ } else {
+ AliWarning(" Determinant fCovariance=0:" );
+ }
+ }
point.Zero();
point(0,0) = y;
point(1,0) = x;
pointWeight(0,0) = 1/hit->GetBendingReso2();
pointWeight(1,1) = 1/hit->GetNonBendingReso2();
TryPoint(point,pointWeight,trackPar,dChi2);
- if (TMath::Abs(1./(trackPar)(4,0)) < fgEventReconstructor->GetMinBendingMomentum()) continue; // p < p_min - next hit
+ if (TMath::Abs(1./(trackPar)(4,0)) < fgTrackReconstructor->GetMinBendingMomentum()) continue; // p < p_min - next hit
+ // if (TMath::Sign(1.,(trackPar)(4,0)*(*fTrackPar)(4,0)) < 0) continue; // change of sign
ok = kTRUE;
nHitsOK++;
//if (nHitsOK > -1) {
trackParTmp = trackPar;
pointWeightTmp = pointWeight;
hitAdd = hit;
+ if (fgDebug > 0) cout << " Added point: " << x << " " << y << " " << dChi2 << endl;
} else {
// branching: create a new track
- trackPtr = fgEventReconstructor->GetRecTracksPtr();
- nRecTracks = fgEventReconstructor->GetNRecTracks();
+ trackPtr = fgTrackReconstructor->GetRecTracksPtr();
+ nRecTracks = fgTrackReconstructor->GetNRecTracks();
trackK = new ((*trackPtr)[nRecTracks]) AliMUONTrackK(NULL, NULL);
*trackK = *this;
- fgEventReconstructor->SetNRecTracks(nRecTracks+1);
- if (fgDebug > 0) cout << " ******** New track: " << ichamb << " " << hit->GetTTRTrack() << " " << 1/(trackPar)(4,0) << " " << hit->GetBendingCoor() << " " << hit->GetNonBendingCoor() << " " << fNTrackHits << " " << nRecTracks << endl;
+ fgTrackReconstructor->SetNRecTracks(nRecTracks+1);
+ if (fgDebug > 0) cout << " ******** New track: " << ichamb << " " << hit->GetTTRTrack() << " " << 1/(trackPar)(4,0) << " " << hit->GetBendingCoor() << " " << hit->GetNonBendingCoor() << " " << fNmbTrackHits << " " << nRecTracks << endl;
trackK->fRecover = 0;
*(trackK->fTrackPar) = trackPar;
*(trackK->fWeight) += pointWeight;
/*
*(trackK->fCovariance) = *(trackK->fWeight);
if (trackK->fCovariance->Determinant() != 0) {
- Int_t ifailCov;
- mnvertLocalK(&((*(trackK->fCovariance))(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*(trackK->fCovariance))(0,0)), fgkSize,fgkSize,fgkSize,ifail);
}
cout << (*(trackK->fCovariance))(0,0) << " " << (*(trackK->fCovariance))(1,1) << " " << (*fCovariance)(0,0) << " " << (*fCovariance)(1,1) << endl;
*/
// Add filtered matrices for the smoother
- //AZ(z->-z) if (fTrackDir < 0) {
if (fTrackDir > 0) {
if (nHitsOK > 2) { // check for position adjustment
for (Int_t i=trackK->fNSteps-1; i>=0; i--) {
if (TMath::Abs(hit->GetZ()-(*trackK->fSteps)[i]) > 0.1) {
//if (TMath::Abs(hit->GetZ()-(trackK->fSteps)[i]) > 0.1) {
RemoveMatrices(trackK);
- cout << " *** Position adjustment 1 " << hit->GetZ() << " "
- << (*trackK->fSteps)[i] << endl;
- AliFatal("Position adjustment 1.");
+ AliError(Form(" *** Position adjustment 1: %f %f", hit->GetZ(), (*trackK->fSteps)[i]));
}
else break;
}
AddMatrices (trackK, dChi2, hit);
}
// Mark hits as being on 2 tracks
- for (Int_t i=0; i<fNTrackHits; i++) {
- hitLoop = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i]);
- hitLoop->SetNTrackHits(hitLoop->GetNTrackHits()+1);
+ for (Int_t i=0; i<fNmbTrackHits; i++) {
+ hitLoop = (AliMUONHitForRec*) ((*fTrackHits)[i]);
+ //AZ hitLoop->SetNTrackHits(hitLoop->GetNTrackHits()+1);
if (fgDebug >=10) {
cout << " ** ";
cout << hitLoop->GetChamberNumber() << " ";
}
}
//add point
- trackK->fTrackHitsPtr->Add(hit); // add hit
- trackK->fNTrackHits ++;
+ trackK->fTrackHits->Add(hit); // add hit
+ trackK->fNmbTrackHits ++;
hit->SetNTrackHits(hit->GetNTrackHits()+1); // mark hit as being on track
if (ichamb == 9) {
// the last chamber
- //AZ(z->-z) trackK->fTrackDir = -1;
trackK->fTrackDir = 1;
trackK->fBPFlag = kTRUE;
}
fChi2 += dChi2Tmp; // Chi2
fPosition = savePosition;
// Add filtered matrices for the smoother
- //AZ(z->-z) if (fTrackDir < 0) {
if (fTrackDir > 0) {
for (Int_t i=fNSteps-1; i>=0; i--) {
if (TMath::Abs(fPosition-(*fSteps)[i]) > 0.1) {
//if (TMath::Abs(fPosition-fSteps[i]) > 0.1) {
RemoveMatrices(this);
- if (fgDebug > 1) cout << " *** Position adjustment 2 " << fPosition << " " << (*fSteps)[i] << endl;
+ if (fgDebug > 0) cout << " *** Position adjustment 2 " << fPosition << " " << (*fSteps)[i] << endl;
}
else break;
} // for (Int_t i=fNSteps-1;
// check whether the Invert method returns flag if matrix cannot be inverted,
// and do not calculate the Determinant in that case !!!!
if (wu.Determinant() != 0) {
- // wu.Invert();
- Int_t ifailWU;
- mnvertLocalK(&((wu)(0,0)), fgkSize,fgkSize,fgkSize,ifailWU);
+ Int_t ifail;
+ mnvertLocal(&((wu)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant wu=0:");
+ AliWarning(" Determinant wu=0:");
}
trackParTmp = TMatrixD(wu,TMatrixD::kMult,right);
// check whether the Invert method returns flag if matrix cannot be inverted,
// and do not calculate the Determinant in that case !!!!
if (fWeight->Determinant() != 0) {
- //fWeight->Invert(); // covariance
-
- Int_t ifailWeight;
- mnvertLocalK(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifailWeight);
+ Int_t ifail;
+ mnvertLocal(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant fWeight=0:");
+ AliWarning(" Determinant fWeight=0:");
}
cosAlph = TMath::Cos((*fTrackParNew)(2,0));
momentum = 1/(*fTrackParNew)(4,0); // particle momentum
//velo = momentum/TMath::Sqrt(momentum*momentum+muonMass*muonMass); // velocity/c for muon hypothesis
velo = 1; // relativistic
- path = TMath::Abs(fgEventReconstructor->GetChamberThicknessInX0()/cosAlph/cosBeta); // path length
+ path = TMath::Abs(fgTrackReconstructor->GetChamberThicknessInX0()/cosAlph/cosBeta); // path length
theta0 = 0.0136/velo/momentum*TMath::Sqrt(path)*(1+0.038*TMath::Log(path)); // projected scattering angle
(*fWeight)(2,2) += sign*theta0/cosBeta*theta0/cosBeta; // alpha
(*fWeight)(3,3) += sign*theta0*theta0; // beta
- //fWeight->Invert(); // weight
-
- Int_t ifailWeight;
- mnvertLocalK(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifailWeight);
+ Int_t ifail;
+ mnvertLocal(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
return;
}
for (Int_t i=0; i<fgkSize; i++) {
for (Int_t j=0; j<fgkSize; j++) {
if (j==i) (*fWeight)(i,i) /= 100;
- //if (j==i) (*fWeight)(i,i) /= fNTrackHits*fNTrackHits;
+ //if (j==i) (*fWeight)(i,i) /= fNmbTrackHits*fNmbTrackHits;
else (*fWeight)(j,i) = 0;
}
}
// Sort hits on track in descending order in abs(z)
- SortHits(0, fTrackHitsPtr);
+ SortHits(0, fTrackHits);
}
//__________________________________________________________________________
VGeant3[0] = (*fTrackParNew)(1,0); // X
VGeant3[1] = (*fTrackParNew)(0,0); // Y
VGeant3[2] = fPositionNew; // Z
- //AZ(z->-z) VGeant3[3] = iFB*TMath::Sin((*fTrackParNew)(3,0)); // Px/Ptot
- //AZ)z->-z) VGeant3[4] = iFB*TMath::Cos((*fTrackParNew)(3,0))*TMath::Sin((*fTrackParNew)(2,0)); // Py/Ptot
- VGeant3[3] = -iFB*TMath::Sin((*fTrackParNew)(3,0)); // Px/Ptot
- VGeant3[4] = -iFB*TMath::Cos((*fTrackParNew)(3,0))*TMath::Sin((*fTrackParNew)(2,0)); // Py/Ptot
+ VGeant3[3] = iFB*TMath::Sin((*fTrackParNew)(3,0)); // Px/Ptot
+ VGeant3[4] = iFB*TMath::Cos((*fTrackParNew)(3,0))*TMath::Sin((*fTrackParNew)(2,0)); // Py/Ptot
VGeant3[5] = iFB*TMath::Sqrt(1.0-VGeant3[3]*VGeant3[3]-VGeant3[4]*VGeant3[4]); // Pz/Ptot
VGeant3[6] = 1/TMath::Abs((*fTrackParNew)(4,0)); // Ptot
}
fPositionNew = VGeant3[2]; // Z
(*fTrackParNew)(0,0) = VGeant3[1]; // Y
(*fTrackParNew)(1,0) = VGeant3[0]; // X
- //AZ(z->-z) (*fTrackParNew)(3,0) = TMath::ASin(iFB*VGeant3[3]); // beta
- //AZ(z->-z) (*fTrackParNew)(2,0) = TMath::ASin(iFB*VGeant3[4]/TMath::Cos((*fTrackParNew)(3,0))); // alpha
- (*fTrackParNew)(3,0) = TMath::ASin(-iFB*VGeant3[3]); // beta
- (*fTrackParNew)(2,0) = TMath::ASin(iFB*VGeant3[4]/TMath::Cos((*fTrackParNew)(3,0))) - TMath::Pi(); // alpha
+ (*fTrackParNew)(3,0) = TMath::ASin(iFB*VGeant3[3]); // beta
+ (*fTrackParNew)(2,0) = TMath::ASin(iFB*VGeant3[4]/TMath::Cos((*fTrackParNew)(3,0))); // alpha
(*fTrackParNew)(4,0) = 1/VGeant3[6]*TMath::Sign(Double_t(1.0),(*fTrackPar)(4,0)); // 1/Ptot
}
// Computes "track quality" from Chi2 (if iChi2==0) or vice versa
if (fChi2 > 500) {
- cout << " ***** Too high Chi2: " << fChi2 << endl;
+ AliWarning(Form(" *** Too high Chi2: %f ", fChi2));
fChi2 = 500;
}
- if (iChi2 == 0) fChi2 = fNTrackHits + (500.-fChi2)/501;
- else fChi2 = 500 - (fChi2-fNTrackHits)*501;
+ if (iChi2 == 0) fChi2 = fNmbTrackHits + (500.-fChi2)/501;
+ else fChi2 = 500 - (fChi2-fNmbTrackHits)*501;
}
//__________________________________________________________________________
AliMUONHitForRec *hit0, *hit1;
hitsInCommon = 0;
- nHits0 = track0->fNTrackHits;
- nTrackHits2 = fNTrackHits/2;
+ nHits0 = track0->fNmbTrackHits;
+ nTrackHits2 = fNmbTrackHits/2;
for (i=0; i<nHits0; i++) {
// Check if hit belongs to several tracks
- hit0 = (AliMUONHitForRec*) (*track0->fTrackHitsPtr)[i];
+ hit0 = (AliMUONHitForRec*) (*track0->fTrackHits)[i];
if (hit0->GetNTrackHits() == 1) continue;
- for (j=0; j<fNTrackHits; j++) {
- hit1 = (AliMUONHitForRec*) (*fTrackHitsPtr)[j];
+ for (j=0; j<fNmbTrackHits; j++) {
+ hit1 = (AliMUONHitForRec*) (*fTrackHits)[j];
if (hit1->GetNTrackHits() == 1) continue;
if (hit0 == hit1) {
hitsInCommon++;
void AliMUONTrackK::Kill(void)
{
// Kill track candidate
- Int_t i;
- AliMUONHitForRec *hit;
-
- if (fTrackHitsPtr) {
- // Remove track mark from hits
- for (i=0; i<fNTrackHits; i++) {
- hit = (AliMUONHitForRec*) (*fTrackHitsPtr)[i];
- hit->SetNTrackHits(hit->GetNTrackHits()-1);
- }
- }
- fgEventReconstructor->GetRecTracksPtr()->Remove(this);
+ fgTrackReconstructor->GetRecTracksPtr()->Remove(this);
}
//__________________________________________________________________________
// Compute track parameters at hit positions (as for AliMUONTrack)
// Set number of hits per track
- ((AliMUONTrack*)this)->SetNTrackHits(fNTrackHits);
+ SetNTrackHits(fNmbTrackHits);
+ // Set Chi2
+ SetFitFMin(fChi2);
// Set track parameters at vertex
AliMUONTrackParam trackParam;
SetTrackParam(&trackParam, fTrackPar, fPosition);
- ((AliMUONTrack*)this)->SetTrackParamAtVertex(&trackParam);
+ SetTrackParamAtVertex(&trackParam);
// Set track parameters at hits
- for (Int_t i = fNTrackHits-1; i>=0; i--) {
+ for (Int_t i = fNmbTrackHits-1; i>=0; i--) {
if ((*fChi2Smooth)[i] < 0) {
// Propagate through last chambers
- trackParam.ExtrapToZ(((AliMUONHitForRec*)((*fTrackHitsPtr)[i]))->GetZ());
+ trackParam.ExtrapToZ(((AliMUONHitForRec*)((*fTrackHits)[i]))->GetZ());
} else {
// Take saved info
- SetTrackParam(&trackParam, (TMatrixD*)fParSmooth->UncheckedAt(i), ((AliMUONHitForRec*)((*fTrackHitsPtr)[i]))->GetZ());
+ SetTrackParam(&trackParam, (TMatrixD*)fParSmooth->UncheckedAt(i), ((AliMUONHitForRec*)((*fTrackHits)[i]))->GetZ());
}
- ((AliMUONTrack*)this)->AddTrackParamAtHit(&trackParam);
+ AddTrackParamAtHit(&trackParam);
+ // Fill array of HitForRec's
+ AddHitForRecAtHit((AliMUONHitForRec*)fTrackHits->UncheckedAt(i));
}
}
// Propagates track to the vertex thru absorber using Branson correction
// (makes use of the AliMUONTrackParam class)
- AliMUONTrackParam *trackParam = new AliMUONTrackParam();
+ //AliMUONTrackParam *trackParam = new AliMUONTrackParam();
+ AliMUONTrackParam trackParam = AliMUONTrackParam();
/*
trackParam->SetBendingCoor((*fTrackPar)(0,0));
trackParam->SetNonBendingCoor((*fTrackPar)(1,0));
trackParam->SetInverseBendingMomentum((*fTrackPar)(4,0)/TMath::Cos((*fTrackPar)(3,0)));
trackParam->SetZ(fPosition);
*/
- SetTrackParam(trackParam, fTrackPar, fPosition);
+ SetTrackParam(&trackParam, fTrackPar, fPosition);
- trackParam->ExtrapToVertex(Double_t(0.), Double_t(0.), Double_t(0.));
+ trackParam.ExtrapToVertex(Double_t(0.), Double_t(0.), Double_t(0.));
+ //trackParam.ExtrapToVertex();
- (*fTrackPar)(0,0) = trackParam->GetBendingCoor();
- (*fTrackPar)(1,0) = trackParam->GetNonBendingCoor();
- (*fTrackPar)(2,0) = TMath::ATan(trackParam->GetBendingSlope());
- (*fTrackPar)(3,0) = TMath::ATan(TMath::Cos((*fTrackPar)(2,0))*trackParam->GetNonBendingSlope());
- (*fTrackPar)(4,0) = TMath::Cos((*fTrackPar)(3,0))*trackParam->GetInverseBendingMomentum();
- fPosition = trackParam->GetZ();
- delete trackParam;
- cout << 1/(*fTrackPar)(4,0) << " " << fPosition << " " << (*fTrackPar)(0,0) << endl;
+ (*fTrackPar)(0,0) = trackParam.GetBendingCoor();
+ (*fTrackPar)(1,0) = trackParam.GetNonBendingCoor();
+ (*fTrackPar)(2,0) = TMath::ATan(trackParam.GetBendingSlope());
+ (*fTrackPar)(3,0) = TMath::ATan(TMath::Cos((*fTrackPar)(2,0))*trackParam.GetNonBendingSlope());
+ (*fTrackPar)(4,0) = TMath::Cos((*fTrackPar)(3,0))*trackParam.GetInverseBendingMomentum();
+ fPosition = trackParam.GetZ();
+ //delete trackParam;
+ if (fgDebug > 0) cout << 1/(*fTrackPar)(4,0) << " " << fPosition << " " << (*fTrackPar)(0,0) << endl;
// Get covariance matrix
*fCovariance = *fWeight;
if (fCovariance->Determinant() != 0) {
- Int_t ifailCov;
- mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant fCovariance=0:");
+ AliWarning(" Determinant fCovariance=0:");
}
}
TClonesArray *rawclusters;
// First step to the rear end of the absorber
- //AZ(z->-z) Double_t zRear = 503;
Double_t zRear = -503;
GoToZ(zRear);
Double_t tan3 = TMath::Tan(3./180*TMath::Pi());
} else {
deltaP = 3.0714 + 0.011767 * p0;
}
+ deltaP *= 0.75;
} else {
if (p0 < 20) {
deltaP = 2.1207 + 0.05478 * p0 - 0.00145079 * p0 * p0;
} else {
deltaP = 2.6069 + 0.0051705 * p0;
}
+ deltaP *= 0.9;
}
- deltaP *= 0.9;
//*/
p0 = pTotal + deltaP/TMath::Abs(TMath::Cos((*fTrackPar)(2,0))/TMath::Cos((*fTrackPar)(3,0)));
fChi2 += dChi2; // Chi2
if (fgDebug < 0) return; // no output
- cout << pOld << " " << 1/(*fTrackPar)(4,0) << " " << dChi2 << " " << fChi2 << " " << fNTrackHits << endl;
- for (Int_t i1=0; i1<fNTrackHits; i1++) {
- hit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i1]);
- printf ("%4d", hit->GetChamberNumber());
+ cout << pOld << " " << 1/(*fTrackPar)(4,0) << " " << dChi2 << " " << fChi2 << " " << fNmbTrackHits << endl;
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) {
+ hit = (AliMUONHitForRec*) ((*fTrackHits)[i1]);
+ printf ("%5d", hit->GetChamberNumber());
}
cout << endl;
if (fgDebug > 0) {
- for (Int_t i1=0; i1<fNTrackHits; i1++) {
- hit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i1]);
- //cout << ((AliMUONHitForRec*)((*fTrackHitsPtr)[i1]))->GetHitNumber() << " ";
- //cout << ((AliMUONHitForRec*)((*fTrackHitsPtr)[i1]))->GetZ() << " ";
- printf ("%4d", fgHitForRec->IndexOf(hit));
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) {
+ hit = (AliMUONHitForRec*) ((*fTrackHits)[i1]);
+ //cout << ((AliMUONHitForRec*)((*fTrackHits)[i1]))->GetHitNumber() << " ";
+ //cout << ((AliMUONHitForRec*)((*fTrackHits)[i1]))->GetZ() << " ";
+ printf ("%5d", fgHitForRec->IndexOf(hit));
}
cout << endl;
}
- if (fgEventReconstructor->GetRecTrackRefHits()) {
+ if (fgTrackReconstructor->GetRecTrackRefHits()) {
// from track ref. hits
- for (Int_t i1=0; i1<fNTrackHits; i1++) {
- hit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i1]);
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) {
+ hit = (AliMUONHitForRec*) ((*fTrackHits)[i1]);
cout << hit->GetTTRTrack() + hit->GetTrackRefSignal()*10000 << " ";
}
} else {
// from raw clusters
- for (Int_t i1=0; i1<fNTrackHits; i1++) {
- hit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i1]);
- rawclusters = fgEventReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
- clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber());
- printf ("%4d", clus->GetTrack(1) - 1);
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) {
+ hit = (AliMUONHitForRec*) ((*fTrackHits)[i1]);
+ if (hit->GetHitNumber() < 0) { // combined cluster / track finder
+ Int_t index = -hit->GetHitNumber() / 100000;
+ Int_t iPos = -hit->GetHitNumber() - index * 100000;
+ clus = (AliMUONRawCluster*) fgCombi->DetElem(index-1)->RawClusters()->UncheckedAt(iPos);
+ } else {
+ rawclusters = fgTrackReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
+ clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber());
+ }
+ printf ("%5d", clus->GetTrack(1)%10000000);
}
cout << endl;
- for (Int_t i1=0; i1<fNTrackHits; i1++) {
- hit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i1]);
- rawclusters = fgEventReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
- clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber());
- if (clus->GetTrack(2) != 0) printf ("%4d", clus->GetTrack(2) - 1);
- else printf ("%4s", " ");
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) {
+ hit = (AliMUONHitForRec*) ((*fTrackHits)[i1]);
+ if (hit->GetHitNumber() < 0) { // combined cluster / track finder
+ Int_t index = -hit->GetHitNumber() / 100000;
+ Int_t iPos = -hit->GetHitNumber() - index * 100000;
+ clus = (AliMUONRawCluster*) fgCombi->DetElem(index-1)->RawClusters()->UncheckedAt(iPos);
+ } else {
+ rawclusters = fgTrackReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
+ clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber());
+ }
+ if (clus->GetTrack(2) != -1) printf ("%5d", clus->GetTrack(2)%10000000);
+ else printf ("%5s", " ");
}
}
cout << endl;
- for (Int_t i1=0; i1<fNTrackHits; i1++) {
- //cout << ((AliMUONHitForRec*)((*fTrackHitsPtr)[i1]))->GetHitNumber() << " ";
- cout << ((AliMUONHitForRec*)((*fTrackHitsPtr)[i1]))->GetZ() << " ";
- //cout << fgHitForRec->IndexOf(((AliMUONHitForRec*)((*fTrackHitsPtr)[i1]))) << " ";
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) {
+ //cout << ((AliMUONHitForRec*)((*fTrackHits)[i1]))->GetHitNumber() << " ";
+ cout << ((AliMUONHitForRec*)((*fTrackHits)[i1]))->GetZ() << " ";
+ //cout << fgHitForRec->IndexOf(((AliMUONHitForRec*)((*fTrackHits)[i1]))) << " ";
}
cout << endl;
- for (Int_t i1=0; i1<fNTrackHits; i1++) printf("%8.4f", (*fChi2Smooth)[i1]);
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) printf("%8.4f", (*fChi2Smooth)[i1]);
cout << endl;
cout << "---------------------------------------------------" << endl;
/* Not needed - covariance matrix is not interesting to anybody
*fCovariance = *fWeight;
if (fCovariance->Determinant() != 0) {
- // fCovariance->Invert();
- Int_t ifailCov;
- mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant fCovariance=0:" );
+ AliWarning(" Determinant fCovariance=0:" );
}
*/
}
*fCovariance = *fWeight;
if (fCovariance->Determinant() != 0) {
// fCovariance->Invert();
- Int_t ifailCov;
- mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant fCovariance=0:" );
+ AliWarning(" Determinant fCovariance=0:" );
}
(*fCovariance)(0,0) += dl3*(dYdT*dYdT+dYdB*dYdB); // <yy>
(*fCovariance)(0,3) += dl2*dYdB; // <yb>
(*fCovariance)(3,0) = (*fCovariance)(0,3);
- (*fCovariance)(1,2) += dl2*(dXdT*dAdT+dXdB*dAdB); // <xa>
+ (*fCovariance)(1,2) += dl2*(-dXdT*dAdT+dXdB*dAdB); // <xa>
(*fCovariance)(2,1) = (*fCovariance)(1,2);
(*fCovariance)(1,3) += dl2*dXdB; // <xb>
// Get weight matrix
*fWeight = *fCovariance;
if (fWeight->Determinant() != 0) {
- // fWeight->Invert();
- Int_t ifailWeight;
- mnvertLocalK(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifailWeight);
+ Int_t ifail;
+ mnvertLocal(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant fWeight=0:");
+ AliWarning(" Determinant fWeight=0:");
}
}
AliMUONTrackK *trackK;
if (fgDebug > 0) cout << " ******** Enter Recover " << endl;
- trackPtr = fgEventReconstructor->GetRecTracksPtr();
+ trackPtr = fgTrackReconstructor->GetRecTracksPtr();
// Remove hit with the highest chi2
Double_t chi2 = 0;
if (fgDebug > 0) {
- for (Int_t i=0; i<fNTrackHits; i++) {
+ for (Int_t i=0; i<fNmbTrackHits; i++) {
chi2 = fChi2Smooth ? (*fChi2Smooth)[i] : (*fChi2Array)[i];
printf("%10.4f", chi2);
}
printf("\n");
- for (Int_t i=0; i<fNTrackHits; i++) {
- printf("%10d", ((AliMUONHitForRec*)fTrackHitsPtr->UncheckedAt(i))->GetChamberNumber());
+ for (Int_t i=0; i<fNmbTrackHits; i++) {
+ printf("%10d", ((AliMUONHitForRec*)fTrackHits->UncheckedAt(i))->GetChamberNumber());
}
printf("\n");
}
- Double_t chi2_max = 0;
+ Double_t chi2max = 0;
Int_t imax = 0;
- for (Int_t i=0; i<fNTrackHits; i++) {
+ for (Int_t i=0; i<fNmbTrackHits; i++) {
chi2 = fChi2Smooth ? (*fChi2Smooth)[i] : (*fChi2Array)[i];
- if (chi2 < chi2_max) continue;
- chi2_max = chi2;
+ if (chi2 < chi2max) continue;
+ chi2max = chi2;
imax = i;
}
- //if (chi2_max < 10) return kFALSE; // !!!
- //if (chi2_max < 25) imax = fNTrackHits - 1;
- if (chi2_max < 15) imax = fNTrackHits - 1; // discard the last point
+ //if (chi2max < 10) return kFALSE; // !!!
+ //if (chi2max < 25) imax = fNmbTrackHits - 1;
+ if (chi2max < 15) imax = fNmbTrackHits - 1; // discard the last point
// Check if the outlier is not from the seed segment
- AliMUONHitForRec *skipHit = (AliMUONHitForRec*) fTrackHitsPtr->UncheckedAt(imax);
+ AliMUONHitForRec *skipHit = (AliMUONHitForRec*) fTrackHits->UncheckedAt(imax);
if (skipHit == fStartSegment->GetHitForRec1() || skipHit == fStartSegment->GetHitForRec2()) {
//DropBranches(fStartSegment); // drop all tracks with the same seed segment
return kFALSE; // to be changed probably
}
// Make a copy of track hit collection
- TObjArray *hits = new TObjArray(*fTrackHitsPtr);
+ TObjArray *hits = new TObjArray(*fTrackHits);
Int_t imax0;
imax0 = imax;
// Hits after the found one will be removed
- if (GetStation0() == 3 && skipHit->GetChamberNumber() > 7) {
- SortHits(1, fTrackHitsPtr); // unsort hits
- imax = fTrackHitsPtr->IndexOf(skipHit);
+ if (GetStation0() == 3 && skipHit->GetChamberNumber() >= 7) {
+ SortHits(1, fTrackHits); // unsort hits
+ imax = fTrackHits->IndexOf(skipHit);
}
- Int_t nTrackHits = fNTrackHits;
+ Int_t nTrackHits = fNmbTrackHits;
for (Int_t i=imax+1; i<nTrackHits; i++) {
- AliMUONHitForRec *hit = (AliMUONHitForRec*) fTrackHitsPtr->UncheckedAt(i);
- fTrackHitsPtr->Remove(hit);
+ AliMUONHitForRec *hit = (AliMUONHitForRec*) fTrackHits->UncheckedAt(i);
+ fTrackHits->Remove(hit);
hit->SetNTrackHits(hit->GetNTrackHits()-1); // unmark hit
- fNTrackHits--;
+ fNmbTrackHits--;
}
// Check if the track candidate doesn't exist yet
//DropBranches(imax0, hits); // drop branches downstream the discarded hit
delete hits;
- nRecTracks = fgEventReconstructor->GetNRecTracks();
- skipHit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[fNTrackHits-1]);
+ nRecTracks = fgTrackReconstructor->GetNRecTracks();
+ skipHit = (AliMUONHitForRec*) ((*fTrackHits)[fNmbTrackHits-1]);
// Remove all saved steps and smoother matrices after the skipped hit
RemoveMatrices(skipHit->GetZ());
// Propagation toward high Z or skipped hit next to segment -
// start track from segment
trackK = new ((*trackPtr)[nRecTracks]) AliMUONTrackK(fStartSegment);
- fgEventReconstructor->SetNRecTracks(nRecTracks+1);
+ fgTrackReconstructor->SetNRecTracks(nRecTracks+1);
trackK->fRecover = 1;
trackK->fSkipHit = skipHit;
- trackK->fNTrackHits = fNTrackHits;
- delete trackK->fTrackHitsPtr; // not efficient ?
- trackK->fTrackHitsPtr = new TObjArray(*fTrackHitsPtr);
+ trackK->fNmbTrackHits = fNmbTrackHits;
+ delete trackK->fTrackHits; // not efficient ?
+ trackK->fTrackHits = new TObjArray(*fTrackHits);
if (fgDebug > 0) cout << nRecTracks << " " << trackK->fRecover << endl;
return kTRUE;
}
trackK = new ((*trackPtr)[nRecTracks]) AliMUONTrackK(NULL, NULL);
*trackK = *this;
- fgEventReconstructor->SetNRecTracks(nRecTracks+1);
+ fgTrackReconstructor->SetNRecTracks(nRecTracks+1);
//AZ(z->-z) trackK->fTrackDir = -1;
trackK->fTrackDir = 1;
trackK->fRecover = 1;
*((TMatrixD*)trackK->fCovFilter->Last()) = *((TMatrixD*)fCovExtrap->Last());
*(trackK->fWeight) = *((TMatrixD*)trackK->fCovFilter->Last());
if (trackK->fWeight->Determinant() != 0) {
- Int_t ifailCov;
- mnvertLocalK(&((*(trackK->fWeight))(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*(trackK->fWeight))(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant fWeight=0:");
+ AliWarning(" Determinant fWeight=0:");
}
trackK->fPosition = trackK->fPositionNew = (*fSteps)[fNSteps-1];
trackK->fChi2 = 0;
- for (Int_t i=0; i<fNTrackHits-1; i++) trackK->fChi2 += (*fChi2Array)[i];
+ for (Int_t i=0; i<fNmbTrackHits-1; i++) trackK->fChi2 += (*fChi2Array)[i];
if (fgDebug > 0) cout << nRecTracks << " " << trackK->fRecover << endl;
return kTRUE;
}
// Covariance
*(trackK->fCovariance) = *(trackK->fWeight);
if (trackK->fCovariance->Determinant() != 0) {
- Int_t ifailCov;
- mnvertLocalK(&((*(trackK->fCovariance))(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*(trackK->fCovariance))(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant fCovariance=0:");
+ AliWarning(" Determinant fCovariance=0:");
}
iD = trackK->fCovFilter->Last()->GetUniqueID();
if (iD > 1) {
trackK->fCovFilter->Last()->SetUniqueID(iD);
// Save Chi2-increment for point
- Int_t indx = trackK->fTrackHitsPtr->IndexOf(hitAdd);
- if (indx < 0) indx = fNTrackHits;
+ Int_t indx = trackK->fTrackHits->IndexOf(hitAdd);
+ if (indx < 0) indx = fNmbTrackHits;
if (trackK->fChi2Array->fN <= indx) trackK->fChi2Array->Set(indx+10);
trackK->fChi2Array->AddAt(dChi2,indx);
}
//__________________________________________________________________________
-void AliMUONTrackK::CreateMatrix(TObjArray *objArray)
+void AliMUONTrackK::CreateMatrix(TObjArray *objArray) const
{
// Create new matrix and add it to TObjArray
TMatrixD *matrix = (TMatrixD*) objArray->First();
TMatrixD *tmp = new TMatrixD(*matrix);
- objArray->AddAt(tmp,objArray->GetLast());
+ objArray->AddAtAndExpand(tmp,objArray->GetLast());
//cout << " !!! " << tmp << " " << tmp->GetUniqueID() << " " << tmp->GetNoElements() << endl;
}
else ((TMatrixD*)(trackK->fJacob->RemoveAt(i)))->Delete();
}
- //__________________________________________________________________________
-void mnvertLocalK(Double_t *a, Int_t l, Int_t, Int_t n, Int_t &ifail)
-{
-//*-*-*-*-*-*-*-*-*-*-*-*Inverts a symmetric matrix*-*-*-*-*-*-*-*-*-*-*-*-*
-//*-* ==========================
-//*-* inverts a symmetric matrix. matrix is first scaled to
-//*-* have all ones on the diagonal (equivalent to change of units)
-//*-* but no pivoting is done since matrix is positive-definite.
-//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-
- // taken from TMinuit package of Root (l>=n)
- // fVERTs, fVERTq and fVERTpp changed to localVERTs, localVERTq and localVERTpp
- // Double_t localVERTs[n], localVERTq[n], localVERTpp[n];
- Double_t * localVERTs = new Double_t[n];
- Double_t * localVERTq = new Double_t[n];
- Double_t * localVERTpp = new Double_t[n];
- // fMaxint changed to localMaxint
- Int_t localMaxint = n;
-
- /* System generated locals */
- Int_t aOffset;
-
- /* Local variables */
- Double_t si;
- Int_t i, j, k, kp1, km1;
-
- /* Parameter adjustments */
- aOffset = l + 1;
- a -= aOffset;
-
- /* Function Body */
- ifail = 0;
- if (n < 1) goto L100;
- if (n > localMaxint) goto L100;
-//*-*- scale matrix by sqrt of diag elements
- for (i = 1; i <= n; ++i) {
- si = a[i + i*l];
- if (si <= 0) goto L100;
- localVERTs[i-1] = 1 / TMath::Sqrt(si);
- }
- for (i = 1; i <= n; ++i) {
- for (j = 1; j <= n; ++j) {
- a[i + j*l] = a[i + j*l]*localVERTs[i-1]*localVERTs[j-1];
- }
- }
-//*-*- . . . start main loop . . . .
- for (i = 1; i <= n; ++i) {
- k = i;
-//*-*- preparation for elimination step1
- if (a[k + k*l] != 0) localVERTq[k-1] = 1 / a[k + k*l];
- else goto L100;
- localVERTpp[k-1] = 1;
- a[k + k*l] = 0;
- kp1 = k + 1;
- km1 = k - 1;
- if (km1 < 0) goto L100;
- else if (km1 == 0) goto L50;
- else goto L40;
-L40:
- for (j = 1; j <= km1; ++j) {
- localVERTpp[j-1] = a[j + k*l];
- localVERTq[j-1] = a[j + k*l]*localVERTq[k-1];
- a[j + k*l] = 0;
- }
-L50:
- if (k - n < 0) goto L51;
- else if (k - n == 0) goto L60;
- else goto L100;
-L51:
- for (j = kp1; j <= n; ++j) {
- localVERTpp[j-1] = a[k + j*l];
- localVERTq[j-1] = -a[k + j*l]*localVERTq[k-1];
- a[k + j*l] = 0;
- }
-//*-*- elimination proper
-L60:
- for (j = 1; j <= n; ++j) {
- for (k = j; k <= n; ++k) { a[j + k*l] += localVERTpp[j-1]*localVERTq[k-1]; }
- }
- }
-//*-*- elements of left diagonal and unscaling
- for (j = 1; j <= n; ++j) {
- for (k = 1; k <= j; ++k) {
- a[k + j*l] = a[k + j*l]*localVERTs[k-1]*localVERTs[j-1];
- a[j + k*l] = a[k + j*l];
- }
- }
- delete [] localVERTs;
- delete [] localVERTq;
- delete [] localVERTpp;
- return;
-//*-*- failure return
-L100:
- delete [] localVERTs;
- delete [] localVERTq;
- delete [] localVERTpp;
- ifail = 1;
-} /* mnvertLocal */
-
//__________________________________________________________________________
Bool_t AliMUONTrackK::Smooth(void)
{
// Apply smoother
- Int_t ihit = fNTrackHits - 1;
- AliMUONHitForRec *hit = (AliMUONHitForRec*) (*fTrackHitsPtr)[ihit];
- fChi2Smooth = new TArrayD(fNTrackHits);
+ Int_t ihit = fNmbTrackHits - 1;
+ AliMUONHitForRec *hit = (AliMUONHitForRec*) (*fTrackHits)[ihit];
+ fChi2Smooth = new TArrayD(fNmbTrackHits);
fChi2Smooth->Reset(-1);
fChi2 = 0;
fParSmooth = new TObjArray(15);
/*
for (Int_t i=fNSteps-1; i>=0; i--) cout << (*fSteps)[i] << " ";
cout << endl;
- for (Int_t i=fNSteps-1; i>=0; i--) {cout << i; ((TMatrixD*)fParFilter->UncheckedAt(i))->Print(); }
+ for (Int_t i=fNSteps-1; i>=0; i--) {cout << i << " " << (*fSteps)[i]; ((TMatrixD*)fParFilter->UncheckedAt(i))->Print(); ((TMatrixD*)fParExtrap->UncheckedAt(i))->Print(); ((TMatrixD*)fJacob->UncheckedAt(i))->Print();}
*/
- for (Int_t i=ihit; i>=0; i--) cout << ((AliMUONHitForRec*)(*fTrackHitsPtr)[i])->GetZ() << " ";
+ for (Int_t i=ihit; i>=0; i--) cout << ((AliMUONHitForRec*)(*fTrackHits)[i])->GetZ() << " ";
cout << endl;
}
// Find last point corresponding to the last hit
Int_t iLast = fNSteps - 1;
for ( ; iLast>=0; iLast--) {
- //AZ(z->-z) if ((*fSteps)[iLast] + 0.01 > ((AliMUONHitForRec*)(*fTrackHitsPtr)[fNTrackHits-1])->GetZ()) break;
- if (TMath::Abs((*fSteps)[iLast]) + 0.01 > TMath::Abs(((AliMUONHitForRec*)(*fTrackHitsPtr)[fNTrackHits-1])->GetZ())) break;
+ //AZ(z->-z) if ((*fSteps)[iLast] + 0.01 > ((AliMUONHitForRec*)(*fTrackHits)[fNmbTrackHits-1])->GetZ()) break;
+ if (TMath::Abs((*fSteps)[iLast]) + 0.01 > TMath::Abs(((AliMUONHitForRec*)(*fTrackHits)[fNmbTrackHits-1])->GetZ())) break;
}
TMatrixD parSmooth = *((TMatrixD*)(fParFilter->UncheckedAt(iLast))); // last filtered = first smoothed
//parSmooth.Print(); ((TMatrixD*)(fParExtrap->Last()))->Print();
Bool_t found;
- Double_t chi2_max = 0;
+ Double_t chi2max = 0;
for (Int_t i=iLast+1; i>0; i--) {
if (i == iLast + 1) goto L33; // temporary fix
// Smoother gain matrix
weight = *((TMatrixD*)(fCovExtrap->UncheckedAt(i)));
if (weight.Determinant() != 0) {
- Int_t ifailCov;
- mnvertLocalK(&(weight(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&(weight(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant weight=0:");
+ AliWarning(" Determinant weight=0:");
}
// Fk'Wkk+1
tmp = TMatrixD(*((TMatrixD*)(fJacob->UncheckedAt(i))),TMatrixD::kTransposeMult,weight);
// Check if there was a measurement at given z
found = kFALSE;
for ( ; ihit>=0; ihit--) {
- hit = (AliMUONHitForRec*) (*fTrackHitsPtr)[ihit];
+ hit = (AliMUONHitForRec*) (*fTrackHits)[ihit];
if (TMath::Abs(hit->GetZ()-(*fSteps)[i-1]) < 0.1) { found = kTRUE; break; }
- //AZ(z->-z) else if (ihit < fNTrackHits-1 && hit->GetZ() > (*fSteps)[i-1]) { ihit++; break; }
- else if (ihit < fNTrackHits-1 && TMath::Abs(hit->GetZ()) > TMath::Abs((*fSteps)[i-1])) { ihit++; break; }
+ //AZ(z->-z) else if (ihit < fNmbTrackHits-1 && hit->GetZ() > (*fSteps)[i-1]) { ihit++; break; }
+ else if (ihit < fNmbTrackHits-1 && TMath::Abs(hit->GetZ()) > TMath::Abs((*fSteps)[i-1])) { ihit++; break; }
}
if (!found) continue; // no measurement - skip the rest
else if (fgDebug > 1) cout << i << " " << ihit << " " << hit->GetZ() << endl;
// Calculate Chi2 of smoothed residuals
if (tmp.Determinant() != 0) {
- Int_t ifailCov;
- mnvertLocalK(&(tmp(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&(tmp(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant tmp=0:");
+ AliWarning(" Determinant tmp=0:");
}
TMatrixD vector(tmp,TMatrixD::kMult,tmpPar);
TMatrixD chi2(tmpPar,TMatrixD::kTransposeMult,vector);
if (fgDebug > 1) chi2.Print();
(*fChi2Smooth)[ihit] = chi2(0,0);
- if (chi2(0,0) > chi2_max) chi2_max = chi2(0,0);
+ if (chi2(0,0) > chi2max) chi2max = chi2(0,0);
fChi2 += chi2(0,0);
if (chi2(0,0) < 0) {
- chi2.Print(); cout << i << " " << iLast << endl;
- AliFatal("chi2 < 0.");
+ //chi2.Print();
+ AliError(Form(" *** chi2 < 0: %d %d ", i, iLast));
}
// Save smoothed parameters
TMatrixD *par = new TMatrixD(parSmooth);
- fParSmooth->AddAt(par, ihit);
+ fParSmooth->AddAtAndExpand(par, ihit);
} // for (Int_t i=iLast+1;
- //if (chi2_max > 16) {
- //if (chi2_max > 25) {
- //if (chi2_max > 50) {
- //if (chi2_max > 100) {
- if (chi2_max > fgkChi2max) {
+ //if (chi2max > 16) {
+ //if (chi2max > 25) {
+ //if (chi2max > 50) {
+ //if (chi2max > 100) {
+ if (chi2max > fgkChi2max) {
//if (Recover()) DropBranches();
//Recover();
Outlier();
if (fgDebug > 0) {
cout << " ******** Enter Outlier " << endl;
- for (Int_t i=0; i<fNTrackHits; i++) printf("%10.4f", (*fChi2Smooth)[i]);
+ for (Int_t i=0; i<fNmbTrackHits; i++) printf("%10.4f", (*fChi2Smooth)[i]);
printf("\n");
- for (Int_t i=0; i<fNTrackHits; i++) {
- printf("%10d", ((AliMUONHitForRec*)fTrackHitsPtr->UncheckedAt(i))->GetChamberNumber());
+ for (Int_t i=0; i<fNmbTrackHits; i++) {
+ printf("%10d", ((AliMUONHitForRec*)fTrackHits->UncheckedAt(i))->GetChamberNumber());
}
printf("\n");
}
- Double_t chi2_max = 0;
+ Double_t chi2max = 0;
Int_t imax = 0;
- for (Int_t i=0; i<fNTrackHits; i++) {
- if ((*fChi2Smooth)[i] < chi2_max) continue;
- chi2_max = (*fChi2Smooth)[i];
+ for (Int_t i=0; i<fNmbTrackHits; i++) {
+ if ((*fChi2Smooth)[i] < chi2max) continue;
+ chi2max = (*fChi2Smooth)[i];
imax = i;
}
// Check if the outlier is not from the seed segment
- AliMUONHitForRec *hit = (AliMUONHitForRec*) fTrackHitsPtr->UncheckedAt(imax);
+ AliMUONHitForRec *hit = (AliMUONHitForRec*) fTrackHits->UncheckedAt(imax);
if (hit == fStartSegment->GetHitForRec1() || hit == fStartSegment->GetHitForRec2()) return; // to be changed probably
// Check for missing station
Int_t ok = 1;
if (imax == 0) {
- if (((AliMUONHitForRec*)fTrackHitsPtr->UncheckedAt(1))->GetChamberNumber() < 8) ok--;
- } else if (imax == fNTrackHits-1) {
- if (((AliMUONHitForRec*)fTrackHitsPtr->UncheckedAt(fNTrackHits-2))->GetChamberNumber() > 1) ok--;
+ if (((AliMUONHitForRec*)fTrackHits->UncheckedAt(1))->GetChamberNumber() < 8) ok--;
+ } else if (imax == fNmbTrackHits-1) {
+ if (((AliMUONHitForRec*)fTrackHits->UncheckedAt(fNmbTrackHits-2))->GetChamberNumber() > 1) ok--;
}
- else if (((AliMUONHitForRec*)fTrackHitsPtr->UncheckedAt(imax-1))->GetChamberNumber()/2 - ((AliMUONHitForRec*)fTrackHitsPtr->UncheckedAt(imax+1))->GetChamberNumber()/2 > 1) ok--;
+ else if (((AliMUONHitForRec*)fTrackHits->UncheckedAt(imax-1))->GetChamberNumber()/2 - ((AliMUONHitForRec*)fTrackHits->UncheckedAt(imax+1))->GetChamberNumber()/2 > 1) ok--;
if (!ok) { Recover(); return; } // try to recover track
//AZ if (!ok) { if (fgDebug >= 0) cout << imax << endl; DropBranches(imax, 0); return; }
// Check for possible double track candidates
//if (ExistDouble(hit)) return;
- TClonesArray *trackPtr = fgEventReconstructor->GetRecTracksPtr();
- Int_t nRecTracks = fgEventReconstructor->GetNRecTracks();
+ TClonesArray *trackPtr = fgTrackReconstructor->GetRecTracksPtr();
+ Int_t nRecTracks = fgTrackReconstructor->GetNRecTracks();
AliMUONTrackK *trackK = 0;
if (!fNSteps || GetStation0() == 3 && hit->GetChamberNumber() > 7) {
// start track from segment
trackK = new ((*trackPtr)[nRecTracks]) AliMUONTrackK(fStartSegment);
- fgEventReconstructor->SetNRecTracks(nRecTracks+1);
+ fgTrackReconstructor->SetNRecTracks(nRecTracks+1);
trackK->fRecover = 2;
trackK->fSkipHit = hit;
- trackK->fNTrackHits = fNTrackHits;
- delete trackK->fTrackHitsPtr; // not efficient ?
- trackK->fTrackHitsPtr = new TObjArray(*fTrackHitsPtr);
- if (GetStation0() == 3) trackK->SortHits(1, trackK->fTrackHitsPtr);
+ trackK->fNmbTrackHits = fNmbTrackHits;
+
+ hit = (AliMUONHitForRec*) trackK->fTrackHits->UncheckedAt(0);
+ hit->SetNTrackHits(hit->GetNTrackHits()-1);
+ hit = (AliMUONHitForRec*) trackK->fTrackHits->UncheckedAt(1);
+ hit->SetNTrackHits(hit->GetNTrackHits()-1);
+ delete trackK->fTrackHits; // not efficient ?
+ trackK->fTrackHits = new TObjArray(*fTrackHits);
+ for (Int_t i = 0; i < fNmbTrackHits; i++) {
+ hit = (AliMUONHitForRec*) fTrackHits->UncheckedAt(i);
+ hit->SetNTrackHits(hit->GetNTrackHits()+1);
+ }
+
+ if (GetStation0() == 3) trackK->SortHits(1, trackK->fTrackHits);
if (fgDebug > 0) cout << nRecTracks << " Outlier" << endl;
return;
}
trackK = new ((*trackPtr)[nRecTracks]) AliMUONTrackK(NULL, NULL);
*trackK = *this;
- fgEventReconstructor->SetNRecTracks(nRecTracks+1);
- //AZ(z->-z) trackK->fTrackDir = -1;
+ fgTrackReconstructor->SetNRecTracks(nRecTracks+1);
trackK->fTrackDir = 1;
trackK->fRecover = 2;
trackK->fSkipHit = hit;
*((TMatrixD*)trackK->fCovFilter->Last()) = *((TMatrixD*)fCovExtrap->Last());
*(trackK->fWeight) = *((TMatrixD*)trackK->fCovFilter->Last());
if (trackK->fWeight->Determinant() != 0) {
- Int_t ifailCov;
- mnvertLocalK(&((*(trackK->fWeight))(0,0)), fgkSize,fgkSize,fgkSize,ifailCov);
+ Int_t ifail;
+ mnvertLocal(&((*(trackK->fWeight))(0,0)), fgkSize,fgkSize,fgkSize,ifail);
} else {
- AliWarning("Determinant fWeight=0:");
+ AliWarning(" Determinant fWeight=0:");
}
trackK->fPosition = trackK->fPositionNew = (*fSteps)[fNSteps-1];
trackK->fChi2 = 0;
- for (Int_t i=0; i<fNTrackHits-1; i++) trackK->fChi2 += (*fChi2Array)[i];
+ for (Int_t i=0; i<fNmbTrackHits-1; i++) trackK->fChi2 += (*fChi2Array)[i];
if (fgDebug > 0) cout << nRecTracks << " Outlier " << trackK->fChi2 << endl;
}
Int_t flag = 1;
AliMUONHitForRec *hit = 0;
- if (fgEventReconstructor->GetRecTrackRefHits()) {
+ if (fgTrackReconstructor->GetRecTrackRefHits()) {
// from track ref. hits
- for (Int_t j=0; j<fNTrackHits; j++) {
- hit = (AliMUONHitForRec*) fTrackHitsPtr->UncheckedAt(j);
+ for (Int_t j=0; j<fNmbTrackHits; j++) {
+ hit = (AliMUONHitForRec*) fTrackHits->UncheckedAt(j);
if (hit->GetTTRTrack() > 1) { flag = 0; break; }
}
- for (Int_t j=0; j<fNTrackHits; j++) {
+ for (Int_t j=0; j<fNmbTrackHits; j++) {
printf("%10.4f", GetChi2PerPoint(j));
if (GetChi2PerPoint(j) > -0.1) {
- hit = (AliMUONHitForRec*) fTrackHitsPtr->UncheckedAt(j);
+ hit = (AliMUONHitForRec*) fTrackHits->UncheckedAt(j);
fprintf(lun,"%3d %3d %10.4f", gAlice->GetEvNumber(), hit->GetChamberNumber(), GetChi2PerPoint(j));
fprintf(lun, "%3d %3d %3d \n", hit->GetTrackRefSignal(), hit->GetTTRTrack(), flag);
}
// from raw clusters
AliMUONRawCluster *clus = 0;
TClonesArray *rawclusters = 0;
- for (Int_t i1=0; i1<fNTrackHits; i1++) {
- hit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i1]);
- rawclusters = fgEventReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) {
+ hit = (AliMUONHitForRec*) ((*fTrackHits)[i1]);
+ rawclusters = fgTrackReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber());
if (TMath::Abs(clus->GetTrack(1)-1) < 2) {
if (clus->GetTrack(2)) flag = 2;
break;
}
Int_t sig[2]={1,1}, tid[2]={0};
- for (Int_t i1=0; i1<fNTrackHits; i1++) {
+ for (Int_t i1=0; i1<fNmbTrackHits; i1++) {
if (GetChi2PerPoint(i1) < -0.1) continue;
- hit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[i1]);
- rawclusters = fgEventReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
+ hit = (AliMUONHitForRec*) ((*fTrackHits)[i1]);
+ rawclusters = fgTrackReconstructor->GetMUONData()->RawClusters(hit->GetChamberNumber());
clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber());
for (Int_t j=0; j<2; j++) {
tid[j] = clus->GetTrack(j+1) - 1;
TClonesArray *trackPtr;
AliMUONTrackK *trackK;
- trackPtr = fgEventReconstructor->GetRecTracksPtr();
- nRecTracks = fgEventReconstructor->GetNRecTracks();
+ trackPtr = fgTrackReconstructor->GetRecTracksPtr();
+ nRecTracks = fgTrackReconstructor->GetNRecTracks();
Int_t icand = trackPtr->IndexOf(this);
- if (!hits) hits = fTrackHitsPtr;
+ if (!hits) hits = fTrackHits;
// Check if the track candidate doesn't exist yet
for (Int_t i=icand+1; i<nRecTracks; i++) {
trackK = (AliMUONTrackK*) ((*trackPtr)[i]);
- if (trackK->fNTrackHits == 2 && trackK->GetRecover() == 0) continue;
+ if (trackK->fNmbTrackHits == 2 && trackK->GetRecover() == 0) continue;
if (trackK->GetRecover() < 0) continue;
- if (trackK->fNTrackHits >= imax + 1) {
+ if (trackK->fNmbTrackHits >= imax + 1) {
for (Int_t j=0; j<=imax; j++) {
- //if (j != fNTrackHits-1 && (*trackK->fTrackHitsPtr)[j] != (*fTrackHitsPtr)[j]) break;
- if ((*trackK->fTrackHitsPtr)[j] != (*hits)[j]) break;
+ //if (j != fNmbTrackHits-1 && (*trackK->fTrackHits)[j] != (*fTrackHits)[j]) break;
+ if ((*trackK->fTrackHits)[j] != (*hits)[j]) break;
if (j == imax) {
- if (hits != fTrackHitsPtr) {
+ if (hits != fTrackHits) {
// Drop all branches downstream the hit (for Recover)
trackK->SetRecover(-1);
if (fgDebug >= 0 )cout << " Recover " << i << endl;
// Check if the removal of the hit breaks the track
Int_t ok = 1;
if (imax == 0) {
- if (((AliMUONHitForRec*)trackK->fTrackHitsPtr->UncheckedAt(1))->GetChamberNumber() < 8) ok--; }
- else if (imax == trackK->fNTrackHits-1) continue;
- // else if (imax == trackK->fNTrackHits-1) {
- //if (((AliMUONHitForRec*)trackK->fTrackHitsPtr->UncheckedAt(trackK->fNTrackHits-2))->GetChamberNumber() > 1) ok--;
+ if (((AliMUONHitForRec*)trackK->fTrackHits->UncheckedAt(1))->GetChamberNumber() < 8) ok--; }
+ else if (imax == trackK->fNmbTrackHits-1) continue;
+ // else if (imax == trackK->fNmbTrackHits-1) {
+ //if (((AliMUONHitForRec*)trackK->fTrackHits->UncheckedAt(trackK->fNmbTrackHits-2))->GetChamberNumber() > 1) ok--;
//}
- else if (((AliMUONHitForRec*)trackK->fTrackHitsPtr->UncheckedAt(imax-1))->GetChamberNumber()/2 - ((AliMUONHitForRec*)trackK->fTrackHitsPtr->UncheckedAt(imax+1))->GetChamberNumber()/2 > 1) ok--;
+ else if (((AliMUONHitForRec*)trackK->fTrackHits->UncheckedAt(imax-1))->GetChamberNumber()/2 - ((AliMUONHitForRec*)trackK->fTrackHits->UncheckedAt(imax+1))->GetChamberNumber()/2 > 1) ok--;
if (!ok) trackK->SetRecover(-1);
}
} // for (Int_t j=0;
TClonesArray *trackPtr;
AliMUONTrackK *trackK;
- trackPtr = fgEventReconstructor->GetRecTracksPtr();
- nRecTracks = fgEventReconstructor->GetNRecTracks();
+ trackPtr = fgTrackReconstructor->GetRecTracksPtr();
+ nRecTracks = fgTrackReconstructor->GetNRecTracks();
Int_t icand = trackPtr->IndexOf(this);
for (Int_t i=icand+1; i<nRecTracks; i++) {
trackK = (AliMUONTrackK*) ((*trackPtr)[i]);
- if (trackK->fNTrackHits == 2 && trackK->GetRecover() == 0) continue;
+ if (trackK->fNmbTrackHits == 2 && trackK->GetRecover() == 0) continue;
if (trackK->GetRecover() < 0) continue;
if (trackK->fStartSegment == segment) trackK->SetRecover(-1);
}
{
// Return the hit where track stopped
- if (!fNSteps) return (AliMUONHitForRec*)((*fTrackHitsPtr)[1]);
+ if (!fNSteps) return (AliMUONHitForRec*)((*fTrackHits)[1]);
return fSkipHit;
}
{
// Check if the track will make a double after outlier removal
- TClonesArray *trackPtr = fgEventReconstructor->GetRecTracksPtr();
- Int_t nRecTracks = fgEventReconstructor->GetNRecTracks();
- TObjArray *hitArray = new TObjArray(*fTrackHitsPtr);
+ TClonesArray *trackPtr = fgTrackReconstructor->GetRecTracksPtr();
+ Int_t nRecTracks = fgTrackReconstructor->GetNRecTracks();
+ TObjArray *hitArray = new TObjArray(*fTrackHits);
TObjArray *hitArray1 = new TObjArray(*hitArray);
hitArray1->Remove(hit);
hitArray1->Compress();
Bool_t same = kFALSE;
for (Int_t i=0; i<nRecTracks; i++) {
AliMUONTrackK *trackK = (AliMUONTrackK*) ((*trackPtr)[i]);
- if (trackK->fNTrackHits == 2 && trackK->GetRecover() == 0) continue;
+ if (trackK->fNmbTrackHits == 2 && trackK->GetRecover() == 0) continue;
if (trackK == this) continue;
- if (trackK->fNTrackHits == fNTrackHits || trackK->fNTrackHits == fNTrackHits-1) {
- TObjArray *hits = new TObjArray(*trackK->fTrackHitsPtr);
+ if (trackK->fNmbTrackHits == fNmbTrackHits || trackK->fNmbTrackHits == fNmbTrackHits-1) {
+ TObjArray *hits = new TObjArray(*trackK->fTrackHits);
same = kTRUE;
- if (trackK->fNTrackHits == fNTrackHits) {
- for (Int_t j=0; j<fNTrackHits; j++) {
+ if (trackK->fNmbTrackHits == fNmbTrackHits) {
+ for (Int_t j=0; j<fNmbTrackHits; j++) {
if (hits->UncheckedAt(j) != hitArray->UncheckedAt(j)) { same = kFALSE; break; }
}
if (same) { delete hits; break; }
if (hits1->Remove(trackK->fSkipHit) > 0) {
hits1->Compress();
same = kTRUE;
- for (Int_t j=0; j<fNTrackHits-1; j++) {
+ for (Int_t j=0; j<fNmbTrackHits-1; j++) {
if (hits1->UncheckedAt(j) != hitArray1->UncheckedAt(j)) { same = kFALSE; break; }
}
if (same) { delete hits1; break; }
} else {
// Check with removed outlier
same = kTRUE;
- for (Int_t j=0; j<fNTrackHits-1; j++) {
+ for (Int_t j=0; j<fNmbTrackHits-1; j++) {
if (hits->UncheckedAt(j) != hitArray1->UncheckedAt(j)) { same = kFALSE; break; }
}
if (same) { delete hits; break; }
{
// Check if the track will make a double after recovery
- TClonesArray *trackPtr = fgEventReconstructor->GetRecTracksPtr();
- Int_t nRecTracks = fgEventReconstructor->GetNRecTracks();
+ TClonesArray *trackPtr = fgTrackReconstructor->GetRecTracksPtr();
+ Int_t nRecTracks = fgTrackReconstructor->GetNRecTracks();
- TObjArray *hitArray = new TObjArray(*fTrackHitsPtr);
+ TObjArray *hitArray = new TObjArray(*fTrackHits);
if (GetStation0() == 3) SortHits(0, hitArray); // sort
//if (GetStation0() == 3) SortHits(1, hitArray); // unsort
Bool_t same = kFALSE;
for (Int_t i=0; i<nRecTracks; i++) {
AliMUONTrackK *trackK = (AliMUONTrackK*) ((*trackPtr)[i]);
- if (trackK->fNTrackHits == 2 && trackK->GetRecover() == 0) continue;
+ if (trackK->fNmbTrackHits == 2 && trackK->GetRecover() == 0) continue;
if (trackK == this) continue;
//AZ if (trackK->GetRecover() < 0) continue; //
- if (trackK->fNTrackHits >= fNTrackHits) {
- TObjArray *hits = new TObjArray(*trackK->fTrackHitsPtr);
+ if (trackK->fNmbTrackHits >= fNmbTrackHits) {
+ TObjArray *hits = new TObjArray(*trackK->fTrackHits);
if (trackK->GetStation0() == 3) SortHits(0, hits); // sort
//if (trackK->GetStation0() == 3) SortHits(1, hits); // unsort
- for (Int_t j=0; j<fNTrackHits; j++) {
- //cout << fNTrackHits << " " << i << " " << j << " " << (*hitArray)[j] << " " << (*hits)[j] << " " << trackK->fSkipHit << endl;
- if (j != fNTrackHits-1 && (*hitArray)[j] != (*hits)[j]) break;
- if (j == fNTrackHits-1) {
+ for (Int_t j=0; j<fNmbTrackHits; j++) {
+ //cout << fNmbTrackHits << " " << i << " " << j << " " << (*hitArray)[j] << " " << (*hits)[j] << " " << trackK->fSkipHit << endl;
+ if (j != fNmbTrackHits-1 && (*hitArray)[j] != (*hits)[j]) break;
+ if (j == fNmbTrackHits-1) {
if (trackK->fSkipHit && TMath::Abs(((AliMUONHitForRec*)((*hitArray)[j]))->GetZ()-trackK->fSkipHit->GetZ()) < 0.5) same = kTRUE;
- //if (trackK->fNTrackHits > fNTrackHits &&
+ //if (trackK->fNmbTrackHits > fNmbTrackHits &&
//if (trackK->fSkipHit) cout << ((AliMUONHitForRec*)((*hitArray)[j]))->GetZ() << " " << trackK->fSkipHit->GetZ() << endl;
}
} // for (Int_t j=0;
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff