Physics Ntuple update

Change the conditions for writing the physics ntuple Only apply blinding conditions to colliding BCIDs (including +/- 1) Write out calo-only triggers (modulo the blinding conditions) Make the calo blinding cut configurable (raise default to 25 GeV)

Also contains DIF code from Carl

enabled an automatic merge when the pipeline for 2da9e37f succeeds

mentioned in commit efdb5416

merged