Easier access to Slection info added

diff --git a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
index 39fd2e58b0f725c0ec85cd45a4357875ac8dbcd5..6ef6715fc680358913c19a78db5406abd326691b 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
+++ b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
@@ -457,6 +457,11 @@ Bool_t  AliAnalysisHelperJetTasks::IsPileUp(){
 }
 
 
+Bool_t  AliAnalysisHelperJetTasks::TestSelectInfo(UInt_t iMask){
+  return ((SelectInfo()&iMask)==iMask);
+}
+
+
 UInt_t  AliAnalysisHelperJetTasks::SelectInfo(Bool_t bSet,UInt_t iNew){
   static UInt_t iSelectInfo = 0; //
   if(bSet){

diff --git a/PWG4/JetTasks/AliAnalysisHelperJetTasks.h b/PWG4/JetTasks/AliAnalysisHelperJetTasks.h
index 3ecbf27233cd84c66bd403ba2612a4f1d3ccd60f..cd48bd669b5f776785353df1795a14021815d327 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisHelperJetTasks.h
+++ b/PWG4/JetTasks/AliAnalysisHelperJetTasks.h
@@ -33,8 +33,17 @@ class AliAnalysisHelperJetTasks : public TObject {
 
 
   enum {kMaxJets = 6}; //  needed for array size not to fragemnt memory on the heap by many new/delete 
-  enum { kNone = 1<<0,kBunchBunch = 1<<1,kBunchEmpty = 1<<2,kEmptyEmpty= 1<<3,
-        kPhysicsSelection = 1<<4, kVertexIn = 1<<5, kIsCosmic = 1<<6, kIsPileUp = 1<<7,kTotalSelections = (1<<8) - 1};
+
+
+  enum { kNone = 1<<0,
+        kBunchBunch = 1<<1,
+        kBunchEmpty = 1<<2,
+        kEmptyEmpty= 1<<3,
+        kPhysicsSelection = 1<<4, 
+        kVertexIn = 1<<5, 
+        kIsCosmic = 1<<6, 
+        kIsPileUp = 1<<7,
+        kTotalSelections = (1<<8) - 1};
 
   enum Trigger {kAcceptAll = 0,kMB1,kMB2,kMB3,kSPDGFO,kTrigger}; // 
 
@@ -42,6 +51,7 @@ class AliAnalysisHelperJetTasks : public TObject {
 
   static Bool_t IsPileUp(); // Wrapper for SelectInfo with PileUp
   static Bool_t IsCosmic(); // Wrapper for SelectInfo with cosmic
+  static Bool_t TestSelectInfo(UInt_t iMask); // Wrapper for testing the SelectInfo bitmask
 
   static UInt_t SelectInfo(Bool_t bSet = kFALSE,UInt_t iNew = 0); // static function to store the state bitmask of the selection from service task
   

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
index 53e09fb39e227ebdd5ebd137c607519648f09c29..4bf25bf6721b9f10b72228a323ee0ed08af8ffc8 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
@@ -509,7 +509,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     selected = AliAnalysisHelperJetTasks::Selected();
   }
   else if(fUseGlobalSelection&&fEventSelectionMask>0){
-    selected = ((AliAnalysisHelperJetTasks::SelectInfo()&fEventSelectionMask)==fEventSelectionMask);
+    selected = AliAnalysisHelperJetTasks::TestSelectInfo(fEventSelectionMask);
   }
 
   if(!selected){
@@ -733,7 +733,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     if(phi<0)phi+=TMath::Pi()*2.;    
     Float_t eta = leading->Eta();
     pt = leading->Pt();
-     while((tmpRec = (AliAODJet*)(recIter->Next()))){
+    while((tmpRec = (AliAODJet*)(recIter->Next()))){
       Float_t tmpPt = tmpRec->Pt();
       fh1PtJetsRecIn->Fill(tmpPt);
       if(tmpRec==leading){
@@ -996,7 +996,7 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
 
     fhnJetContainer[kStep0+kMaxStep]->Fill(container,eventW);
     if (fDebug > 10)Printf("%s:%d",(char*)__FILE__,__LINE__);
-
+  
     Float_t zLeading = -1;
     if(TMath::Abs(etaRec)<fRecEtaWindow){
       fh2JetPtJetPhi->Fill(ptRec,phiRec);