From c07cb486c35b4893d0b8a8de032ae02038fe584f Mon Sep 17 00:00:00 2001 From: marian Date: Wed, 23 Apr 2008 10:17:28 +0000 Subject: [PATCH] Calculate the weighted mean of the shape factor (Marian) --- TPC/AliTPCseed.cxx | 43 ++++++++++++++++++++++--------------------- TPC/AliTPCseed.h | 8 ++++---- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/TPC/AliTPCseed.cxx b/TPC/AliTPCseed.cxx index 9ca7391be01..58326195686 100644 --- a/TPC/AliTPCseed.cxx +++ b/TPC/AliTPCseed.cxx @@ -41,8 +41,8 @@ AliTPCseed::AliTPCseed(): fCurrentSigmaZ2(1e10), fCMeanSigmaY2p30(-1.), //! current mean sigma Y2 - mean30% fCMeanSigmaZ2p30(-1.), //! current mean sigma Z2 - mean30% - fCMeanSigmaY2p2(-1.), //! current mean sigma Y2 - mean2% - fCMeanSigmaZ2p2(-1.), //! current mean sigma Z2 - mean2% + fCMeanSigmaY2p30R(-1.), //! current mean sigma Y2 - mean2% + fCMeanSigmaZ2p30R(-1.), //! current mean sigma Z2 - mean2% // fErrorY2(1e10), fErrorZ2(1e10), @@ -86,12 +86,12 @@ AliTPCseed::AliTPCseed(const AliTPCseed &s, Bool_t clusterOwner): fRow(0), fSector(-1), fRelativeSector(-1), - fCurrentSigmaY2(1e10), - fCurrentSigmaZ2(1e10), + fCurrentSigmaY2(-1), + fCurrentSigmaZ2(-1), fCMeanSigmaY2p30(-1.), //! current mean sigma Y2 - mean30% fCMeanSigmaZ2p30(-1.), //! current mean sigma Z2 - mean30% - fCMeanSigmaY2p2(-1.), //! current mean sigma Y2 - mean2% - fCMeanSigmaZ2p2(-1.), //! current mean sigma Z2 - mean2% + fCMeanSigmaY2p30R(-1.), //! current mean sigma Y2 - mean2% + fCMeanSigmaZ2p30R(-1.), //! current mean sigma Z2 - mean2% fErrorY2(1e10), fErrorZ2(1e10), fCurrentCluster(0x0), @@ -141,12 +141,12 @@ AliTPCseed::AliTPCseed(const AliTPCtrack &t): fRow(0), fSector(-1), fRelativeSector(-1), - fCurrentSigmaY2(1e10), - fCurrentSigmaZ2(1e10), + fCurrentSigmaY2(-1), + fCurrentSigmaZ2(-1), fCMeanSigmaY2p30(-1.), //! current mean sigma Y2 - mean30% fCMeanSigmaZ2p30(-1.), //! current mean sigma Z2 - mean30% - fCMeanSigmaY2p2(-1.), //! current mean sigma Y2 - mean2% - fCMeanSigmaZ2p2(-1.), //! current mean sigma Z2 - mean2% + fCMeanSigmaY2p30R(-1.), //! current mean sigma Y2 - mean2% + fCMeanSigmaZ2p30R(-1.), //! current mean sigma Z2 - mean2% fErrorY2(1e10), fErrorZ2(1e10), fCurrentCluster(0x0), @@ -201,12 +201,12 @@ AliTPCseed::AliTPCseed(Double_t xr, Double_t alpha, const Double_t xx[5], fRow(0), fSector(-1), fRelativeSector(-1), - fCurrentSigmaY2(1e10), - fCurrentSigmaZ2(1e10), + fCurrentSigmaY2(-1), + fCurrentSigmaZ2(-1), fCMeanSigmaY2p30(-1.), //! current mean sigma Y2 - mean30% fCMeanSigmaZ2p30(-1.), //! current mean sigma Z2 - mean30% - fCMeanSigmaY2p2(-1.), //! current mean sigma Y2 - mean2% - fCMeanSigmaZ2p2(-1.), //! current mean sigma Z2 - mean2% + fCMeanSigmaY2p30R(-1.), //! current mean sigma Y2 - mean2% + fCMeanSigmaZ2p30R(-1.), //! current mean sigma Z2 - mean2% fErrorY2(1e10), fErrorZ2(1e10), fCurrentCluster(0x0), @@ -527,16 +527,17 @@ Bool_t AliTPCseed::Update(const AliCluster *c, Double_t chisq, Int_t index) if (fCMeanSigmaY2p30<0){ fCMeanSigmaY2p30= c->GetSigmaY2(); //! current mean sigma Y2 - mean30% - fCMeanSigmaZ2p30= c->GetSigmaZ2(); //! current mean sigma Z2 - mean30% - fCMeanSigmaY2p2 = c->GetSigmaY2(); //! current mean sigma Y2 - mean5% - fCMeanSigmaZ2p2 = c->GetSigmaZ2(); //! current mean sigma Z2 - mean5% + fCMeanSigmaZ2p30= c->GetSigmaZ2(); //! current mean sigma Z2 - mean30% + fCMeanSigmaY2p30R = 1; //! current mean sigma Y2 - mean5% + fCMeanSigmaZ2p30R = 1; //! current mean sigma Z2 - mean5% } // fCMeanSigmaY2p30= 0.70*fCMeanSigmaY2p30 +0.30*c->GetSigmaY2(); - fCMeanSigmaZ2p30= 0.70*fCMeanSigmaZ2p30 +0.30*c->GetSigmaZ2(); - fCMeanSigmaY2p2 = 0.98*fCMeanSigmaY2p30 +0.02*c->GetSigmaY2(); - fCMeanSigmaZ2p2 = 0.98*fCMeanSigmaZ2p30 +0.02*c->GetSigmaZ2(); - + fCMeanSigmaZ2p30= 0.70*fCMeanSigmaZ2p30 +0.30*c->GetSigmaZ2(); + if (fCurrentSigmaY2>0){ + fCMeanSigmaY2p30R = 0.7*fCMeanSigmaY2p30R +0.3*c->GetSigmaY2()/fCurrentSigmaY2; + fCMeanSigmaZ2p30R = 0.7*fCMeanSigmaZ2p30R +0.3*c->GetSigmaZ2()/fCurrentSigmaZ2; + } SetClusterIndex(n,idx); // restore the current cluster index diff --git a/TPC/AliTPCseed.h b/TPC/AliTPCseed.h index 7a23d5eafae..5135a0903b2 100644 --- a/TPC/AliTPCseed.h +++ b/TPC/AliTPCseed.h @@ -125,8 +125,8 @@ class AliTPCseed : public AliTPCtrack { Float_t GetErrorZ2() const {return fErrorZ2;} Float_t GetCMeanSigmaY2p30() const {return fCMeanSigmaY2p30;} Float_t GetCMeanSigmaZ2p30() const {return fCMeanSigmaZ2p30;} - Float_t GetCMeanSigmaY2p2() const {return fCMeanSigmaY2p2;} - Float_t GetCMeanSigmaZ2p2() const {return fCMeanSigmaZ2p2;} + Float_t GetCMeanSigmaY2p30R() const {return fCMeanSigmaY2p30R;} + Float_t GetCMeanSigmaZ2p30R() const {return fCMeanSigmaZ2p30R;} // // void SetClusterMapBit(int ibit, Bool_t state); @@ -152,8 +152,8 @@ class AliTPCseed : public AliTPCtrack { Float_t fCurrentSigmaZ2; //!expected current cluster sigma Z Float_t fCMeanSigmaY2p30; //! current mean sigma Y2 - mean30% Float_t fCMeanSigmaZ2p30; //! current mean sigma Z2 - mean30% - Float_t fCMeanSigmaY2p2; //! current mean sigma Y2 - mean2% - Float_t fCMeanSigmaZ2p2; //! current mean sigma Z2 - mean2% + Float_t fCMeanSigmaY2p30R; //! current relative mean sigma Y2 - mean30% + Float_t fCMeanSigmaZ2p30R; //! current relative mean sigma Z2 - mean30% Float_t fErrorY2; //!sigma of current cluster Float_t fErrorZ2; //!sigma of current cluster AliTPCclusterMI * fCurrentCluster; //!pointer to the current cluster for prolongation -- 2.43.0