aod protection added, bug fix in 2d dca cut

diff --git a/CORRFW/AliCFTrackIsPrimaryCuts.cxx b/CORRFW/AliCFTrackIsPrimaryCuts.cxx
index b60599ad9424df6ed123c8b30c39475ea3fb9a23..784229ddd334be49538a02c4192fe93ae5f853e8 100644 (file)
--- a/CORRFW/AliCFTrackIsPrimaryCuts.cxx
+++ b/CORRFW/AliCFTrackIsPrimaryCuts.cxx
@@ -500,7 +500,7 @@ void AliCFTrackIsPrimaryCuts::SelectionBitMap(TObject* obj)
   iCutBit++;
 
   if (isESDTrack) {
-    if (!fDCAToVertex2D || (fDCAToVertex2D && b2Dmin > 1  && b2Dmax < 1)) {
+    if (!fDCAToVertex2D || (fDCAToVertex2D && TMath::Sqrt(b2Dmin) > 1  && TMath::Sqrt(b2Dmax) < 1)) {
       fBitmap->SetBitNumber(iCutBit,kTRUE);
     }
   }

diff --git a/CORRFW/AliCFTrackQualityCuts.cxx b/CORRFW/AliCFTrackQualityCuts.cxx
index 2d94f1fc356eb7a97b6720894287d5f8222ea94c..99934e70ec1d132f316db7f59202d0139aeeb0f4 100644 (file)
--- a/CORRFW/AliCFTrackQualityCuts.cxx
+++ b/CORRFW/AliCFTrackQualityCuts.cxx
@@ -502,7 +502,7 @@ void AliCFTrackQualityCuts::SelectionBitMap(TObject* obj)
   if (nTrackletsTRD >= fMinNTrackletTRD)
     fBitmap->SetBitNumber(iCutBit,kTRUE);
   iCutBit++;
-  if (esdTrack->GetTRDntrackletsPID() >= fMinNTrackletTRDpid)
+  if (!isESDTrack || esdTrack->GetTRDntrackletsPID() >= fMinNTrackletTRDpid)
     fBitmap->SetBitNumber(iCutBit,kTRUE);
   iCutBit++;
 
@@ -520,7 +520,7 @@ void AliCFTrackQualityCuts::SelectionBitMap(TObject* obj)
   if (chi2PerTrackletTRD <= fMaxChi2PerTrackletTRD)
     fBitmap->SetBitNumber(iCutBit,kTRUE);
   iCutBit++;
-  if (esdTrack->GetTPCsignalN() >= fMinNdEdxClusterTPC)
+  if (!isESDTrack || esdTrack->GetTPCsignalN() >= fMinNdEdxClusterTPC)
     fBitmap->SetBitNumber(iCutBit,kTRUE);
   iCutBit++;
 
@@ -960,9 +960,10 @@ void AliCFTrackQualityCuts::FillHistograms(TObject* obj, Bool_t b)
 //   if (b==0 || (b==1 && fTrackCuts->GetCutVariable(2)>0)) fhQA[kCutMinFoundClusterTPC][b]->Fill((float)fractionFoundClustersTPC);
   if (b==0 || (b==1 && nClustersTPC>0)) fhQA[kCutMinFoundClusterTPC][b]->Fill((float)fractionFoundClustersTPC);
   fhQA[kCutTrackletTRD][b]->Fill((float)nTrackletsTRD);
-  fhQA[kCutTrackletTRDpid][b]->Fill((float)esdTrack->GetTRDntrackletsPID());
-  fhQA[kCutdEdxClusterTPC][b]->Fill((float)esdTrack->GetTPCsignalN());
-
+  if (isESDTrack) {
+   fhQA[kCutTrackletTRDpid][b]->Fill((float)esdTrack->GetTRDntrackletsPID());
+   fhQA[kCutdEdxClusterTPC][b]->Fill((float)esdTrack->GetTPCsignalN());
+  }
 // // // include following lines when AliESDtrackCuts is updated
 //   fhQA[kCutCovElement11][b]->Fill(fTrackCuts->GetCutVariable(6));
 //   fhQA[kCutCovElement22][b]->Fill(fTrackCuts->GetCutVariable(7));