Skip to content

Commit 396cb60

Browse files
committed
2to3 print
1 parent 253bc80 commit 396cb60

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

shift1/dataproc_general.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from __future__ import division
1+
from __future__ import division, print_function
22
from six.moves import range
33
#source /reg/g/psdm/etc/psconda.sh
44
from psana import *

shift1/run17.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from __future__ import division
1+
from __future__ import division, print_function
22
from six.moves import range
33
import psana
44
from xfel.cxi.cspad_ana import cspad_tbx
@@ -18,15 +18,15 @@
1818
for i, t in enumerate(times):
1919
evt = run.event(t)
2020
ts = cspad_tbx.evt_timestamp((t.seconds(),t.nanoseconds()/1e6))
21-
print ts,
21+
print(ts, end=' ')
2222
for key in evt:
2323
if key.alias() in ['Rayonix', 'Jungfrau1M']:
24-
print key.alias(),
24+
print(key.alias(), end=' ')
2525
if 'FEE-SPEC0' in str(key):
26-
print key.src(),
26+
print(key.src(), end=' ')
2727
d = evt.get(key.type(), key.src())
2828
plt.cla()
2929
plt.plot(range(len(d.hproj())), d.hproj(), '-')
3030
plt.draw()
3131
plt.pause(0.1)
32-
print
32+
print()

shift1/rund.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from __future__ import division
1+
from __future__ import division, print_function
22
from six.moves import range
33
import psana
44
import sys
@@ -21,14 +21,14 @@
2121
for i, t in enumerate(times):
2222
evt = run.event(t)
2323
ts = cspad_tbx.evt_timestamp((t.seconds(),t.nanoseconds()/1e6))
24-
print icount,ts,
24+
print(icount,ts, end=' ')
2525
icount+=1
2626
for key in evt:
2727
if key.alias() != "":
2828

29-
print key.alias(),
29+
print(key.alias(), end=' ')
3030
if 0 and 'FEE-SPEC0' in str(key):
31-
print key.src(),
31+
print(key.src(), end=' ')
3232
d = evt.get(key.type(), key.src())
3333
plt.cla()
3434
plt.plot(range(len(d.hproj())), d.hproj(), '-')
@@ -42,4 +42,4 @@
4242
plt.imshow(thisdata)
4343
plt.draw()
4444
plt.pause(0.01)
45-
print
45+
print()

0 commit comments

Comments
 (0)