few more changes, validated

Author: AlexianL

PWGMM/Mult/Tasks/mftReassociationValidation.cxx

@@ -1165,17 +1165,6 @@ struct MftReassociationValidation {
         registry.fill(HIST(WhatDataType[DataType]) + HIST(WhatReassociationMethod[ReassociationMethod]) + HIST("hPreciseTrackSelectionCounter"), MftTrackAmbiguityStep::NumberOfAmbiguousTracks);
       }
       return true;
-      if (mftTrack.ambDegree() > 1) {
-        if (fillHistograms) {
-          registry.fill(HIST(WhatDataType[DataType]) + HIST(WhatReassociationMethod[ReassociationMethod]) + HIST("hPreciseTrackSelectionCounter"), MftTrackAmbiguityStep::NumberOfAmbiguousTracks);
-        }
-        return true;
-      }
-
-      if (fillHistograms) {
-        registry.fill(HIST(WhatDataType[DataType]) + HIST(WhatReassociationMethod[ReassociationMethod]) + HIST("hPreciseTrackSelectionCounter"), MftTrackAmbiguityStep::NumberOfNonAmbiguousTracks);
-      }
-      return false;
     }
 
     if (fillHistograms) {
@@ -1330,6 +1319,10 @@ struct MftReassociationValidation {
 
       auto templatedTrack = reassociated2dMftTrack.template mfttrack_as<FilteredMftTracksWCollsMcLabels>();
 
+      if (reassociated2dMftTrack.compatibleCollIds().size() > 0) {
+        return;
+      }
+
       o2::track::TrackParCovFwd trackPar = o2::aod::fwdtrackutils::getTrackParCovFwdShift(templatedTrack, mZShift);
       std::array<double, 3> dcaInfOrig;
       trackPar.propagateToDCAhelix(bZ, {collision.posX(), collision.posY(), collision.posZ()}, dcaInfOrig);
@@ -1610,6 +1603,7 @@ struct MftReassociationValidation {
           }
 
         } else { // NON AMBI TRACKS
+
           if (configTask.fillGeneralHistograms) {
             registry.fill(HIST("MC/2D/hAmbiguityOfMftTracks"), MftTrackAmbiguityStep::NumberOfNonAmbiguousTracks);
             registry.fill(HIST("MC/2D/hIsNonAmbiguousTrackMatchedToTrueCollision"), MftNonAmbiguousAndMatchedToTrueCollisionStep::IsNonAmbiguous);
@@ -1717,6 +1711,10 @@ struct MftReassociationValidation {
 
       auto templatedTrack = reassociated3dMftTrack.template mfttrack_as<FilteredMftTracksWCollsMcLabels>();
 
+      if (reassociated3dMftTrack.compatibleCollIds().size() > 0) {
+        return;
+      }
+
       o2::track::TrackParCovFwd trackPar = o2::aod::fwdtrackutils::getTrackParCovFwdShift(templatedTrack, mZShift);
       std::array<double, 3> dcaInfOrig;
       trackPar.propagateToDCAhelix(bZ, {collision.posX(), collision.posY(), collision.posZ()}, dcaInfOrig);