Tidied up deterministic implementation.  Better triggering pdfs, but still gets bg/trigger split wrong.