select the parton checking the acceptance so that at least one of the parton/jets is within the acceptance, not the two

Author: gconesab

MC/config/PWGGAJE/hooks/jets_hook.C

@@ -7,8 +7,8 @@ R__ADD_INCLUDE_PATH($O2DPG_ROOT)
 
 /// \brief Select jet events within acceptance or associated parton flavor using Pythia Hooks.
 ///
-/// Select outoging jets on the 2->2 process, at least one in a selected acceptance and 
-/// with a  given PDG value.
+/// Select outoging parton/jets on the 2->2 process, at least one in a selected acceptance and
+/// optionally select the parton with a given PDG value.
 /// Only valid for PYTHIA8 and using Hooks
 ///
 /// \author Gustavo Conesa Balbastre (LPSC-IN2P3-CNRS)
@@ -22,6 +22,14 @@ class UserHooks_jets : public Pythia8::UserHooks
   ~UserHooks_jets() = default;
   bool canVetoPartonLevel() override { return true; };
   bool doVetoPartonLevel(const Pythia8::Event& event) override {
+
+//    for (Int_t id = 0; id < 10; id++)
+//    {
+//      printf("parton %d PDG %d, status %d, mother %d, E %2.2f, pT %2.2f, eta %2.2f, phi %2.2f\n",
+//             id, event[id].id() , event[id].status(), event[id].mother1(),
+//             event[id].e()  , event[id].pT(),
+//             event[id].eta(), event[id].phi()*TMath::RadToDeg());
+//    }
 
     // Get the outgoing 2->2 partons. 
     // The jets are in position 5 or 6.
@@ -37,39 +45,37 @@ class UserHooks_jets : public Pythia8::UserHooks
     if ( mOutPartonPDG > 0 && TMath::Abs(event[id1].id()) != mOutPartonPDG ) 
       okpdg1 = false;
 
-    if ( acc1 && okpdg1 )
-    {
-      printf("--- Accepted event, jet 1 ---\n");
-      printf("PDG %d, status %d, mother %d, E %2.2f, pT %2.2f, eta %2.2f, phi %2.2f\n", 
-             event[id1].id() , event[id1].status(), event[id1].mother1(),
-             event[id1].e()  , event[id1].pT(),
-             event[id1].eta(), event[id1].phi()*TMath::RadToDeg());
-      
-      return false;
-    }
-    
     // Check the second jet
     //
     bool acc2 = detector_acceptance(mAcceptance, event[id2].phi(), event[id2].eta())  ; 
     bool okpdg2 = true;
 
     if ( mOutPartonPDG > 0 && TMath::Abs(event[id2].id()) != mOutPartonPDG ) 
       okpdg2 = false;
-    
-    if ( acc2 && okpdg2 )
+
+    //printf("acc1 %d, acc2 %d, okpdg1 %d, okpdf2 %d\n",acc1,acc2,okpdg1,okpdg2);
+
+    if ( (acc1 || acc2) && (okpdg1 || okpdg2) )
     {
-      printf("--- Accepted event, jet 2 ---\n");
-      printf("PDG %d, status %d, mother %d, E %2.2f, pT %2.2f, eta %2.2f, phi %2.2f\n", 
+      printf("--- Accepted event ---\n");
+      printf("\t --- jet 1 ---\n");
+      printf("\t PDG %d, status %d, mother %d, E %2.2f, pT %2.2f, eta %2.2f, phi %2.2f\n",
+             event[id1].id() , event[id1].status(), event[id1].mother1(),
+             event[id1].e()  , event[id1].pT(),
+             event[id1].eta(), event[id1].phi()*TMath::RadToDeg());
+
+      printf("\t --- jet 2 ---\n");
+      printf("\t PDG %d, status %d, mother %d, E %2.2f, pT %2.2f, eta %2.2f, phi %2.2f\n",
              event[id2].id() , event[id2].status(), event[id2].mother1(),
              event[id2].e()  , event[id2].pT(),
              event[id2].eta(), event[id2].phi()*TMath::RadToDeg());
-      
+
       return false;
     }
 
-    // Jets not found
+    // Jets rejected
     //
-    printf("--- Rejected event ---\n");
+    printf("\t --- Rejected event ---\n");
 
     return true;