fRunBins(0),
fRunStart(0),
fRunEnd(0)
-// fBinsVdrift(fTimeBins,fPtBins,fVdriftBins),
-// fXminVdrift(fTimeStart,fPtStart,fVdriftStart),
-// fXmaxVdrift(fTimeEnd,fPtEnd,fVdriftEnd)
{
//
// default constructor
for (Int_t i=0;i<10;i++) {
fCosmiMatchingHisto[i]=0;
}
+ //
+ for (Int_t i=0;i<5;i++) {
+ fResHistoTPCITS[i]=0;
+ fResHistoTPCTRD[i]=0;
+ fResHistoTPCTOF[i]=0;
+ fResHistoTPCvertex[i]=0;
+ }
+
}
AliTPCcalibTime::AliTPCcalibTime(const Text_t *name, const Text_t *title, UInt_t StartTime, UInt_t EndTime, Int_t deltaIntegrationTimeVdrift)
fHistVdriftLaserC[i]=0;
}
+ for (Int_t i=0;i<5;i++) {
+ fResHistoTPCITS[i]=0;
+ fResHistoTPCTRD[i]=0;
+ fResHistoTPCTOF[i]=0;
+ fResHistoTPCvertex[i]=0;
+ }
+
+
AliInfo("Non Default Constructor");
fTimeBins =(EndTime-StartTime)/deltaIntegrationTimeVdrift;
fTimeStart =StartTime; //(((TObjString*)(mapGRP->GetValue("fAliceStartTime")))->GetString()).Atoi();
fAlignTRDTPC->SetOwner(kTRUE);
fAlignTOFTPC->SetOwner(kTRUE);
- // fArrayDz->AddLast(fHistVdriftLaserA[0]);
-// fArrayDz->AddLast(fHistVdriftLaserA[1]);
-// fArrayDz->AddLast(fHistVdriftLaserA[2]);
-// fArrayDz->AddLast(fHistVdriftLaserC[0]);
-// fArrayDz->AddLast(fHistVdriftLaserC[1]);
-// fArrayDz->AddLast(fHistVdriftLaserC[2]);
fCosmiMatchingHisto[0]=new TH1F("Cosmics matching","p0-all" ,100,-10*0.5356 ,10*0.5356 );
fCosmiMatchingHisto[1]=new TH1F("Cosmics matching","p1-all" ,100,-10*4.541 ,10*4.541 );
fCosmiMatchingHisto[7]=new TH1F("Cosmics matching","p2-isPair",100,-10*0.01134 ,10*0.01134 );
fCosmiMatchingHisto[8]=new TH1F("Cosmics matching","p3-isPair",100,-10*0.004644,10*0.004644);
fCosmiMatchingHisto[9]=new TH1F("Cosmics matching","p4-isPair",100,-10*0.03773 ,10*0.03773 );
-// Char_t nameHisto[3]={'p','0','\n'};
-// for (Int_t i=0;i<10;i++){
-// fCosmiMatchingHisto[i]=new TH1F("Cosmics matching",nameHisto,8192,0,0);
-// nameHisto[1]++;
-// if(i==4) nameHisto[1]='0';
-// }
+ BookDistortionMaps();
}
AliTPCcalibTime::~AliTPCcalibTime(){
fCosmiMatchingHisto[i]=NULL;
}
}
+
+ for (Int_t i=0;i<5;i++) {
+ delete fResHistoTPCITS[i];
+ delete fResHistoTPCTRD[i];
+ delete fResHistoTPCTOF[i];
+ delete fResHistoTPCvertex[i];
+ fResHistoTPCITS[i]=0;
+ fResHistoTPCTRD[i]=0;
+ fResHistoTPCTOF[i]=0;
+ fResHistoTPCvertex[i]=0;
+ }
+
+
fAlignITSTPC->SetOwner(kTRUE);
fAlignTRDTPC->SetOwner(kTRUE);
fAlignTOFTPC->SetOwner(kTRUE);
TTreeSRedirector *cstream = GetDebugStreamer();
if (cstream){
TTimeStamp tstamp(fTime);
- Float_t valuePressure0 = AliTPCcalibDB::GetPressure(tstamp,fRun,0);
- Float_t valuePressure1 = AliTPCcalibDB::GetPressure(tstamp,fRun,1);
- Double_t ptrelative0 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,0);
- Double_t ptrelative1 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,1);
- Double_t temp0 = AliTPCcalibDB::GetTemperature(tstamp,fRun,0);
- Double_t temp1 = AliTPCcalibDB::GetTemperature(tstamp,fRun,1);
- Double_t vdcorr = AliTPCcalibDB::Instance()->GetVDriftCorrectionTime(tstamp,fRun,0,1);
- TVectorD vecGoofie(20);
- AliDCSSensorArray* goofieArray = AliTPCcalibDB::Instance()->GetGoofieSensors(fRun);
- if (goofieArray){
- for (Int_t isensor=0; isensor<goofieArray->NumSensors();isensor++){
- AliDCSSensor *gsensor = goofieArray->GetSensor(isensor);
- if (gsensor) vecGoofie[isensor]=gsensor->GetValue(tstamp);
- }
- }
(*cstream)<<"laserInfo"<<
"run="<<fRun<< // run number
"event="<<fEvent<< // event number
"time="<<fTime<< // time stamp of event
"trigger="<<fTrigger<< // trigger
"mag="<<fMagF<< // magnetic field
- // Environment values
- "press0="<<valuePressure0<<
- "press1="<<valuePressure1<<
- "pt0="<<ptrelative0<<
- "pt1="<<ptrelative1<<
- "temp0="<<temp0<<
- "temp1="<<temp1<<
- "vecGoofie.="<<&vecGoofie<<
- "vdcorr="<<vdcorr<<
//laser
"rejectA="<<isReject[0]<<
"rejectC="<<isReject[1]<<
vecDriftLaserA[2]=vdriftA[2]/250.;
vecDriftLaserC[2]=vdriftC[2]/250.;
}
- if (isReject[0]==0) fHistVdriftLaserA[icalib]->Fill(vecDriftLaserA);
- if (isReject[1]==0) fHistVdriftLaserC[icalib]->Fill(vecDriftLaserC);
+ //if (isReject[0]==0) fHistVdriftLaserA[icalib]->Fill(vecDriftLaserA);
+ //if (isReject[1]==0) fHistVdriftLaserC[icalib]->Fill(vecDriftLaserC);
+ fHistVdriftLaserA[icalib]->Fill(vecDriftLaserA);
+ fHistVdriftLaserC[icalib]->Fill(vecDriftLaserC);
}
// THnSparse* curHist=new THnSparseF("","HistVdrift;time;p/T ratio;Vdrift;run",4,fBinsVdrift,fXminVdrift,fXmaxVdrift);
if (ntracks > fCutTracks) return;
if (GetDebugLevel()>20) printf("Hallo world: Im here\n");
- AliESDfriend *esdFriend=static_cast<AliESDfriend*>(event->FindListObject("AliESDfriend"));
+ AliESDfriend *esdFriend=(AliESDfriend*)(((AliESDEvent*)event)->FindListObject("AliESDfriend"));
TObjArray tpcSeeds(ntracks);
Double_t vtxx[3]={0,0,0};
//
// Propagate using Magnetic field and correct fo material budget
//
- AliTracker::PropagateTrackTo(¶m0,dmax+1,0.0005,3,kTRUE);
- AliTracker::PropagateTrackTo(¶m1,dmax+1,0.0005,3,kTRUE);
+ AliTracker::PropagateTrackTo(¶m0,dmax+1,TDatabasePDG::Instance()->GetParticle("e-")->Mass(),3,kTRUE);
+ AliTracker::PropagateTrackTo(¶m1,dmax+1,TDatabasePDG::Instance()->GetParticle("e-")->Mass(),3,kTRUE);
//
// Propagate rest to the 0,0 DCA - z should be ignored
//
if (fStreamLevel>0){
TTreeSRedirector *cstream = GetDebugStreamer();
if (cstream){
- TTimeStamp tstamp(fTime);
- Float_t valuePressure0 = AliTPCcalibDB::GetPressure(tstamp,fRun,0);
- Float_t valuePressure1 = AliTPCcalibDB::GetPressure(tstamp,fRun,1);
- Double_t ptrelative0 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,0);
- Double_t ptrelative1 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,1);
- Double_t temp0 = AliTPCcalibDB::GetTemperature(tstamp,fRun,0);
- Double_t temp1 = AliTPCcalibDB::GetTemperature(tstamp,fRun,1);
- Double_t vdcorr = AliTPCcalibDB::Instance()->GetVDriftCorrectionTime(tstamp,fRun,0,1);
- TVectorD vecGoofie(20);
- AliDCSSensorArray* goofieArray = AliTPCcalibDB::Instance()->GetGoofieSensors(fRun);
- if (goofieArray){
- for (Int_t isensor=0; isensor<goofieArray->NumSensors();isensor++){
- AliDCSSensor *gsensor = goofieArray->GetSensor(isensor);
- if (gsensor) vecGoofie[isensor]=gsensor->GetValue(tstamp);
- }
- }
(*cstream)<<"timeInfo"<<
"run="<<fRun<< // run number
"event="<<fEvent<< // event number
"trigger="<<fTrigger<< // trigger
"mag="<<fMagF<< // magnetic field
// Environment values
- "press0="<<valuePressure0<<
- "press1="<<valuePressure1<<
- "pt0="<<ptrelative0<<
- "pt1="<<ptrelative1<<
- "temp0="<<temp0<<
- "temp1="<<temp1<<
- "vecGoofie.=<<"<<&vecGoofie<<
- "vdcorr="<<vdcorr<<
//
// accumulated values
//
return fitDrift;
}
-//TObjArray* AliTPCcalibTime::GetFitDrift(){
-// TObjArray* arrayFitDrift=new TObjArray();
-// TIterator* iterator = fArrayDz->MakeIterator();
-// iterator->Reset();
-// THnSparse* addHist=NULL;
-// while((addHist=(THnSparseF*)iterator->Next())) arrayFitDrift->AddLast(GetFitDrift(addHist->GetName()));
-// return arrayFitDrift;
-//}
Long64_t AliTPCcalibTime::Merge(TCollection *const li) {
//
fHistVdriftLaserC[imeas]->Add(cal->GetHistVdriftLaserC(imeas));
}
}
+ //
+ for (Int_t imeas=0; imeas<5; imeas++){
+ if (cal->GetResHistoTPCITS(imeas) && cal->GetResHistoTPCITS(imeas)){
+ fResHistoTPCITS[imeas]->Add(cal->fResHistoTPCITS[imeas]);
+ fResHistoTPCvertex[imeas]->Add(cal->fResHistoTPCvertex[imeas]);
+ fResHistoTPCTRD[imeas]->Add(cal->fResHistoTPCTRD[imeas]);
+ fResHistoTPCTOF[imeas]->Add(cal->fResHistoTPCTOF[imeas]);
+ }
+ }
TObjArray* addArray=cal->GetHistoDrift();
if(!addArray) return 0;
TIterator* iterator = addArray->MakeIterator();
}
localHist->Add(addHist);
}
-// TMap * addMap=cal->GetHistoDrift();
-// if(!addMap) return 0;
-// TIterator* iterator = addMap->MakeIterator();
-// iterator->Reset();
-// TPair* addPair=0;
-// while((addPair=(TPair *)(addMap->FindObject(iterator->Next())))){
-// THnSparse* addHist=dynamic_cast<THnSparseF*>(addPair->Value());
-// if (!addHist) continue;
-// addHist->Print();
-// THnSparse* localHist=dynamic_cast<THnSparseF*>(fMapDz->GetValue(addHist->GetName()));
-// if(!localHist){
-// localHist=new THnSparseF(addHist->GetName(),"HistVdrift;time;p/T ratio;Vdrift;run",4,fBinsVdrift,fXminVdrift,fXmaxVdrift);
-// fMapDz->Add(new TObjString(addHist->GetName()),localHist);
-// }
-// localHist->Add(addHist);
-// }
+
for(Int_t i=0;i<10;i++) if (cal->GetCosmiMatchingHisto(i)) fCosmiMatchingHisto[i]->Add(cal->GetCosmiMatchingHisto(i));
//
// Merge alignment
TVectorD gxyz(3);
trackIn.GetXYZ(gxyz.GetMatrixArray());
TTimeStamp tstamp(fTime);
- Double_t ptrelative0 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,0);
- Double_t ptrelative1 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,1);
- Double_t vdcorr = AliTPCcalibDB::Instance()->GetVDriftCorrectionTime(tstamp,fRun,0,1);
(*cstream)<<"tpctpc"<<
"run="<<fRun<< // run number
"event="<<fEvent<< // event number
"time="<<fTime<< // time stamp of event
"trigger="<<fTrigger<< // trigger
"mag="<<fMagF<< // magnetic field
- "ptrel0.="<<ptrelative0<<
- "ptrel1.="<<ptrelative1<<
- "vdcorr="<<vdcorr<< // drift correction applied
//
"xyz.="<<&gxyz<< // global position
"tIn.="<<&trackIn<< // refitterd track in
const Double_t kVdYErr = 0.05; // initial uncertainty of the vd correction
const Double_t kOutCut = 1.0; // outlyer cut in AliRelAlgnmentKalman
const Double_t kMinPt = 0.3; // minimal pt
- const Int_t kN=500; // deepnes of history
+ const Int_t kN=50; // deepnes of history
static Int_t kglast=0;
static Double_t* kgdP[4]={new Double_t[kN], new Double_t[kN], new Double_t[kN], new Double_t[kN]};
/*
AliExternalTrackParam pITS(*(friendTrack->GetITSOut())); // ITS standalone if possible
AliExternalTrackParam pITS2(*(friendTrack->GetITSOut())); //TPC-ITS track
pITS2.Rotate(pTPC.GetAlpha());
- pITS2.PropagateTo(pTPC.GetX(),fMagF);
+ // pITS2.PropagateTo(pTPC.GetX(),fMagF);
+ AliTracker::PropagateTrackToBxByBz(&pITS2,pTPC.GetX(),0.1,0.1,kFALSE);
+
AliESDfriendTrack *itsfriendTrack=0;
//
// try to find standalone ITS track corresponing to the TPC if possible
pITS=(*(itsfriendTrack->GetITSOut()));
//
pITS.Rotate(pTPC.GetAlpha());
- pITS.PropagateTo(pTPC.GetX(),fMagF);
+ //pITS.PropagateTo(pTPC.GetX(),fMagF);
+ AliTracker::PropagateTrackToBxByBz(&pITS,pTPC.GetX(),0.1,0.1,kFALSE);
if (TMath::Abs(pITS2.GetY()-pITS.GetY())> kMaxDy) continue;
hasAlone=kTRUE;
}
//
// 1. Update median and RMS info
//
- TVectorD vecDelta(4),vecMedian(4), vecRMS(4);
+ TVectorD vecDelta(5),vecMedian(5), vecRMS(5);
TVectorD vecDeltaN(5);
Double_t sign=(pITS.GetParameter()[1]>0)? 1.:-1.;
vecDelta[4]=0;
// 3. Update alignment
//
Int_t htime = fTime/3600; //time in hours
- if (fAlignITSTPC->GetEntries()<htime){
+ if (fAlignITSTPC->GetEntriesFast()<htime){
fAlignITSTPC->Expand(htime*2+20);
}
AliRelAlignerKalman* align = (AliRelAlignerKalman*)fAlignITSTPC->At(htime);
align->AddTrackParams(&pITS,&pTPC);
align->SetTimeStamp(fTime);
align->SetRunNumber(fRun );
+ Float_t dca[2],cov[3];
+ track->GetImpactParameters(dca,cov);
+ if (TMath::Abs(dca[0])<kMaxDy){
+ FillResHistoTPCITS(&pTPC,&pITS);
+ FillResHistoTPC(track);
+ }
//
Int_t nupdates=align->GetNUpdates();
align->SetOutRejSigma(kOutCut+kOutCut*kN/Double_t(nupdates));
align->SetRejectOutliers(kFALSE);
TTreeSRedirector *cstream = GetDebugStreamer();
if (cstream && align->GetState() && align->GetState()->GetNrows()>2 ){
- TTimeStamp tstamp(fTime);
- Float_t valuePressure0 = AliTPCcalibDB::GetPressure(tstamp,fRun,0);
- Float_t valuePressure1 = AliTPCcalibDB::GetPressure(tstamp,fRun,1);
- Double_t ptrelative0 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,0);
- Double_t ptrelative1 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,1);
- Double_t temp0 = AliTPCcalibDB::GetTemperature(tstamp,fRun,0);
- Double_t temp1 = AliTPCcalibDB::GetTemperature(tstamp,fRun,1);
- TVectorD vecGoofie(20);
- AliDCSSensorArray* goofieArray = AliTPCcalibDB::Instance()->GetGoofieSensors(fRun);
- if (goofieArray){
- for (Int_t isensor=0; isensor<goofieArray->NumSensors();isensor++){
- AliDCSSensor *gsensor = goofieArray->GetSensor(isensor);
- if (gsensor) vecGoofie[isensor]=gsensor->GetValue(tstamp);
- }
- }
TVectorD gpTPC(3), gdTPC(3);
TVectorD gpITS(3), gdITS(3);
pTPC.GetXYZ(gpTPC.GetMatrixArray());
pTPC.GetDirection(gdTPC.GetMatrixArray());
pITS.GetXYZ(gpITS.GetMatrixArray());
pITS.GetDirection(gdITS.GetMatrixArray());
- Double_t vdcorr = AliTPCcalibDB::Instance()->GetVDriftCorrectionTime(tstamp,fRun,0,1);
(*cstream)<<"itstpc"<<
"run="<<fRun<< // run number
"event="<<fEvent<< // event number
"time="<<fTime<< // time stamp of event
"trigger="<<fTrigger<< // trigger
"mag="<<fMagF<< // magnetic field
- // Environment values
- "press0="<<valuePressure0<<
- "press1="<<valuePressure1<<
- "pt0="<<ptrelative0<<
- "pt1="<<ptrelative1<<
- "temp0="<<temp0<<
- "temp1="<<temp1<<
- "vecGoofie.="<<&vecGoofie<<
- "vdcorr="<<vdcorr<< // drift correction applied
//
"hasAlone="<<hasAlone<< // has ITS standalone ?
"track.="<<track<< // track info
const Int_t kMinTPC = 80; // minimal number of TPC cluster
const Int_t kMinTRD = 50; // minimal number of TRD cluster
const Double_t kMinZ = 20; // maximal dz distance
- const Double_t kMaxDy = 2.; // maximal dy distance
- const Double_t kMaxAngle= 0.015; // maximal angular distance
- const Double_t kSigmaCut= 5; // maximal sigma distance to median
+ const Double_t kMaxDy = 5.; // maximal dy distance
+ const Double_t kMaxAngle= 0.1; // maximal angular distance
+ const Double_t kSigmaCut= 10; // maximal sigma distance to median
const Double_t kVdErr = 0.1; // initial uncertainty of the vd correction
const Double_t kVdYErr = 0.05; // initial uncertainty of the vd correction
const Double_t kOutCut = 1.0; // outlyer cut in AliRelAlgnmentKalman
- const Int_t kN=500; // deepnes of history
+ const Double_t kRefX = 275; // reference X
+ const Int_t kN=50; // deepnes of history
static Int_t kglast=0;
static Double_t* kgdP[4]={new Double_t[kN], new Double_t[kN], new Double_t[kN], new Double_t[kN]};
//
if (track->GetTRDclusters(dummycl)<kMinTRD) return; // minimal amount of clusters
if (track->GetTPCNcls()<kMinTPC) return; // minimal amount of clusters cut
if (!friendTrack->GetTRDIn()) return;
+ if (!track->IsOn(AliESDtrack::kTRDrefit)) return;
+ if (!track->IsOn(AliESDtrack::kTRDout)) return;
if (!track->GetInnerParam()) return;
- if (!track->GetOuterParam()) return;
+ if (!friendTrack->GetTPCOut()) return;
// exclude crossing track
- if (track->GetOuterParam()->GetZ()*track->GetInnerParam()->GetZ()<0) return;
+ if (friendTrack->GetTPCOut()->GetZ()*track->GetInnerParam()->GetZ()<0) return;
if (TMath::Abs(track->GetInnerParam()->GetZ())<kMinZ) return;
//
- AliExternalTrackParam &pTPC=(AliExternalTrackParam &)(*(track->GetOuterParam()));
+ AliExternalTrackParam &pTPC=(AliExternalTrackParam &)(*(friendTrack->GetTPCOut()));
+ AliTracker::PropagateTrackToBxByBz(&pTPC,kRefX,0.1,0.1,kFALSE);
AliExternalTrackParam pTRD(*(friendTrack->GetTRDIn()));
pTRD.Rotate(pTPC.GetAlpha());
- pTRD.PropagateTo(pTPC.GetX(),fMagF);
+ // pTRD.PropagateTo(pTPC.GetX(),fMagF);
+ AliTracker::PropagateTrackToBxByBz(&pTRD,pTPC.GetX(),0.1,0.1,kFALSE);
+
((Double_t*)pTRD.GetCovariance())[2]+=3.*3.; // increas sys errors
((Double_t*)pTRD.GetCovariance())[9]+=0.1*0.1; // increse sys errors
if (TMath::Abs(pTRD.GetY()-pTPC.GetY()) >kMaxDy) return;
if (TMath::Abs(pTRD.GetSnp()-pTPC.GetSnp())>kMaxAngle) return;
- if (TMath::Abs(pTRD.GetTgl()-pTPC.GetTgl())>kMaxAngle) return;
+ // if (TMath::Abs(pTRD.GetTgl()-pTPC.GetTgl())>kMaxAngle) return;
//
// 1. Update median and RMS info
//
- TVectorD vecDelta(4),vecMedian(4), vecRMS(4);
+ TVectorD vecDelta(5),vecMedian(5), vecRMS(5);
TVectorD vecDeltaN(5);
Double_t sign=(pTRD.GetParameter()[1]>0)? 1.:-1.;
vecDelta[4]=0;
Int_t entries=(kglast<kN)?kglast:kN;
for (Int_t i=0;i<4;i++){
vecMedian[i] = TMath::Median(entries,kgdP[i]);
+
vecRMS[i] = TMath::RMS(entries,kgdP[i]);
vecDeltaN[i] = 0;
if (vecRMS[i]>0.){
// 3. Update alignment
//
Int_t htime = fTime/3600; //time in hours
- if (fAlignTRDTPC->GetEntries()<htime){
+ if (fAlignTRDTPC->GetEntriesFast()<htime){
fAlignTRDTPC->Expand(htime*2+20);
}
AliRelAlignerKalman* align = (AliRelAlignerKalman*)fAlignTRDTPC->At(htime);
align->AddTrackParams(&pTRD,&pTPC);
align->SetTimeStamp(fTime);
align->SetRunNumber(fRun );
+ Float_t dca[2],cov[3];
+ track->GetImpactParameters(dca,cov);
+ if (TMath::Abs(dca[0])<kMaxDy){
+ FillResHistoTPCTRD(&pTPC,&pTRD); //only primaries
+ }
//
Int_t nupdates=align->GetNUpdates();
align->SetOutRejSigma(kOutCut+kOutCut*kN/Double_t(nupdates));
align->SetRejectOutliers(kFALSE);
TTreeSRedirector *cstream = GetDebugStreamer();
if (cstream && align->GetState() && align->GetState()->GetNrows()>2 ){
- TTimeStamp tstamp(fTime);
- Float_t valuePressure0 = AliTPCcalibDB::GetPressure(tstamp,fRun,0);
- Float_t valuePressure1 = AliTPCcalibDB::GetPressure(tstamp,fRun,1);
- Double_t ptrelative0 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,0);
- Double_t ptrelative1 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,1);
- Double_t temp0 = AliTPCcalibDB::GetTemperature(tstamp,fRun,0);
- Double_t temp1 = AliTPCcalibDB::GetTemperature(tstamp,fRun,1);
- TVectorD vecGoofie(20);
- AliDCSSensorArray* goofieArray = AliTPCcalibDB::Instance()->GetGoofieSensors(fRun);
- if (goofieArray){
- for (Int_t isensor=0; isensor<goofieArray->NumSensors();isensor++){
- AliDCSSensor *gsensor = goofieArray->GetSensor(isensor);
- if (gsensor) vecGoofie[isensor]=gsensor->GetValue(tstamp);
- }
- }
TVectorD gpTPC(3), gdTPC(3);
TVectorD gpTRD(3), gdTRD(3);
pTPC.GetXYZ(gpTPC.GetMatrixArray());
pTPC.GetDirection(gdTPC.GetMatrixArray());
pTRD.GetXYZ(gpTRD.GetMatrixArray());
pTRD.GetDirection(gdTRD.GetMatrixArray());
- Double_t vdcorr = AliTPCcalibDB::Instance()->GetVDriftCorrectionTime(tstamp,fRun,0,1);
(*cstream)<<"trdtpc"<<
"run="<<fRun<< // run number
"event="<<fEvent<< // event number
"time="<<fTime<< // time stamp of event
"trigger="<<fTrigger<< // trigger
"mag="<<fMagF<< // magnetic field
- // Environment values
- "press0="<<valuePressure0<<
- "press1="<<valuePressure1<<
- "pt0="<<ptrelative0<<
- "pt1="<<ptrelative1<<
- "temp0="<<temp0<<
- "temp1="<<temp1<<
- "vecGoofie.="<<&vecGoofie<<
- "vdcorr="<<vdcorr<< // drift correction applied
//
"nmed="<<kglast<< // number of entries to define median and RMS
"vMed.="<<&vecMedian<< // median of deltas
const Double_t kVdYErr = 0.05; // initial uncertainty of the vd correction
const Double_t kOutCut = 1.0; // outlyer cut in AliRelAlgnmentKalman
- const Int_t kN=1000; // deepnes of history
+ const Int_t kN=50; // deepnes of history
static Int_t kglast=0;
static Double_t* kgdP[4]={new Double_t[kN], new Double_t[kN], new Double_t[kN], new Double_t[kN]};
//
if (track->GetTOFsignal()<=0) return;
if (!friendTrack->GetTPCOut()) return;
if (!track->GetInnerParam()) return;
- if (!track->GetOuterParam()) return;
+ if (!friendTrack->GetTPCOut()) return;
const AliTrackPointArray *points=friendTrack->GetTrackPointArray();
if (!points) return;
- AliExternalTrackParam pTPC(*(track->GetOuterParam()));
+ AliExternalTrackParam pTPC(*(friendTrack->GetTPCOut()));
AliExternalTrackParam pTOF(pTPC);
Double_t mass = TDatabasePDG::Instance()->GetParticle("mu+")->Mass();
Int_t npoints = points->GetNPoints();
//
if (track->GetTPCNcls()<kMinTPC) return; // minimal amount of clusters cut
// exclude crossing track
- if (track->GetOuterParam()->GetZ()*track->GetInnerParam()->GetZ()<0) return;
+ if (friendTrack->GetTPCOut()->GetZ()*track->GetInnerParam()->GetZ()<0) return;
//
if (TMath::Abs(pTOF.GetY()-pTPC.GetY()) >kMaxDy) return;
if (TMath::Abs(pTOF.GetSnp()-pTPC.GetSnp())>kMaxAngle) return;
//
// 1. Update median and RMS info
//
- TVectorD vecDelta(4),vecMedian(4), vecRMS(4);
+ TVectorD vecDelta(5),vecMedian(5), vecRMS(5);
TVectorD vecDeltaN(5);
Double_t sign=(pTOF.GetParameter()[1]>0)? 1.:-1.;
vecDelta[4]=0;
// 3. Update alignment
//
Int_t htime = fTime/3600; //time in hours
- if (fAlignTOFTPC->GetEntries()<htime){
+ if (fAlignTOFTPC->GetEntriesFast()<htime){
fAlignTOFTPC->Expand(htime*2+20);
}
AliRelAlignerKalman* align = (AliRelAlignerKalman*)fAlignTOFTPC->At(htime);
fAlignTOFTPC->AddAt(align,htime);
}
align->AddTrackParams(&pTOF,&pTPC);
+ Float_t dca[2],cov[3];
+ track->GetImpactParameters(dca,cov);
+ if (TMath::Abs(dca[0])<kMaxDy){
+ FillResHistoTPCTOF(&pTPC,&pTOF);
+ }
align->SetTimeStamp(fTime);
align->SetRunNumber(fRun );
//
align->SetRejectOutliers(kFALSE);
TTreeSRedirector *cstream = GetDebugStreamer();
if (cstream && align->GetState() && align->GetState()->GetNrows()>2 ){
- TTimeStamp tstamp(fTime);
- Float_t valuePressure0 = AliTPCcalibDB::GetPressure(tstamp,fRun,0);
- Float_t valuePressure1 = AliTPCcalibDB::GetPressure(tstamp,fRun,1);
- Double_t ptrelative0 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,0);
- Double_t ptrelative1 = AliTPCcalibDB::GetPTRelative(tstamp,fRun,1);
- Double_t temp0 = AliTPCcalibDB::GetTemperature(tstamp,fRun,0);
- Double_t temp1 = AliTPCcalibDB::GetTemperature(tstamp,fRun,1);
- TVectorD vecGoofie(20);
- AliDCSSensorArray* goofieArray = AliTPCcalibDB::Instance()->GetGoofieSensors(fRun);
- if (goofieArray){
- for (Int_t isensor=0; isensor<goofieArray->NumSensors();isensor++){
- AliDCSSensor *gsensor = goofieArray->GetSensor(isensor);
- if (gsensor) vecGoofie[isensor]=gsensor->GetValue(tstamp);
- }
- }
TVectorD gpTPC(3), gdTPC(3);
TVectorD gpTOF(3), gdTOF(3);
pTPC.GetXYZ(gpTPC.GetMatrixArray());
pTPC.GetDirection(gdTPC.GetMatrixArray());
pTOF.GetXYZ(gpTOF.GetMatrixArray());
pTOF.GetDirection(gdTOF.GetMatrixArray());
- Double_t vdcorr = AliTPCcalibDB::Instance()->GetVDriftCorrectionTime(tstamp,fRun,0,1);
(*cstream)<<"toftpc"<<
"run="<<fRun<< // run number
"event="<<fEvent<< // event number
"time="<<fTime<< // time stamp of event
"trigger="<<fTrigger<< // trigger
"mag="<<fMagF<< // magnetic field
- // Environment values
- "press0="<<valuePressure0<<
- "press1="<<valuePressure1<<
- "pt0="<<ptrelative0<<
- "pt1="<<ptrelative1<<
- "temp0="<<temp0<<
- "temp1="<<temp1<<
- "vecGoofie.="<<&vecGoofie<<
- "vdcorr="<<vdcorr<< // drift correction applied
//
"nmed="<<kglast<< // number of entries to define median and RMS
"vMed.="<<&vecMedian<< // median of deltas
}
+void AliTPCcalibTime::BookDistortionMaps(){
+ //
+ // Book ndimensional histograms of distortions/residuals
+ // Only primary tracks are selected for analysis
+ //
+
+ Double_t xminTrack[4], xmaxTrack[4];
+ Int_t binsTrack[4];
+ TString axisName[4];
+ TString axisTitle[4];
+ //
+ binsTrack[0] =50;
+ axisName[0] ="#Delta";
+ axisTitle[0] ="#Delta";
+ //
+ binsTrack[1] =20;
+ xminTrack[1] =-1.5; xmaxTrack[1]=1.5;
+ axisName[1] ="tanTheta";
+ axisTitle[1] ="tan(#Theta)";
+ //
+ binsTrack[2] =90;
+ xminTrack[2] =-TMath::Pi(); xmaxTrack[2]=TMath::Pi();
+ axisName[2] ="phi";
+ axisTitle[2] ="#phi";
+ //
+ binsTrack[3] =20;
+ xminTrack[3] =-1.; xmaxTrack[3]=1.; // 0.33 GeV cut
+ axisName[3] ="snp";
+ //
+ // delta y
+ xminTrack[0] =-1.5; xmaxTrack[0]=1.5; //
+ fResHistoTPCITS[0] = new THnSparseS("TPCITS#Delta_{Y} (cm)","#Delta_{Y} (cm)", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCvertex[0] = new THnSparseS("TPCVertex#Delta_{Y} (cm)","#Delta_{Y} (cm)", 4, binsTrack,xminTrack, xmaxTrack);
+ xminTrack[0] =-1.5; xmaxTrack[0]=1.5; //
+ fResHistoTPCTRD[0] = new THnSparseS("TPCTRD#Delta_{Y} (cm)","#Delta_{Y} (cm)", 4, binsTrack,xminTrack, xmaxTrack);
+ xminTrack[0] =-5; xmaxTrack[0]=5; //
+ fResHistoTPCTOF[0] = new THnSparseS("TPCTOF#Delta_{Y} (cm)","#Delta_{Y} (cm)", 4, binsTrack,xminTrack, xmaxTrack);
+ //
+ // delta z
+ xminTrack[0] =-3.; xmaxTrack[0]=3.; //
+ fResHistoTPCITS[1] = new THnSparseS("TPCITS#Delta_{Z} (cm)","#Delta_{Z} (cm)", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCvertex[1] = new THnSparseS("TPCVertex#Delta_{Z} (cm)","#Delta_{Z} (cm)", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCTRD[1] = new THnSparseS("TPCTRD#Delta_{Z} (cm)","#Delta_{Z} (cm)", 4, binsTrack,xminTrack, xmaxTrack);
+ xminTrack[0] =-5.; xmaxTrack[0]=5.; //
+ fResHistoTPCTOF[1] = new THnSparseS("TPCTOF#Delta_{Z} (cm)","#Delta_{Z} (cm)", 4, binsTrack,xminTrack, xmaxTrack);
+ //
+ // delta snp-P2
+ xminTrack[0] =-0.015; xmaxTrack[0]=0.015; //
+ fResHistoTPCITS[2] = new THnSparseS("TPCITS#Delta_{#phi}","#Delta_{#phi}", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCvertex[2] = new THnSparseS("TPCITSv#Delta_{#phi}","#Delta_{#phi}", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCTRD[2] = new THnSparseS("TPCTRD#Delta_{#phi}","#Delta_{#phi}", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCTOF[2] = new THnSparseS("TPCTOF#Delta_{#phi}","#Delta_{#phi}", 4, binsTrack,xminTrack, xmaxTrack);
+ //
+ // delta theta-P3
+ xminTrack[0] =-0.025; xmaxTrack[0]=0.025; //
+ fResHistoTPCITS[3] = new THnSparseS("TPCITS#Delta_{#theta}","#Delta_{#theta}", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCvertex[3] = new THnSparseS("TPCITSv#Delta_{#theta}","#Delta_{#theta}", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCTRD[3] = new THnSparseS("TPCTRD#Delta_{#theta}","#Delta_{#theta}", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCTOF[3] = new THnSparseS("TPCTOF#Delta_{#theta}","#Delta_{#theta}", 4, binsTrack,xminTrack, xmaxTrack);
+ //
+ // delta theta-P4
+ xminTrack[0] =-0.2; xmaxTrack[0]=0.2; //
+ fResHistoTPCITS[4] = new THnSparseS("TPCITS#Delta_{1/pt}","#Delta_{1/pt}", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCvertex[4] = new THnSparseS("TPCITSv#Delta_{1/pt}","#Delta_{1/pt}", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCTRD[4] = new THnSparseS("TPCTRD#Delta_{1/pt}","#Delta_{1/pt}", 4, binsTrack,xminTrack, xmaxTrack);
+ fResHistoTPCTOF[4] = new THnSparseS("TPCTOF#Delta_{1/pt}","#Delta_{1/pt}", 4, binsTrack,xminTrack, xmaxTrack);
+ //
+ for (Int_t ivar=0;ivar<4;ivar++){
+ for (Int_t ivar2=0;ivar2<4;ivar2++){
+ fResHistoTPCITS[ivar]->GetAxis(ivar2)->SetName(axisName[ivar2].Data());
+ fResHistoTPCITS[ivar]->GetAxis(ivar2)->SetTitle(axisTitle[ivar2].Data());
+ fResHistoTPCTRD[ivar]->GetAxis(ivar2)->SetName(axisName[ivar2].Data());
+ fResHistoTPCTRD[ivar]->GetAxis(ivar2)->SetTitle(axisTitle[ivar2].Data());
+ fResHistoTPCvertex[ivar]->GetAxis(ivar2)->SetName(axisName[ivar2].Data());
+ fResHistoTPCvertex[ivar]->GetAxis(ivar2)->SetTitle(axisTitle[ivar2].Data());
+ }
+ }
+}
+
+
+void AliTPCcalibTime::FillResHistoTPCITS(const AliExternalTrackParam * pTPCIn, const AliExternalTrackParam * pITSOut ){
+ //
+ // fill residual histograms pTPCIn-pITSOut
+ // Histogram is filled only for primary tracks
+ //
+ Double_t histoX[4];
+ Double_t xyz[3];
+ pTPCIn->GetXYZ(xyz);
+ Double_t phi= TMath::ATan2(xyz[1],xyz[0]);
+ histoX[1]= pTPCIn->GetTgl();
+ histoX[2]= phi;
+ histoX[3]= pTPCIn->GetSnp();
+ AliExternalTrackParam lits(*pITSOut);
+ lits.Rotate(pTPCIn->GetAlpha());
+ lits.PropagateTo(pTPCIn->GetX(),fMagF);
+ //
+ for (Int_t ihisto=0; ihisto<5; ihisto++){
+ histoX[0]=pTPCIn->GetParameter()[ihisto]-lits.GetParameter()[ihisto];
+ fResHistoTPCITS[ihisto]->Fill(histoX);
+ }
+}
+
+
+void AliTPCcalibTime::FillResHistoTPC(const AliESDtrack * pTrack){
+ //
+ // fill residual histograms pTPC - vertex
+ // Histogram is filled only for primary tracks
+ //
+ Double_t histoX[4];
+ const AliExternalTrackParam * pTPCIn = pTrack->GetInnerParam();
+ AliExternalTrackParam pTPCvertex(*(pTrack->GetInnerParam()));
+ //
+ AliExternalTrackParam lits(*pTrack);
+ if (TMath::Abs(pTrack->GetY())>3) return; // beam pipe
+ pTPCvertex.Rotate(lits.GetAlpha());
+ //pTPCvertex.PropagateTo(pTPCvertex->GetX(),fMagF);
+ AliTracker::PropagateTrackToBxByBz(&pTPCvertex,lits.GetX(),0.1,2,kFALSE);
+ AliTracker::PropagateTrackToBxByBz(&pTPCvertex,lits.GetX(),0.1,0.1,kFALSE);
+ Double_t xyz[3];
+ pTPCIn->GetXYZ(xyz);
+ Double_t phi= TMath::ATan2(xyz[1],xyz[0]);
+ histoX[1]= pTPCIn->GetTgl();
+ histoX[2]= phi;
+ histoX[3]= pTPCIn->GetSnp();
+ //
+ Float_t dca[2], cov[3];
+ pTrack->GetImpactParametersTPC(dca,cov);
+ for (Int_t ihisto=0; ihisto<5; ihisto++){
+ histoX[0]=pTPCvertex.GetParameter()[ihisto]-lits.GetParameter()[ihisto];
+ // if (ihisto<2) histoX[0]=dca[ihisto];
+ fResHistoTPCvertex[ihisto]->Fill(histoX);
+ }
+}
+
+
+void AliTPCcalibTime::FillResHistoTPCTRD(const AliExternalTrackParam * pTPCOut, const AliExternalTrackParam * pTRDIn ){
+ //
+ // fill resuidual histogram TPCout-TRDin
+ //
+ Double_t histoX[4];
+ Double_t xyz[3];
+ pTPCOut->GetXYZ(xyz);
+ Double_t phi= TMath::ATan2(xyz[1],xyz[0]);
+ histoX[1]= pTPCOut->GetTgl();
+ histoX[2]= phi;
+ histoX[3]= pTPCOut->GetSnp();
+ //
+ AliExternalTrackParam ltrd(*pTRDIn);
+ ltrd.Rotate(pTPCOut->GetAlpha());
+ // ltrd.PropagateTo(pTPCOut->GetX(),fMagF);
+ AliTracker::PropagateTrackToBxByBz(<rd,pTPCOut->GetX(),0.1,0.1,kFALSE);
+
+ for (Int_t ihisto=0; ihisto<5; ihisto++){
+ histoX[0]=pTPCOut->GetParameter()[ihisto]-ltrd.GetParameter()[ihisto];
+ fResHistoTPCTRD[ihisto]->Fill(histoX);
+ }
+
+}
+
+void AliTPCcalibTime::FillResHistoTPCTOF(const AliExternalTrackParam * pTPCOut, const AliExternalTrackParam * pTOFIn ){
+ //
+ // fill resuidual histogram TPCout-TOFin
+ // track propagated to the TOF position
+ Double_t histoX[4];
+ Double_t xyz[3];
+
+ AliExternalTrackParam ltpc(*pTPCOut);
+ ltpc.Rotate(pTOFIn->GetAlpha());
+ AliTracker::PropagateTrackToBxByBz(<pc,pTOFIn->GetX(),0.1,0.1,kFALSE);
+ //
+ ltpc.GetXYZ(xyz);
+ Double_t phi= TMath::ATan2(xyz[1],xyz[0]);
+ histoX[1]= ltpc.GetTgl();
+ histoX[2]= phi;
+ histoX[3]= ltpc.GetSnp();
+ //
+ for (Int_t ihisto=0; ihisto<2; ihisto++){
+ histoX[0]=ltpc.GetParameter()[ihisto]-pTOFIn->GetParameter()[ihisto];
+ fResHistoTPCTOF[ihisto]->Fill(histoX);
+ }
+
+}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff