Added MC truth module and trigger modules.  Tidied up existing code.