@@ -102,7 +102,6 @@ struct HfCandidateCreatorCascade {
102102 double bz = 0 .;
103103
104104 using V0full = soa::Join<aod::V0Datas, aod::V0Covs>;
105- using V0fCfull = soa::Join<aod::V0fCDatas, aod::V0fCCovs>;
106105
107106 std::shared_ptr<TH1> hCandidates;
108107 HistogramRegistry registry{" registry" };
@@ -169,7 +168,6 @@ struct HfCandidateCreatorCascade {
169168 aod::HfCascades const & rowsTrackIndexCasc,
170169 aod::V0sLinked const &,
171170 V0full const &,
172- V0fCfull const &,
173171 aod::TracksWCov const &,
174172 aod::BCsWithTimestamps const & /* bcWithTimeStamps*/ )
175173 {
@@ -224,42 +222,14 @@ struct HfCandidateCreatorCascade {
224222 dcaNegToPV = v0row.dcanegtopv ();
225223 v0cosPA = v0row.v0cosPA ();
226224
225+ int momIndSize = 6 ;
227226 constexpr int MomInd[6 ] = {9 , 13 , 14 , 18 , 19 , 20 }; // cov matrix elements for momentum component
228- for (int i = 0 ; i < 6 ; i++) {
229- covV[MomInd[i]] = v0row.momentumCovMat ()[i];
230- covV[i] = v0row.positionCovMat ()[i];
231- }
232- } else if (v0index.has_v0fCData ()) {
233- // this V0 passes only V0-for-cascade selections, use that instead
234- auto v0row = v0index.template v0fCData_as <V0fCfull>();
235- const auto & trackV0DaughPos = v0row.posTrack_as <aod::TracksWCov>();
236- const auto & trackV0DaughNeg = v0row.negTrack_as <aod::TracksWCov>();
237- posGlobalIndex = trackV0DaughPos.globalIndex ();
238- negGlobalIndex = trackV0DaughNeg.globalIndex ();
239- v0X = v0row.x ();
240- v0Y = v0row.y ();
241- v0Z = v0row.z ();
242- v0px = v0row.px ();
243- v0py = v0row.py ();
244- v0pz = v0row.pz ();
245- v0PosPx = v0row.pxpos ();
246- v0PosPy = v0row.pypos ();
247- v0PosPz = v0row.pzpos ();
248- v0NegPx = v0row.pxneg ();
249- v0NegPy = v0row.pyneg ();
250- v0NegPz = v0row.pzneg ();
251- dcaV0dau = v0row.dcaV0daughters ();
252- dcaPosToPV = v0row.dcapostopv ();
253- dcaNegToPV = v0row.dcanegtopv ();
254- v0cosPA = v0row.v0cosPA ();
255-
256- constexpr int MomInd[6 ] = {9 , 13 , 14 , 18 , 19 , 20 }; // cov matrix elements for momentum component
257- for (int i = 0 ; i < 6 ; i++) {
227+ for (int i = 0 ; i < momIndSize; i++) {
258228 covV[MomInd[i]] = v0row.momentumCovMat ()[i];
259229 covV[i] = v0row.positionCovMat ()[i];
260230 }
261231 } else {
262- LOGF (warning, " V0Data/V0fCData not there for V0 %d in HF cascade %d. Skipping candidate." , casc.v0Id (), casc.globalIndex ());
232+ LOGF (warning, " V0Data not there for V0 %d in HF cascade %d. Skipping candidate." , casc.v0Id (), casc.globalIndex ());
263233 continue ; // this was inadequately linked, should not happen
264234 }
265235
@@ -363,11 +333,10 @@ struct HfCandidateCreatorCascade {
363333 aod::HfCascades const & rowsTrackIndexCasc,
364334 aod::V0sLinked const & v0sLinked,
365335 V0full const & v0Full,
366- V0fCfull const & v0fcFull,
367336 aod::TracksWCov const & tracks,
368337 aod::BCsWithTimestamps const & bcs)
369338 {
370- runCreatorCascade<CentralityEstimator::None>(collisions, rowsTrackIndexCasc, v0sLinked, v0Full, v0fcFull, tracks, bcs);
339+ runCreatorCascade<CentralityEstimator::None>(collisions, rowsTrackIndexCasc, v0sLinked, v0Full, tracks, bcs);
371340 }
372341 PROCESS_SWITCH (HfCandidateCreatorCascade, processNoCent, " Run candidate creator w/o centrality selections" , true );
373342
@@ -376,11 +345,10 @@ struct HfCandidateCreatorCascade {
376345 aod::HfCascades const & rowsTrackIndexCasc,
377346 aod::V0sLinked const & v0sLinked,
378347 V0full const & v0Full,
379- V0fCfull const & v0fcFull,
380348 aod::TracksWCov const & tracks,
381349 aod::BCsWithTimestamps const & bcs)
382350 {
383- runCreatorCascade<CentralityEstimator::FT0C>(collisions, rowsTrackIndexCasc, v0sLinked, v0Full, v0fcFull, tracks, bcs);
351+ runCreatorCascade<CentralityEstimator::FT0C>(collisions, rowsTrackIndexCasc, v0sLinked, v0Full, tracks, bcs);
384352 }
385353 PROCESS_SWITCH (HfCandidateCreatorCascade, processCentFT0C, " Run candidate creator w/ centrality selection on FT0C" , false );
386354
@@ -389,11 +357,10 @@ struct HfCandidateCreatorCascade {
389357 aod::HfCascades const & rowsTrackIndexCasc,
390358 aod::V0sLinked const & v0sLinked,
391359 V0full const & v0Full,
392- V0fCfull const & v0fcFull,
393360 aod::TracksWCov const & tracks,
394361 aod::BCsWithTimestamps const & bcs)
395362 {
396- runCreatorCascade<CentralityEstimator::FT0M>(collisions, rowsTrackIndexCasc, v0sLinked, v0Full, v0fcFull, tracks, bcs);
363+ runCreatorCascade<CentralityEstimator::FT0M>(collisions, rowsTrackIndexCasc, v0sLinked, v0Full, tracks, bcs);
397364 }
398365 PROCESS_SWITCH (HfCandidateCreatorCascade, processCentFT0M, " Run candidate creator w/ centrality selection on FT0M" , false );
399366
0 commit comments