@@ -131,16 +131,16 @@ class PairTrackTrackBuilder
131131 void processSameEvent (T1 const & col, T2& trackTable, T3& partition1, T4& partition2, T5& cache)
132132 {
133133 if (mSameSpecies ) {
134- auto trackSlice1 = partition1->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
134+ auto trackSlice1 = partition1->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
135135 if (trackSlice1.size () == 0 ) {
136136 return ;
137137 }
138138 mColHistManager .fill (col);
139139 mCprSe .setMagField (col.magField ());
140140 pairprocesshelpers::processSameEvent (trackSlice1, trackTable, mTrackHistManager1 , mPairHistManagerSe , mCprSe , mRng , mMixIdenticalParticles );
141141 } else {
142- auto trackSlice1 = partition1->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
143- auto trackSlice2 = partition2->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
142+ auto trackSlice1 = partition1->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
143+ auto trackSlice2 = partition2->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
144144 if (trackSlice1.size () == 0 || trackSlice2.size () == 0 ) {
145145 return ;
146146 }
@@ -299,16 +299,16 @@ class PairV0V0Builder
299299 void processSameEvent (T1 const & col, T2& trackTable, T3& /* lambdaTable*/ , T4& partition1, T5& partition2, T6& cache)
300300 {
301301 if (mSameSpecies ) {
302- auto v0Slice1 = partition1->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
302+ auto v0Slice1 = partition1->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
303303 if (v0Slice1.size () == 0 ) {
304304 return ;
305305 }
306306 mColHistManager .fill (col);
307307 mCprSe .setMagField (col.magField ());
308308 pairprocesshelpers::processSameEvent (v0Slice1, trackTable, mV0HistManager1 , mPairHistManagerSe , mCprSe , mRng , mMixIdenticalParticles );
309309 } else {
310- auto v0Slice1 = partition1->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
311- auto v0Slice2 = partition2->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
310+ auto v0Slice1 = partition1->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
311+ auto v0Slice2 = partition2->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
312312 if (v0Slice1.size () == 0 || v0Slice2.size () == 0 ) {
313313 return ;
314314 }
@@ -433,8 +433,8 @@ class PairTrackV0Builder
433433 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
434434 void processSameEvent (T1 const & col, T2& trackTable, T3& trackPartition, T4& /* v0table*/ , T5& v0Partition, T6& cache)
435435 {
436- auto trackSlice = trackPartition->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
437- auto v0Slice = v0Partition->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
436+ auto trackSlice = trackPartition->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
437+ auto v0Slice = v0Partition->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
438438 if (trackSlice.size () == 0 || v0Slice.size () == 0 ) {
439439 return ;
440440 }
@@ -538,8 +538,8 @@ class PairTrackTwoTrackResonanceBuilder
538538 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
539539 void processSameEvent (T1 const & col, T2& trackTable, T3& trackPartition, T4& /* resonanceTable*/ , T5& resonancePartition, T6& cache)
540540 {
541- auto trackSlice = trackPartition->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
542- auto v0Slice = resonancePartition->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
541+ auto trackSlice = trackPartition->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
542+ auto v0Slice = resonancePartition->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
543543 if (trackSlice.size () == 0 || v0Slice.size () == 0 ) {
544544 return ;
545545 }
@@ -624,12 +624,12 @@ class PairTrackKinkBuilder
624624
625625 mPairHistManagerSe .init (registry, pairHistSpec);
626626 mPairHistManagerSe .setMass (confTrackSelection.pdgCode .value , confKinkSelection.pdgCode .value );
627- mPairHistManagerSe .setCharge (confTrackSelection.chargeAbs .value , confKinkSelection. sign . value );
627+ mPairHistManagerSe .setCharge (confTrackSelection.chargeAbs .value , 1 ); // abs charge of kink daughter is always 1
628628 mCprSe .init (registry, cprHistSpec, confCpr.detaMax .value , confCpr.dphistarMax .value , confTrackSelection.chargeAbs .value , confCpr.on .value );
629629
630630 mPairHistManagerMe .init (registry, pairHistSpec);
631631 mPairHistManagerMe .setMass (confTrackSelection.pdgCode .value , confKinkSelection.pdgCode .value );
632- mPairHistManagerMe .setCharge (confTrackSelection.chargeAbs .value , confKinkSelection. sign . value );
632+ mPairHistManagerMe .setCharge (confTrackSelection.chargeAbs .value , 1 ); // abs charge of kink daughter is always 1
633633 mCprMe .init (registry, cprHistSpec, confCpr.detaMax .value , confCpr.dphistarMax .value , confTrackSelection.chargeAbs .value , confCpr.on .value );
634634
635635 // setup mixing
@@ -640,8 +640,8 @@ class PairTrackKinkBuilder
640640 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
641641 void processSameEvent (T1 const & col, T2& trackTable, T3& trackPartition, T4& /* kinktable*/ , T5& kinkPartition, T6& cache)
642642 {
643- auto trackSlice = trackPartition->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
644- auto kinkSlice = kinkPartition->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
643+ auto trackSlice = trackPartition->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
644+ auto kinkSlice = kinkPartition->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
645645 if (trackSlice.size () == 0 || kinkSlice.size () == 0 ) {
646646 return ;
647647 }
@@ -732,12 +732,12 @@ class PairTrackCascadeBuilder
732732
733733 mPairHistManagerSe .init (registry, pairHistSpec);
734734 mPairHistManagerSe .setMass (confTrackSelection.pdgCode .value , confCascadeSelection.pdgCode .value );
735- mPairHistManagerSe .setCharge (confTrackSelection.chargeAbs .value , confCascadeSelection. sign . value );
735+ mPairHistManagerSe .setCharge (confTrackSelection.chargeAbs .value , 1 );
736736 mCprSe .init (registry, cprHistSpec, confCpr.detaMax .value , confCpr.dphistarMax .value , confTrackSelection.chargeAbs .value , confCpr.on .value );
737737
738738 mPairHistManagerMe .init (registry, pairHistSpec);
739739 mPairHistManagerMe .setMass (confTrackSelection.pdgCode .value , confCascadeSelection.pdgCode .value );
740- mPairHistManagerMe .setCharge (confTrackSelection.chargeAbs .value , confCascadeSelection. sign . value );
740+ mPairHistManagerMe .setCharge (confTrackSelection.chargeAbs .value , 1 );
741741 mCprMe .init (registry, cprHistSpec, confCpr.detaMax .value , confCpr.dphistarMax .value , confTrackSelection.chargeAbs .value , confCpr.on .value );
742742
743743 // setup mixing
@@ -748,8 +748,8 @@ class PairTrackCascadeBuilder
748748 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
749749 void processSameEvent (T1 const & col, T2& trackTable, T3& trackPartition, T4& /* cascadeTable*/ , T5& v0Partition, T6& cache)
750750 {
751- auto trackSlice = trackPartition->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
752- auto v0Slice = v0Partition->sliceByCached (o2::aod::femtobase::stored::collisionId , col.globalIndex (), cache);
751+ auto trackSlice = trackPartition->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
752+ auto v0Slice = v0Partition->sliceByCached (o2::aod::femtobase::stored::fColId , col.globalIndex (), cache);
753753 if (trackSlice.size () == 0 || v0Slice.size () == 0 ) {
754754 return ;
755755 }
0 commit comments