Skip to content

Commit

Permalink
Changes present on testing
Browse files Browse the repository at this point in the history
  • Loading branch information
SIX Operator committed Oct 4, 2023
1 parent da019c8 commit eefaf25
Show file tree
Hide file tree
Showing 11 changed files with 212 additions and 86 deletions.
19 changes: 10 additions & 9 deletions plans/gas-cell-plan.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,16 +333,16 @@ def gas_cell_gr500():
yield from mv(sclr.preset_time, 1)
yield from mv(extslt.hg,150)

cff_ideal_500 = 2.20
cff_ideal_500 = 2.34
yield from mv(pgm.cff, cff_ideal_500)
yield from mv(extslt.vg,11)
offset=0
offset= -0.1 #main peak should be at 867.2

for i in range(-4, 5):
for i in range(-4,5):
yield from mv(pgm.cff,cff_ideal_500+i*0.02) #fine 0.02
yield from mv(pgm.en,864-offset)
yield from sleep(30)
yield from scan(det_list,pgm.en,864-offset,872-offset,201)
yield from sleep(10)
yield from scan(det_list,pgm.en,864-offset,872-offset,251)
yield from mv(pgm.cff,cff_ideal_500)


Expand All @@ -354,7 +354,7 @@ def gas_cell_gr1800():
# yield from sleep(3600)
# yield from beamline_align_v2()
# yield from sleep(120)
cff_ideal_1800 = 4.55
cff_ideal_1800 = 4.35
yield from mv(pgm.cff, cff_ideal_1800)
yield from mv(extslt.vg,11)
offset = 0
Expand All @@ -369,7 +369,7 @@ def gas_cell_gr1800():

def gas_cell_gr1200():
######################### Grating 1200l/mm ##################################
yield from pgm.hbg
#yield from pgm.hbg
det_list=[sclr, ring_curr]
yield from mv(sclr.preset_time, 1)
yield from mv(extslt.hg,150)
Expand All @@ -379,21 +379,22 @@ def gas_cell_gr1200():
cff_ideal_1200 = 3.92
yield from mv(pgm.cff, cff_ideal_1200)
yield from mv(extslt.vg,12)
offset = 0
offset = 0 #main peak should be at 867.2

# yield from scan(det_list,pgm.en,864-offset,872-offset,401)
for i in range(-4, 5):
yield from mv(pgm.cff,cff_ideal_1200+i*0.025) #fine step: 0.025
yield from mv(pgm.en,864-offset)
yield from sleep(30)
yield from scan(det_list,pgm.en,864-offset,872-offset,401) # fine step: 401
# yield from mv(pgm.cff,cff_ideal_1200)
yield from mv(pgm.cff,cff_ideal_1200)


def n2gascell_vs_M1roll():
yield from mv(extslt.vg,30)
yield from mv(extslt.hg,300)
yield from mv(pgm.cff,2.3277)

yield from mv(pgm.en,398.8)
yield from sleep(10)

Expand Down
48 changes: 24 additions & 24 deletions plans/rixscam.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,17 @@ def rixscam_acquire_w_shutter_count(Ei_vals, m7_pit_vals, num_rixs_im, extra_md


def rixscam_cff_optimization_centroid(cts, num_scans=1,extra_md = '' ):
precison_digit = 4
x_motor= pgm.cff

y_motor= pgm.en
#y_val= 529.3
#x_ideal= 3.95

x_ideal= 3.94
x_start= x_ideal - 0.02 * 2 #0.04# 0.02 fine step
x_stop= x_ideal + 0.02 * 2 #.04# 0.02 fine step
number= 5
x_ideal= 3.92
x_start= x_ideal - 0.02 * 3 #0.04# 0.02 fine step
x_stop= x_ideal + 0.02 * 3 #.04# 0.02 fine step
number= 7
yield from mv(gvbt1,'Open')
f_string=''

Expand All @@ -175,19 +176,18 @@ def rixscam_m7_gr_2_axis_centroid(cts, num_scans=1, extra_md = ' '):
precison_digit = 4
dets = [ring_curr, rixscam]
y_motor= espgm.m7pit
y_ideal = 6.391
y_start = y_ideal - 0.004 * 2
y_stop = y_ideal + 0.004 * 2
y_ideal = 5.595896
y_start = y_ideal - 0.008 * 3
y_stop = y_ideal + 0.008 * 3
#fine steps 0.004

x_motor= espgm.grpit
x_ideal= 7.574
x_start= x_ideal - 0.002 * 2
x_stop = x_ideal + 0.002 * 2
x_ideal= 6.267636
x_start= x_ideal - 0.004 * 3
x_stop = x_ideal + 0.004 * 3
#fine steps 0.002
num = 5
num = 7


f_string=''

#yield from count([rixscam], md = {'reason':'dummy'})
Expand Down Expand Up @@ -216,18 +216,17 @@ def rixscam_m6_m7_2_axis_centroid(cts, num_scans=1, extra_md = ' '):
dets = [ ring_curr, rixscam]
precison_digit = 4
y_motor= m6.pit
y_ideal = 1.4238
y_start= y_ideal - 0.0005 * 2
y_stop = y_ideal + 0.0005 * 2
y_ideal = 1.4075
y_start= y_ideal - 0.001 * 4
y_stop = y_ideal + 0.001 * 4
# fine step is 0.0005
#CHANGED STEP TO 0.001 and 4 on each side

x_motor= espgm.m7pit
x_ideal= 5.5984

x_start= x_ideal - 0.0005 * 2
x_stop = x_ideal + 0.0005 * 2
num = 5
x_ideal= 5.7264
x_start= x_ideal - 0.001 * 4
x_stop = x_ideal + 0.001 * 4
num = 9

f_string=''

Expand All @@ -237,6 +236,7 @@ def rixscam_m6_m7_2_axis_centroid(cts, num_scans=1, extra_md = ' '):
x_val = round (x_start + i * (x_stop - x_start) / (num - 1) , precison_digit)
y_val = round (y_start + i * (y_stop - y_start) / (num - 1) , precison_digit)
yield from mv(x_motor,x_val,y_motor,y_val)

yield from sleep(20)
for s in range(num_scans):
uid = yield from count(dets, num=cts, md = {'reason':' m7-gr scan {}'. format(extra_md)})
Expand Down Expand Up @@ -286,9 +286,9 @@ def rixscam_pgm_en_centroid(cts, num_scans=1, extra_md = '' ):
"""

x_motor=pgm.en
x_start = 705
x_stop = 715
num = 5
x_start = 700
x_stop = 712
num = 13

extslt_vg_value = np.round(extslt.vg.user_readback.value,0)

Expand All @@ -314,7 +314,7 @@ def rixscam_extslit_centroid(cts, num_scans=1, extra_md = '' ):

x_motor=extslt.vg
x_start = 12
vgs = [12,15,20,25]
vgs = [12,15,20,25,30]

extslt_vg_value = np.round(extslt.vg.user_readback.value,0)

Expand Down
5 changes: 3 additions & 2 deletions startup/12-slits.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@ class ExitSlit(Device):


#The following devices have been moved to '82-PreDefinedInstances.py'
#dcslt = BaffleSlit('XF:02IDD-ES{DC:1-Slt:1',name='dcslt')
#m4slt = BaffleSlit('XF:02IDC-OP{Mir:4-Slt:18_U_1', name='m4slt')
#Uncommented on Aug 24, 2023
dcslt = BaffleSlit('XF:02IDD-ES{DC:1-Slt:1',name='dcslt')
m4slt = BaffleSlit('XF:02IDC-OP{Mir:4-Slt:18_U_1', name='m4slt')
18 changes: 13 additions & 5 deletions startup/21-areadetector.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,15 @@ class StandardProsilicaSaving(StandardProsilicaROI):
write_path_template='/nsls2/data/six/legacy/prosilica/%Y/%m/%d',
root='/nsls2/data/six/legacy')

#class StandardProsilicaSaving(StandardProsilicaROI):
# hdf5 = Cpt(HDF5PluginWithFileStore,
# suffix='HDF1:',
# write_path_template='/tmp/tempimage/%Y/%m/%d',
# root='/tmp/')

diagon_h_cam = StandardProsilicaROI('XF:02IDA-BI{Diag:1-Cam:H}', name='diagon_h_cam')

#diagon_h_cam = StandardProsilicaROI('XF:02IDA-BI{Diag:1-Cam:H}', name='diagon_h_cam')
diagon_h_cam = StandardProsilicaSaving('XF:02IDA-BI{Diag:1-Cam:H}', name='diagon_h_cam')
diagon_v_cam = StandardProsilicaROI('XF:02IDA-BI{Diag:1-Cam:V}', name='diagon_v_cam')
m3_diag_cam = StandardProsilicaSaving('XF:02IDC-BI{Mir:3-Cam:13_U_1}', name='m3_diag_cam')
extslt_cam = StandardProsilicaSaving('XF:02IDC-BI{Slt:1-Cam:15_1}', name='extslt_cam')
Expand Down Expand Up @@ -259,11 +266,12 @@ def name_qem(qem, chan_names, chan_numbers=None):
#qem01 = name_qem(SIXQuadEM('XF:02IDA-BI{EM:1}EM180:', name='qem01'),
# ['m1slt_{}_tey'.format(s) for s in ('in', 'out', 'bot', 'top')])

qem02 = name_qem(SIXQuadEM('XF:02IDB-BI{EM:2}EM180:', name='qem02'),
['pgmslt_u_{}_tey'.format(s) for s in ('in', 'out', 'bot', 'top')])
# qem2 and 3 not working 9/2/22 after power shutdown
#qem02 = name_qem(SIXQuadEM('XF:02IDB-BI{EM:2}EM180:', name='qem02'),
# ['pgmslt_u_{}_tey'.format(s) for s in ('in', 'out', 'bot', 'top')])

qem03 = name_qem(SIXQuadEM('XF:02IDB-BI{EM:3}EM180:', name='qem03'),
['pgmslt_d_{}_tey'.format(s) for s in ('in', 'out', 'bot', 'top')])
#qem03 = name_qem(SIXQuadEM('XF:02IDB-BI{EM:3}EM180:', name='qem03'),
# ['pgmslt_d_{}_tey'.format(s) for s in ('in', 'out', 'bot', 'top')])

qem04 = name_qem(SIXQuadEM('XF:02IDC-BI{EM:4}EM180:', name='qem04'),
['m3slt_{}_tey'.format(s) for s in ('in', 'out', 'bot', 'top')])
Expand Down
20 changes: 10 additions & 10 deletions startup/82-PreDefinedInstances.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,16 @@ class BaffleSlitSAClass(PreDefinedPositions):


#Baffle Slits

dcslt = BaffleSlitClass('XF:02IDD-ES{DC:1-Slt:1',
locations={'close':['inb',18,'out',45,'bot',11,'top',10],
'open':['inb',46,'out',46,'bot',38,'top',33]},
name='dcslt')

m4slt = BaffleSlitClass('XF:02IDC-OP{Mir:4-Slt:18_U_1',
locations={'close':['inb',5,'out',5,'bot',5,'top',-8],
'open':['inb',0,'out',10,'bot',0,'top',0]},
name='m4slt')
#Commented lines below on Aug 24, 2023
#dcslt = BaffleSlitClass('XF:02IDD-ES{DC:1-Slt:1',
# locations={'close':['inb',18,'out',45,'bot',11,'top',10],
# 'open':['inb',46,'out',46,'bot',38,'top',33]},
# name='dcslt')

#m4slt = BaffleSlitClass('XF:02IDC-OP{Mir:4-Slt:18_U_1',
# locations={'close':['inb',5,'out',5,'bot',5,'top',-8],
# 'open':['inb',0,'out',10,'bot',0,'top',0]},
# name='m4slt')



Expand Down
23 changes: 15 additions & 8 deletions startup/84-pgm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,21 @@ class PGM_ES(Device):


pgm = PGM('XF:02IDB-OP{Mono:1', name='pgm', locations = {
'mbg': ['m2off', 84.19979335038944, 'groff', 82.07823104069193,'grx', -63.0, 'grlines', 500, 'm3slt_hs', -37.4,
'm3slt_ha',-18], #' offset values before 20220125 m2 84.20095245038944; groff 82.08049027069194

'hbg': ['m2off', 84.199606602, 'groff', 82.1314578049,'grx', 61.0, 'grlines', 1200, 'm3slt_hs', -38,
'm3slt_ha',-17.4], # offset values before 20220125 m2 84.201175342; groff 82.1322482849

'ubg': ['m2off', 84.20377334307703, 'groff', 82.132248343 , 'grx', -1,'grlines', 1800, 'm3slt_hs', -37.7,
'm3slt_ha',-17.8] }) #before 01/16/2020 'm2off', 84.2072359100, 'groff', 82.105016851
'mbg': ['m2off', 84.1951147473, 'groff', 82.0717671,'grx', -63, 'grlines', 500, 'm3slt_hs', -37.8,
'm3slt_ha',-17.6], # 20230914 -> 'm2off', 84.1983417173, 'groff', 82.07381828
# offset before 20230127 'm2off', 84.2004597573, 'groff', 82.07204739;
# offset as 20220916 -> m2 = 84.19979335038944 gr = 82.07823104069193; gr_x = -63

'hbg': ['m2off', 84.1991382173, 'groff', 82.1336183933033,'grx', 61.0, 'grlines', 1200, 'm3slt_hs', -38.1,
'm3slt_ha',-17.8], # 20230913 -> 'm2off', 84.1991382173, 'groff', 82.1336183933033
# 20230127 ->'m2off', 84.2033182673, 'groff', 82.1366541933033
# 20220915 -> offset m2off 84.199606602; 'groff', 82.1314578049,'grx', 61.0,
# offset values before 20220125 m2 84.201175342; groff 82.1322482849

'ubg': ['m2off', 84.20149823, 'groff', 82.11328655, 'grx', -1,'grlines', 1800, 'm3slt_hs', -38.0,
'm3slt_ha',-17.8] }) # at 20230127 ->'m2off', 84.20009535, 'groff', 82.1145797096
# before 20220918 'm2off', 84.20377334307703, 'groff', 82.132248343, 'grx', -1
#before 01/16/2020 'm2off', 84.2072359100, 'groff', 82.105016851

pgmjoe = PGMjoe('XF:02IDB-OP{Mono:1-Ax:9', name='pgmjoe')
espgm = PGM_ES('XF:02IDD-ES{Mono:2-Ax:',name='espgm')
Expand Down
55 changes: 34 additions & 21 deletions startup/95-magics.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,27 @@
m1slt.out,
m1slt.bot,
m1slt.top,
pgm.cff,
pgm.en,
pgm.grx,
pgm.m2pit,
pgm.grpit,
pgmsltd.hg,
pgmsltd.hc,
pgmsltd.vg,
pgmsltd.vc,
pgmsltd.inb,
pgmsltd.out,
pgmsltd.bot,
pgmsltd.top,
pgmsltu.hg,
pgmsltu.hc,
pgmsltu.vg,
pgmsltu.vc,
pgmsltu.inb,
pgmsltu.out,
pgmsltu.bot,
pgmsltu.top,
m3.x,
m3.y,
m3.z,
Expand Down Expand Up @@ -64,27 +85,19 @@
m4slt.top,
ow,
#ow.th,
pgm.cff,
pgm.en,
pgm.grx,
pgm.m2pit,
pgm.grpit,
pgmsltd.hg,
pgmsltd.hc,
pgmsltd.vg,
pgmsltd.vc,
pgmsltd.inb,
pgmsltd.out,
pgmsltd.bot,
pgmsltd.top,
pgmsltu.hg,
pgmsltu.hc,
pgmsltu.vg,
pgmsltu.vc,
pgmsltu.inb,
pgmsltu.out,
pgmsltu.bot,
pgmsltu.top]
m5,
m5mask, m6_msk,
m6,
espgm.m7pit,
espgm.grpit,
espgm.grx,
espgmmask,
# espgm.cff, espgm.e
#espgm.grlines, #added on 12/15/2020 DOESN'T WORK
oc,
dcslt,
dc
]


BlueskyMagics.detectors = [qem07]
35 changes: 35 additions & 0 deletions startup/96-keithley.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

voltage_dc_1A = EpicsSignal('XF:02IDD{K2636B:1-ChA}SP-VLvl', name = 'voltage_dc_1A')
current_dc_1A = EpicsSignal('XF:02IDD{K2636B:1-ChA}SP-ILvl', name='current_dc_1A')
voltage_dc_sp_rbk_1A = EpicsSignal('XF:02IDD{K2636B:1-ChA}RB-VLvl', name = 'voltage_dc_sp_rbk_1A')
current_dc_sp_rbk_1A = EpicsSignal('XF:02IDD{K2636B:1-ChA}RB-ILvl', name='current_dc_sp_rbk_1A')
keithley_output_1A = EpicsSignal('XF:02IDD{K2636B:1-ChA}Cmd:Out-Ena', name = 'keithley_output_1A')
current_rbk_1A = EpicsSignal('XF:02IDD{K2636B:1-ChA}RB-MeasI', name = 'current_rbk_1A')
voltage_rbk_1A = EpicsSignal('XF:02IDD{K2636B:1-ChA}RB-MeasV',name='voltage_rbk_1A')
Expand All @@ -16,6 +18,8 @@

voltage_dc_1B = EpicsSignal('XF:02IDD{K2636B:1-ChB}SP-VLvl', name = 'voltage_dc_1B')
current_dc_1B = EpicsSignal('XF:02IDD{K2636B:1-ChB}SP-ILvl', name='current_dc_1B')
voltage_dc_sp_rbk_1B = EpicsSignal('XF:02IDD{K2636B:1-ChB}RB-VLvl', name = 'voltage_dc_sp_rbk_1B')
current_dc_sp_rbk_1B = EpicsSignal('XF:02IDD{K2636B:1-ChB}RB-ILvl', name='current_dc_sp_rbk_1B')
keithley_output_1B = EpicsSignal('XF:02IDD{K2636B:1-ChB}Cmd:Out-Ena', name = 'keithley_output_1B')
current_rbk_1B = EpicsSignal('XF:02IDD{K2636B:1-ChB}RB-MeasI', name = 'current_rbk_1B')
voltage_rbk_1B = EpicsSignal('XF:02IDD{K2636B:1-ChB}RB-MeasV',name='voltage_rbk_1B')
Expand All @@ -26,3 +30,34 @@
interval_pulse_1B = EpicsSignal('XF:02IDD{K2636B:1-ChB}Cmd-Pulse.SCAN', name = 'interval_pulse_1B')
voltage_pulse_rbk_1B = EpicsSignal('XF:02IDD{K2636B:1-ChB}Prev-Buf', name = 'voltage_pulse_rbk_1B')



voltage_dc_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}SP-VLvl', name = 'voltage_dc_2A')
current_dc_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}SP-ILvl', name='current_dc_2A')
voltage_dc_sp_rbk_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}RB-VLvl', name = 'voltage_dc_sp_rbk_2A')
current_dc_sp_rbk_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}RB-ILvl', name='current_dc_sp_rbk_2A')
keithley_output_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}Cmd:Out-Ena', name = 'keithley_output_2A')
current_rbk_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}RB-MeasI', name = 'current_rbk_2A')
voltage_rbk_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}RB-MeasV',name='voltage_rbk_2A')
resistance_rbk_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}RB-MeasR',name='resistance_rbk_2A')
current_pulse_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}PIMV-CurrLevl', name = 'current_pulse_2A')
meaure_mode_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}Meas-Sel', name = 'measure_mode_2A')
time_pulse_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}PIMV-TOn', name = 'time_pulse_2A')
interval_pulse_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}Cmd-Pulse.SCAN', name = 'interval_pulse_2A')
voltage_pulse_rbk_2A = EpicsSignal('XF:02IDD{K2636B:2-ChA}Prev-Buf', name = 'voltage_pulse_rbk_2A')


voltage_dc_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}SP-VLvl', name = 'voltage_dc_2B')
current_dc_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}SP-ILvl', name='current_dc_2B')
voltage_dc_sp_rbk_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}RB-VLvl', name = 'voltage_dc_sp_rbk_2B')
current_dc_sp_rbk_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}RB-ILvl', name='current_dc_sp_rbk_2B')
keithley_output_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}Cmd:Out-Ena', name = 'keithley_output_2B')
current_rbk_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}RB-MeasI', name = 'current_rbk_2B')
voltage_rbk_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}RB-MeasV',name='voltage_rbk_2B')
resistance_rbk_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}RB-MeasR',name='resistance_rbk_2B')
meaure_mode_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}Meas-Sel', name = 'measure_mode_2B')
current_pulse_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}PIMV-CurrLevl', name = 'current_pulse_2B')
time_pulse_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}PIMV-TOn', name = 'time_pulse_2B')
interval_pulse_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}Cmd-Pulse.SCAN', name = 'interval_pulse_2B')
voltage_pulse_rbk_2B = EpicsSignal('XF:02IDD{K2636B:2-ChB}Prev-Buf', name = 'voltage_pulse_rbk_2B')

Loading

0 comments on commit eefaf25

Please sign in to comment.