Skip to content

Commit

Permalink
fixing test for damper
Browse files Browse the repository at this point in the history
  • Loading branch information
aoeftiger committed Oct 31, 2017
1 parent 9334205 commit c1a2174
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion PyHEADTAIL/feedback/transverse_damper.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@ def __init__(self, dampingrate_x, dampingrate_y, *args, **kwargs):
self.prints('Damper in Y active')
elif not dampingrate_x and not dampingrate_y:
self.prints('Dampers not active')
self.track = lambda x: 0
else:
self.gain_x = 2/dampingrate_x
self.gain_y = 2/dampingrate_y
self.track = self.track_all
self.prints('Dampers active')

# will be overwritten at initialisation
def track(self, beam):
pass

def track_horizontal(self, beam):
beam.xp -= self.gain_x * beam.mean_xp()

Expand Down
2 changes: 1 addition & 1 deletion PyHEADTAIL/testing/unittests/test_gpu_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ def test_transverse_damper(self):
bunch_gpu = self.create_all1_bunch()
dampingrate_x = 0.01
dampingrate_y = 0.05
damp = TransverseDamper(dampingrate_x, dampingrate_y)
damp = TransverseDamper(dampingrate_x, dampingrate_y, printer=SilentPrinter())
self.assertTrue(self._track_cpu_gpu([damp], bunch_cpu, bunch_gpu),
'Tracking TransverseDamper CPU/GPU differs')

Expand Down

0 comments on commit c1a2174

Please sign in to comment.