Draft: Include proper code changes that have been accumulating over time for the TrigInDetAnalysis code

Because people see fit to make, largely pointless changes to this package while I need to constantly modify it because it is in almost constant use, then there are many conflicts that have needlessly arisen and I have no time to properly sort out.

Since none of the CI tests actually test this code, every time it is changed by someone else, I need to run lots of tests to make sure that they haven't broken it, and I don't really have time to spend on things like that, as they say, if is isn't broke, don't fix it.