diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index e016c1b..ac606be 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,16 +1,16 @@ -#Fri Jun 02 11:09:06 CEST 2017 +#Fri Jun 02 15:28:55 CEST 2017 colormap=Flame -colormapAutomatic=true -colormapMax=0.0 -colormapMin=0.0 +colormapAutomatic=false +colormapMax=200.0 +colormapMin=10.0 flipHorizontally=false flipVertically=false grayscale=false -imageHeight=1680 -imageWidth=1744 +imageHeight=2148 +imageWidth=2272 invert=false -regionStartX=433 -regionStartY=241 +regionStartX=129 +regionStartY=7 rescaleFactor=1.0 rescaleOffset=0.0 roiHeight=-1 diff --git a/devices/WireScanner motor.properties b/devices/WireScanner motor.properties index b34e7f9..5a0e763 100644 --- a/devices/WireScanner motor.properties +++ b/devices/WireScanner motor.properties @@ -1,12 +1,12 @@ -#Fri Jun 02 10:56:08 CEST 2017 +#Fri Jun 02 11:35:28 CEST 2017 defaultSpeed=6000.0 estbilizationDelay=0 hasEnable=false homingType=None maxSpeed=8000.0 -maxValue=200000.0 +maxValue=51500.0 minSpeed=50.0 -minValue=-200000.0 +minValue=-56789.2 offset=0.0 precision=1 resolution=0.1 diff --git a/script/local.py b/script/local.py index bc361f7..3249eae 100755 --- a/script/local.py +++ b/script/local.py @@ -401,7 +401,7 @@ def check_camtool(): while not is_camtool_running(): if time.time() - start > 2.0: raise Exception("Error starting camtool process") - time.sleep(2.0) + time.sleep(3.0) def bsget(channel): """ diff --git a/script/test/WireScanEncoderTest.py b/script/test/WireScanEncoderTest.py new file mode 100644 index 0000000..af30c2a --- /dev/null +++ b/script/test/WireScanEncoderTest.py @@ -0,0 +1,22 @@ +run("Devices/Elements") +run("Devices/WireScanner") + +prefix = "S30CB09-DWSC440" +scanner = WireScanner(prefix, [-200, 200, -200, 200], 3, 200, True) + + +st = Stream("pulse_id", dispatcher) +st.addScalar("m_pos", prefix + ":ENC_1_BS", 1, 0) +st.initialize() + + +setup_plotting(enable_plots = "m_pos",domain = "pulse_id") + +scanner.set_selection(WireScanner.W1X) +scanner.init(wait=False) + +bscan(st, 650) +scanner.park(wait=False) + +bscan(st, 650, title = "Back") +scanner.wait_in_selection() \ No newline at end of file