M AliTPCAnalysisTaskcalib.cxx - Chckeing the friend status bit

M      AliTPCcalibDB.cxx           - Removing warning
M      AliTPCcalibGainMult.cxx     - Use the number of tracks as multiplicity estiamtor
M      AliTPCcalibTime.cxx        -  Setter for the maximal track multiplicity per event
                                  + Waring in the TVectorD  - resize needed
M      AliTPCtrackerMI.cxx        -  Use the number of tracks as multiplicity estiamtor, (TPC primary vertex not defined yet in the RefitInward)

diff --git a/TPC/AliTPCAnalysisTaskcalib.cxx b/TPC/AliTPCAnalysisTaskcalib.cxx
index 7cc3965126ce1cfe2b18500087cc460322d2a52d..cd45550adedb44b37a46304f9d01beaaaf52bb46 100644 (file)
--- a/TPC/AliTPCAnalysisTaskcalib.cxx
+++ b/TPC/AliTPCAnalysisTaskcalib.cxx
@@ -88,6 +88,7 @@ void AliTPCAnalysisTaskcalib::Exec(Option_t *) {
     //Printf("ERROR: fESDfriend not available");
     return;
   }
+  if (fESDfriend->TestSkipBit()) return;
   Int_t n=fESD->GetNumberOfTracks();
   Process(fESD);
   Int_t run = fESD->GetRunNumber();

