pshell_config/x11ma
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
X11MA
2016-08-12 11:37:23 +02:00
parent c34ed7db79
commit 5c624a1408
6 changed files with 204 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins.properties
+1 -1
View File
@@ -1,4 +1,4 @@
EnergyScan_TBT.java=disabled
EnergyScan_TBT.java=enabled
DelayScan.java=enabled
EnergyScan.java=enabled
Test.java=disabled
plugins/DelayScan.java
+6 -1
View File
@@ -19,6 +19,7 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.nio.file.Files;
import java.util.logging.Logger;
import javax.swing.DefaultComboBoxModel;
/**
@@ -525,7 +526,11 @@ public class DelayScan extends Panel {
}//GEN-LAST:event_buttonExecuteActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
try {
abort();
} catch (InterruptedException ex) {
Logger.getLogger(DelayScan.class.getName()).log(Level.SEVERE, null, ex);
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed
plugins/EnergyScan.java
+6 -1
View File
@@ -19,6 +19,7 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.nio.file.Files;
import java.util.logging.Logger;
import javax.swing.DefaultComboBoxModel;
/**
@@ -628,7 +629,11 @@ public class EnergyScan extends Panel {
}//GEN-LAST:event_jCheckBox1ActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
try {
abort();
} catch (InterruptedException ex) {
Logger.getLogger(EnergyScan.class.getName()).log(Level.SEVERE, null, ex);
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void buttonExecuteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExecuteActionPerformed
plugins/EnergyScan_TBT.java
+6 -1
View File
@@ -19,6 +19,7 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.nio.file.Files;
import java.util.logging.Logger;
import javax.swing.DefaultComboBoxModel;
/**
@@ -641,7 +642,11 @@ public class EnergyScan_TBT extends Panel {
}//GEN-LAST:event_jCheckBox1ActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
try {
abort();
} catch (InterruptedException ex) {
Logger.getLogger(EnergyScan_TBT.class.getName()).log(Level.SEVERE, null, ex);
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void buttonExecuteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExecuteActionPerformed
script/DelayScan.py
+177 -167
View File
@@ -1,6 +1,7 @@
import os
import traceback
import math
import time
print "\nStarting delay scan - Parameters: ",
print START,END,SIZE,ENERGIES,RUNTYPE
@@ -8,7 +9,30 @@ print START,END,SIZE,ENERGIES,RUNTYPE
###############################################################################
# Preparing for the Scan
###############################################################################
if str(SET_OFFSETS) == "1":
print "Setting offsets"
if RUNTYPE in ["+/-", "+" , "-"]:
caput(OTF_MODE1,1) # circ + in ID1
caput(OTF_MODE2,2) # circ - in ID2
elif RUNTYPE in ["LH/LV", "LH", "LV"]:
caput(OTF_MODE1,0)
caput(OTF_MODE2,0)
wait_channel(OTF_DONE, 1, type = 'i')
caput(OTF_ALPHA1, 0.0) # LH in ID1
caput(OTF_ALPHA2, 90.0) # LV in ID2
wait_channel(OTF_DONE, 1, type = 'i')
else:
raise Exception("Invalid run type: " + RUNTYPE)
caput(OTF_OFF1,OFFSET1)
caput(OTF_OFF2,OFFSET2-40) #detune ID2
wait_channel(OTF_DONE, 1, type = 'i')
print "Offsets are set"
import sys
sys.exit(0)
else:
print "Running full script"
'''if ID1 == 1:
caput ("X11PHS-E:OPT","PGM+ID1")
elif ID2 == 1:
@@ -17,7 +41,7 @@ else:
caput ("X11PHS-E:OPT","PGM+ID1+ID2")'''
file_prefix = time.strftime("%y%m%d")
input_path = "/sls/X11MA/Data1/public/X11MA/temp/"+file_prefix+"/"
input_path = PATH+file_prefix+"/"
output_path = input_path
x=ENERGIES
@@ -31,22 +55,24 @@ def switchpol(activeID, runtype):
if activeID == 1:
caput(OTF_OFF1,OFFSET1)
caput(OTF_OFF2,OFFSET2-40) #detune ID2
if runtype in ["+/-", "+"]:
wait_channel(OTF_DONE, 1, type = 'i')
if runtype in ["+/-","+,-", "+"]:
pol_str = "circ +"
elif runtype in ["LH/LV", "LH"]:
elif runtype in ["LH/LV","LH,LV", "LH"]:
pol_str = "Lin. Horizontal"
elif activeID == 2:
caput(OTF_OFF1,OFFSET1-40) #detune ID1
caput(OTF_OFF2,OFFSET2)
if runtype in ["+/-", "-"]:
wait_channel(OTF_DONE, 1, type = 'i')
if runtype in ["+/-","+,-", "+"]:
pol_str = "circ -"
elif runtype in ["LH/LV", "LV"]:
elif runtype in ["LH/LV","LH,LV", "LH"]:
pol_str = "Lin. Vertical"
else:
raise Exception("Invalid parameter")
LPP_DELAY_NEW = 0
LPP_FINE_DELAY_NEW = 0
'''LPP_DELAY_NEW = 0
LPP_FINE_DELAY_NEW = 0'''
def Convert_LPP_Delays(NewDelay):
global LPP_DELAY_NEW, LPP_FINE_DELAY_NEW
LPP_DELAY_NEW = math.trunc(((NewDelay*100.0+DELAY*BucketSize.read()*100+FINEDELAY)/100.0)/BucketSize.read())
@@ -55,7 +81,7 @@ def Convert_LPP_Delays(NewDelay):
pol_str = None
polswitch = 1
number_of_scans = 1
if RUNTYPE in ["+/-", "+", "-"]:
if RUNTYPE in ["+/-","+,-", "+", "-"]:
caput(OTF_MODE1,1) # circ + in ID1
caput(OTF_MODE2,2) # circ - in ID2
wait_channel(OTF_DONE, 1, type = 'i')
@@ -63,7 +89,7 @@ if RUNTYPE in ["+/-", "+", "-"]:
number_of_scans = 2 * ROUNDS
else:
number_of_scans = ROUNDS
elif RUNTYPE in ["LH/LV", "LH", "LV"]:
elif RUNTYPE in ["LH/LV","LH,LV", "LH", "LV"]:
caput(OTF_MODE1,0)
caput(OTF_MODE2,0)
wait_channel(OTF_DONE, 1, type = 'i')
@@ -80,7 +106,7 @@ else:
if RUNTYPE in ["-", "LV"]:
switchpol(2, RUNTYPE) # tune ID2 --> polarization: C- or LV
polswitch = 0
elif RUNTYPE in ["+/-", "+", "LH/LV", "LH"]:
elif RUNTYPE in ["+/-","+,-", "+", "LH/LV","LH,LV", "LH"]:
switchpol(1, RUNTYPE) # tune ID1 --> polarization: C+ or LH
time.sleep(1.0)
@@ -95,128 +121,116 @@ else:
caput (LPP_FINE_DELAY, LPP_FINE_DELAY_NEW)
wait_channel(TIME_DELAY_COMPLETE, 'SCAN Complete', timeout= abs((caget(TIME_DELAY_SET, type='d')-caget(TIME_DELAY_VAL, type='d')))*10)
def Timing(Step_size):
New_Time = caget(TIME_DELAY_VAL, type='d') + Step_Size
def Timing(New_Time):
caput (TIME_DELAY_SET, New_Time)
caput (TIME_DELAY_START, 1)
Convert_LPP_Delays(New_Time)
caput (LPP_DELAY, LPP_DELAY_NEW)
caput (LPP_FINE_DELAY, LPP_FINE_DELAY_NEW)
wait_channel(TIME_DELAY_COMPLETE, 'SCAN Complete', timeout= abs((caget(TIME_DELAY_SET, type='d')-caget(TIME_DELAY_VAL, type='d')))*10)
#wait_channel(TIME_DELAY_COMPLETE, 'SCAN Complete', timeout= abs((caget(TIME_DELAY_SET, type='d')-caget(TIME_DELAY_VAL, type='d')))*10)
try:
wait_channel(TIME_DELAY_COMPLETE, 'SCAN Complete', timeout= abs((caget(TIME_DELAY_SET, type='d')-caget(TIME_DELAY_VAL, type='d')))*10)
#otf_start.waitValue(0, (15 + int(TIME*60)) *1000)
except:
print "******** DELAY STOP TIMEOUT **********"
stopPlot()
###############################################################################
# Scanning
###############################################################################
'''task = None
running = False'''
MCP1 = []
MCP2 = []
sep = "\t"
line_sep = "\r\n"
'''def _startPlot(type):
global running
sep = "\t"
line_sep = "\r\n"
print "Starting plot: type " + str(type)
running = True
p = plot(None,name="Energy")[0]
s = p.getSeries(0)
cur = 0
time.sleep(3.0)
while running:
try:
if otf_start.read() == 0:
break'''
Delay_Time = START
'''for Delay_Time in xrange(START, END+0.1, STEP):
e = energy.read()
if (MCP_1 == 1 or MCP_2 == 1):
aK1=keithley_1a.read()
aP=FillingPattern.read()
aPr = []
for z in aP:
aPr.append(z)
SumaP=0
CamaP=0
for z in xrange(0,480):
SumaP = SumaP + aPr[z]
for z in xrange(460,470):
CamaP = CamaP + aPr[z]
aK1norm = aK1 * CamaP / SumaP
if MCP_1 == 1:
a1=MCPArray1.read()
a1r = []
for i in a1:
a1r.append(i)
Sum1a1 = 0
Cam1a1 = 0
Sum2a1 = 0
Cam2a1 = 0
MCP1.append(line_sep)
MCP1.append(e)
for i in xrange(0,480):
Sum1a1 = Sum1a1 + a1r[i]
for i in xrange(Cam_start,Cam_end+1):
Cam1a1 = Cam1a1 + a1r[i]
MCP1.append(Sum1a1)
MCP1.append(Cam1a1)
MCP1.append(aK1norm)
if NrCounters.read() > 460:
for i in xrange(480,960):
Sum2a1 = Sum2a1 + a1r[i]
for i in xrange(Cam_start+480,Cam_end+481):
Cam2a1 = Cam2a1 + a1r[i]
MCP1.append(Sum2a1)
MCP1.append(Cam2a1)
if Save_array_data == 1:
MCP1.append(a1r)
if MCP_2 == 1:
a2=MCPArray2.read()
a2r = []
for j in a2:
a2r.append(j)
Sum1a2 = 0
Cam1a2 = 0
Sum2a2 = 0
Cam2a2 = 0
MCP2.append(line_sep)
MCP2.append(e)
for j in xrange(0,480):
Sum1a2 = Sum1a2 + a2r[j]
for j in xrange(Cam_start,Cam_end+1):
Cam1a2 = Cam1a2 + a2r[j]
MCP2.append(Sum1a2)
MCP2.append(Cam1a2)
MCP2.append(aK1norm)
if NrCounters.read() > 460:
for j in xrange(480,960):
Sum2a2 = Sum2a2 + a2r[j]
for j in xrange(Cam_start+480,Cam_end+481):
Cam2a2 = Cam2a2 + a2r[j]
MCP2.append(Sum2a2)
MCP2.append(Cam2a2)
if Save_array_data == 1:
MCP2.append(a2r)
time.sleep(SamplingTime.read()*0.001)
if (abs(e-cur)) > 0.1:
v = abs((keithley_2a.read() / ((keithley_1a if (type==1) else keithley_3a).read() )))
s.appendData(e,v)
cur = e
# time.sleep(0.2)
except:
pass
print "Done Plotting"
def Scan(Dtime):
e = energy.read()
if (MCP_1 == 1 or MCP_2 == 1):
aK1=keithley_1a.read()
aP=FillingPattern.read()
aPr = []
for z in aP:
aPr.append(z)
SumaP=0
CamaP=0
for z in xrange(0,480):
SumaP = SumaP + aPr[z]
for z in xrange(460,470):
CamaP = CamaP + aPr[z]
aK1norm = aK1 * CamaP / SumaP
t_end = time.time()+ACQTIME
if MCP_1 == 1:
'''a1=MCPArray1.read()
a1r = []
for i in a1:
a1r.append(i)'''
a1r = []
while time.time() < t_end
a1t = MCPArray1.read().tolist()
a1r = [a1r[i]+a1t[i] for i in xrange(len(a1t))]
time.sleep(SamplingTime.read()*0.001)
Sum1a1 = 0
Cam1a1 = 0
Sum2a1 = 0
Cam2a1 = 0
MCP1.append(line_sep)
MCP1.append(Dtime)
MCP1.append(e)
MCP1.append(pol_str)
for i in xrange(0,480):
Sum1a1 = Sum1a1 + a1r[i]
for i in xrange(Cam_start,Cam_end+1):
Cam1a1 = Cam1a1 + a1r[i]
MCP1.append(Sum1a1)
MCP1.append(Cam1a1)
MCP1.append(aK1norm)
if NrCounters.read() > 460:
for i in xrange(480,960):
Sum2a1 = Sum2a1 + a1r[i]
for i in xrange(Cam_start+480,Cam_end+481):
Cam2a1 = Cam2a1 + a1r[i]
MCP1.append(Sum2a1)
MCP1.append(Cam2a1)
if Save_array_data == 1:
MCP1.append(a1r)
if MCP_2 == 1:
'''a2=MCPArray2.read()
a2r = []
for j in a2:
a2r.append(j)'''
a2r = []
while time.time() < t_end
a2t = MCPArray2.read().tolist()
a2r = [a2r[i]+a2t[i] for i in xrange(len(a2t))]
time.sleep(SamplingTime.read()*0.001)
Sum1a2 = 0
Cam1a2 = 0
Sum2a2 = 0
Cam2a2 = 0
MCP2.append(line_sep)
MCP1.append(Dtime)
MCP2.append(e)
MCP2.append(pol_str)
for j in xrange(0,480):
Sum1a2 = Sum1a2 + a2r[j]
for j in xrange(Cam_start,Cam_end+1):
Cam1a2 = Cam1a2 + a2r[j]
MCP2.append(Sum1a2)
MCP2.append(Cam1a2)
MCP2.append(aK1norm)
if NrCounters.read() > 460:
for j in xrange(480,960):
Sum2a2 = Sum2a2 + a2r[j]
for j in xrange(Cam_start+480,Cam_end+481):
Cam2a2 = Cam2a2 + a2r[j]
MCP2.append(Sum2a2)
MCP2.append(Cam2a2)
if Save_array_data == 1:
MCP2.append(a2r)
#v = abs((keithley_2a.read() / ((keithley_1a if (type==1) else keithley_3a).read() )))
s.appendData(Dtime,Cam1a1)
else:
print "No MCP is selected for acquisition. Select at least one ! ! ! "
def SaveData():
if MCP_1 == 1:
output_file_MCP1 = output_path+"MCP_1_"+file_prefix+"_" + suffix + ".dat"
MCP1out = open(output_file_MCP1, "a+")
sMCP1 = sep.join(str(x) for x in MCP1) + line_sep # MCP1.write("%s" + sep % i)
sMCP1out = sep + "rbkenergy" + sep + "Sum1" + sep + "Cam1" + sep + "Keithley1_norm"
sMCP1out = sep + "Delay_Time" + sep + "rbkenergy" + sep + "pol"+ sep + "Sum1" + sep + "Cam1" + sep + "Keithley1_norm"
if NrCounters.read() > 460:
sMCP1out = sMCP1out + sep + "Sum2" + sep + "Cam2"
if Save_array_data == 1:
@@ -229,7 +243,7 @@ Delay_Time = START
output_file_MCP2 = output_path+"MCP_2_"+file_prefix+"_" + suffix + ".dat"
MCP2out = open(output_file_MCP2, "a+")
sMCP2 = sep.join(str(y) for y in MCP2) + line_sep
sMCP2out = sep + "rbkenergy" + sep + "Sum1" + sep + "Cam1" + sep + "Keithley1_norm"
sMCP2out = sep + "Delay_Time" + sep + "rbkenergy"+ sep + "pol" + sep + "Sum1" + sep + "Cam1" + sep + "Keithley1_norm"
if NrCounters.read() > 460:
sMCP2out = sMCP2out + sep + "Sum2" + sep + "Cam2"
if Save_array_data == 1:
@@ -237,59 +251,57 @@ Delay_Time = START
sMCP2out = sMCP2out + line_sep + sMCP2
MCP2out.write(sMCP2out)
MCP2out.close()
print "Saved MCP I_0 data"
'''
'''
print "Saved MCP I_0 data"
###############################################################################
# Scanning
###############################################################################
sep = "\t"
line_sep = "\r\n"
def _startPlot(type):
sep = "\t"
line_sep = "\r\n"
print "Starting plot"
p = plot(None,name="Delay")[0]
s = p.getSeries(0)
Delay_Time = START
if RUNTYPE in ["+,-", "LH,LV"]:
polperscan=2
else:
polperscan=1
for Delay_Time in xrange(START, END+0.1, STEP):
Timing(Delay_Time)
for en in y:
caput(OTF_ESET,en)
wait_channel(OTF_DONE, 1, type = 'i')
Scan(Delay_Time)
if polperscan=2:
switchpol(2,RUNTYPE)
Scan(Delay_Time)
switchpol(1,RUNTYPE)
SaveData()
print "Done Plotting and Saving Data"
def startPlot(type = 1):
global task
task = fork((_startPlot,(type,)),)
def stopPlot():
global task, running
running = False
global task
ret = join(task)
'''
for scan_no in range(number_of_scans):
suffix = ("%03d" % fid)
input_file = input_path + "o" + file_prefix + "_" + suffix + ".dat"
caput(OTF_E1, E1)
caput(OTF_E2, E2)
caput(OTF_TIME, TIME)
caput(OTF_FTS,file_prefix)
caput(OTF_FID,fid)
time.sleep(2.0)
caput(OTF_ESET, E1)
wait_channel(OTF_DONE, 1, type = 'i')
time.sleep(DELAY)
time.sleep(2.0)
startPlot(PLOT_TYPE)
#Start the OTF scan
#caput(OTF_START, 'GO')
otf_start.write(1)
time.sleep(3.0)
MCP1 = []
MCP2 = []
startPlot()
print "Running scan " + str(scan_no+1) + " out of " + str(number_of_scans)
try:
#wait_channel(OTF_START, 'STOP', timeout = int(TIME*60), type = 's')
otf_start.waitValue(0, (15 + int(TIME*60)) *1000)
except:
print "******** OTF STOP TIMEOUT **********"
otf_start.write(0)
finally:
stopPlot()
time.sleep(5.0)
#TODO: wait for file instead of sleep
#Convert file
output_file = output_path+"os"+file_prefix+"_" + suffix + ".dat"
print("Converting data file: " + output_file);
convert_file(input_file, output_file, pol_str)
plot_file(output_file, file_prefix+"_" + suffix) #"Scan " + str(scan_no+1))
print "Finished scan " + str(scan_no+1) + " out of " + str(number_of_scans)
if RUNTYPE in ["+/-", "LH/LV"]:
if polswitch == 1:
switchpol(2, RUNTYPE) # tune ID2 --> polarization: C- or LV
@@ -298,9 +310,7 @@ for scan_no in range(number_of_scans):
polswitch = 1
switchpol(1, RUNTYPE) # tune ID1 --> polarization: C+ or LH
else:
print "running in one polarization mode, no switching"
time.sleep(3.0)
print "running in one polarization mode or in +,- mode"
fid = fid + 1
print "Finished Delay scan"
script/EnergyScan.py
+8 -8
View File
@@ -102,8 +102,8 @@ def _startPlot(type):
MCP1.append(e)
for i in xrange(0,480):
Sum1a1 = Sum1a1 + a1r[i]
#for i in xrange(Cam_start,Cam_end+1):
# Cam1a1 = Cam1a1 + a1r[i]
for i in xrange(Cam_start,Cam_end+1):
Cam1a1 = Cam1a1 + a1r[i]
Cam1a1 = a1r[Cam_start]
MCP1.append(Sum1a1)
@@ -113,8 +113,8 @@ def _startPlot(type):
if NrCounters.read() > 460:
for i in xrange(480,960):
Sum2a1 = Sum2a1 + a1r[i]
#for i in xrange(Cam_start+480,Cam_end+481):
# Cam2a1 = Cam2a1 + a1r[i]
for i in xrange(Cam_start+480,Cam_end+481):
Cam2a1 = Cam2a1 + a1r[i]
Cam2a1 = a1r[Cam_start+480]
MCP1.append(Sum2a1)
MCP1.append(Cam2a1)
@@ -134,8 +134,8 @@ def _startPlot(type):
MCP2.append(e)
for j in xrange(0,480):
Sum1a2 = Sum1a2 + a2r[j]
#for j in xrange(Cam_start,Cam_end+1):
# Cam1a2 = Cam1a2 + a2r[j]
for j in xrange(Cam_start,Cam_end+1):
Cam1a2 = Cam1a2 + a2r[j]
Cam1a2 = a2r[Cam_end]
MCP2.append(Sum1a2)
@@ -144,8 +144,8 @@ def _startPlot(type):
if NrCounters.read() > 460:
for j in xrange(480,960):
Sum2a2 = Sum2a2 + a2r[j]
#for j in xrange(Cam_start+480,Cam_end+481):
# Cam2a2 = Cam2a2 + a2r[j]
for j in xrange(Cam_start+480,Cam_end+481):
Cam2a2 = Cam2a2 + a2r[j]
Cam2a2 = a2r[Cam_end+481]
MCP2.append(Sum2a2)
MCP2.append(Cam2a2)