diff --git a/devices/src1.properties b/devices/src1.properties index ae3390a..9621cf6 100644 --- a/devices/src1.properties +++ b/devices/src1.properties @@ -1,4 +1,4 @@ -#Tue May 03 10:26:42 CEST 2016 +#Fri Jun 02 14:36:51 CEST 2017 colormap=Temperature colormapAutomatic=true colormapMax=255.0 @@ -9,5 +9,16 @@ grayscale=false invert=false rescaleFactor=1.0 rescaleOffset=0.0 +roiHeight=-1 +roiWidth=-1 +roiX=0 +roiY=0 rotation=0.0 +rotationCrop=false scale=1.0 +spatialCalOffsetX=NaN +spatialCalOffsetY=NaN +spatialCalScaleX=NaN +spatialCalScaleY=NaN +spatialCalUnits=mm +transpose=false diff --git a/devices/src2.properties b/devices/src2.properties index b5c9eee..b56cd4c 100644 --- a/devices/src2.properties +++ b/devices/src2.properties @@ -1,4 +1,4 @@ -#Tue May 03 10:26:42 CEST 2016 +#Fri Jun 02 14:36:51 CEST 2017 colormap=Grayscale colormapAutomatic=true colormapMax=255.0 @@ -9,5 +9,16 @@ grayscale=false invert=false rescaleFactor=1.0 rescaleOffset=0.0 +roiHeight=-1 +roiWidth=-1 +roiX=0 +roiY=0 rotation=0.0 +rotationCrop=false scale=1.0 +spatialCalOffsetX=NaN +spatialCalOffsetY=NaN +spatialCalScaleX=NaN +spatialCalScaleY=NaN +spatialCalUnits=mm +transpose=false diff --git a/script/Bpm6ParallelScan.py b/script/Bpm6ParallelScan.py index b21790e..f40bec1 100644 --- a/script/Bpm6ParallelScan.py +++ b/script/Bpm6ParallelScan.py @@ -51,8 +51,11 @@ for sensor in sensors: sensor.setMonitored(True) caput ("X12SA-ES1-TTL:OUT_02", "HIGH") +x_axis = SensorXAxis(pico_bpm6_ts_sumall) +#r = tscan([pico_bpm6_ts_sumall, pico_bpm6_ts_cur1, pico_bpm6_ts_cur2, pico_bpm6_ts_cur3, pico_bpm6_ts_cur4, x_axis], 10, 0.2) + try: - time_interval_scan(pico_bpm6_ts_sumall, 10, 0.2) + time_interval_scan(pico_bpm6_ts_sumall, 10, 0.2)\ samples = 10 parallelize([fixed_samples_scan, [pico_bpm6_ts_sumall, samples]], [fixed_samples_scan, [pico_bpm6_ts_cur1, samples]], \ [fixed_samples_scan, [pico_bpm6_ts_cur2, samples]], [fixed_samples_scan, [pico_bpm6_ts_cur3, samples]], \ diff --git a/script/local.py b/script/local.py index 9a26826..2635288 100644 --- a/script/local.py +++ b/script/local.py @@ -85,6 +85,14 @@ class PicoAmp(DeviceBase, Stoppable): return caget (self.prefix + "Current4:TSAcquiring") == "Done" + + +################################################################################################### +#Scripted dvice instantiation +################################################################################################### + + + ################################################################################################### #Scripted dvice instantiation ###################################################################################################