Be sure to load mapping when needed

[u/mrichter/AliRoot.git] / TPC / AliTPCcalibTime.cxx

diff --git a/TPC/AliTPCcalibTime.cxx b/TPC/AliTPCcalibTime.cxx
index 1a4bb05739c047884177763e31e52d3b746d2e7f..a9aa6ef2d9610835b771540b3a4b5633ce2f1995 100644 (file)
--- a/TPC/AliTPCcalibTime.cxx
+++ b/TPC/AliTPCcalibTime.cxx
@@ -359,7 +359,13 @@ void AliTPCcalibTime::Process(AliESDEvent *event){
   // main function to make calibration
   //
   if(!event) return;
-  if (event->GetNumberOfTracks()<2) return;
+  if (event->GetNumberOfTracks()<2) return; 
+  AliESDfriend *ESDfriend=static_cast<AliESDfriend*>(event->FindListObject("AliESDfriend"));
+  if (!ESDfriend) {
+    return;
+  }
+  if (ESDfriend->TestSkipBit()) return;
+  
   ResetCurrent();
   //if(IsLaser  (event)) 
   ProcessLaser (event);
@@ -1084,7 +1090,7 @@ Long64_t AliTPCcalibTime::Merge(TCollection *const li) {
       }
     }
     //
-    if (fTPCVertexCorrelation && cal->fTPCVertexCorrelation){
+    if (fTPCVertexCorrelation[0] && cal->fTPCVertexCorrelation[0]){
       for (Int_t imeas=0; imeas<5; imeas++){
        if (fTPCVertexCorrelation[imeas] && cal->fTPCVertexCorrelation[imeas]) fTPCVertexCorrelation[imeas]->Add(cal->fTPCVertexCorrelation[imeas]);
       }