From b0ec5b4d850d6383d9b22df040b3d47aba92832c Mon Sep 17 00:00:00 2001 From: sfop Date: Fri, 25 Nov 2016 11:10:15 +0100 Subject: [PATCH] Startup --- devices/CurrentCamera.properties | 14 +++++++------- script/scan_dv.py | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 660fe70..1daf0a0 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Mon Nov 21 09:52:06 CET 2016 +#Thu Nov 24 16:18:07 CET 2016 colormap=Grayscale colormapAutomatic=true colormapMax=0.0 @@ -6,8 +6,8 @@ colormapMin=0.0 flipHorizontally=false flipVertically=true grayscale=false -imageHeight=1200 -imageWidth=1246 +imageHeight=1680 +imageWidth=1744 invert=false rescaleFactor=1.0 rescaleOffset=0.0 @@ -18,9 +18,9 @@ roiY=0 rotation=0.0 rotationCrop=false scale=1.0 -spatialCalOffsetX=-630.0 -spatialCalOffsetY=-612.0 -spatialCalScaleX=-26.761819803746654 -spatialCalScaleY=-26.595744680851062 +spatialCalOffsetX=-861.0 +spatialCalOffsetY=-820.0 +spatialCalScaleX=-18.90359168241966 +spatialCalScaleY=-19.37984496124031 spatialCalUnits=mm transpose=false diff --git a/script/scan_dv.py b/script/scan_dv.py index 54dffb2..27e637e 100644 --- a/script/scan_dv.py +++ b/script/scan_dv.py @@ -1,12 +1,12 @@ -knob = "" -sensor1 = "SINEG01-DICT215:B1_CHARGE" -sensor2 = "S10DI01-DICT025:B1_CHARGE" +knob = Channel("SARUN20-MCRX080:I-SET") +sensor1 = Channel("SINEG01-DICT210:B1_CHARGE") +sensor2 = Channel("SINEG01-DICT215:B1_CHARGE") -start = 3 -stop = 9 -step = 0.5 +start = -0.6 +stop = -0.4 +nstep = 10 +lat = 0.5 +r = lscan(knob, (sensor1, sensor2), start, stop, nstep, lat) -r = lscan(knob, (sensor1, sensor2), start, stop, step, 1.0) - -plot(r.getReadable(1), xdata = r.getReadable(0)) +#plot(r.getReadable(0), r.getReadable(1), xdata = r.getPositions(0))