changed way of setting event info in AliCFManager and cuts in order to reduce

[u/mrichter/AliRoot.git] / CORRFW / AliCFTrackIsPrimaryCuts.cxx

diff --git a/CORRFW/AliCFTrackIsPrimaryCuts.cxx b/CORRFW/AliCFTrackIsPrimaryCuts.cxx
index 9c60121668a9faa14c950c7453cd4c72ffd19555..841a98dde4cd1e32c873c02014d57e19b37c38b0 100644 (file)
--- a/CORRFW/AliCFTrackIsPrimaryCuts.cxx
+++ b/CORRFW/AliCFTrackIsPrimaryCuts.cxx
@@ -54,7 +54,7 @@
 #include <TBits.h>
 
 #include <AliESDtrack.h>
-#include <AliESD.h>
+#include <AliESDEvent.h>
 #include <AliLog.h>
 #include "AliCFTrackIsPrimaryCuts.h"
 
@@ -360,25 +360,28 @@ void AliCFTrackIsPrimaryCuts::Copy(TObject &c) const
   TNamed::Copy(c);
 }
 //__________________________________________________________________________________
-void AliCFTrackIsPrimaryCuts::SetEvtInfo(TObject* esd) {
+void AliCFTrackIsPrimaryCuts::SetRecEventInfo(const TObject* esd) {
   //
-  // Sets pointer to esd event information (AliESD)
+  // Sets pointer to esd event information (AliESDEvent)
   //
   if (!esd) {
-    AliError("Pointer to AliESD !");
+    AliError("Pointer to AliESDEvent !");
     return;
   }
   TString className(esd->ClassName());
-  if (className.CompareTo("AliESD") != 0) {
-    AliError("argument must point to an AliESD !");
+  if (className.CompareTo("AliESDEvent") != 0) {
+    AliError("argument must point to an AliESDEvent !");
     return ;
   }
-  fESD = (AliESD*) esd;
+  fESD = (AliESDEvent*) esd;
 }
 //__________________________________________________________________________________
 void AliCFTrackIsPrimaryCuts::UseSPDvertex(Bool_t b) {
   fUseSPDvertex = b;
-  if(fUseTPCvertex) fUseSPDvertex = kFALSE;
+  if(fUseTPCvertex && fUseSPDvertex) {
+       fUseSPDvertex = kFALSE;
+       AliError("SPD and TPC vertex chosen. TPC vertex is preferred.");
+  }
 }
 //__________________________________________________________________________________
 void AliCFTrackIsPrimaryCuts::UseTPCvertex(Bool_t b) {
@@ -497,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);
     }
   }