X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTrackK.cxx;h=c9e3f2646c30e0e34723a88f6e1254dba6113a8f;hb=460b43637196c58e3f94ec063c7a24f24b39b6b7;hp=cb7a41365aa78de4148c23ceb5783c0a380f7a07;hpb=f93b9bd80024179705b3dcce1f563265c6c86a89;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONTrackK.cxx b/MUON/AliMUONTrackK.cxx index cb7a41365aa..c9e3f2646c3 100644 --- a/MUON/AliMUONTrackK.cxx +++ b/MUON/AliMUONTrackK.cxx @@ -15,21 +15,29 @@ /* $Id$ */ -#include // for exit() +// Class AliMUONTrackK +// ------------------------------------- +// Reconstructed track in the muons system based on the extended +// Kalman filter approach +// +// Author: Alexander Zinchenko, JINR Dubna + #include #include #include #include #include "AliMUONTrackK.h" -#include "AliCallf77.h" #include "AliMUON.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" @@ -40,16 +48,14 @@ const Int_t AliMUONTrackK::fgkTriesMax = 10000; const Double_t AliMUONTrackK::fgkEpsilon = 0.002; void mnvertLocal(Double_t* a, Int_t l, Int_t m, Int_t n, Int_t& ifail); // from AliMUONTrack -//void mnvertLocalK(Double_t* a, Int_t l, Int_t m, Int_t n, Int_t& ifail); - -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; 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() @@ -59,13 +65,12 @@ AliMUONTrackK::AliMUONTrackK() // Default constructor fgTrackReconstructor = NULL; // pointer to event reconstructor - fgMUON = NULL; // pointer to Muon module 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; @@ -81,20 +86,20 @@ AliMUONTrackK::AliMUONTrackK() //__________________________________________________________________________ AliMUONTrackK::AliMUONTrackK(AliMUONTrackReconstructor *TrackReconstructor, TClonesArray *hitForRec) - //AZ: TObject() : AliMUONTrack() { // Constructor if (!TrackReconstructor) return; fgTrackReconstructor = TrackReconstructor; // pointer to event reconstructor - fgMUON = (AliMUON*) gAlice->GetModule("MUON"); // pointer to Muon module 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; @@ -109,8 +114,8 @@ AliMUONTrackK::AliMUONTrackK(AliMUONTrackReconstructor *TrackReconstructor, TClo //__________________________________________________________________________ AliMUONTrackK::AliMUONTrackK(AliMUONSegment *segment) - //AZ: TObject() - : AliMUONTrack(segment, segment, fgTrackReconstructor) + //: AliMUONTrack(segment, segment, fgTrackReconstructor) + : AliMUONTrack(NULL, segment, fgTrackReconstructor) { // Constructor from a segment Double_t dX, dY, dZ; @@ -132,8 +137,8 @@ AliMUONTrackK::AliMUONTrackK(AliMUONSegment *segment) 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 @@ -147,8 +152,8 @@ AliMUONTrackK::AliMUONTrackK(AliMUONSegment *segment) (*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 { @@ -156,8 +161,8 @@ AliMUONTrackK::AliMUONTrackK(AliMUONSegment *segment) (*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; } @@ -186,14 +191,14 @@ AliMUONTrackK::AliMUONTrackK(AliMUONSegment *segment) fParSmooth = NULL; if (fgDebug < 0 ) return; - cout << fgTrackReconstructor->GetBendingMomentumFromImpactParam(segment->GetBendingImpact()) << " " << 1/(*fTrackPar)(4,0) << " "; + 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]); + hit1 = (AliMUONHitForRec*) ((*fTrackHits)[i]); rawclusters = fgTrackReconstructor->GetMUONData()->RawClusters(hit1->GetChamberNumber()); clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit1->GetHitNumber()); cout << clus->GetTrack(1); @@ -209,9 +214,14 @@ AliMUONTrackK::~AliMUONTrackK() { // 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; @@ -284,7 +294,6 @@ AliMUONTrackK::~AliMUONTrackK() //__________________________________________________________________________ AliMUONTrackK::AliMUONTrackK (const AliMUONTrackK& source) - //AZ: TObject(source) : AliMUONTrack(source) { // Protected copy constructor @@ -303,7 +312,7 @@ AliMUONTrackK & AliMUONTrackK::operator=(const AliMUONTrackK& source) AliMUONTrack::operator=(source); fStartSegment = source.fStartSegment; - fNTrackHits = source.fNTrackHits; + fNmbTrackHits = source.fNmbTrackHits; fChi2 = source.fChi2; fPosition = source.fPosition; fPositionNew = source.fPositionNew; @@ -313,9 +322,13 @@ AliMUONTrackK & AliMUONTrackK::operator=(const AliMUONTrackK& source) 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 @@ -373,7 +386,6 @@ void AliMUONTrackK::EvalCovariance(Double_t dZ) (*fWeight)(1,3) = dBdX*(*fWeight)(1,1); // (*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, @@ -381,7 +393,6 @@ void AliMUONTrackK::EvalCovariance(Double_t dZ) if (fWeight->Determinant() != 0) { // fWeight->Invert(); Int_t ifail; - //mnvertLocalK(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifailWeight); mnvertLocal(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifail); } else { AliWarning(" Determinant fWeight=0:"); @@ -395,9 +406,9 @@ Bool_t AliMUONTrackK::KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, // 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; @@ -414,48 +425,58 @@ Bool_t AliMUONTrackK::KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, 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; @@ -471,8 +492,25 @@ Bool_t AliMUONTrackK::KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, 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 @@ -494,6 +532,7 @@ Bool_t AliMUONTrackK::KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, 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) { @@ -505,9 +544,9 @@ Bool_t AliMUONTrackK::KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, cout << ((AliMUONHitForRec*)((*fgHitForRec)[i1]))->GetTTRTrack() << endl; } cout << endl; - cout << fNTrackHits << endl; - for (Int_t i1=0; i1GetChamberNumber(), hit->GetBendingCoor(), hit->GetNonBendingCoor(), hit->GetZ()); @@ -524,7 +563,7 @@ Bool_t AliMUONTrackK::KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, } } } // 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) @@ -573,12 +612,13 @@ Bool_t AliMUONTrackK::KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t 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); } @@ -595,7 +635,6 @@ Bool_t AliMUONTrackK::KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, 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 @@ -603,20 +642,20 @@ Bool_t AliMUONTrackK::KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, 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 (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; } @@ -672,10 +711,7 @@ void AliMUONTrackK::ParPropagation(Double_t zEnd) 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); @@ -684,19 +720,7 @@ void AliMUONTrackK::ParPropagation(Double_t zEnd) //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) { @@ -717,7 +741,6 @@ void AliMUONTrackK::WeightPropagation(Double_t zEnd, Bool_t smooth) // 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 ifail; mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail); //fCovariance->Print(); @@ -755,7 +778,6 @@ void AliMUONTrackK::WeightPropagation(Double_t zEnd, Bool_t smooth) // 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); @@ -786,7 +808,7 @@ void AliMUONTrackK::WeightPropagation(Double_t zEnd, Bool_t smooth) } //__________________________________________________________________________ -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 @@ -795,15 +817,35 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int TClonesArray *trackPtr; AliMUONHitForRec *hit, *hitLoop; AliMUONTrackK *trackK; + AliMUONDetElement *detElem = NULL; Bool_t ok = kFALSE; + + 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 ifail; mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail); } else { @@ -818,37 +860,32 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int 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= 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) { - if (TMath::Abs(hit->GetZ()-zEnd) > 0.05) { - // adjust position: for multiple hits in the chamber - // (mostly (only?) for GEANT hits) - cout << " ******* adjust " << zEnd << " " << hit->GetZ() << endl; - 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:" ); - } - } 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()); @@ -886,6 +923,24 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int // 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; @@ -893,6 +948,7 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int pointWeight(1,1) = 1/hit->GetNonBendingReso2(); TryPoint(point,pointWeight,trackPar,dChi2); 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) { @@ -905,6 +961,7 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int trackParTmp = trackPar; pointWeightTmp = pointWeight; hitAdd = hit; + if (fgDebug > 0) cout << " Added point: " << x << " " << y << " " << dChi2 << endl; } else { // branching: create a new track trackPtr = fgTrackReconstructor->GetRecTracksPtr(); @@ -912,7 +969,7 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int trackK = new ((*trackPtr)[nRecTracks]) AliMUONTrackK(NULL, NULL); *trackK = *this; fgTrackReconstructor->SetNRecTracks(nRecTracks+1); - if (fgDebug > 0) cout << " ******** New track: " << ichamb << " " << hit->GetTTRTrack() << " " << 1/(trackPar)(4,0) << " " << hit->GetBendingCoor() << " " << hit->GetNonBendingCoor() << " " << fNTrackHits << " " << nRecTracks << endl; + 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; @@ -927,16 +984,13 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int 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; } @@ -944,9 +998,9 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int AddMatrices (trackK, dChi2, hit); } // Mark hits as being on 2 tracks - for (Int_t i=0; iSetNTrackHits(hitLoop->GetNTrackHits()+1); + for (Int_t i=0; iSetNTrackHits(hitLoop->GetNTrackHits()+1); if (fgDebug >=10) { cout << " ** "; cout << hitLoop->GetChamberNumber() << " "; @@ -962,12 +1016,11 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int } } //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; } @@ -984,7 +1037,6 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int 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) { @@ -1024,9 +1076,8 @@ void AliMUONTrackK::TryPoint(TMatrixD &point, const TMatrixD &pointWeight, TMatr // 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 ifail; - mnvertLocal(&((wu)(0,0)), fgkSize,fgkSize,fgkSize,ifail); + Int_t ifail; + mnvertLocal(&((wu)(0,0)), fgkSize,fgkSize,fgkSize,ifail); } else { AliWarning(" Determinant wu=0:"); } @@ -1054,8 +1105,6 @@ void AliMUONTrackK::MSThin(Int_t sign) // 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 ifail; mnvertLocal(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifail); } else { @@ -1072,8 +1121,6 @@ void AliMUONTrackK::MSThin(Int_t sign) (*fWeight)(2,2) += sign*theta0/cosBeta*theta0/cosBeta; // alpha (*fWeight)(3,3) += sign*theta0*theta0; // beta - //fWeight->Invert(); // weight - Int_t ifail; mnvertLocal(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifail); return; @@ -1089,12 +1136,12 @@ void AliMUONTrackK::StartBack(void) for (Int_t i=0; i 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; } //__________________________________________________________________________ @@ -1192,15 +1239,15 @@ Bool_t AliMUONTrackK::KeepTrack(AliMUONTrackK* track0) const AliMUONHitForRec *hit0, *hit1; hitsInCommon = 0; - nHits0 = track0->fNTrackHits; - nTrackHits2 = fNTrackHits/2; + nHits0 = track0->fNmbTrackHits; + nTrackHits2 = fNmbTrackHits/2; for (i=0; ifTrackHitsPtr)[i]; + hit0 = (AliMUONHitForRec*) (*track0->fTrackHits)[i]; if (hit0->GetNTrackHits() == 1) continue; - for (j=0; jGetNTrackHits() == 1) continue; if (hit0 == hit1) { hitsInCommon++; @@ -1216,16 +1263,6 @@ Bool_t AliMUONTrackK::KeepTrack(AliMUONTrackK* track0) const void AliMUONTrackK::Kill(void) { // Kill track candidate - Int_t i; - AliMUONHitForRec *hit; - - if (fTrackHitsPtr) { - // Remove track mark from hits - for (i=0; iSetNTrackHits(hit->GetNTrackHits()-1); - } - } fgTrackReconstructor->GetRecTracksPtr()->Remove(this); } @@ -1235,25 +1272,27 @@ void AliMUONTrackK::FillMUONTrack(void) // 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 - ((AliMUONTrack*)this)->AddHitForRecAtHit((AliMUONHitForRec*)fTrackHitsPtr->UncheckedAt(i)); + AddHitForRecAtHit((AliMUONHitForRec*)fTrackHits->UncheckedAt(i)); } } @@ -1298,13 +1337,13 @@ void AliMUONTrackK::Branson(void) (*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; + if (fgDebug > 0) cout << 1/(*fTrackPar)(4,0) << " " << fPosition << " " << (*fTrackPar)(0,0) << endl; // Get covariance matrix *fCovariance = *fWeight; if (fCovariance->Determinant() != 0) { - Int_t ifail; - mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail); + Int_t ifail; + mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail); } else { AliWarning(" Determinant fCovariance=0:"); } @@ -1349,7 +1388,6 @@ void AliMUONTrackK::GoToVertex(Int_t iflag) 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()); @@ -1445,14 +1483,15 @@ void AliMUONTrackK::GoToVertex(Int_t iflag) } 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))); @@ -1479,52 +1518,64 @@ vertex: fChi2 += dChi2; // Chi2 if (fgDebug < 0) return; // no output - cout << pOld << " " << 1/(*fTrackPar)(4,0) << " " << dChi2 << " " << fChi2 << " " << fNTrackHits << endl; - for (Int_t i1=0; i1GetChamberNumber()); + cout << pOld << " " << 1/(*fTrackPar)(4,0) << " " << dChi2 << " " << fChi2 << " " << fNmbTrackHits << endl; + for (Int_t i1=0; i1GetChamberNumber()); } cout << endl; if (fgDebug > 0) { - for (Int_t i1=0; i1GetHitNumber() << " "; - //cout << ((AliMUONHitForRec*)((*fTrackHitsPtr)[i1]))->GetZ() << " "; - printf ("%4d", fgHitForRec->IndexOf(hit)); + for (Int_t i1=0; i1GetHitNumber() << " "; + //cout << ((AliMUONHitForRec*)((*fTrackHits)[i1]))->GetZ() << " "; + printf ("%5d", fgHitForRec->IndexOf(hit)); } cout << endl; } if (fgTrackReconstructor->GetRecTrackRefHits()) { // from track ref. hits - for (Int_t i1=0; i1GetTTRTrack() + hit->GetTrackRefSignal()*10000 << " "; } } else { // from raw clusters - for (Int_t i1=0; i1GetMUONData()->RawClusters(hit->GetChamberNumber()); - clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber()); - printf ("%4d", clus->GetTrack(1)); + for (Int_t i1=0; i1GetHitNumber() < 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; i1GetMUONData()->RawClusters(hit->GetChamberNumber()); - clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber()); - if (clus->GetTrack(2) != -1) printf ("%4d", clus->GetTrack(2)); - else printf ("%4s", " "); + for (Int_t i1=0; i1GetHitNumber() < 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; i1GetHitNumber() << " "; - cout << ((AliMUONHitForRec*)((*fTrackHitsPtr)[i1]))->GetZ() << " "; - //cout << fgHitForRec->IndexOf(((AliMUONHitForRec*)((*fTrackHitsPtr)[i1]))) << " "; + for (Int_t i1=0; i1GetHitNumber() << " "; + cout << ((AliMUONHitForRec*)((*fTrackHits)[i1]))->GetZ() << " "; + //cout << fgHitForRec->IndexOf(((AliMUONHitForRec*)((*fTrackHits)[i1]))) << " "; } cout << endl; - for (Int_t i1=0; i1Determinant() != 0) { - // fCovariance->Invert(); Int_t ifail; mnvertLocal(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifail); } else { @@ -1607,7 +1657,6 @@ void AliMUONTrackK::MSLine(Double_t dZ, Double_t x0) // Get weight matrix *fWeight = *fCovariance; if (fWeight->Determinant() != 0) { - // fWeight->Invert(); Int_t ifail; mnvertLocal(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifail); } else { @@ -1629,50 +1678,50 @@ Bool_t AliMUONTrackK::Recover(void) // Remove hit with the highest chi2 Double_t chi2 = 0; if (fgDebug > 0) { - for (Int_t i=0; iUncheckedAt(i))->GetChamberNumber()); + for (Int_t i=0; iUncheckedAt(i))->GetChamberNumber()); } printf("\n"); } Double_t chi2max = 0; Int_t imax = 0; - for (Int_t i=0; iUncheckedAt(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; iUncheckedAt(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 @@ -1682,7 +1731,7 @@ Bool_t AliMUONTrackK::Recover(void) delete hits; nRecTracks = fgTrackReconstructor->GetNRecTracks(); - skipHit = (AliMUONHitForRec*) ((*fTrackHitsPtr)[fNTrackHits-1]); + skipHit = (AliMUONHitForRec*) ((*fTrackHits)[fNmbTrackHits-1]); // Remove all saved steps and smoother matrices after the skipped hit RemoveMatrices(skipHit->GetZ()); @@ -1694,9 +1743,9 @@ Bool_t AliMUONTrackK::Recover(void) 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; } @@ -1734,7 +1783,7 @@ Bool_t AliMUONTrackK::Recover(void) } trackK->fPosition = trackK->fPositionNew = (*fSteps)[fNSteps-1]; trackK->fChi2 = 0; - for (Int_t i=0; ifChi2 += (*fChi2Array)[i]; + for (Int_t i=0; ifChi2 += (*fChi2Array)[i]; if (fgDebug > 0) cout << nRecTracks << " " << trackK->fRecover << endl; return kTRUE; } @@ -1778,14 +1827,14 @@ void AliMUONTrackK::AddMatrices(AliMUONTrackK *trackK, Double_t dChi2, AliMUONHi 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 @@ -1853,9 +1902,9 @@ void AliMUONTrackK::RemoveMatrices(AliMUONTrackK* trackK) 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); @@ -1869,15 +1918,15 @@ Bool_t AliMUONTrackK::Smooth(void) cout << endl; 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 @@ -1922,10 +1971,10 @@ Bool_t AliMUONTrackK::Smooth(void) // 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; @@ -1961,8 +2010,8 @@ L33: if (chi2(0,0) > chi2max) chi2max = chi2(0,0); fChi2 += chi2(0,0); if (chi2(0,0) < 0) { - chi2.Print(); cout << " chi2 < 0 " << i << " " << iLast << endl; - //AliFatal("chi2 < 0."); + //chi2.Print(); + AliError(Form(" *** chi2 < 0: %d %d ", i, iLast)); } // Save smoothed parameters TMatrixD *par = new TMatrixD(parSmooth); @@ -1990,33 +2039,33 @@ void AliMUONTrackK::Outlier() if (fgDebug > 0) { cout << " ******** Enter Outlier " << endl; - for (Int_t i=0; iUncheckedAt(i))->GetChamberNumber()); + for (Int_t i=0; iUncheckedAt(i))->GetChamberNumber()); } printf("\n"); } Double_t chi2max = 0; Int_t imax = 0; - for (Int_t i=0; iUncheckedAt(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; } @@ -2036,17 +2085,26 @@ void AliMUONTrackK::Outlier() 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; fgTrackReconstructor->SetNRecTracks(nRecTracks+1); - //AZ(z->-z) trackK->fTrackDir = -1; trackK->fTrackDir = 1; trackK->fRecover = 2; trackK->fSkipHit = hit; @@ -2076,7 +2134,7 @@ void AliMUONTrackK::Outlier() } trackK->fPosition = trackK->fPositionNew = (*fSteps)[fNSteps-1]; trackK->fChi2 = 0; - for (Int_t i=0; ifChi2 += (*fChi2Array)[i]; + for (Int_t i=0; ifChi2 += (*fChi2Array)[i]; if (fgDebug > 0) cout << nRecTracks << " Outlier " << trackK->fChi2 << endl; } @@ -2097,14 +2155,14 @@ void AliMUONTrackK::Print(FILE *lun) const AliMUONHitForRec *hit = 0; if (fgTrackReconstructor->GetRecTrackRefHits()) { // from track ref. hits - for (Int_t j=0; jUncheckedAt(j); + for (Int_t j=0; jUncheckedAt(j); if (hit->GetTTRTrack() > 1) { flag = 0; break; } } - for (Int_t j=0; 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); } @@ -2114,8 +2172,8 @@ void AliMUONTrackK::Print(FILE *lun) const // from raw clusters AliMUONRawCluster *clus = 0; TClonesArray *rawclusters = 0; - for (Int_t i1=0; i1GetMUONData()->RawClusters(hit->GetChamberNumber()); clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber()); if (TMath::Abs(clus->GetTrack(1)-1) < 2) { @@ -2130,9 +2188,9 @@ void AliMUONTrackK::Print(FILE *lun) const break; } Int_t sig[2]={1,1}, tid[2]={0}; - for (Int_t i1=0; i1GetMUONData()->RawClusters(hit->GetChamberNumber()); clus = (AliMUONRawCluster*) rawclusters->UncheckedAt(hit->GetHitNumber()); for (Int_t j=0; j<2; j++) { @@ -2162,20 +2220,20 @@ void AliMUONTrackK::DropBranches(Int_t imax, TObjArray *hits) 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; ifNTrackHits == 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; @@ -2184,12 +2242,12 @@ void AliMUONTrackK::DropBranches(Int_t imax, TObjArray *hits) // 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; @@ -2211,7 +2269,7 @@ void AliMUONTrackK::DropBranches(AliMUONSegment *segment) for (Int_t i=icand+1; ifNTrackHits == 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); } @@ -2223,7 +2281,7 @@ AliMUONHitForRec* AliMUONTrackK::GetHitLastOk(void) { // Return the hit where track stopped - if (!fNSteps) return (AliMUONHitForRec*)((*fTrackHitsPtr)[1]); + if (!fNSteps) return (AliMUONHitForRec*)((*fTrackHits)[1]); return fSkipHit; } @@ -2241,7 +2299,7 @@ Bool_t AliMUONTrackK::ExistDouble(AliMUONHitForRec *hit) TClonesArray *trackPtr = fgTrackReconstructor->GetRecTracksPtr(); Int_t nRecTracks = fgTrackReconstructor->GetNRecTracks(); - TObjArray *hitArray = new TObjArray(*fTrackHitsPtr); + TObjArray *hitArray = new TObjArray(*fTrackHits); TObjArray *hitArray1 = new TObjArray(*hitArray); hitArray1->Remove(hit); hitArray1->Compress(); @@ -2249,13 +2307,13 @@ Bool_t AliMUONTrackK::ExistDouble(AliMUONHitForRec *hit) Bool_t same = kFALSE; for (Int_t i=0; ifNTrackHits == 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; jfNmbTrackHits == fNmbTrackHits) { + for (Int_t j=0; jUncheckedAt(j) != hitArray->UncheckedAt(j)) { same = kFALSE; break; } } if (same) { delete hits; break; } @@ -2264,7 +2322,7 @@ Bool_t AliMUONTrackK::ExistDouble(AliMUONHitForRec *hit) if (hits1->Remove(trackK->fSkipHit) > 0) { hits1->Compress(); same = kTRUE; - for (Int_t j=0; jUncheckedAt(j) != hitArray1->UncheckedAt(j)) { same = kFALSE; break; } } if (same) { delete hits1; break; } @@ -2274,7 +2332,7 @@ Bool_t AliMUONTrackK::ExistDouble(AliMUONHitForRec *hit) } else { // Check with removed outlier same = kTRUE; - for (Int_t j=0; jUncheckedAt(j) != hitArray1->UncheckedAt(j)) { same = kFALSE; break; } } if (same) { delete hits; break; } @@ -2295,26 +2353,26 @@ Bool_t AliMUONTrackK::ExistDouble(void) 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; ifNTrackHits == 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; jfSkipHit << endl; - if (j != fNTrackHits-1 && (*hitArray)[j] != (*hits)[j]) break; - if (j == fNTrackHits-1) { + for (Int_t j=0; jfSkipHit << 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;