@@ -259,18 +259,20 @@ struct LongrangecorrDerived {
259259 template <CorrelationContainer::CFStep step, typename TTarget, typename TTriggers, typename TAssocs>
260260 void fillCorrHist (TTarget target, TTriggers const & triggers, TAssocs const & assocs, bool mixing, float vz, float multiplicity, float eventWeight)
261261 {
262- auto trigAmpl = 1 .0f ;
263262 for (auto const & triggerTrack : triggers) {
263+ auto trigAmpl = 1 .0f ;
264+ if constexpr (std::experimental::is_detected<HasFt0, typename TTriggers::iterator>::value) {
265+ trigAmpl = triggerTrack.gainAmplitude ();
266+ } else {
267+ trigAmpl = 1.0 ;
268+ }
264269 if constexpr (std::experimental::is_detected<HasTpcTrack, typename TTriggers::iterator>::value) {
265270 if (cfgPidMask != 0 && (cfgPidMask & (1u << static_cast <uint32_t >(triggerTrack.trackType ()))) == 0u )
266271 continue ;
267272 } else if constexpr (std::experimental::is_detected<HasV0Track, typename TTriggers::iterator>::value) {
268273 if (cfgV0Mask != 0 && (cfgV0Mask & (1u << static_cast <uint32_t >(triggerTrack.v0Type ()))) == 0u )
269274 continue ;
270275 }
271- if constexpr (std::experimental::is_detected<HasFt0, typename TTriggers::iterator>::value) {
272- trigAmpl *= triggerTrack.gainAmplitude ();
273- }
274276 if (!mixing) {
275277 fillTrigTrackQA (triggerTrack);
276278 if constexpr (std::experimental::is_detected<HasFt0, typename TTriggers::iterator>::value) {
@@ -281,10 +283,12 @@ struct LongrangecorrDerived {
281283 histos.fill (HIST (" Trig_hist" ), vz, multiplicity, triggerTrack.pt (), 1.0 , eventWeight * trigAmpl);
282284 }
283285 }
284- auto assoAmpl = 1 .0f ;
285286 for (auto const & assoTrack : assocs) {
287+ auto assoAmpl = 1 .0f ;
286288 if constexpr (std::experimental::is_detected<HasFt0, typename TAssocs::iterator>::value) {
287- assoAmpl *= assoTrack.gainAmplitude ();
289+ assoAmpl = assoTrack.gainAmplitude ();
290+ } else {
291+ assoAmpl = 1 .0f ;
288292 }
289293 float deltaPhi = RecoDecay::constrainAngle (triggerTrack.phi () - assoTrack.phi (), -PIHalf);
290294 float deltaEta = triggerTrack.eta () - assoTrack.eta ();
@@ -294,7 +298,6 @@ struct LongrangecorrDerived {
294298 } else {
295299 histos.fill (HIST (" deltaEta_deltaPhi_mixed" ), deltaPhi, deltaEta, eventWeight * trigAmpl * assoAmpl);
296300 }
297-
298301 if constexpr (std::experimental::is_detected<HasFt0, typename TTriggers::iterator>::value) {
299302 target->getPairHist ()->Fill (step, vz, multiplicity, 1.0 , 1.0 , deltaPhi, deltaEta, 1.0 , eventWeight * trigAmpl * assoAmpl);
300303 } else if constexpr (std::experimental::is_detected<HasInvMass, typename TTriggers::iterator>::value) {
0 commit comments