Adding calculations

Also fixing problems related with the implementation of catalogues with
"errors" instead of "odds".