adding upc selections

Author: nzardosh

PWGJE/Core/FastJetUtilities.h

@@ -17,6 +17,8 @@
 #ifndef PWGJE_CORE_FASTJETUTILITIES_H_
 #define PWGJE_CORE_FASTJETUTILITIES_H_
 
+#include <CommonConstants/PhysicsConstants.h>
+
 #include <fastjet/PseudoJet.hh>
 
 #include <cmath>
@@ -31,8 +33,6 @@ enum class JetConstituentStatus {
 namespace fastjetutilities
 {
 
-static constexpr float mPion = 0.139; // TDatabasePDG::Instance()->GetParticle(211)->Mass(); //can be removed when pion mass becomes default for unidentified tracks
-
 // Class defined to store additional info which is passed to the FastJet object
 class fastjet_user_info : public fastjet::PseudoJet::UserInfoBase
 {
@@ -78,7 +78,7 @@ void setFastJetUserInfo(std::vector<fastjet::PseudoJet>& constituents, int index
  */
 
 template <typename T>
-void fillTracks(const T& constituent, std::vector<fastjet::PseudoJet>& constituents, int index = -99999999, int status = static_cast<int>(JetConstituentStatus::track), float mass = mPion)
+void fillTracks(const T& constituent, std::vector<fastjet::PseudoJet>& constituents, int index = -99999999, int status = static_cast<int>(JetConstituentStatus::track), float mass = o2::constants::physics::MassPiPlus)
 {
   if (status == static_cast<int>(JetConstituentStatus::track) || status == static_cast<int>(JetConstituentStatus::candidate)) {
     // auto p = std::sqrt((constituent.px() * constituent.px()) + (constituent.py() * constituent.py()) + (constituent.pz() * constituent.pz()));

PWGJE/Core/JetDerivedDataUtilities.h

@@ -17,10 +17,14 @@
 #ifndef PWGJE_CORE_JETDERIVEDDATAUTILITIES_H_
 #define PWGJE_CORE_JETDERIVEDDATAUTILITIES_H_
 
+#include "PWGUD/Core/SGSelector.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/RCTSelectionFlags.h"
 #include "Common/CCDB/TriggerAliases.h"
 
+#include <CommonConstants/PhysicsConstants.h>
+
 #include <Rtypes.h>
 
 #include <array>
@@ -33,7 +37,7 @@
 namespace jetderiveddatautilities
 {
 
-static constexpr float mPion = 0.139; // TDatabasePDG::Instance()->GetParticle(211)->Mass(); //can be removed when pion mass becomes default for unidentified tracks
+static constexpr float mPion = o2::constants::physics::MassPiPlus; // TDatabasePDG::Instance()->GetParticle(211)->Mass(); //can be removed when pion mass becomes default for unidentified tracks
 
 enum JCollisionSel {
   sel8 = 0,
@@ -45,7 +49,10 @@ enum JCollisionSel {
   selNoSameBunchPileup = 6,
   selIsGoodZvtxFT0vsPV = 7,
   selNoCollInTimeRangeStandard = 8,
-  selNoCollInRofStandard = 9
+  selNoCollInRofStandard = 9,
+  selUpcSingleGapA = 10,
+  selUpcSingleGapC = 11,
+  selUpcDoubleGap = 12,
 };
 
 enum JCollisionSubGeneratorId {
@@ -169,11 +176,21 @@ std::vector<int> initialiseEventSelectionBits(const std::string& eventSelectionM
     eventSelectionMaskBits.push_back(JCollisionSel::sel7);
     eventSelectionMaskBits.push_back(JCollisionSel::selKINT7);
   }
+  if (eventSelectionMasksContainSelection(eventSelectionMasks, "selUPCSingleGapA")) {
+    eventSelectionMaskBits.push_back(JCollisionSel::selUpcSingleGapA);
+  }
+  if (eventSelectionMasksContainSelection(eventSelectionMasks, "selUPCSingleGapC")) {
+    eventSelectionMaskBits.push_back(JCollisionSel::selUpcSingleGapC);
+  }
+  if (eventSelectionMasksContainSelection(eventSelectionMasks, "selUPCDoubleGap")) {
+    eventSelectionMaskBits.push_back(JCollisionSel::selUpcDoubleGap);
+  }
+
   return eventSelectionMaskBits;
 }
 
 template <typename T>
-uint16_t setEventSelectionBit(T const& collision)
+uint16_t setEventSelectionBit(T const& collision, int upcSelectionResult = o2::aod::sgselector::TrueGap::NoGap)
 {
   uint16_t bit = 0;
   if (collision.sel8()) {
@@ -206,6 +223,16 @@ uint16_t setEventSelectionBit(T const& collision)
   if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard)) {
     SETBIT(bit, JCollisionSel::selNoCollInRofStandard);
   }
+  if (upcSelectionResult == o2::aod::sgselector::SingleGapA) {
+    SETBIT(bit, JCollisionSel::selUpcSingleGapA);
+  }
+  if (upcSelectionResult == o2::aod::sgselector::SingleGapC) {
+    SETBIT(bit, JCollisionSel::selUpcSingleGapC);
+  }
+  if (upcSelectionResult == o2::aod::sgselector::DoubleGap) {
+    SETBIT(bit, JCollisionSel::selUpcDoubleGap);
+  }
+
   return bit;
 }
 

PWGJE/DataModel/JetReducedData.h

@@ -88,6 +88,11 @@ DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float);
 DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);
 DECLARE_SOA_COLUMN(CentFT0CVariant1, centFT0CVariant1, float);
 DECLARE_SOA_COLUMN(CentralityVariant1, centralityVariant1, float);
+DECLARE_SOA_COLUMN(AmplitudesFV0, amplitudesFV0, std::vector<float>);
+DECLARE_SOA_COLUMN(AmplitudesFT0A, amplitudesFT0A, std::vector<float>);
+DECLARE_SOA_COLUMN(AmplitudesFT0C, amplitudesFT0C, std::vector<float>);
+DECLARE_SOA_COLUMN(AmplitudesFDDA, amplitudesFDDA, std::vector<float>);
+DECLARE_SOA_COLUMN(AmplitudesFDDC, amplitudesFDDC, std::vector<float>);
 DECLARE_SOA_COLUMN(HadronicRate, hadronicRate, float);
 DECLARE_SOA_COLUMN(Weight, weight, float);
 DECLARE_SOA_COLUMN(GetSubGeneratorId, getSubGeneratorId, int);
@@ -134,6 +139,11 @@ DECLARE_SOA_TABLE_STAGED(JCollisions, "JCOLLISION",
                          jcollision::CentFT0C,
                          jcollision::CentFT0M,
                          jcollision::CentFT0CVariant1,
+                         jcollision::AmplitudesFV0,
+                         jcollision::AmplitudesFT0A,
+                         jcollision::AmplitudesFT0C,
+                         jcollision::AmplitudesFDDA,
+                         jcollision::AmplitudesFDDC,
                          jcollision::HadronicRate,
                          jcollision::TrackOccupancyInTimeRange,
                          jcollision::Alias,

PWGJE/TableProducer/CMakeLists.txt

@@ -15,7 +15,7 @@ if(FastJet_FOUND)
 
 o2physics_add_dpl_workflow(jet-deriveddata-producer
                     SOURCES derivedDataProducer.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils O2Physics::SGCutParHolder
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(jet-deriveddata-trigger-producer