@@ -260,12 +260,7 @@ struct FemtoDreamPairTaskCascadeCascade {
260260 const auto & posChild1 = parts.iteratorAt (casc.index () - 3 );
261261 const auto & negChild1 = parts.iteratorAt (casc.index () - 2 );
262262 const auto & bachChild1 = parts.iteratorAt (casc.index () - 1 );
263- // This is how it is supposed to work but there seems to be an issue
264- // with partitions and accessing elements in tables that have been declared
265- // with an SELF_INDEX column. Under investigation. Maybe need to change
266- // femtdream dataformat to take special care of v0 candidates
267- // auto posChild = v0.template children_as<S>().front();
268- // auto negChild = v0.template children_as<S>().back();
263+
269264 // check cuts on V0 children
270265 if (Cascade1.useChildCuts ) {
271266 if (!(((posChild1.cut () & Cascade1.childPosCutBit ) == Cascade1.childPosCutBit ) &&
@@ -291,12 +286,7 @@ struct FemtoDreamPairTaskCascadeCascade {
291286 const auto & posChild2 = parts.iteratorAt (casc.index () - 3 );
292287 const auto & negChild2 = parts.iteratorAt (casc.index () - 2 );
293288 const auto & bachChild2 = parts.iteratorAt (casc.index () - 1 );
294- // This is how it is supposed to work but there seems to be an issue
295- // with partitions and accessing elements in tables that have been declared
296- // with an SELF_INDEX column. Under investigation. Maybe need to change
297- // femtdream dataformat to take special care of v0 candidates
298- // auto posChild = v0.template children_as<S>().front();
299- // auto negChild = v0.template children_as<S>().back();
289+
300290 // check cuts on V0 children
301291 if (Cascade2.useChildCuts ) {
302292 if (!(((posChild2.cut () & Cascade2.childPosCutBit ) == Cascade2.childPosCutBit ) &&
@@ -359,25 +349,6 @@ struct FemtoDreamPairTaskCascadeCascade {
359349 }
360350 }
361351
362- // CPR cuts // HERE I NEED HELP FROM GEORGIOS. This was for track-cascade:
363- // we can start with no CPR for Cascade-Cascade for the moment
364- // if (Option.cprOn.value) {
365- // if ((p1.cut() & kSignPlusMask) == kSignPlusMask) {
366- // if (pairCloseRejectionSE.isClosePair(p1, posChild, parts, col.magField())) {
367- // continue;
368- // }
369- // } else {
370- // if (pairCloseRejectionSE.isClosePair(p1, posChild, parts, col.magField())) {
371- // continue;
372- // }
373- // }
374- // }
375-
376- // Pair Cleaner //-> This should now work for cascades!
377- // if (!pairCleaner.isCleanPair(p1, p2, parts)) {
378- // continue;
379- // }
380-
381352 // SE pair set:
382353 sameEventCont.setPair <isMC>(p1, p2, col.multNtr (), col.multV0M (), Option.use4D , Option.extendedPlots , Option.smearingByOrigin );
383354 }
@@ -386,9 +357,6 @@ struct FemtoDreamPairTaskCascadeCascade {
386357 // process Same Event
387358 void processSameEvent (FilteredCollision const & col, FDParticles const & parts)
388359 {
389- // if ((col.bitmaskTrackOne() & bitMask) != bitMask || (col.bitmaskTrackTwo() & bitMask) != bitMask) {
390- // return;
391- // }
392360 eventHisto.fillQA <false >(col);
393361 auto sliceCascade1 = partitionCascade1->sliceByCached (aod::femtodreamparticle::fdCollisionId, col.globalIndex (), cache);
394362 auto sliceCascade2 = partitionCascade2->sliceByCached (aod::femtodreamparticle::fdCollisionId, col.globalIndex (), cache);
@@ -400,12 +368,6 @@ struct FemtoDreamPairTaskCascadeCascade {
400368 template <bool isMC, typename CollisionType, typename PartType, typename PartitionType, typename BinningType>
401369 void doMixedEvent (CollisionType const & cols, PartType const & parts, PartitionType& part1, PartitionType& part2, BinningType binPolicy)
402370 {
403- // Partition<CollisionType> PartitionMaskedCol = ncheckbit(aod::femtodreamcollision::bitmaskTrackOne, bitMask) && ncheckbit(aod::femtodreamcollision::bitmaskTrackTwo, bitMask);// && aod::femtodreamcollision::downsample == true;
404- // PartitionMaskedCol.bindTable(cols);
405-
406- // use *Partition.mFiltered when passing the partition to mixing object
407- // there is an issue when the partition is passed directly
408- // workaround for now, change back once it is fixed
409371 for (auto const & [collision1, collision2] : soa::selfCombinations (binPolicy, Mixing.depth .value , -1 , cols, cols)) {
410372 // make sure that tracks in same events are not mixed
411373 if (collision1.globalIndex () == collision2.globalIndex ()) {
@@ -451,25 +413,6 @@ struct FemtoDreamPairTaskCascadeCascade {
451413 }
452414 }
453415
454- // CPR cuts // HERE I NEED HELP FROM GEORGIOS. This was for track-cascade:
455- // we can start with no CPR for Cascade-Cascade for the moment
456- // if (Option.cprOn.value) {
457- // if ((p1.cut() & kSignPlusMask) == kSignPlusMask) {
458- // if (pairCloseRejectionME.isClosePair(p1, posChild, parts, collision1.magField())) {
459- // continue;
460- // }
461- // } else {
462- // if (pairCloseRejectionME.isClosePair(p1, negChild, parts, collision1.magField())) {
463- // continue;
464- // }
465- // }
466- // }
467-
468- // Pair cleaner not needed in the mixing
469- // if (!pairCleaner.isCleanPair(p1, p2, parts)) {
470- // continue;
471- // }
472-
473416 mixedEventCont.setPair <isMC>(p1, p2, collision1.multNtr (), collision1.multV0M (), Option.use4D , Option.extendedPlots , Option.smearingByOrigin );
474417 }
475418 }
0 commit comments