Skip to content

Commit 95de5ca

Browse files
sigurdnesesigurdnese
committed
Fill FIT info from reduced table in FillEvent and make use of it in analysis
1 parent c8bfd76 commit 95de5ca

File tree

2 files changed

+45
-8
lines changed

2 files changed

+45
-8
lines changed

‎PWGDQ/Core/VarManager.h‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,6 +2106,35 @@ void VarManager::FillEvent(T const& event, float* values)
21062106
FillZDC(event, values);
21072107
}
21082108

2109+
if constexpr ((fillMap & ReducedFit) > 0) {
2110+
values[kAmplitudeFT0A] = event.amplitudeFT0A();
2111+
values[kAmplitudeFT0C] = event.amplitudeFT0C();
2112+
values[kTimeFT0A] = event.timeFT0A();
2113+
values[kTimeFT0C] = event.timeFT0C();
2114+
values[kTriggerMaskFT0] = event.triggerMaskFT0();
2115+
values[kNFiredChannelsFT0A] = event.nFiredChannelsFT0A();
2116+
values[kNFiredChannelsFT0C] = event.nFiredChannelsFT0C();
2117+
values[kAmplitudeFDDA] = event.amplitudeFDDA();
2118+
values[kAmplitudeFDDC] = event.amplitudeFDDC();
2119+
values[kTimeFDDA] = event.timeFDDA();
2120+
values[kTimeFDDC] = event.timeFDDC();
2121+
values[kTriggerMaskFDD] = event.triggerMaskFDD();
2122+
values[kAmplitudeFV0A] = event.amplitudeFV0A();
2123+
values[kTimeFV0A] = event.timeFV0A();
2124+
values[kTriggerMaskFV0A] = event.triggerMaskFV0A();
2125+
values[kNFiredChannelsFV0A] = event.nFiredChannelsFV0A();
2126+
values[kBBFT0Apf] = event.bbFT0Apf();
2127+
values[kBGFT0Apf] = event.bgFT0Apf();
2128+
values[kBBFT0Cpf] = event.bbFT0Cpf();
2129+
values[kBGFT0Cpf] = event.bgFT0Cpf();
2130+
values[kBBFV0Apf] = event.bbFV0Apf();
2131+
values[kBGFV0Apf] = event.bgFV0Apf();
2132+
values[kBBFDDApf] = event.bbFDDApf();
2133+
values[kBGFDDApf] = event.bgFDDApf();
2134+
values[kBBFDDCpf] = event.bbFDDCpf();
2135+
values[kBGFDDCpf] = event.bgFDDCpf();
2136+
}
2137+
21092138
// FillEventDerived(values);
21102139
}
21112140

