@@ -91,6 +91,7 @@ enum EventSelectionFlags {
9191};
9292
9393DECLARE_SOA_BITMAP_COLUMN (Selection, selection, 32 ); // ! Bitmask of selection flags
94+ DECLARE_SOA_DYNAMIC_COLUMN (Sel8, sel8, [](uint32_t selection_bit) -> bool { return (selection_bit & BIT (o2::aod::emevsel::kIsTriggerTVX )) && (selection_bit & BIT (o2::aod::emevsel::kNoTimeFrameBorder )) && (selection_bit & BIT (o2::aod::emevsel::kNoITSROFrameBorder )); });
9495
9596template <typename TBC>
9697uint32_t reduceSelectionBit (TBC const & bc)
@@ -230,7 +231,7 @@ DECLARE_SOA_COLUMN(CentFT0Auint8, centFT0Auint8, uint8_t); //! this is onl
230231
231232DECLARE_SOA_DYNAMIC_COLUMN (PosZ, posZ, [](int16_t posZint16) -> float { return (posZint16 < 0 ? std::nextafter (posZint16 * 0 .01f , -std::numeric_limits<float >::infinity ()) : std::nextafter (posZint16 * 0 .01f , std::numeric_limits<float >::infinity ())); }); // ! poZ is multiplied by 100 in createEMEventDileton.cxx
232233DECLARE_SOA_DYNAMIC_COLUMN (CentFT0C, centFT0C, [](uint16_t centuint16) -> float { return std::nextafter (centuint16 * 0 .002f , std::numeric_limits<float >::infinity ()); }); // ! centrality is multiplied by 500 in createEMEventDilepton.cxx
233- DECLARE_SOA_DYNAMIC_COLUMN (Sel8, sel8, [](uint64_t selection_bit) -> bool { return (selection_bit & BIT (o2::aod::emevsel ::kIsTriggerTVX )) && (selection_bit & BIT (o2::aod::emevsel ::kNoTimeFrameBorder )) && (selection_bit & BIT (o2::aod::emevsel ::kNoITSROFrameBorder )); });
234+ DECLARE_SOA_DYNAMIC_COLUMN (Sel8, sel8, [](uint64_t selection_bit) -> bool { return (selection_bit & BIT (o2::aod::evsel ::kIsTriggerTVX )) && (selection_bit & BIT (o2::aod::evsel ::kNoTimeFrameBorder )) && (selection_bit & BIT (o2::aod::evsel ::kNoITSROFrameBorder )); });
234235DECLARE_SOA_DYNAMIC_COLUMN (EP2FT0M, ep2ft0m, [](float q2x, float q2y) -> float { return std::atan2 (q2y, q2x) / 2.0 ; });
235236DECLARE_SOA_DYNAMIC_COLUMN (EP2FT0A, ep2ft0a, [](float q2x, float q2y) -> float { return std::atan2 (q2y, q2x) / 2.0 ; });
236237DECLARE_SOA_DYNAMIC_COLUMN (EP2FT0C, ep2ft0c, [](float q2x, float q2y) -> float { return std::atan2 (q2y, q2x) / 2.0 ; });
@@ -318,7 +319,7 @@ DECLARE_SOA_TABLE_VERSIONED(EMEvents_004, "AOD", "EMEVENT", 4, //! Main event
318319DECLARE_SOA_TABLE_VERSIONED (EMEvents_005, " AOD" , " EMEVENT" , 5 , // ! Main event information table
319320 o2::soa::Index<>, emevent::CollisionId, bc::RunNumber, bc::GlobalBC, emevsel::Selection, evsel::Rct, timestamp::Timestamp,
320321 collision::PosZ,
321- collision::NumContrib, evsel::NumTracksInTimeRange, evsel::SumAmpFT0CInTimeRange, emevent ::Sel8<emevsel::Selection>);
322+ collision::NumContrib, evsel::NumTracksInTimeRange, evsel::SumAmpFT0CInTimeRange, emevsel ::Sel8<emevsel::Selection>);
322323
323324using EMEvents = EMEvents_005;
324325using EMEvent = EMEvents::iterator;
@@ -497,7 +498,7 @@ DECLARE_SOA_TABLE_VERSIONED(EMEventNormInfos_001, "AOD", "EMEVENTNORMINFO", 1, /
497498
498499DECLARE_SOA_TABLE_VERSIONED (EMEventNormInfos_002, " AOD" , " EMEVENTNORMINFO" , 2 , // ! event information for normalization
499500 emevsel::Selection, evsel::Rct, emevent::PosZint8, emevent::CentFT0Muint8, emevent::CentFT0Cuint8, emevent::CentNTPVuint8, /* emevent::CentNGlobaluint8,*/
500- emevent ::Sel8<emevsel::Selection>, emeventnorm::PosZ<emevent::PosZint8>, emeventnorm::CentFT0M<emevent::CentFT0Muint8>, emeventnorm::CentFT0C<emevent::CentFT0Cuint8>, emeventnorm::CentNTPV<emevent::CentNTPVuint8>, /* emeventnorm::CentNTPV<emevent::CentNGlobaluint8>,*/ o2::soa::Marker<1 >);
501+ emevsel ::Sel8<emevsel::Selection>, emeventnorm::PosZ<emevent::PosZint8>, emeventnorm::CentFT0M<emevent::CentFT0Muint8>, emeventnorm::CentFT0C<emevent::CentFT0Cuint8>, emeventnorm::CentNTPV<emevent::CentNTPVuint8>, /* emeventnorm::CentNTPV<emevent::CentNGlobaluint8>,*/ o2::soa::Marker<1 >);
501502
502503using EMEventNormInfos = EMEventNormInfos_002;
503504using EMEventNormInfo = EMEventNormInfos::iterator;
@@ -1160,7 +1161,7 @@ using EMThinEvent = EMThinEvents::iterator;
11601161
11611162DECLARE_SOA_TABLE_VERSIONED (EMThinEventNormInfos_000, " AOD" , " EMTHINEVENTNORM" , 0 , // ! event information for normalization
11621163 o2::soa::Index<>, emevsel::Selection, evsel::Rct, emevent::PosZint8, emevent::CentFT0Muint8, emevent::CentFT0Cuint8, emevent::CentNTPVuint8, /* emevent::CentNGlobaluint8,*/
1163- emevent ::Sel8<emevsel::Selection>, emeventnorm::PosZ<emevent::PosZint8>, emeventnorm::CentFT0M<emevent::CentFT0Muint8>, emeventnorm::CentFT0C<emevent::CentFT0Cuint8>, emeventnorm::CentNTPV<emevent::CentNTPVuint8>, /* emeventnorm::CentNGlobal<emevent::CentNGlobaluint8>,*/ o2::soa::Marker<2 >);
1164+ emevsel ::Sel8<emevsel::Selection>, emeventnorm::PosZ<emevent::PosZint8>, emeventnorm::CentFT0M<emevent::CentFT0Muint8>, emeventnorm::CentFT0C<emevent::CentFT0Cuint8>, emeventnorm::CentNTPV<emevent::CentNTPVuint8>, /* emeventnorm::CentNGlobal<emevent::CentNGlobaluint8>,*/ o2::soa::Marker<2 >);
11641165using EMThinEventNormInfos = EMThinEventNormInfos_000;
11651166using EMThinEventNormInfo = EMThinEventNormInfos::iterator;
11661167
0 commit comments