Update master to work with v11 central nanoAOD

If the experts give green light, we replace trkSumPtHollowConeDR03 with Photon_pfChargedIsoPFPV to be able to work with v11 nanoAOD. The trkSum iso variable should be present in v12 nanoAOD again. Note: Maybe include an argparse argument to be able to choose in order not to have diverging branches/releases...