Bug fix on AOD test filter bit and adding a default setting for 2010 cuts

diff --git a/PWG2/RESONANCES/AliRsnCutTrackQuality.cxx b/PWG2/RESONANCES/AliRsnCutTrackQuality.cxx
index 9800707923187530fe868036557ad747e80f5684..7adc15bbb5defc5b0451ddcdbc158e67d2f55ef8 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCutTrackQuality.cxx
+++ b/PWG2/RESONANCES/AliRsnCutTrackQuality.cxx
@@ -251,7 +251,7 @@ Bool_t AliRsnCutTrackQuality::CheckAOD(AliAODTrack *track)
 
    // if a test bit is used, check it and skip the following
    if (fAODTestFilterBit >= 0) {
-      UInt_t bit = (UInt_t)fAODTestFilterBit;
+      UInt_t bit = 1 << fAODTestFilterBit;
       AliDebugClass(2, Form("Required a test filter bit for AOD check: %u (result: %s)", bit, (track->TestFilterBit(bit) ? "accept" : "reject")));
       if (!track->TestFilterBit(bit)) 
          return kFALSE;
@@ -261,7 +261,7 @@ Bool_t AliRsnCutTrackQuality::CheckAOD(AliAODTrack *track)
          return kTRUE;
       }
    }
-
+   
    // try to retrieve the reference AOD event
    AliAODEvent *aodEvent = 0x0;
    if (fEvent) aodEvent = fEvent->GetRefAOD();

diff --git a/PWG2/RESONANCES/AliRsnCutTrackQuality.h b/PWG2/RESONANCES/AliRsnCutTrackQuality.h
index bfa74af1870331300b605719ec5446ff56cb26fd..88ba13ff1f9ad47b56deeab21ea3de24fe1ee910 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCutTrackQuality.h
+++ b/PWG2/RESONANCES/AliRsnCutTrackQuality.h
@@ -50,6 +50,8 @@ public:
    void      SetRejectKinkDaughters(Bool_t yn = kTRUE) {fRejectKinkDaughters = yn;}
    
    void      SetAODTestFilterBit(Int_t value)          {fAODTestFilterBit = value;}
+   
+   void      SetDefaults2010();
 
    virtual Bool_t IsSelected(TObject *obj);
    virtual void   Print(const Option_t *option = "") const;
@@ -102,4 +104,27 @@ inline const char * AliRsnCutTrackQuality::Binary(UInt_t number)
     return b;
 }
 
+//__________________________________________________________________________________________________
+inline void AliRsnCutTrackQuality::SetDefaults2010()
+{
+//
+// Default settings for cuts used in 2010
+//
+
+   AddStatusFlag(AliESDtrack::kTPCin   , kTRUE);
+   AddStatusFlag(AliESDtrack::kTPCrefit, kTRUE);
+   AddStatusFlag(AliESDtrack::kITSrefit, kTRUE);
+   SetPtRange(0.15, 1E+20);
+   SetEtaRange(-0.8, 0.8);
+   SetDCARPtFormula("0.0182+0.0350/pt^1.01");
+   SetDCAZmax(2.0);
+   SetSPDminNClusters(1);
+   SetITSminNClusters(0);
+   SetITSmaxChi2(1E+20);
+   SetTPCminNClusters(70);
+   SetTPCmaxChi2(4.0);
+   SetRejectKinkDaughters();
+   SetAODTestFilterBit(5);
+}
+
 #endif