TB: small fixes (#487)

pySDC/core/controller.py

@@ -47,7 +47,7 @@ class Controller(object):
         user_hooks = controller_params.get('hook_class', [])
         hook_classes += user_hooks if type(user_hooks) == list else [user_hooks]
         [self.add_hook(hook) for hook in hook_classes]
-        controller_params['hook_class'] = controller_params.get('hook_class', hook_classes)
+        controller_params['hook_class'] = hook_classes
 
         for hook in self.hooks:
             hook.pre_setup(step=None, level_number=None)

pySDC/implementations/convergence_controller_classes/interpolate_between_restarts.py

@@ -56,7 +56,7 @@ class InterpolateBetweenRestarts(ConvergenceController):
 
                 for m in range(len(level.u)):
                     level.u[m][:] = self.status.u_inter[i][m].reshape(level.prob.init[0])[:]
-                    level.f[m][:] = self.status.f_inter[i][m].reshape(level.prob.init[0])[:]
+                    level.f[m][:] = self.status.f_inter[i][m].reshape(level.f[m].shape)[:]
 
             # reset the status variables
             self.status.perform_interpolation = False