Address only the bug

Author: ddobrigk

Framework/Core/include/Framework/AnalysisDataModel.h

@@ -1990,16 +1990,20 @@ namespace mcparticle_v2
 // note: this has to be declared in a separate namespace so it does not conflict with existing
 // derived data table declarations in O2Physics
 DECLARE_SOA_DYNAMIC_COLUMN(IsPhysicalPrimary, isPhysicalPrimary, //! True if particle is considered a physical primary according to the ALICE definition
-                           [](uint8_t flags, float vx, float vy) -> bool {
-                            if(std::hypot(vx, vy) > o2::aod::mcparticle::maxRadiusForPhysicalPrimary) return o2::aod::mcparticle::enums::FromBackgroundEvent;
-                            return (flags & o2::aod::mcparticle::enums::PhysicalPrimary) == o2::aod::mcparticle::enums::PhysicalPrimary; });
+                           [](uint8_t input_flags, float vx, float vy) -> bool {
+                            if((std::hypot(vx, vy) > o2::aod::mcparticle::maxRadiusForPhysicalPrimary) && ((input_flags & o2::aod::mcparticle::enums::PhysicalPrimary) == o2::aod::mcparticle::enums::PhysicalPrimary)){
+                              return o2::aod::mcparticle::enums::FromBackgroundEvent;
+                            }
+                            return (input_flags & o2::aod::mcparticle::enums::PhysicalPrimary) == o2::aod::mcparticle::enums::PhysicalPrimary; });
 
 // avoid that the stored flags are provided unprotected via
 // the getter '.flags': analysers will get the correct bit map transparently
 DECLARE_SOA_COLUMN(Flags, storedFlags, uint8_t);   //! ALICE specific flags, see MCParticleFlags. Do not use directly. Use the dynamic columns, e.g. producedByGenerator()
 DECLARE_SOA_DYNAMIC_COLUMN(McParticleFlags, flags, //! protected against
                            [](uint8_t input_flags, float vx, float vy) -> uint8_t {
-                            if(std::hypot(vx, vy) > o2::aod::mcparticle::maxRadiusForPhysicalPrimary) return o2::aod::mcparticle::enums::FromBackgroundEvent;
+                            if((std::hypot(vx, vy) > o2::aod::mcparticle::maxRadiusForPhysicalPrimary) && ((input_flags & o2::aod::mcparticle::enums::PhysicalPrimary) == o2::aod::mcparticle::enums::PhysicalPrimary)){
+                              return o2::aod::mcparticle::enums::FromBackgroundEvent;
+                            }
                             return input_flags; });
 
 } // namespace mcparticle_v2