adding rct selections for full jets

Author: nzardosh

PWGJE/JetFinders/jetFinder.h

@@ -60,7 +60,7 @@ struct JetFinderTask {
   o2::framework::Configurable<float> centralityMin{"centralityMin", -999.0, "minimum centrality"};
   o2::framework::Configurable<float> centralityMax{"centralityMax", 999.0, "maximum centrality"};
   o2::framework::Configurable<int> trackOccupancyInTimeRangeMax{"trackOccupancyInTimeRangeMax", 999999, "maximum occupancy of tracks in neighbouring collisions in a given time range"};
-  o2::framework::Configurable<std::string> eventSelections{"eventSelections", "sel8", "choose event selection"};
+  o2::framework::Configurable<std::string> eventSelections{"eventSelections", "sel8", "choose event selection for analyses"};
   o2::framework::Configurable<std::string> triggerMasks{"triggerMasks", "", "possible JE Trigger masks: fJetChLowPt,fJetChHighPt,fTrackLowPt,fTrackHighPt,fJetD0ChLowPt,fJetD0ChHighPt,fJetLcChLowPt,fJetLcChHighPt,fEMCALReadout,fJetFullHighPt,fJetFullLowPt,fJetNeutralHighPt,fJetNeutralLowPt,fGammaVeryHighPtEMCAL,fGammaVeryHighPtDCAL,fGammaHighPtEMCAL,fGammaHighPtDCAL,fGammaLowPtEMCAL,fGammaLowPtDCAL,fGammaVeryLowPtEMCAL,fGammaVeryLowPtDCAL"};
   o2::framework::Configurable<bool> skipMBGapEvents{"skipMBGapEvents", true, "decide to run over MB gap events or not"};
   o2::framework::Configurable<bool> applyRCTSelections{"applyRCTSelections", true, "decide to apply RCT selections"};
@@ -210,7 +210,7 @@ struct JetFinderTask {
   void processNeutralJets(o2::soa::Filtered<o2::aod::JetCollisions>::iterator const& collision,
                           o2::soa::Filtered<o2::aod::JetClusters> const& clusters)
   {
-    if ((doEMCALEventSelection && !jetderiveddatautilities::eventEMCAL(collision)) || !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
+    if ((doEMCALEventSelection && !jetderiveddatautilities::eventEMCAL(collision)) || !jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents, applyRCTSelections, "CBT_calo") || !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
       return;
     }
     inputParticles.clear();
@@ -223,7 +223,7 @@ struct JetFinderTask {
                        o2::soa::Filtered<o2::aod::JetTracks> const& tracks,
                        o2::soa::Filtered<o2::aod::JetClusters> const& clusters)
   {
-    if ((doEMCALEventSelection && !jetderiveddatautilities::eventEMCAL(collision)) || !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
+    if ((doEMCALEventSelection && !jetderiveddatautilities::eventEMCAL(collision)) || !jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents, applyRCTSelections, "CBT_calo") || !jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
       return;
     }
     inputParticles.clear();
@@ -257,7 +257,7 @@ struct JetFinderTask {
 
   void processParticleLevelNeutralJets(o2::soa::Filtered<o2::aod::JetMcCollisions>::iterator const& mcCollision, o2::soa::Filtered<o2::aod::JetParticles> const& particles)
   {
-    if (!jetderiveddatautilities::selectMcCollision(mcCollision, skipMBGapEvents, applyRCTSelections)) {
+    if (!jetderiveddatautilities::selectMcCollision(mcCollision, skipMBGapEvents, applyRCTSelections, "CBT_calo")) {
       return;
     }
     inputParticles.clear();
@@ -268,7 +268,7 @@ struct JetFinderTask {
 
   void processParticleLevelFullJets(o2::soa::Filtered<o2::aod::JetMcCollisions>::iterator const& mcCollision, o2::soa::Filtered<o2::aod::JetParticles> const& particles)
   {
-    if (!jetderiveddatautilities::selectMcCollision(mcCollision, skipMBGapEvents, applyRCTSelections)) {
+    if (!jetderiveddatautilities::selectMcCollision(mcCollision, skipMBGapEvents, applyRCTSelections, "CBT_calo")) {
       return;
     }
     inputParticles.clear();

PWGJE/TableProducer/derivedDataSelector.cxx

@@ -90,9 +90,11 @@ struct JetDerivedDataSelector {
     Configurable<float> centralityMin{"centralityMin", -999.0, "minimum centrality"};
     Configurable<float> centralityMax{"centralityMax", 999.0, "maximum centrality"};
     Configurable<int> trackOccupancyInTimeRangeMax{"trackOccupancyInTimeRangeMax", 999999, "maximum occupancy of tracks in neighbouring collisions in a given time range"};
-    Configurable<std::string> eventSelections{"eventSelections", "", "choose event selection"};
+    Configurable<std::string> eventSelectionsCharged{"eventSelectionsCharged", "", "choose charged event selection"};
+    Configurable<std::string> eventSelectionsFull{"eventSelectionsCharged", "", "choose full event selection"};
     Configurable<bool> skipMBGapEvents{"skipMBGapEvents", true, "decide to run over MB gap events or not"};
-    Configurable<bool> applyRCTSelections{"applyRCTSelections", true, "decide to apply RCT selections"};
+    Configurable<bool> applyRCTSelectionsCharged{"applyRCTSelectionsCharged", true, "decide to apply RCT selections"};
+    Configurable<bool> applyRCTSelectionsFull{"applyRCTSelectionsFull", true, "decide to apply RCT selections to full analyses"};
     Configurable<bool> performTrackSelection{"performTrackSelection", true, "only save tracks that pass one of the track selections"};
     Configurable<float> trackPtSelectionMin{"trackPtSelectionMin", 0.15, "only save tracks that have a pT larger than this pT"};
     Configurable<float> trackEtaSelectionMax{"trackEtaSelectionMax", 0.9, "only save tracks that have an eta smaller than this eta"};
@@ -105,11 +107,13 @@ struct JetDerivedDataSelector {
 
   TRandom3 randomNumber;
 
-  std::vector<int> eventSelectionBits;
+  std::vector<int> eventSelectionBitsCharged;
+  std::vector<int> eventSelectionBitsFull;
   std::vector<int> triggerMaskBits;
   void init(InitContext&)
   {
-    eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(config.eventSelections));
+    eventSelectionBitsCharged = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(config.eventSelectionsCharged));
+    eventSelectionBitsFull = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(config.eventSelectionsFull));
     randomNumber.SetSeed(0);
     triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(config.triggerMasks);
   }
@@ -195,7 +199,20 @@ struct JetDerivedDataSelector {
 
   void processDoCollisionSelections(aod::JetCollision const& collision)
   { // can also add event selection like sel8 but goes a little against the derived data idea
-    if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, config.skipMBGapEvents, config.applyRCTSelections) || collision.centFT0M() < config.centralityMin || collision.centFT0M() >= config.centralityMax || collision.trackOccupancyInTimeRange() > config.trackOccupancyInTimeRangeMax || std::abs(collision.posZ()) > config.vertexZCut) {
+    if (collision.centFT0M() < config.centralityMin || collision.centFT0M() >= config.centralityMax || collision.trackOccupancyInTimeRange() > config.trackOccupancyInTimeRangeMax || std::abs(collision.posZ()) > config.vertexZCut) {
+      collisionFlag[collision.globalIndex()] = false;
+    }
+    bool barrelRCTFlagSelection = false;
+    bool emcalRCTFlagSelection = false;
+    if (jetderiveddatautilities::selectCollision(collision, eventSelectionBitsCharged, config.skipMBGapEvents, config.applyRCTSelectionsCharged)) {
+      barrelRCTFlagSelection = true;
+    }
+    if (doprocessSelectingNeutralJets || doprocessSelectingNeutralMCDJets || doprocessSelectingNeutralMCPJets || doprocessSelectingFullJets || doprocessSelectingFullMCDJets || doprocessSelectingFullMCPJets || doprocessSelectingClusters) {
+      if (jetderiveddatautilities::selectCollision(collision, eventSelectionBitsFull, config.skipMBGapEvents, config.applyRCTSelectionsFull, "CBT_calo")) {
+        emcalRCTFlagSelection = true;
+      }
+    }
+    if (!barrelRCTFlagSelection && !emcalRCTFlagSelection) {
       collisionFlag[collision.globalIndex()] = false;
     }
   }