GenTauCPProducer: Moved general calculations to dedicated class, minor generalisations