diff --git a/Generators/TruthUtils/TruthUtils/AtlasPID.h b/Generators/TruthUtils/TruthUtils/AtlasPID.h index c2c4285deafec66047de66d954838dc5c696ef0c..75d3ce5f771719a141a78a165dd1a17b7eec6154 100644 --- a/Generators/TruthUtils/TruthUtils/AtlasPID.h +++ b/Generators/TruthUtils/TruthUtils/AtlasPID.h @@ -276,7 +276,7 @@ template<> inline bool isKK(const int& p){ auto value_digits = DecodedPID(p); re /// are then used when the magnetic and electrical charge sign agree and 412nq1nq2 nq3 0 /// when they disagree, with the overall sign of the particle set by the magnetic charge. For /// now no spin information is provided. -template<> inline bool isMonopole(const DecodedPID& p){return (p.ndigits() == 7 && p(0) == 4 && p(1) == 1 && (p(2) == 1 || p(2) == 2 ) && p(7) == 0);} +template<> inline bool isMonopole(const DecodedPID& p){return (p.ndigits() == 7 && p(0) == 4 && p(1) == 1 && (p(2) == 1 || p(2) == 2 ) && p(6) == 0);} template<> inline bool isMonopole(const int& p){ auto value_digits = DecodedPID(p); return isMonopole(value_digits);} diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleInteractingFilter_test.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleInteractingFilter_test.cxx index 1ed7571e152e1c6d735d078d176e554f23c4d004..54d147d13881b0c71dbd9dcc18a717c827ffb127 100644 --- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleInteractingFilter_test.cxx +++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleInteractingFilter_test.cxx @@ -136,18 +136,22 @@ TEST_F(GenParticleInteractingFilter_test, allPropertiesUnset_stdParticle_expectN } -TEST_F(GenParticleInteractingFilter_test, allPropertiesUnset_exoticParticle_expectNoPass) { - EXPECT_TRUE( m_filterTool->initialize().isSuccess() ); - - const HepMC::FourVector mom4(1.0*sin(150.*M_PI/180.), 0.0, 1.0*cos(150.*M_PI/180.), 1.0); // rho=1, eta=-1.32 -#ifdef HEPMC3 - HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/4110000); -#else - const HepMC::GenParticle part(mom4, /*pdg id=*/4110000); -#endif - - ASSERT_FALSE( m_filterTool->pass(part) ); -} + // Temporarily commenting out as after MR!74633 Monopoles count as + // intercting without any special settings - need to use a different + // kind of exotic particle for this test - see ATLASSIM-7301 + +// TEST_F(GenParticleInteractingFilter_test, allPropertiesUnset_exoticParticle_expectNoPass) { +// EXPECT_TRUE( m_filterTool->initialize().isSuccess() ); + +// const HepMC::FourVector mom4(1.0*sin(150.*M_PI/180.), 0.0, 1.0*cos(150.*M_PI/180.), 1.0); // rho=1, eta=-1.32 +// #ifdef HEPMC3 +// HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/4110000); +// #else +// const HepMC::GenParticle part(mom4, /*pdg id=*/4110000); +// #endif + +// ASSERT_FALSE( m_filterTool->pass(part) ); +// } TEST_F(GenParticleInteractingFilter_test, stdParticle_expectPass) {