#include "AliESDtrack.h"
#include "AliTracker.h"
#include "AliTPCClusterParam.h"
+#include "AliTPCParam.h"
#include "AliTPCcalibDB.h"
#include "AliTPCTransform.h"
#include "AliTPCclusterMI.h"
#include "AliTPCseed.h"
#include "AliTPCPointCorrection.h"
-
+#include <TGeoManager.h>
+#include <TGeoPhysicalNode.h>
+#include "TDatabasePDG.h"
ClassImp(AliTPCcalibCalib)
AliTPCcalibCalib::AliTPCcalibCalib():
for (Int_t i=0;i<ntracks;++i) {
AliESDtrack *track = event->GetTrack(i);
- AliESDfriendTrack *friendTrack = ESDfriend->GetTrack(i);
-
+ AliESDfriendTrack *friendTrack = (AliESDfriendTrack*) ESDfriend->GetTrack(i);
+ if (!friendTrack) continue;
+ //track->SetFriendTrack(friendTrack);
+ fCurrentFriendTrack=friendTrack;
const AliExternalTrackParam * trackIn = track->GetInnerParam();
const AliExternalTrackParam * trackOut = track->GetOuterParam();
AliExternalTrackParam * tpcOut = (AliExternalTrackParam *)friendTrack->GetTPCOut();
if ((seed=dynamic_cast<AliTPCseed*>(calibObject))) break;
}
if (!seed) continue;
- RefitTrack(track, seed,event->GetMagneticField());
+ RefitTrack(track, seed, event->GetMagneticField());
(*tpcOut)=*(track->GetOuterParam());
}
return;
//
// 0 - Setup transform object
//
+ const Double_t kxIFC = 83.; // position of IFC
+ const Double_t kxOFC = 250.; // position of OFC
+ const Double_t kaFC = 1.; // amplitude
+ const Double_t ktFC = 5.0; // slope of error
+ //cov[0]+= kaFC*(TMath::Exp(-TMath::Abs(cl->GetX()-kxIFC)/ktFC)+TMath::Exp(-TMath::Abs(cl->GetX()-kxOFC)/ktFC));
+ //cov[2]+= kaFC*(TMath::Exp(-TMath::Abs(cl->GetX()-kxIFC)/ktFC)+TMath::Exp(-TMath::Abs(cl->GetX()-kxOFC)/ktFC));
+
+ static Int_t streamCounter=0;
+ streamCounter++;
+ AliESDfriendTrack *friendTrack = fCurrentFriendTrack;
+
AliTPCTransform *transform = AliTPCcalibDB::Instance()->GetTransform() ;
AliTPCParam *param = AliTPCcalibDB::Instance()->GetParameters();
transform->SetCurrentRun(fRun);
//
// First apply calibration
//
- AliTPCPointCorrection * corr = AliTPCPointCorrection::Instance();
+ // AliTPCPointCorrection * corr = AliTPCPointCorrection::Instance();
for (Int_t irow=0;irow<159;irow++) {
AliTPCclusterMI *cluster=seed->GetClusterPointer(irow);
if (!cluster) continue;
if (cluster->GetDetector()>35) ipad=1;
Float_t dy =0;//AliTPCClusterParam::SPosCorrection(0,ipad,cluster->GetPad(),cluster->GetTimeBin(),cluster->GetZ(),cluster->GetSigmaY2(),cluster->GetSigmaZ2(),cluster->GetMax());
Float_t dz =0;//AliTPCClusterParam::SPosCorrection(1,ipad,cluster->GetPad(),cluster->GetTimeBin(),cluster->GetZ(),cluster->GetSigmaY2(),cluster->GetSigmaZ2(),cluster->GetMax());
- // if(fApplyPositionCorrection) {
- //x[1]-=dy;
- //x[2]-=dz;
- // }
- //
- // Apply sector alignment
- //
- Double_t dxq = AliTPCPointCorrection::SGetCorrectionSector(0,cluster->GetDetector()%36,cluster->GetX(),
- cluster->GetY(),cluster->GetZ());
- Double_t dyq = AliTPCPointCorrection::SGetCorrectionSector(1,cluster->GetDetector()%36,cluster->GetX(),
- cluster->GetY(),cluster->GetZ());
- Double_t dzq = AliTPCPointCorrection::SGetCorrectionSector(2,cluster->GetDetector()%36,cluster->GetX(),
- cluster->GetY(),cluster->GetZ());
- if (fApplySectorAlignment){
- x[0]-=dxq;
- x[1]-=dyq;
- x[2]-=dzq;
- }
- //
- // Apply r-phi correction - To be done on track level- knowing the track angle !!!
- //
- Double_t corrclY =
- corr->RPhiCOGCorrection(cluster->GetDetector(),cluster->GetRow(), cluster->GetPad(),
- cluster->GetY(),cluster->GetY(), cluster->GetZ(), 0., cluster->GetMax(),2.5);
- // R correction
- Double_t corrR = corr->CorrectionOutR0(kFALSE,kFALSE,cluster->GetX(),cluster->GetY(),cluster->GetZ(),cluster->GetDetector());
-
- if (fApplyRPhiCorrection){
- if (cluster->GetY()>0) x[1]+=corrclY; // rphi correction
- if (cluster->GetY()<0) x[1]-=corrclY; // rphi correction
- }
- if (fApplyRCorrection){
- x[0]+=corrR; // radial correction
- }
-
- //
- //
//
cluster->SetX(x[0]);
cluster->SetY(x[1]);
//
// Apply alignemnt
//
-
-// if (!param->IsGeoRead()) param->ReadGeoMatrices();
-// TGeoHMatrix *mat = param->GetClusterMatrix(cluster->GetDetector());
-// //TGeoHMatrix mat;
-// Double_t pos[3]= {cluster->GetX(),cluster->GetY(),cluster->GetZ()};
-// Double_t posC[3]={cluster->GetX(),cluster->GetY(),cluster->GetZ()};
-// if (mat) mat->LocalToMaster(pos,posC);
-// else{
-// // chack Loading of Geo matrices from GeoManager - TEMPORARY FIX
-// }
-// cluster->SetX(posC[0]);
-// cluster->SetY(posC[1]);
-// cluster->SetZ(posC[2]);
-
+ if (transform->GetCurrentRecoParam()->GetUseSectorAlignment()){
+ if (!param->IsGeoRead()) param->ReadGeoMatrices();
+ TGeoHMatrix *mat = param->GetClusterMatrix(cluster->GetDetector());
+ //TGeoHMatrix mat;
+ Double_t pos[3]= {cluster->GetX(),cluster->GetY(),cluster->GetZ()};
+ Double_t posC[3]={cluster->GetX(),cluster->GetY(),cluster->GetZ()};
+ if (mat) mat->LocalToMaster(pos,posC);
+ else{
+ // chack Loading of Geo matrices from GeoManager - TEMPORARY FIX
+ }
+ cluster->SetX(posC[0]);
+ cluster->SetY(posC[1]);
+ cluster->SetZ(posC[2]);
+ }
- if (fStreamLevel>2){
+ if (fStreamLevel>2 && streamCounter<20*fStreamLevel ){
+ // dump debug info if required
TTreeSRedirector *cstream = GetDebugStreamer();
if (cstream){
(*cstream)<<"Clusters"<<
"cl.="<<cluster<<
"cy="<<dy<<
"cz="<<dz<<
- "cY="<<corrclY<<
- "cR="<<corrR<<
- "dxq="<<dxq<<
- "dyq="<<dyq<<
- "dzq="<<dzq<<
"\n";
}
}
//
//
Int_t ncl = seed->GetNumberOfClusters();
+ const Double_t kResetCov=4.;
+ const Double_t kSigma=5.;
Double_t covar[15];
for (Int_t i=0;i<15;i++) covar[i]=0;
- covar[0]=10.*10.;
- covar[2]=10.*10.;
- covar[5]=10.*10./(64.*64.);
- covar[9]=10.*10./(64.*64.);
- covar[14]=0.3*0.3;
+ covar[0]=kSigma*kSigma;
+ covar[2]=kSigma*kSigma;
+ covar[5]=kSigma*kSigma/Float_t(ncl*ncl);
+ covar[9]=kSigma*kSigma/Float_t(ncl*ncl);
+ covar[14]=0.2*0.2;
if (TMath::Abs(magesd)<0.05) {
covar[14]=0.025*0.025;
}
// And now do refit
//
AliExternalTrackParam * trackInOld = (AliExternalTrackParam*)track->GetInnerParam();
- AliExternalTrackParam * trackOutOld = (AliExternalTrackParam*)track->GetOuterParam();
+ AliExternalTrackParam * trackOuter = (AliExternalTrackParam*)track->GetOuterParam();
+ AliExternalTrackParam * trackOutOld = (AliExternalTrackParam *)friendTrack->GetTPCOut();
+ Double_t mass = TDatabasePDG::Instance()->GetParticle("pi+")->Mass();
+
AliExternalTrackParam trackIn = *trackOutOld;
+ trackIn.ResetCovariance(kResetCov);
+ trackIn.AddCovariance(covar);
if (TMath::Abs(magesd)<0.05) {
((Double_t&)(trackIn.GetParameter()[4]))=0.000000001;
+ ((Double_t&)(trackIn.GetCovariance()[14]))=covar[14]; // fix the line
}
- trackIn.ResetCovariance(20.);
- trackIn.AddCovariance(covar);
+
Double_t xyz[3];
Int_t nclIn=0,nclOut=0;
//
// Refit in
//
-
for (Int_t irow=159; irow>0; irow--){
AliTPCclusterMI *cl=seed->GetClusterPointer(irow);
if (!cl) continue;
AliTPCseed::GetError(cl, &trackIn,cov[0],cov[2]);
cov[0]*=cov[0];
cov[2]*=cov[2];
+ cov[0]+= kaFC*(TMath::Exp(-TMath::Abs(cl->GetX()-kxIFC)/ktFC)+TMath::Exp(-TMath::Abs(cl->GetX()-kxOFC)/ktFC));
+ cov[2]+= kaFC*(TMath::Exp(-TMath::Abs(cl->GetX()-kxIFC)/ktFC)+TMath::Exp(-TMath::Abs(cl->GetX()-kxOFC)/ktFC));
trackIn.GetXYZ(xyz);
- Double_t bz = AliTracker::GetBz(xyz);
+ // Double_t bz = AliTracker::GetBz(xyz);
+
+ // if (!trackIn.PropagateTo(r[0],bz)) continue;
+ if (!AliTracker::PropagateTrackToBxByBz(&trackIn, r[0],mass,1.,kFALSE)) continue;
- if (!trackIn.PropagateTo(r[0],bz)) continue;
if (RejectCluster(cl,&trackIn)) continue;
nclIn++;
trackIn.Update(&r[1],cov);
}
//
AliExternalTrackParam trackOut = trackIn;
+ trackOut.ResetCovariance(kResetCov);
+ trackOut.AddCovariance(covar);
if (TMath::Abs(magesd)<0.05) {
((Double_t&)(trackOut.GetParameter()[4]))=0.000000001;
+ ((Double_t&)(trackOut.GetCovariance()[14]))=covar[14]; // fix the line
}
- trackOut.ResetCovariance(20.);
- trackOut.AddCovariance(covar);
+
//
// Refit out
//
AliTPCseed::GetError(cl, &trackOut,cov[0],cov[2]);
cov[0]*=cov[0];
cov[2]*=cov[2];
+ cov[0]+= kaFC*(TMath::Exp(-TMath::Abs(cl->GetX()-kxIFC)/ktFC)+TMath::Exp(-TMath::Abs(cl->GetX()-kxOFC)/ktFC));
+ cov[2]+= kaFC*(TMath::Exp(-TMath::Abs(cl->GetX()-kxIFC)/ktFC)+TMath::Exp(-TMath::Abs(cl->GetX()-kxOFC)/ktFC));
trackOut.GetXYZ(xyz);
- Double_t bz = AliTracker::GetBz(xyz);
- if (!trackOut.PropagateTo(r[0],bz)) continue;
+ //Double_t bz = AliTracker::GetBz(xyz);
+ // if (!trackOut.PropagateTo(r[0],bz)) continue;
+ if (!AliTracker::PropagateTrackToBxByBz(&trackOut, r[0],mass,1.,kFALSE)) continue;
+
if (RejectCluster(cl,&trackOut)) continue;
nclOut++;
trackOut.Update(&r[1],cov);
//
nclIn=0;
trackIn = trackOut;
- trackIn.ResetCovariance(10.);
+ trackIn.ResetCovariance(kResetCov);
+ if (TMath::Abs(magesd)<0.05) {
+ ((Double_t&)(trackIn.GetParameter()[4]))=0.000000001;
+ ((Double_t&)(trackIn.GetCovariance()[14]))=covar[14]; // fix the line
+ }
//
// Refit in one more time
//
AliTPCseed::GetError(cl, &trackIn,cov[0],cov[2]);
cov[0]*=cov[0];
cov[2]*=cov[2];
+ cov[0]+= kaFC*(TMath::Exp(-TMath::Abs(cl->GetX()-kxIFC)/ktFC)+TMath::Exp(-TMath::Abs(cl->GetX()-kxOFC)/ktFC));
+ cov[2]+= kaFC*(TMath::Exp(-TMath::Abs(cl->GetX()-kxIFC)/ktFC)+TMath::Exp(-TMath::Abs(cl->GetX()-kxOFC)/ktFC));
+
trackIn.GetXYZ(xyz);
- Double_t bz = AliTracker::GetBz(xyz);
+ //Double_t bz = AliTracker::GetBz(xyz);
+
+ // if (!trackIn.PropagateTo(r[0],bz)) continue;
+ if (!AliTracker::PropagateTrackToBxByBz(&trackIn, r[0],mass,1,kFALSE)) continue;
- if (!trackIn.PropagateTo(r[0],bz)) continue;
if (RejectCluster(cl,&trackIn)) continue;
nclIn++;
trackIn.Update(&r[1],cov);
trackOut.PropagateTo(trackOutOld->GetX(),bz);
- if (fStreamLevel>0){
+ if (fStreamLevel>0 && streamCounter<100*fStreamLevel){
TTreeSRedirector *cstream = GetDebugStreamer();
if (cstream){
(*cstream)<<"Tracks"<<
(*trackInOld) = trackIn;
(*trackOutOld) = trackOut;
+ (*trackOuter) = trackOut;
AliExternalTrackParam *t = &trackIn;
- track->Set(t->GetX(),t->GetAlpha(),t->GetParameter(),t->GetCovariance());
+ //track->Set(t->GetX(),t->GetAlpha(),t->GetParameter(),t->GetCovariance());
seed->Set(t->GetX(),t->GetAlpha(),t->GetParameter(),t->GetCovariance());
seed->SetNumberOfClusters((nclIn+nclOut)/2);
return kTRUE;
// check the acceptance of cluster
// Cut on edge effects
//
+ if (!param) return kTRUE;
Float_t kEdgeCut=2.5;
Float_t kSigmaCut=6;
Bool_t isReject = kFALSE;
Float_t edgeY = cl->GetX()*TMath::Tan(TMath::Pi()/18);
Float_t dist = edgeY - TMath::Abs(cl->GetY());
- if (param) dist = TMath::Abs(edgeY - TMath::Abs(param->GetY()));
+ dist = TMath::Abs(edgeY - TMath::Abs(param->GetY()));
if (dist<kEdgeCut) isReject=kTRUE;
Double_t cov[3]={0.01,0.,0.01}; //TODO: correct error parametrisation
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff