Commit c14c468e authored by rodolakis's avatar rodolakis
Browse files

debug plot and startoftheweek

parent 00c9b4b5
......@@ -139,3 +139,9 @@
======= 20220405:
{'HEG': {'S2V': -0.015, 'S2H': -0.028, 'S1V': -0.041, 'S1H': 0.107}, 'MEG': {'S2V': -0.0725, 'S2H': 0.1813, 'S1V': -0.0789, 'S1H': 0.1735}}
======= 20220412:
{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': -0.0725, 'S2H': 0.1813, 'S1V': -0.0789, 'S1H': 0.1735}}
======= 20220412:
{'HEG': {'S2V': -0.0135, 'S2H': -0.1435, 'S1V': -0.0383, 'S1H': 0.1339}, 'MEG': {'S2V': 0.2254, 'S2H': -0.0578, 'S1V': -0.0666, 'S1H': 0.1837}}
......@@ -4828,7 +4828,7 @@ def StartOfTheWeek(GRT,branch,wait=False,**kwargs):
SetSlit1A(4.5,4.5,0,0)
m=MDA_GetLastFileNum()
print('\nsteering out => move beam more positive (10 urad ~ 0.25 mm)')
print('steering up => move beam more positive (10 urad ~ 0.25 mm)')
print('steering up => move beam more positive (10 urad ~ 0.25 mm)\n')
try:
h_position=fit_mda(m-1,detCA4,1,'gauss',xrange=[-1,1]);plt.show()
v_position=fit_mda(m ,detCA4,1,'gauss',xrange=[-1,1]);plt.show()
......@@ -4966,9 +4966,9 @@ def StartOfTheWeek(GRT,branch,wait=False,**kwargs):
slit(50)
energy(500)
scanhv(475,525,1,comment='Mono Scan @ 500eV')
m=MDA_GetLastFileNum()
try:
m=MDA_GetLastFileNum()
plot_mda(m,detDiode,flux=3);plt.show()
plot_mda(m,detDiode,Flux=3);plt.show()
except:
print('Unable to plot. Try:')
print("plot_mda("+str(m)+","+str(detDiode)+",flux=3);plt.show()")
......
......@@ -205,9 +205,8 @@ def mda_1D(ScanNum,DetectorNum,coeff=1,bckg=0,filepath=None,prefix=None,scanIOC=
if len(d)<len(n):
x=x[:len(d)]
y=y[:len(d)]
y[y>1e30] = np.nan
y = [p if p<1e30 else np.nan for p in y]
y=[(y[i]+bckg)*coeff for i, e in enumerate(y)]
#y=[(y[i]*coeff)+bckg for i, e in enumerate(y)]
return x,y,x_name,y_name
except:
print('error')
......
Supports Markdown
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