Changing the type of some classes and adding an auxiliary calibrated class with a ROOT dictionnary + adding the possibility to take CalData as input in Exogam