Commit 360b9556 authored by bliss administrator's avatar bliss administrator

commit unsaved changes

parent 9d2ff1cc
......@@ -137,7 +137,7 @@ class CScanDisplay(object):
for motor in self.motors:
self.motor_display_pos[motor.name] = '%.4f'%motor.position()
for acq_device,events in data_events.iteritems():
for acq_device,events in data_events.items():
data_node = nodes.get(acq_device)
if is_zerod(data_node):
channel_name = data_node.name
......@@ -161,7 +161,7 @@ class CScanDisplay(object):
self.motor_display_pos[name] = display
display = ''
motor_name = None
for motor_name,disp in self.motor_display_pos.iteritems():
for motor_name,disp in self.motor_display_pos.items():
display += '%s -> %s ' % (motor_name,disp)
if motor_name is not None:
......@@ -169,7 +169,7 @@ class CScanDisplay(object):
display += 'musst trig (%d/%d) ' % (musst_trig_position/2,self.nb_points)
if display:
print display,'\r',
print(display,'\r', end=' ')
sys.stdout.flush()
def _get_musst_template(master_motor, *other_chans):
......
......@@ -207,7 +207,7 @@ class KmapCScanDisplay(object):
# return True
def print_last_display(self):
print self.last_display
print(self.last_display)
def __call__(self,data_events,nodes,info):
display_list = list()
......@@ -222,7 +222,7 @@ class KmapCScanDisplay(object):
curr_point,
self.nb_points))
for acq_device,events in data_events.iteritems():
for acq_device,events in data_events.items():
data_node = nodes.get(acq_device)
if is_zerod(data_node):
if self.channel_name == data_node.name:
......@@ -230,7 +230,7 @@ class KmapCScanDisplay(object):
display_list.insert(0,"point %d/%d" % (point_number,self.nb_points))
display = ' '.join(display_list)
if display:
print display,'\r',
print(display,'\r', end=' ')
sys.stdout.flush()
self.last_display = display
......@@ -254,7 +254,7 @@ def _multiplexer(multiplexer, musst_device):
multiplexer.switch('DETECTOR', 'P201')
multiplexer.switch('SHUTTER','P201')
musst_device.putget("IO !IO9") # Force shutter to be closed
print 'Took: %s seconds' % (time.time()-started)
print('Took: %s seconds' % (time.time()-started))
def akmap_lut(fast_mot, xmin, xmax, x_nb_points,expo_time,
*slow_motors_positions, **kwargs) :
......@@ -278,7 +278,7 @@ def akmap_lut(fast_mot, xmin, xmax, x_nb_points,expo_time,
if kwargs:
raise ValueError("akmap_lut: keys %r are not allowed" % kwargs.keys())
raise ValueError("akmap_lut: keys %r are not allowed" % list(kwargs.keys()))
measurement = setup_globals.ACTIVE_MG
enabled_counters_name = measurement.enabled
......
......@@ -27,4 +27,4 @@ def calibrate(motor, distance, time, nb_points=1000):
scan_info={'title': 'PI calibration of %s with movement %f' % (motor.name, distance)},
writer=None)
scan.run()
print 'End Scan'
print('End Scan')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment