From 763bdf3ef997bb113e8fc9e7bcea77bdd6fd92e7 Mon Sep 17 00:00:00 2001 From: masera Date: Tue, 26 Oct 2010 15:15:36 +0000 Subject: [PATCH] Fix for Savannah bug 74286 --- ITS/AliITStrackMI.cxx | 3 +-- ITS/AliITStrackMI.h | 2 +- ITS/AliITStrackV2.cxx | 6 ++---- ITS/AliITStrackV2.h | 2 +- ITS/AliITStrackerMI.cxx | 29 +++++------------------------ ITS/AliITStrackerV2.cxx | 28 ++++------------------------ 6 files changed, 14 insertions(+), 56 deletions(-) diff --git a/ITS/AliITStrackMI.cxx b/ITS/AliITStrackMI.cxx index df83813c5f6..de8d5c2094e 100644 --- a/ITS/AliITStrackMI.cxx +++ b/ITS/AliITStrackMI.cxx @@ -56,7 +56,7 @@ fGoldV0(kFALSE) } //____________________________________________________________________________ -AliITStrackMI::AliITStrackMI(AliESDtrack& t,Bool_t c) throw (const Char_t *) : +AliITStrackMI::AliITStrackMI(AliESDtrack& t,Bool_t c): AliITStrackV2(t,c), fNUsed(0), fNSkipped(0), @@ -75,7 +75,6 @@ fGoldV0(kFALSE) { for(Int_t i=0; i<12; i++) {fDy[i]=0; fDz[i]=0; fSigmaY[i]=0; fSigmaZ[i]=0; fSigmaYZ[i]=0; fChi2MIP[i]=0;} fD[0]=0; fD[1]=0; fDnorm[0]=0; fDnorm[1]=0; - //if (!Invariant()) throw "AliITStrackV2: conversion failed !\n"; } diff --git a/ITS/AliITStrackMI.h b/ITS/AliITStrackMI.h index 77a88527d06..6cfd942ecad 100644 --- a/ITS/AliITStrackMI.h +++ b/ITS/AliITStrackMI.h @@ -37,7 +37,7 @@ class AliESDtrack; class AliITStrackMI : public AliITStrackV2 { public: AliITStrackMI(); - AliITStrackMI(AliESDtrack& t,Bool_t c=kFALSE) throw (const Char_t *); + AliITStrackMI(AliESDtrack& t,Bool_t c=kFALSE); AliITStrackMI(const AliITStrackMI& t); Int_t GetProlongationFast(Double_t alpha, Double_t xr,Double_t &y, Double_t &z); Bool_t UpdateMI(const AliCluster *c, Double_t chi2, Int_t i); diff --git a/ITS/AliITStrackV2.cxx b/ITS/AliITStrackV2.cxx index 58565e0c409..c4478c5d742 100644 --- a/ITS/AliITStrackV2.cxx +++ b/ITS/AliITStrackV2.cxx @@ -46,7 +46,7 @@ AliITStrackV2::AliITStrackV2() : AliKalmanTrack(), //____________________________________________________________________________ -AliITStrackV2::AliITStrackV2(AliESDtrack& t,Bool_t c) throw (const Char_t *) : +AliITStrackV2::AliITStrackV2(AliESDtrack& t,Bool_t c): AliKalmanTrack(), fCheckInvariant(kTRUE), fdEdx(t.GetITSsignal()), @@ -59,12 +59,10 @@ AliITStrackV2::AliITStrackV2(AliESDtrack& t,Bool_t c) throw (const Char_t *) : const AliExternalTrackParam *par=&t; if (c) { par=t.GetConstrainedParam(); - if (!par) throw "AliITStrackV2: conversion failed !\n"; + if (!par) AliError("AliITStrackV2: conversion failed !\n"); } Set(par->GetX(),par->GetAlpha(),par->GetParameter(),par->GetCovariance()); - //if (!Invariant()) throw "AliITStrackV2: conversion failed !\n"; - SetLabel(t.GetLabel()); SetMass(t.GetMass()); SetNumberOfClusters(t.GetITSclusters(fIndex)); diff --git a/ITS/AliITStrackV2.h b/ITS/AliITStrackV2.h index 7840c10fafe..d715f834045 100644 --- a/ITS/AliITStrackV2.h +++ b/ITS/AliITStrackV2.h @@ -24,7 +24,7 @@ class AliTracker; class AliITStrackV2 : public AliKalmanTrack { public: AliITStrackV2(); - AliITStrackV2(AliESDtrack& t,Bool_t c=kFALSE) throw (const Char_t *); + AliITStrackV2(AliESDtrack& t,Bool_t c=kFALSE); AliITStrackV2(const AliITStrackV2& t); ~AliITStrackV2(){fESDtrack=0;} diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx index 8bc08253f44..63f7d164586 100644 --- a/ITS/AliITStrackerMI.cxx +++ b/ITS/AliITStrackerMI.cxx @@ -526,14 +526,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { if (esd->GetStatus()&AliESDtrack::kTPCout) continue; if (esd->GetStatus()&AliESDtrack::kITSin) continue; if (esd->GetKinkIndex(0)>0) continue; //kink daughter - AliITStrackMI *t=0; - try { - t=new AliITStrackMI(*esd); - } catch (const Char_t *msg) { - //Warning("Clusters2Tracks",msg); - delete t; - continue; - } + AliITStrackMI *t = new AliITStrackMI(*esd); t->GetDZ(GetX(),GetY(),GetZ(),t->GetDP()); //I.B. Double_t vdist = TMath::Sqrt(t->GetD(0)*t->GetD(0)+t->GetD(1)*t->GetD(1)); @@ -669,14 +662,8 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) { if ((esd->GetStatus()&AliESDtrack::kITSin)==0) continue; if (esd->GetStatus()&AliESDtrack::kITSout) continue; - AliITStrackMI *t=0; - try { - t=new AliITStrackMI(*esd); - } catch (const Char_t *msg) { - //Warning("PropagateBack",msg); - delete t; - continue; - } + AliITStrackMI *t = new AliITStrackMI(*esd); + t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.)); ResetTrackToFollow(*t); @@ -746,14 +733,8 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { if (esd->GetStatus()&AliESDtrack::kTPCout) if ((esd->GetStatus()&AliESDtrack::kTPCrefit)==0) continue; - AliITStrackMI *t=0; - try { - t=new AliITStrackMI(*esd); - } catch (const Char_t *msg) { - //Warning("RefitInward",msg); - delete t; - continue; - } + AliITStrackMI *t = new AliITStrackMI(*esd); + t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.)); if (!CorrectForTPCtoITSDeadZoneMaterial(t)) { delete t; diff --git a/ITS/AliITStrackerV2.cxx b/ITS/AliITStrackerV2.cxx index a1b1d6a2c50..7777bc9d626 100644 --- a/ITS/AliITStrackerV2.cxx +++ b/ITS/AliITStrackerV2.cxx @@ -282,14 +282,8 @@ Int_t AliITStrackerV2::Clusters2Tracks(AliESDEvent *event) { if (esd->GetStatus()&AliESDtrack::kTPCout) continue; if (esd->GetStatus()&AliESDtrack::kITSin) continue; - AliITStrackV2 *t=0; - try { - t=new AliITStrackV2(*esd); - } catch (const Char_t *msg) { - Warning("Clusters2Tracks",msg); - delete t; - continue; - } + AliITStrackV2 *t = new AliITStrackV2(*esd); + if (TMath::Abs(t->GetD(GetX(),GetY()))>4) { delete t; continue; @@ -363,14 +357,7 @@ Int_t AliITStrackerV2::PropagateBack(AliESDEvent *event) { if ((esd->GetStatus()&AliESDtrack::kITSin)==0) continue; if (esd->GetStatus()&AliESDtrack::kITSout) continue; - AliITStrackV2 *t=0; - try { - t=new AliITStrackV2(*esd); - } catch (const Char_t *msg) { - Warning("PropagateBack",msg); - delete t; - continue; - } + AliITStrackV2 *t = new AliITStrackV2(*esd); ResetTrackToFollow(*t); @@ -424,14 +411,7 @@ Int_t AliITStrackerV2::RefitInward(AliESDEvent *event) { if (esd->GetStatus()&AliESDtrack::kTPCout) if ((esd->GetStatus()&AliESDtrack::kTPCrefit)==0) continue; - AliITStrackV2 *t=0; - try { - t=new AliITStrackV2(*esd); - } catch (const Char_t *msg) { - Warning("RefitInward",msg); - delete t; - continue; - } + AliITStrackV2 *t = new AliITStrackV2(*esd); if (CorrectForDeadZoneMaterial(t)!=0) { Warning("RefitInward", -- 2.39.3