pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gobbo_a
2017-09-05 14:16:03 +02:00
parent 00003869e0
commit 0c1d63ae9a
9 changed files with 38 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
-2
View File
@@ -45,7 +45,5 @@ gsry=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:ROT_Y_SP SINEG01-MSOL130:ROT
camtool=ch.psi.pshell.bs.Camtool|localhost:10005|||
cam_server=ch.psi.pshell.bs.PipelineServer|sf-daqsync-01:8889|||
#SINEG01-DBPM340:Q=ch.psi.pshell.device.Averager|SINEG01-DBPM340:Q|||true
pbpg_mx=ch.psi.pshell.epics.Motor|SARFE10-PBPG050:MOTOR_X|||true
pbpg_my=ch.psi.pshell.epics.Motor|SARFE10-PBPG050:MOTOR_Y|||true
adc_xh1=ch.psi.pshell.epics.ChannelInteger|SARFE10-PBPG050:HAMP-014-x-h1-DATA-SUM|||true
adc_yh2=ch.psi.pshell.epics.ChannelInteger|SARFE10-PBPG050:HAMP-011-y-h2-DATA-SUM|||true
devices/CurrentCamera.properties
+8 -8
View File
@@ -1,16 +1,16 @@
#Tue Sep 05 10:19:32 CEST 2017
#Tue Sep 05 13:56:15 CEST 2017
colormap=Flame
colormapAutomatic=true
colormapMax=450.0
colormapMax=1000.0
colormapMin=70.0
flipHorizontally=false
flipVertically=false
grayscale=false
imageHeight=2148
imageWidth=2272
imageHeight=494
imageWidth=659
invert=false
regionStartX=129
regionStartY=7
regionStartX=0
regionStartY=0
rescaleFactor=1.0
rescaleOffset=0.0
roiHeight=-1
@@ -21,8 +21,8 @@ rotation=0.0
rotationCrop=false
scale=1.0
serverURL=localhost\:10000
spatialCalOffsetX=-50.03909304143862
spatialCalOffsetY=-50.048875855327466
spatialCalOffsetX=295.94701986754967
spatialCalOffsetY=138.70408163265307
spatialCalScaleX=-1.0
spatialCalScaleY=-1.0
spatialCalUnits=mm
devices/cam_server.properties
+3 -3
View File
@@ -1,4 +1,4 @@
#Mon Sep 04 11:07:31 CEST 2017
#Tue Sep 05 14:13:35 CEST 2017
colormap=Flame
colormapAutomatic=true
colormapMax=NaN
@@ -16,8 +16,8 @@ roiY=0
rotation=0.0
rotationCrop=false
scale=1.0
spatialCalOffsetX=-50.075987841945285
spatialCalOffsetY=-50.10141987829615
spatialCalOffsetX=-50.03909304143862
spatialCalOffsetY=-50.048875855327466
spatialCalScaleX=-1.0
spatialCalScaleY=-1.0
spatialCalUnits=mm
devices/camtool.properties
+5 -5
View File
@@ -1,4 +1,4 @@
#Wed Aug 16 06:32:36 CEST 2017
#Tue Sep 05 13:50:41 CEST 2017
colormap=Flame
colormapAutomatic=true
colormapMax=578.797
@@ -18,9 +18,9 @@ roiY=0
rotation=0.0
rotationCrop=false
scale=1.0
spatialCalOffsetX=-861.4939970777481
spatialCalOffsetY=-820.4883730911062
spatialCalScaleX=-18.90359092620482
spatialCalScaleY=-19.37984500632817
spatialCalOffsetX=0.0
spatialCalOffsetY=0.0
spatialCalScaleX=1.0
spatialCalScaleY=1.0
spatialCalUnits=mm
transpose=false
plugins/ScreenPanel.java
+6 -2
View File
@@ -2697,14 +2697,18 @@ public class ScreenPanel extends Panel {
source.getConfig().colormapAutomatic = buttonAutomatic.isSelected();
source.getConfig().colormapMin = buttonFullRange.isSelected() ? Double.NaN : (Integer) spinnerMin.getValue();
source.getConfig().colormapMax = buttonFullRange.isSelected() ? Double.NaN : (Integer) spinnerMax.getValue();
source.getConfig().save();
try{
source.getConfig().save();
} catch (Exception ex){
Logger.getLogger(ScreenPanel.class.getName()).log(Level.WARNING, null, ex);
}
source.refresh();
if (buttonPause.isSelected()) {
updatePause();
}
updateColormap();
}
} catch (Exception ex) {
} catch (Exception ex) {
showException(ex);
}
}//GEN-LAST:event_onChangeColormap
script/CPython/extremum.py
+5 -3
View File
@@ -5,14 +5,16 @@ def extremum(x, y):
"""
Return extremum coordinates of quadratic fit
"""
p = np.polyfit(x, y, 2)
pf = np.polyfit(x, y, 2, full=True)
p = pf[0]
res = pf[1][0]
f = np.poly1d(p)
if p[0] != 0:
x_ext = -p[1]/2/p[0]
x_ext = -p[1] / (2 * p[0])
y_ext = f(x_ext)
else:
x_ext = None
y_ext = None
x_fit = np.linspace(min(x), max(x), 100)
y_fit = f(x_fit)
return (x_ext, y_ext, x_fit, y_fit)
return (x_ext, y_ext, x_fit, y_fit, res)
script/CPython/wrapper.py
+1 -1
View File
@@ -6,7 +6,7 @@ def hfitoff(data, xdeg):
def extremum(x, y):
ret = call_jep("CPython/extremum", "extremum", [to_npa(x),to_npa(y)])
return (ret[0], ret[1], ret[2].data, ret[3].data)
return (ret[0], ret[1], ret[2].data, ret[3].data, ret[4])
def gfitoff(x, y, off=None, amp=None, com=None, sigma=None):
ret = call_jep("CPython/gfitoff", "gfitoff", [to_npa(x), to_npa(y), off, amp, com, sigma])
script/RFscan/GunEnergyScan.py
+10 -8
View File
@@ -1,8 +1,8 @@
import ch.psi.pshell.epics.Positioner as Positioner
import ch.psi.pshell.epics.Camtool as Camtool
dry_run = False
do_elog = True
dry_run = True
do_elog = False
is_panel = get_exec_pars().source != CommandSource.ui #must be check before run
run("CPython/wrapper")
@@ -99,9 +99,9 @@ try:
i_max = p.index(max(p))
i_min = dp.index(min(dp))
min_i, max_i = max(i_max-5, 0), min(i_max+6, len(p))
(ph_p_max, p_max, ph_p_fit, p_fit) = extremum(ph[min_i:max_i], p[min_i:max_i])
(ph_p_max, p_max, ph_p_fit, p_fit, p_res) = extremum(ph[min_i:max_i], p[min_i:max_i])
min_i, max_i = max(i_min-5, 0), min(i_min+6, len(dp))
(ph_dp_min, dp_min, ph_dp_fit, dp_fit) = extremum(ph[min_i:max_i], dp[min_i:max_i])
(ph_dp_min, dp_min, ph_dp_fit, dp_fit, dp_res) = extremum(ph[min_i:max_i], dp[min_i:max_i])
plt.addSeries(LinePlotErrorSeries("Momentum Fit", plt.getSeries(0).color))
plt.addSeries(LinePlotErrorSeries("Momentum Spread Fit", plt.getSeries(1).color, 2))
plt.getSeries(2).setData(ph_p_fit, p_fit)
@@ -115,11 +115,13 @@ except:
#Saving metadata
save_dataset(get_exec_pars().group + "/p", p)
set_attribute(get_exec_pars().group + "/p", "ph_p_max", ph_p_max)
set_attribute(get_exec_pars().group + "/p", "p_max", p_max)
set_attribute(get_exec_pars().group + "/p", "p max", p_max)
set_attribute(get_exec_pars().group + "/p", "p max phase", ph_p_max)
set_attribute(get_exec_pars().group + "/p", "p fit residuals", p_res)
save_dataset(get_exec_pars().group + "/dp", dp)
set_attribute(get_exec_pars().group + "/dp", "ph_dp_min", ph_dp_min)
set_attribute(get_exec_pars().group + "/dp", "dp_min", dp_min)
set_attribute(get_exec_pars().group + "/dp", "dp min", dp_min)
set_attribute(get_exec_pars().group + "/dp", "dp min phase", ph_dp_min)
set_attribute(get_exec_pars().group + "/dp", "dp fit residuals", dp_res)
#Elog entry
if do_elog:
script/camtool.py
-246
View File
@@ -1,246 +0,0 @@
#Interface to CameraTool application
import ch.psi.utils.Convert.toBidimensional as mono_to_bidi
import ch.psi.utils.Convert.toDouble as toDouble
import org.apache.commons.math3.linear.Array2DRowRealMatrix as Matrix
class CamToolImage(ReadableMatrix):
def __init__(self, camtool):
self.camtool = camtool
shape = camtool.shape.read()
self._width = shape[1] #len(camtool.profile_x.read())
self._height = shape[0] #len(camtool.(profile_y.read())
def read(self):
raw = self.camtool.data.read()
#return Matrix(toDouble(mono_to_bidi(raw, self.getHeight(), self.getWidth()))).transpose().getData() #data is transposed
return mono_to_bidi(raw, self.getWidth(), self.getHeight())
def getWidth(self):
return self._width
def getHeight(self):
return self._height
class CamTool(DeviceBase):
def __init__(self, name, prefix = "cam:", latch = False, camera = "SINEG01-DSCR190", egu = True, gauss = True):
DeviceBase.__init__(self, name)
run_channel = prefix + "camera.run"
caget(run_channel)
#try:
# caget(run_channel)
#except:
# cmd = "camtool --casprefix " + prefix + " --run -1 " + camera #--nogui
# print cmd
# fork( (exec_cmd,(cmd,)),)
# self.waitForChannel(run_channel, 20)
# time.sleep(5.0)
self.prefix = prefix
self.latch = latch
self.egu = egu
self.gauss=gauss
self.mode = "latch" if latch else "pipeline"
self.data_prefix = prefix + self.mode + "."
self.cam_run = create_channel_device(prefix + "camera.run", type='i', size=None, deviceName=name + " run") # Channel(prefix + "camera.run", alias = name + " run")
self.cam_latch = create_channel_device(prefix + "latch.capture", type='l', size=None, deviceName=name + " latch") # Channel(prefix + "latch.capture", 'l', alias = name + " latch")
if self.latch:
self.start()
time.sleep(3.0)
self.cam_latch.write(1)
self.waitForChannel(self.data_prefix + "timestamp",20)
else:
self.cam_run.write(1)
time.sleep(5.0)
self.waitForChannel(self.data_prefix + "timestamp",20)
self.waitForChannel(self.data_prefix + "image.shape",20)
self.stop()
self.timestamp = create_channel_device(self.data_prefix + "timestamp", type='d', size=None, deviceName=name + " timestamp") # Channel(self.data_prefix + "timestamp",type = 'd', alias = name + " timestamp") #[D1, D2, ...]
self.timestamp.setMonitored(True)#self.timestamp.set_monitored(True)
if egu:
if gauss:
self.com_x = create_channel_device(self.data_prefix + "x_stats.g_center_egu", type='d', size=None, deviceName=name + " gc_egu x")
self.com_y = create_channel_device(self.data_prefix + "y_stats.g_center_egu", type='d', size=None, deviceName=name + " gc_egu y")
caput(self.data_prefix + "x_stats.gauss_en", 1)
caput(self.data_prefix + "y_stats.gauss_en", 1)
else:
self.com_x = create_channel_device(self.data_prefix + "x_stats.com_egu", type='d', size=None, deviceName=name + " com_egu x") #Channel(self.data_prefix + "x_stats.com_egu", alias = name + " com_egu x")
self.com_y = create_channel_device(self.data_prefix + "y_stats.com_egu", type='d', size=None, deviceName=name + " com_egu y") #Channel(self.data_prefix + "y_stats.com_egu", alias = name + " com_egu y")
else:
self.com_x = create_channel_device(self.data_prefix + "x_stats.com", type='d', size=None, deviceName=name + " com x") #Channel(self.data_prefix + "x_stats.com", alias = name + " com x")
self.com_y = create_channel_device(self.data_prefix + "y_stats.com", type='d', size=None, deviceName=name + " com x") #Channel(self.data_prefix + "y_stats.com", alias = name + " com y")
self.profile_x = create_channel_device(self.data_prefix + "profile.x", type='d', size=None, deviceName=name + " profile x") #Channel(self.data_prefix + "profile.x", alias = name + " profile x")
self.profile_y = create_channel_device(self.data_prefix + "profile.y", type='d', size=None, deviceName=name + " profile y") #Channel(self.data_prefix + "profile.y", alias = name + " profile y")
self.data = Channel(self.data_prefix + "image", alias = name + " data")
self.shape = Channel(self.data_prefix + "image.shape", alias = name + " shape") #[D1, D2, ...]
self.bg_en = create_channel_device(prefix + "pipeline.bg.enabled", type='l', size=None, deviceName=name + " bg enabled") #self.bg_en = Channel(prefix + "pipeline.bg.enabled", type = 'l', alias = name + " bg enabled")
self.bg_capture = create_channel_device(prefix + "pipeline.bg.capture", type='l', size=None, deviceName=name + " bg capture") #self.bg_capture = Channel(prefix + "pipeline.bg.capture", type = 'l', alias = name + " bg capture")
self.bg_capture_remain = create_channel_device(prefix + "pipeline.bg.capture_remain", type='l', size=None, deviceName=name + " capture remain") #self.bg_capture_remain = Channel(prefix + "pipeline.bg.capture_remain", alias = name + " capture remain")
self.num_images = 1
self.grab_timeout = 5.0
self.image = CamToolImage(self)
set_device_alias(self.image, name + " image")
self.com_x_samples, self.com_y_samples = [], []
class CamToolComX(Readable):
def read(self):
return mean(self.camtool.com_x_samples)
self.com_x_mean = CamToolComX(); self.com_x_mean.camtool = self
class CamToolComY(Readable):
def read(self):
return mean(self.camtool.com_y_samples)
self.com_y_mean = CamToolComY(); self.com_y_mean.camtool = self
class CamToolComXVar(Readable):
def read(self):
return stdev(self.camtool.com_x_samples)
self.com_x_stdev = CamToolComXVar(); self.com_x_stdev.camtool = self
class CamToolComXVar(Readable):
def read(self):
return stdev(self.camtool.com_y_samples)
self.com_y_stdev = CamToolComXVar(); self.com_y_stdev.camtool = self
set_device_alias(self.com_x_mean, name + " com x mean")
set_device_alias(self.com_y_mean, name + " com y mean")
set_device_alias(self.com_x_stdev, name + " com x stdev")
set_device_alias(self.com_y_stdev, name + " com y stdev")
def waitForChannel(self, channel, timeout):
print "Waiting for:", channel
start = time.time()
while(True):
try:
caget(channel)
print "Found channel:", channel
break
#except Exception as e:
except:
if (time.time() - start) > timeout:
raise Exception("Timeout waiting for channel: " + channel)
time.sleep(0.5)
def doInitialize(self):
if self.latch:
self.start()
else:
self.stop()
def start(self):
#print "Start"
self.cam_run.write(-1)
def stop(self):
#print "Stop"
self.cam_run.write(0)
def capture(self):
retries = 3
while(True):
try:
timestamp = self.timestamp.read()
#print "Current timestamp: ", timestamp
if not self.latch:
self.cam_run.write(1)
else:
self.cam_latch.write(1)
start = time.time()
while(True):
val = self.timestamp.read()
if timestamp != val:
#print "New timestamp: ", val
self.setCache(val)
return
if (time.time()-start) > self.grab_timeout:
raise Exception("Frame timeout")
time.sleep(0.005)
except Exception, e:
retries = retries -1
print "---------------- Exception ------------------------"
print e
if retries<=0:
print "Failure "
raise e
else:
print "Retrying ", retries
def doUpdate(self):
self.com_x_samples, self.com_y_samples = [], []
for i in range(self.num_images):
self.capture()
self.com_x_samples.append(self.com_x.read())
self.com_y_samples.append(self.com_y.read())
def setNumberOfImages(self, value):
self.num_images = value
def enableBackground(self, value):
self.bg_en.write(1 if value else 0)
def captureBackground(self, images):
self.start()
self.bg_capture.write(images)
sleep(0.2)
while(True):
finished = True
for retry in range(10):
if self.bg_capture_remain.read() > 0:
finished = False
break
sleep(0.05)
if finished:
break
time.sleep(0.1)
#self.stop()
#self.bg_capture.write(images)
#while( self.bg_capture_remain.read() > 0):
# self.capture()
self.doInitialize()
def doClose(self):
self.cam_run.close()
self.cam_latch.close()
self.timestamp.close()
self.com_x.close()
self.com_y.close()
self.profile_x.close()
self.profile_y.close()
self.data.close()
self.shape.close()
#self.bg_image.close()
self.bg_en.close()
self.bg_capture.close()
self.bg_capture_remain.close()
#self.image.close()
"""
try:
if get_device("camtool") is None:
add_device(CamTool("camtool", prefix = "SINEG01-DSCR190:", latch = True, camera = "SINEG01-DSCR190"), True)
camtool.enableBackground(True)
for i in range (1000):
camtool.capture()
print i, camtool.take(), camtool.com_x.read(), camtool.com_y.read()
finally:
print ""
"""
"""
if __name__ == "__builtin__":
#image_stats.enableBackground(False)
image_stats.enableBackground(False)
#image_stats.captureBackground(5)
for i in range (1000):
image_stats.capture()
print i, image_stats.take(), image_stats.com_x.read(), image_stats.com_y.read()
#from camtool import CamTool
#camera_tool = CamTool("camtool", latch = True)
#add_device(camera_tool, True)
#camera_tool.enableBackground(True)
#camera_tool.capture()
#print camera_tool.take(), camera_tool.com_x.read(), camera_tool.com_y.read()
"""