Fixing trigger selection include CSMBB/Postdata before return

diff --git a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
index 60330b65a296970b6f3ebaee37a63661ac9bdc88..cc6b2e5b17b3d7abf593051cdceb2a7585a84116 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
+++ b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
@@ -655,6 +655,8 @@ Bool_t AliAnalysisHelperJetTasks::IsTriggerBitFired(const AliVEvent* aEv, Trigge
       case kMB1:
        {
          if(esd->GetFiredTriggerClasses().Contains("CINT1B"))return kTRUE;
+         // does the same but without or'ed V0s
+         if(esd->GetFiredTriggerClasses().Contains("CSMBB"))return kTRUE;   
          break;
        }
       case kMB2:
@@ -667,7 +669,7 @@ Bool_t AliAnalysisHelperJetTasks::IsTriggerBitFired(const AliVEvent* aEv, Trigge
        }
       case kSPDGFO:
        {
-         if(esd->GetFiredTriggerClasses().Contains("CSMBB"))return kTRUE;        
+         if(esd->GetFiredTriggerClasses().Contains("CSMBB"))return kTRUE;
          break;
        }
       default:
@@ -689,6 +691,8 @@ Bool_t AliAnalysisHelperJetTasks::IsTriggerBitFired(const AliVEvent* aEv, Trigge
       case kMB1:
        {
          if(aod->GetFiredTriggerClasses().Contains("CINT1B"))return kTRUE;
+         // does the same but without or'ed V0s
+         if(aod->GetFiredTriggerClasses().Contains("CSMBB"))return kTRUE;   
          break;
        }
       case kMB2:

diff --git a/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx b/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx
index 0eced3af63bcd0de050b13f4e9c18edf523b51bd..c0916d480009d7d3599b0fe7d55ccd57f0f5b373 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtQATPConly.cxx
@@ -317,7 +317,6 @@ void AliPWG4HighPtQATPConly::Exec(Option_t *) {
   AliDebug(2,Form(">> AliPWG4HighPtQATPConly::Exec \n"));  
 
   // All events without selection
-  cout << "Fill fNEventAll" << endl;
   fNEventAll->Fill(0.);
 
   if (!fESD) {
@@ -327,11 +326,15 @@ void AliPWG4HighPtQATPConly::Exec(Option_t *) {
 
   //Trigger selection
   AliAnalysisHelperJetTasks::Trigger trig;
-  trig = (const enum AliAnalysisHelperJetTasks::Trigger)fTrigger;
+  trig = (AliAnalysisHelperJetTasks::Trigger)fTrigger;
   if (AliAnalysisHelperJetTasks::IsTriggerFired(fESD,trig)){
     AliDebug(2,Form(" Trigger Selection: event ACCEPTED ... "));
   }else{
     AliDebug(2,Form(" Trigger Selection: event REJECTED ... "));
+    // Post output data
+    PostData(0, fHistList);
+    PostData(1, fHistListTPC);
+    PostData(2, fHistListITS);
     return;
   } 
 
@@ -346,9 +349,20 @@ void AliPWG4HighPtQATPConly::Exec(Option_t *) {
   double primVtx[3];
   vtx->GetXYZ(primVtx);
   //  printf("primVtx: %g  %g  %g \n",primVtx[0],primVtx[1],primVtx[2]);
-  if(primVtx[0]>1. || primVtx[1]>1. || primVtx[2]>10.) return;
-
-  if(!fESD->GetNumberOfTracks() || fESD->GetNumberOfTracks()<2) return;
+  if(TMath::Abs(primVtx[0]>1.) || TMath::Abs(primVtx[1]>1.) || TMath::Abs(primVtx[2])>10.){
+    // Post output data
+    PostData(0, fHistList);
+    PostData(1, fHistListTPC);
+    PostData(2, fHistListITS);
+    return;
+  }
+  if(!fESD->GetNumberOfTracks() || fESD->GetNumberOfTracks()<2){ 
+    // Post output data
+    PostData(0, fHistList);
+    PostData(1, fHistListTPC);
+    PostData(2, fHistListITS);
+    return;
+  }
   Int_t nTracks = fESD->GetNumberOfTracks();
   AliDebug(2,Form("nTracks %d\n", nTracks));
 

diff --git a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
index 9eb6105cf14c10c28300a8d2875b69b951d15313..f81bdde737bf5a7f8679b261fc1222ebef6d0de2 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
@@ -172,11 +172,13 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)//UserExec(Option_t *)
 
   //Trigger selection
   AliAnalysisHelperJetTasks::Trigger trig;
-  trig = (const enum AliAnalysisHelperJetTasks::Trigger)fTrigger;
+  trig = (AliAnalysisHelperJetTasks::Trigger)fTrigger;
   if (AliAnalysisHelperJetTasks::IsTriggerFired(fESD,trig)){
     AliDebug(2,Form(" Trigger Selection: event ACCEPTED ... "));
   }else{
     AliDebug(2,Form(" Trigger Selection: event REJECTED ... "));
+    PostData(0,fHistList);
+    PostData(1,fCFManager->GetParticleContainer());
     return;
   } 
   //  if(!fESD->IsTriggerClassFired("CINT1B-ABCE-NOPF-ALL") || !fESD->IsTriggerClassFired("CSMBB-ABCE-NOPF-ALL")) return;
@@ -203,12 +205,18 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)//UserExec(Option_t *)
   
   const AliESDVertex *vtx = fESD->GetPrimaryVertex();
   // Need vertex cut
-  if (vtx->GetNContributors() < 2) return;
+  if (vtx->GetNContributors() < 2){
+    PostData(0,fHistList);
+    PostData(1,fCFManager->GetParticleContainer());
+    return;
+  }
   double primVtx[3];
   vtx->GetXYZ(primVtx);
-  //  printf("primVtx: %g  %g  %g \n",primVtx[0],primVtx[1],primVtx[2]);
-  if(primVtx[0]>1. || primVtx[1]>1. || primVtx[2]>10.) return;
-
+  if(TMath::Abs(primVtx[0]>1. )|| TMath::Abs(primVtx[1]>1.) || TMath::Abs(primVtx[2]>10.)){
+    PostData(0,fHistList);
+    PostData(1,fCFManager->GetParticleContainer());
+    return;
+  }
   AliDebug(2,Form("Vertex title %s, status %d, nCont %d\n",vtx->GetTitle(), vtx->GetStatus(), vtx->GetNContributors()));
 
   Int_t nTracks = fESD->GetNumberOfTracks();