Finished converting calcTotalCatch & catch likelihood