Replace the Efficiency and Efficiency2D

Replace the classes by more rational classes based on a template to move all the commom components into a single place
to simplift the implementatiomn of the 1D and 2D Efficiencies

Rename the 1D Efficiency class from Efficiency to Efficiency1D
a