diff --git a/TPC/AliTPCcalibDB.cxx b/TPC/AliTPCcalibDB.cxx
index 53f7d4d2567a7a1e4b48607bc9e6e1bddcd61b2d..8f2c053955b6dbdc41d5391e61008724b51271dd 100644 (file)
--- a/TPC/AliTPCcalibDB.cxx
+++ b/TPC/AliTPCcalibDB.cxx
@@ -2015,9 +2015,10 @@ AliTPCCorrection * AliTPCcalibDB::GetTPCComposedCorrectionDelta() const{
   //
   if (!fComposedCorrectionArray) return 0;
   if (fRun<0) return 0;
+  if (fDriftCorrectionArray.GetEntriesFast()<=fRun) return 0;
   if (fDriftCorrectionArray.At(fRun)==0) return 0;
-  if (fComposedCorrectionArray->GetEntriesFast()<4) {
-    fComposedCorrectionArray->Expand(4);
+  if (fComposedCorrectionArray->GetEntriesFast()<=4) {
+    fComposedCorrectionArray->Expand(5);
     TObjArray * timeArray =(TObjArray*)(fDriftCorrectionArray.At(fRun));
      AliTPCCorrection * correctionTime = (AliTPCCorrection *)timeArray->FindObject("FitCorrectionTime");
      if (correctionTime){

diff --git a/TPC/AliTPCcalibGainMult.cxx b/TPC/AliTPCcalibGainMult.cxx
index c8af677c49ea4ef19a1e553999655ead99d78c1f..f5dc9ac0be383d1af6082dc9a60be96d3ed1b445 100644 (file)
--- a/TPC/AliTPCcalibGainMult.cxx
+++ b/TPC/AliTPCcalibGainMult.cxx
@@ -128,7 +128,7 @@ AliTPCcalibGainMult::AliTPCcalibGainMult(const Text_t *name, const Text_t *title
   //
   Int_t binsPadEqual[6]    = { 200, 200,    4,   20,   50, 100};
   Double_t xminPadEqual[6] = { 0.5, 0.5, -0.5,    0, -250,   0}; 
-  Double_t xmaxPadEqual[6] = { 1.5, 1.5,  3.5, 4000,  250,   3};
+  Double_t xmaxPadEqual[6] = { 1.5, 1.5,  3.5, 13000,  250,   3};
   TString axisNamePadEqual[6]   = {"dEdxRatioMax","dEdxRatioTot","padType","mult","driftlength", "1_pt"};
   TString axisTitlePadEqual[6]  = {"dEdx_padRegion/mean_dEdx Qmax", "dEdx_padRegion/mean_dEdx Qtot","padType","mult","driftlength", "1/pt"};
   //
@@ -142,7 +142,7 @@ AliTPCcalibGainMult::AliTPCcalibGainMult(const Text_t *name, const Text_t *title
   //                    MIP Qmax, MIP Qtot,  z,  pad, vtx. contribut., ncl
   Int_t binsGainMult[6]    = { 145,  145,   25,    4,  100,  80};
   Double_t xminGainMult[6] = { 10.,  10.,    0, -0.5,    0, -0.5}; 
-  Double_t xmaxGainMult[6] = {300., 300.,  250,  3.5, 5000, 159.5};
+  Double_t xmaxGainMult[6] = {300., 300.,  250,  3.5, 13000, 159.5};
   TString axisNameMult[6]={"Qmax","Qtot","drift","padtype""multiplicity","ncl"};
   TString axisTitleMult[6]={"Qmax (a.u)","Qtot (a.u.)","driftlenght l (cm)","Pad Type","multiplicity","ncl"};
   //
@@ -191,8 +191,7 @@ void AliTPCcalibGainMult::Process(AliESDEvent *event) {
    return;
   }
   UInt_t runNumber = event->GetRunNumber();
-  Int_t nContributors = 0;
-  if (event->GetPrimaryVertexTPC()) nContributors = event->GetPrimaryVertexTPC()->GetNContributors();
+  Int_t nContributors = event->GetNumberOfTracks();
   //
   // track loop
   //

diff --git a/TPC/AliTPCcalibTime.cxx b/TPC/AliTPCcalibTime.cxx
index 3b44ecdc2e74da98fafd529deca079b9de6ad3bd..e7c6a041f3847f31f8c3c810f12e38ea8c07f997 100644 (file)
--- a/TPC/AliTPCcalibTime.cxx
+++ b/TPC/AliTPCcalibTime.cxx
@@ -477,7 +477,7 @@ void AliTPCcalibTime::ProcessLaser(AliESDEvent *event){
   //
   // fill histos
   //
-  TVectorD vdriftA(5), vdriftC(5),vdriftAC(5);
+  TVectorD vdriftA(5), vdriftC(5),vdriftAC(6);
   vdriftA=*(fLaser->fFitAside);
   vdriftC=*(fLaser->fFitCside);
   vdriftAC=*(fLaser->fFitACside);
@@ -805,6 +805,7 @@ void AliTPCcalibTime::ProcessBeam(const AliESDEvent *const event){
   Double_t dcaVertex[2]={0,0};
   Int_t ntracks=event->GetNumberOfTracks();
   if (ntracks==0) return;
+  if (ntracks > fCutTracks) return;
   //
   AliESDfriend *esdFriend=(AliESDfriend*)(((AliESDEvent*)event)->FindListObject("AliESDfriend"));
   //

diff --git a/TPC/AliTPCtrackerMI.cxx b/TPC/AliTPCtrackerMI.cxx
index 1a30123b6fa689828d8bfc1901604470d30a8b99..5a26145dd2721dbd1efedc342129a6063f8b854a 100644 (file)
--- a/TPC/AliTPCtrackerMI.cxx
+++ b/TPC/AliTPCtrackerMI.cxx
@@ -2682,7 +2682,7 @@ Int_t AliTPCtrackerMI::RefitInward(AliESDEvent *event)
   }
   transform->SetCurrentRecoParam((AliTPCRecoParam*)AliTPCReconstructor::GetRecoParam());
   const AliTPCRecoParam * recoParam = AliTPCcalibDB::Instance()->GetTransform()->GetCurrentRecoParam();
-
+  Int_t nContribut = event->GetNumberOfTracks();
   TGraphErrors * graphMultDependenceDeDx = 0x0;
   if (recoParam && recoParam->GetUseMultiplicityCorrectionDedx() && gainCalibArray) {
     if (recoParam->GetUseTotCharge()) {
@@ -2760,9 +2760,8 @@ Int_t AliTPCtrackerMI::RefitInward(AliESDEvent *event)
       Float_t dedx  = seed->GetdEdx();
       // apply mutliplicity dependent dEdx correction if available
       if (graphMultDependenceDeDx) {
-       Int_t nContribut  = event->GetPrimaryVertexTPC()->GetNContributors();
        Double_t corrGain =  AliTPCcalibDButil::EvalGraphConst(graphMultDependenceDeDx, nContribut);
-       dedx /= corrGain;
+       dedx += (1 - corrGain)*50.; // MIP is normalized to 50
       }
       esd->SetTPCsignal(dedx, sdedx, ndedx);
       //