more compact if statements

fjonasALICE · fjonasALICE · commit 46ab9cfe1664 · 2025-01-29T14:56:00.000+01:00
diff --git a/PWGJE/JetFinders/jetFinder.cxx b/PWGJE/JetFinders/jetFinder.cxx
@@ -151,10 +151,7 @@ struct JetFinderTask {
   void processChargedJets(soa::Filtered<aod::JetCollisions>::iterator const& collision,
                           soa::Filtered<aod::JetTracks> const& tracks)
   {
-    if (doEMCALEventSelectionChargedJets && !jetderiveddatautilities::eventEMCAL(collision)) {
-      return;
-    }
-    if (!jetderiveddatautilities::selectCollision(collision, eventSelection) || !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
+    if (!jetderiveddatautilities::selectCollision(collision, eventSelection) || !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits) || (doEMCALEventSelectionChargedJets && !jetderiveddatautilities::eventEMCAL(collision))) {
       return;
     }
     inputParticles.clear();
@@ -167,10 +164,7 @@ struct JetFinderTask {
   void processChargedEvtWiseSubJets(soa::Filtered<aod::JetCollisions>::iterator const& collision,
                                     soa::Filtered<aod::JetTracksSub> const& tracks)
   {
-    if (doEMCALEventSelectionChargedJets && !jetderiveddatautilities::eventEMCAL(collision)) {
-      return;
-    }
-    if (!jetderiveddatautilities::selectCollision(collision, eventSelection) || !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
+    if (!jetderiveddatautilities::selectCollision(collision, eventSelection) || !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits) || (doEMCALEventSelectionChargedJets && !jetderiveddatautilities::eventEMCAL(collision))) {
       return;
     }
     inputParticles.clear();

Original file line number	Diff line number	Diff line change
`@@ -151,10 +151,7 @@ struct JetFinderTask {`
`151`	`151`	`void processChargedJets(soa::Filtered<aod::JetCollisions>::iterator const& collision,`
`152`	`152`	`soa::Filtered<aod::JetTracks> const& tracks)`
`153`	`153`	`{`
`154`		`- if (doEMCALEventSelectionChargedJets && !jetderiveddatautilities::eventEMCAL(collision)) {`
`155`		`- return;`
`156`		`- }`
`157`		`- if (!jetderiveddatautilities::selectCollision(collision, eventSelection) \|\| !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {`
	`154`	`+ if (!jetderiveddatautilities::selectCollision(collision, eventSelection) \|\| !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits) \|\| (doEMCALEventSelectionChargedJets && !jetderiveddatautilities::eventEMCAL(collision))) {`
`158`	`155`	`return;`
`159`	`156`	`}`
`160`	`157`	`inputParticles.clear();`
`@@ -167,10 +164,7 @@ struct JetFinderTask {`
`167`	`164`	`void processChargedEvtWiseSubJets(soa::Filtered<aod::JetCollisions>::iterator const& collision,`
`168`	`165`	`soa::Filtered<aod::JetTracksSub> const& tracks)`
`169`	`166`	`{`
`170`		`- if (doEMCALEventSelectionChargedJets && !jetderiveddatautilities::eventEMCAL(collision)) {`
`171`		`- return;`
`172`		`- }`
`173`		`- if (!jetderiveddatautilities::selectCollision(collision, eventSelection) \|\| !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {`
	`167`	`+ if (!jetderiveddatautilities::selectCollision(collision, eventSelection) \|\| !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits) \|\| (doEMCALEventSelectionChargedJets && !jetderiveddatautilities::eventEMCAL(collision))) {`
`174`	`168`	`return;`
`175`	`169`	`}`
`176`	`170`	`inputParticles.clear();`