‎PWGDQ/Tasks/tableReader_withAssoc.cxx‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ using MyEventsMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtend
196196
using MyEventsMultExtraQVector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsQvectorCentr, aod::ReducedEventsQvectorCentrExtra>;
197197
using MyEventsZdc = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedZdcs>;
198198
using MyEventsMultExtraZdc = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedZdcs>;
199+
using MyEventsMultExtraZdcFit = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedZdcs, aod::ReducedFITs>;
199200
using MyEventsSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::EventCuts>;
200201
using MyEventsMultExtraSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::EventCuts>;
201202
using MyEventsVtxCovSelectedMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll>;
@@ -204,8 +205,8 @@ using MyEventsVtxCov = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended,
204205
using MyEventsVtxCovSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts>;
205206
using MyEventsVtxCovSelectedQvector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsQvectorCentr, aod::ReducedEventsQvectorCentrExtra>;
206207
using MyEventsVtxCovSelectedQvectorWithHash = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsQvectorCentr, aod::ReducedEventsQvectorCentrExtra, aod::MixingHashes>;
207-
using MyEventsVtxCovZdcSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedZdcs, aod::EventCuts>;
208-
using MyEventsVtxCovZdcSelectedMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedZdcs, aod::EventCuts, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll>;
208+
using MyEventsVtxCovZdcSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedZdcs, aod::ReducedFITs, aod::EventCuts>;
209+
using MyEventsVtxCovZdcFitSelectedMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedZdcs, aod::ReducedFITs, aod::EventCuts, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll>;
209210
using MyEventsQvector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsQvector>;
210211
using MyEventsHashSelectedQvector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::EventCuts, aod::MixingHashes, aod::ReducedEventsQvector>;
211212
using MyEventsQvectorCentr = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsQvectorCentr, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll>;
@@ -235,7 +236,8 @@ constexpr static uint32_t gkEventFillMapWithMultExtra = VarManager::ObjTypes::Re
235236
// New fillmap
236237
constexpr static uint32_t gkEventFillMapWithMultExtraWithQVector = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventMultExtra | VarManager::ObjTypes::CollisionQvect;
237238
constexpr static uint32_t gkEventFillMapWithMultExtraZdc = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventMultExtra | VarManager::ReducedZdc;
238-
constexpr static uint32_t gkEventFillMapWithCovZdcMultExtra = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ReducedZdc | VarManager::ReducedEventMultExtra;
239+
constexpr static uint32_t gkEventFillMapWithMultExtraZdcFit = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventMultExtra | VarManager::ReducedZdc | VarManager::ReducedFit;
240+
constexpr static uint32_t gkEventFillMapWithCovZdcFitMultExtra = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ReducedZdc | VarManager::ReducedFit | VarManager::ReducedEventMultExtra;
239241
constexpr static uint32_t gkEventFillMapWithQvectorCentr = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::CollisionQvect | VarManager::ObjTypes::ReducedEventMultExtra;
240242
// constexpr static uint32_t gkEventFillMapWithQvector = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventQvector;
241243
// constexpr static uint32_t gkEventFillMapWithCovQvector = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ObjTypes::ReducedEventQvector;
@@ -302,7 +304,7 @@ struct AnalysisEventSelection {
302304
void init(o2::framework::InitContext& context)
303305
{
304306

305-
bool isAnyProcessEnabled = context.mOptions.get<bool>("processSkimmed") || context.mOptions.get<bool>("processSkimmedWithZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtra") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdc") || context.mOptions.get<bool>("processSkimmedWithQvectorCentr");
307+
bool isAnyProcessEnabled = context.mOptions.get<bool>("processSkimmed") || context.mOptions.get<bool>("processSkimmedWithZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtra") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdcFit") || context.mOptions.get<bool>("processSkimmedWithQvectorCentr");
306308
bool isDummyEnabled = context.mOptions.get<bool>("processDummy");
307309

308310
if (isDummyEnabled) {
@@ -538,6 +540,11 @@ struct AnalysisEventSelection {
538540
runEventSelection<gkEventFillMapWithMultExtraZdc>(events);
539541
publishSelections<gkEventFillMapWithMultExtraZdc>(events);
540542
}
543+
void processSkimmedWithMultExtraZdcFit(MyEventsMultExtraZdcFit const& events)
544+
{
545+
runEventSelection<gkEventFillMapWithMultExtraZdcFit>(events);
546+
publishSelections<gkEventFillMapWithMultExtraZdcFit>(events);
547+
}
541548
void processSkimmedWithQvectorCentr(MyEventsQvectorCentr const& events)
542549
{
543550
runEventSelection<gkEventFillMapWithQvectorCentr>(events);
@@ -552,6 +559,7 @@ struct AnalysisEventSelection {
552559
PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithZdc, "Run event selection on DQ skimmed events, with ZDC", false);
553560
PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithMultExtra, "Run event selection on DQ skimmed events, with mult extra", false);
554561
PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithMultExtraZdc, "Run event selection on DQ skimmed events, with mult extra and ZDC", false);
562+
PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithMultExtraZdcFit, "Run event selection on DQ skimmed events, with mult extra, ZDC and FIT", false);
555563
PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithQvectorCentr, "Run event selection on DQ skimmed events, with Q-vector", false);
556564
PROCESS_SWITCH(AnalysisEventSelection, processDummy, "Dummy function", true);
557565
};
@@ -3042,11 +3050,11 @@ struct AnalysisAsymmetricPairing {
30423050
runAsymmetricPairing<true, VarManager::kDecayToKPi, gkEventFillMapWithCovZdc, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
30433051
}
30443052

3045-
void processKaonPionSkimmedMultExtra(MyEventsVtxCovZdcSelectedMultExtra const& events,
3053+
void processKaonPionSkimmedMultExtra(MyEventsVtxCovZdcFitSelectedMultExtra const& events,
30463054
soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts> const& barrelAssocs,
30473055
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
30483056
{
3049-
runAsymmetricPairing<true, VarManager::kDecayToKPi, gkEventFillMapWithCovZdcMultExtra, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
3057+
runAsymmetricPairing<true, VarManager::kDecayToKPi, gkEventFillMapWithCovZdcFitMultExtra, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
30503058
}
30513059

30523060
void processKaonPionPionSkimmed(MyEventsVtxCovZdcSelected const& events,
@@ -3056,11 +3064,11 @@ struct AnalysisAsymmetricPairing {
30563064
runThreeProng<true, gkEventFillMapWithCovZdc, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToKPiPi);
30573065
}
30583066

3059-
void processKaonPionPionSkimmedMultExtra(MyEventsVtxCovZdcSelectedMultExtra const& events,
3067+
void processKaonPionPionSkimmedMultExtra(MyEventsVtxCovZdcFitSelectedMultExtra const& events,
30603068
soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts> const& barrelAssocs,
30613069
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
30623070
{
3063-
runThreeProng<true, gkEventFillMapWithCovZdcMultExtra, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToKPiPi);
3071+
runThreeProng<true, gkEventFillMapWithCovZdcFitMultExtra, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToKPiPi);
30643072
}
30653073

30663074
void processProtonKaonPionSkimmed(MyEventsVtxCovZdcSelected const& events,

0 commit comments

Comments
 (0)