As you can see this branch was used to do the Naive yield plotting script as well as the tuple prep script, so it has more additions and changes than just the efficiencies. There was also a few changes to the Imports file, which are probably the reasons for the incompatibility with master.
The efficiency.py has the code for MC driven Trigger and Selection efficiencies, but doesn't have PID yet. I do think it is ok to merge it though, as it is functional for the two above mentionned.
As you can see this branch was used to do the Naive yield plotting script as well as the tuple prep script, so it has more additions and changes than just the efficiencies. There was also a few changes to the Imports file, which are probably the reasons for the incompatibility with master.
The efficiency.py has the code for MC driven Trigger and Selection efficiencies, but doesn't have PID yet. I do think it is ok to merge it though, as it is functional for the two above mentionned.