Maybe @serodrig wants to propose further modifications. I also tested the modification in L1Calo with ctest and it seems ok.. @pavol should also have a look.