Keep bachelor if compatible with one of the two cascades (#4392)

* Keep bachelor if compatible with one of the two cascades

* Fix omega histogram filling

Author: fmazzasc

PWGLF/Tasks/nonPromptCascade.cxx

@@ -724,31 +724,38 @@ struct NonPromptCascadeTask {
       // QA PID
       float nSigmaTPC[nParticles]{bachelor.tpcNSigmaKa(), bachelor.tpcNSigmaPi(), protonTrack.tpcNSigmaPr(), pionTrack.tpcNSigmaPi()};
 
+      bool isBachelorSurvived = false;
       if (isOmega) {
         if (bachelor.hasTPC()) {
           LOG(debug) << "TPCSignal bachelor " << bachelor.sign() << "/" << bachelor.tpcInnerParam() << "/" << bachelor.tpcSignal();
-          if (nSigmaTPC[0] < cfgCutsPID->get(0u, 0u) || nSigmaTPC[0] > cfgCutsPID->get(0u, 1u)) {
-            continue;
+          if (nSigmaTPC[0] > cfgCutsPID->get(0u, 0u) && nSigmaTPC[0] < cfgCutsPID->get(0u, 1u)) {
+            registry.fill(HIST("h_PIDcutsOmega"), 3, massOmega);
+            isBachelorSurvived = true;
           }
         }
-        registry.fill(HIST("h_PIDcutsOmega"), 3, massOmega);
       }
 
       if (bachelor.hasTPC()) {
         LOG(debug) << "TPCSignal bachelor " << bachelor.sign() << "/" << bachelor.tpcInnerParam() << "/" << bachelor.tpcSignal();
-        if (nSigmaTPC[1] < cfgCutsPID->get(1u, 0u) || nSigmaTPC[1] > cfgCutsPID->get(1u, 1u)) {
-          continue;
+        if (nSigmaTPC[1] > cfgCutsPID->get(1u, 0u) && nSigmaTPC[1] < cfgCutsPID->get(1u, 1u)) {
+          registry.fill(HIST("h_PIDcutsXi"), 3, massXi);
+          isBachelorSurvived = true;
         }
       }
-      registry.fill(HIST("h_PIDcutsXi"), 3, massXi);
+
+      if (!isBachelorSurvived) {
+        continue;
+      }
 
       LOG(debug) << "TPCSignal protonTrack " << protonTrack.sign() << "/" << protonTrack.tpcInnerParam() << "/" << protonTrack.tpcSignal();
       if (nSigmaTPC[2] < cfgCutsPID->get(2u, 0u) || nSigmaTPC[2] > cfgCutsPID->get(2u, 1u)) {
         continue;
       }
 
+      if (isOmega) {
+        registry.fill(HIST("h_PIDcutsOmega"), 4, massOmega);
+      }
       registry.fill(HIST("h_PIDcutsXi"), 4, massXi);
-      registry.fill(HIST("h_PIDcutsOmega"), 4, massOmega);
 
       LOG(debug) << "TPCSignal ntrack " << pionTrack.sign() << "/" << pionTrack.tpcInnerParam() << "/" << pionTrack.tpcSignal();
       if (nSigmaTPC[3] < cfgCutsPID->get(3u, 0u) || nSigmaTPC[3] > cfgCutsPID->get(3u, 1u)) {