diff --git a/src/phase_spaces/access.jl b/src/phase_spaces/access.jl index 7a936cf..cc51c66 100644 --- a/src/phase_spaces/access.jl +++ b/src/phase_spaces/access.jl @@ -25,3 +25,6 @@ end QEDbase.process(psp::PhaseSpacePoint) = psp.proc QEDbase.model(psp::PhaseSpacePoint) = psp.model QEDbase.phase_space_definition(psp::PhaseSpacePoint) = psp.ps_def + +QEDbase.particles(psp::PhaseSpacePoint, ::QEDbase.Incoming) = psp.in_particles +QEDbase.particles(psp::PhaseSpacePoint, ::QEDbase.Outgoing) = psp.out_particles diff --git a/src/phase_spaces/types.jl b/src/phase_spaces/types.jl index 9897064..7f3fcb7 100644 --- a/src/phase_spaces/types.jl +++ b/src/phase_spaces/types.jl @@ -122,7 +122,7 @@ struct PhaseSpacePoint{ IN_PARTICLES<:Tuple{Vararg{ParticleStateful}}, OUT_PARTICLES<:Tuple{Vararg{ParticleStateful}}, ELEMENT<:QEDbase.AbstractFourMomentum, -} <: QEDbase.AbstractPhaseSpacePoint{PROC,MODEL,PSDEF,IN_PARTICLES,OUT_PARTICLES,ELEMENT} +} <: QEDbase.AbstractPhaseSpacePoint{PROC,MODEL,PSDEF,IN_PARTICLES,OUT_PARTICLES} proc::PROC model::MODEL ps_def::PSDEF diff --git a/test/interfaces/setup.jl b/test/interfaces/setup.jl index 8facc99..067a8ed 100644 --- a/test/interfaces/setup.jl +++ b/test/interfaces/setup.jl @@ -155,8 +155,8 @@ struct TestProcess <: QEDbase.AbstractProcessDefinition end struct TestModel <: QEDbase.AbstractModelDefinition end struct TestProcessSetup <: QEDbase.AbstractProcessSetup end -QEDbase.QEDbase.scattering_process(::TestProcessSetup) = TestProcess() -QEDbase.QEDbase.physical_model(::TestProcessSetup) = TestModel() +QEDbase.scattering_process(::TestProcessSetup) = TestProcess() +QEDbase.physical_model(::TestProcessSetup) = TestModel() struct TestProcessSetupFAIL <: QEDbase.AbstractProcessSetup end @@ -182,8 +182,8 @@ struct TestProcessSetupFAIL <: QEDbase.AbstractProcessSetup end INCOMING_PARTICLES = rand(RNG, PARTICLE_SET, N_INCOMING) OUTGOING_PARTICLES = rand(RNG, PARTICLE_SET, N_OUTGOING) - @suppress QEDbase.QEDbase.incoming_particles(::TestProcess) = INCOMING_PARTICLES - @suppress QEDbase.QEDbase.outgoing_particles(::TestProcess) = OUTGOING_PARTICLES + @suppress QEDbase.incoming_particles(::TestProcess) = INCOMING_PARTICLES + @suppress QEDbase.outgoing_particles(::TestProcess) = OUTGOING_PARTICLES @testset "delegated functions" begin stp = TestProcessSetup() diff --git a/test/runtests.jl b/test/runtests.jl index 5b7a4b1..02a159f 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -29,7 +29,7 @@ begin include("particles/types.jl") end - @time @safetestset "particle types" begin + @time @safetestset "particle states" begin include("particles/states.jl") end diff --git a/test/test_implementation/test_process.jl b/test/test_implementation/test_process.jl index 0de4ae3..67c844a 100644 --- a/test/test_implementation/test_process.jl +++ b/test/test_implementation/test_process.jl @@ -19,8 +19,8 @@ function TestProcess(rng::AbstractRNG, N_in::Int, N_out::Int) return TestProcess(in_particles, out_particles) end -QEDbase.QEDbase.incoming_particles(proc::TestProcess) = proc.incoming_particles -QEDbase.QEDbase.outgoing_particles(proc::TestProcess) = proc.outgoing_particles +QEDbase.incoming_particles(proc::TestProcess) = proc.incoming_particles +QEDbase.outgoing_particles(proc::TestProcess) = proc.outgoing_particles struct TestProcess_FAIL{IP<:Tuple,OP<:Tuple} <: QEDbase.AbstractProcessDefinition incoming_particles::IP @@ -69,8 +69,8 @@ function TestProcess_FAIL_DIFFCS(rng::AbstractRNG, N_in::Int, N_out::Int) return TestProcess_FAIL_DIFFCS(in_particles, out_particles) end -QEDbase.QEDbase.incoming_particles(proc::TestProcess_FAIL_DIFFCS) = proc.incoming_particles -QEDbase.QEDbase.outgoing_particles(proc::TestProcess_FAIL_DIFFCS) = proc.outgoing_particles +QEDbase.incoming_particles(proc::TestProcess_FAIL_DIFFCS) = proc.incoming_particles +QEDbase.outgoing_particles(proc::TestProcess_FAIL_DIFFCS) = proc.outgoing_particles # dummy phase space definition + failing phase space definition struct TestPhasespaceDef <: QEDbase.AbstractPhasespaceDefinition end