diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/CHANGELOG.rst b/CHANGELOG.rst old mode 100644 new mode 100755 index e188044..1440f97 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,13 +1,6 @@ ####### Changes ####### -* 2019-08-09: **2.0.4** - Zachary Parrott - -* Added ability to use a CSV file to generate values for output variables. -* Additional program in \examples for setting up a virtual sweep titled 'Virtual Setup' - - * 2015-04-13: **2.0.2b** Kaveh Gharavi (kayghar@gmail.com) diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/MANIFEST.in b/MANIFEST.in old mode 100644 new mode 100755 diff --git a/README.rst b/README.rst old mode 100644 new mode 100755 diff --git a/SEP_tuning.py b/SEP_tuning.py deleted file mode 100644 index 6d90d6b..0000000 --- a/SEP_tuning.py +++ /dev/null @@ -1,31 +0,0 @@ -from spacq.interface.units import Quantity - -# initialize voltage source -from spacq.devices.basel.dacsp927 import dacsp927 -kwargs1 = {'host_address':'192.168.0.5'} -vsource = dacsp927(**kwargs1) -port1 = vsource.subdevices['port1'] - -# initialize multimeter -from spacq.devices.agilent.dm34410a import DM34410A -kwargs2 = {'ip_address':'192.168.0.7'} -multimeter = DM34410A(**kwargs2) - -import time -target = Quantity(1, units='V') -while True: - v_set = port1.voltage - v_meas = multimeter.reading - print(v_meas) - next_step = target - v_meas - if next_step < Quantity(1.2, 'uV'): #limit of DAC resolution - break - else: - next_voltage = v_set + next_step - port1.voltage = next_voltage - time.sleep(1) - -time.sleep(5) -port1.voltage = Quantity(0, units='V') -time.sleep(0.5) -v_meas = multimeter.reading \ No newline at end of file diff --git a/SEP_tuning_files/2D_sweep_RF_DC.csv b/SEP_tuning_files/2D_sweep_RF_DC.csv deleted file mode 100644 index 34b0f93..0000000 --- a/SEP_tuning_files/2D_sweep_RF_DC.csv +++ /dev/null @@ -1,2602 +0,0 @@ -Vrf [V],Vdc [V],I [nA] -0.63,0.63,0.0011091 -0.632,0.63,0.00075889 -0.634,0.63,0.0002919 -0.636,0.63,0.000175 -0.638,0.63,0.00034974 -0.64,0.63,0.00087415 -0.642,0.63,0.00093229 -0.644,0.63,0.00058273 -0.646,0.63,0.00046622 -0.648,0.63,0.00046622 -0.65,0.63,0.00040797 -0.652,0.63,0.00029143 -0.654,0.63,0.00058294 -0.656,0.63,0.00058251 -0.658,0.63,0.0005826 -0.66,0.63,0.00058256 -0.662,0.63,0.00058281 -0.664,0.63,0.00046649 -0.666,0.63,0 -0.668,0.63,0.00029145 -0.67,0.63,0.00046653 -0.672,0.63,0.0005248 -0.674,0.63,0.0004667 -0.676,0.63,0.00058342 -0.678,0.63,0.00052469 -0.68,0.63,0.00040806 -0.682,0.63,0.00046642 -0.684,0.63,0.00034989 -0.686,0.63,0.00046656 -0.688,0.63,0.00035 -0.69,0.63,0.00046656 -0.692,0.63,0.00052508 -0.694,0.63,0.00058367 -0.696,0.63,0.00058381 -0.698,0.63,0.00064223 -0.7,0.63,0.00075929 -0.702,0.63,0.00075973 -0.704,0.63,0.00093471 -0.706,0.63,0.00075889 -0.708,0.63,0.00093395 -0.71,0.63,0.00081726 -0.712,0.63,0.00081726 -0.714,0.63,0.00075889 -0.716,0.63,0.00093409 -0.718,0.63,0.00058372 -0.72,0.63,0.00046646 -0.722,0.63,0.00034984 -0.724,0.63,0.00017486 -0.726,0.63,0.00017484 -0.728,0.63,0.00046625 -0.73,0.63,0.00040797 -0.63,0.632,0.00023309 -0.632,0.632,0.00011658 -0.634,0.632,0.00023318 -0.636,0.632,0.00023325 -0.638,0.632,0.00046642 -0.64,0.632,0.00034977 -0.642,0.632,0.00029151 -0.644,0.632,0.00029171 -0.646,0.632,0.000175 -0.648,0.632,0.00035015 -0.65,0.632,0.00040857 -0.652,0.632,0.00046698 -0.654,0.632,0.00087577 -0.656,0.632,0.00070051 -0.658,0.632,0.00046712 -0.66,0.632,0.0001168 -0.662,0.632,0.00035046 -0.664,0.632,0.00058462 -0.666,0.632,0.00087661 -0.668,0.632,0.00093513 -0.67,0.632,0.0010523 -0.672,0.632,0.00087668 -0.674,0.632,0.00075996 -0.676,0.632,0.00046746 -0.678,0.632,0.00029205 -0.68,0.632,0.00029203 -0.682,0.632,0.00058393 -0.684,0.632,0.00070088 -0.686,0.632,0.00075934 -0.688,0.632,0.0006429 -0.69,0.632,0.00058398 -0.692,0.632,0.00052546 -0.694,0.632,0.0004086 -0.696,0.632,0.00058342 -0.698,0.632,0.00075883 -0.7,0.632,0.00058354 -0.702,0.632,0.00046653 -0.704,0.632,0.00040821 -0.706,0.632,0.00040812 -0.708,0.632,0.000408 -0.71,0.632,0.00040797 -0.712,0.632,0.00046622 -0.714,0.632,0.0002914 -0.716,0.632,0.00017487 -0.718,0.632,0.00011654 -0.72,0.632,0.00034964 -0.722,0.632,0.00058268 -0.724,0.632,0.00029145 -0.726,0.632,0.00069979 -0.728,0.632,0.00052488 -0.73,0.632,0.00046646 -0.63,0.634,0.00070078 -0.632,0.634,0.0007595 -0.634,0.634,0.00070098 -0.636,0.634,0.00075962 -0.638,0.634,0.00070114 -0.64,0.634,0.00052573 -0.642,0.634,0.00023356 -0.644,0.634,0.00017508 -0.646,0.634,0.00029177 -0.648,0.634,0.0002918 -0.65,0.634,0.0002918 -0.652,0.634,0.00023347 -0.654,0.634,0.0004086 -0.656,0.634,0.00029192 -0.658,0.634,0.0005255 -0.66,0.634,0.00064223 -0.662,0.634,0.00052538 -0.664,0.634,0.00052543 -0.666,0.634,0.00058398 -0.668,0.634,0.00058393 -0.67,0.634,0.00046712 -0.672,0.634,0.00052543 -0.674,0.634,0.00070051 -0.676,0.634,0.00075877 -0.678,0.634,0.00064214 -0.68,0.634,0.00064223 -0.682,0.634,0.00075895 -0.684,0.634,0.00087584 -0.686,0.634,0.00093402 -0.688,0.634,0.00058312 -0.69,0.634,0.00029134 -0.692,0.634,0.00034964 -0.694,0.634,0.00023318 -0.696,0.634,5.83E-05 -0.698,0.634,0.00017506 -0.7,0.634,0.00035023 -0.702,0.634,0.00035026 -0.704,0.634,0.00040866 -0.706,0.634,0.00046701 -0.708,0.634,0.00040875 -0.71,0.634,0.00035036 -0.712,0.634,0.00023354 -0.714,0.634,0.00029197 -0.716,0.634,0.0002919 -0.718,0.634,0.00064238 -0.72,0.634,0.00040872 -0.722,0.634,0.00064219 -0.724,0.634,0.00040866 -0.726,0.634,0.00070051 -0.728,0.634,0.00093409 -0.73,0.634,0.000759 -0.63,0.636,0.00093416 -0.632,0.636,0.00093402 -0.634,0.636,0.0010508 -0.636,0.636,0.0010509 -0.638,0.636,0.00093423 -0.64,0.636,0.00099269 -0.642,0.636,0.0011096 -0.644,0.636,0.0010511 -0.646,0.636,0.00099262 -0.648,0.636,0.0011091 -0.65,0.636,0.001109 -0.652,0.636,0.00046705 -0.654,0.636,0.00029199 -0.656,0.636,0.00075917 -0.658,0.636,0.00093451 -0.66,0.636,0.00093437 -0.662,0.636,0.00099291 -0.664,0.636,0.0011099 -0.666,0.636,0.00099328 -0.668,0.636,0.00099313 -0.67,0.636,0.00093478 -0.672,0.636,0.0010514 -0.674,0.636,0.0011679 -0.676,0.636,0.001168 -0.678,0.636,0.0012264 -0.68,0.636,0.0013429 -0.682,0.636,0.0011094 -0.684,0.636,0.00099262 -0.686,0.636,0.00093409 -0.688,0.636,0.00058381 -0.69,0.636,0.00075877 -0.692,0.636,0.0011088 -0.694,0.636,0.0012259 -0.696,0.636,0.0011091 -0.698,0.636,0.0011091 -0.7,0.636,0.0011091 -0.702,0.636,0.0012838 -0.704,0.636,0.0012841 -0.706,0.636,0.0015748 -0.708,0.636,0.001459 -0.71,0.636,0.0011675 -0.712,0.636,0.00099166 -0.714,0.636,0.0011082 -0.716,0.636,0.0012246 -0.718,0.636,0.0011664 -0.72,0.636,0.0012255 -0.722,0.636,0.0011665 -0.724,0.636,0.0011082 -0.726,0.636,0.001109 -0.728,0.636,0.0012257 -0.73,0.636,0.0012252 -0.63,0.638,0.00017503 -0.632,0.638,0.00017509 -0.634,0.638,0.0001167 -0.636,0.638,0.00029184 -0.638,0.638,0.00029186 -0.64,0.638,0.00023349 -0.642,0.638,0 -0.644,0.638,5.84E-05 -0.646,0.638,0.00029184 -0.648,0.638,0.00046701 -0.65,0.638,0.00058381 -0.652,0.638,0.00046701 -0.654,0.638,0.00029188 -0.656,0.638,0.0002919 -0.658,0.638,0.00023349 -0.66,0.638,0.00058354 -0.662,0.638,0.00075877 -0.664,0.638,0.00058337 -0.666,0.638,0.00075867 -0.668,0.638,0.00058346 -0.67,0.638,0.00046694 -0.672,0.638,0.00046718 -0.674,0.638,0.0009935 -0.676,0.638,0.0012269 -0.678,0.638,0.0014026 -0.68,0.638,0.0014033 -0.682,0.638,0.0014035 -0.684,0.638,0.0014034 -0.686,0.638,0.0011689 -0.688,0.638,0.0014037 -0.69,0.638,0.0017545 -0.692,0.638,0.0016959 -0.694,0.638,0.0016374 -0.696,0.638,0.0018715 -0.698,0.638,0.0018715 -0.7,0.638,0.0022224 -0.702,0.638,0.0022811 -0.704,0.638,0.0024562 -0.706,0.638,0.0026316 -0.708,0.638,0.0026316 -0.71,0.638,0.0026318 -0.712,0.638,0.0027485 -0.714,0.638,0.0028655 -0.716,0.638,0.0031579 -0.718,0.638,0.0034496 -0.72,0.638,0.003507 -0.722,0.638,0.0028617 -0.724,0.638,0.0023936 -0.726,0.638,0.0023934 -0.728,0.638,0.0027443 -0.73,0.638,0.0031558 -0.63,0.64,0.00011674 -0.632,0.64,0.00011671 -0.634,0.64,0.00046687 -0.636,0.64,0.00070041 -0.638,0.64,0.0004668 -0.64,0.64,0.00029184 -0.642,0.64,0.00040836 -0.644,0.64,0.0005835 -0.646,0.64,0.00093409 -0.648,0.64,0.0012844 -0.65,0.64,0.0016353 -0.652,0.64,0.0016355 -0.654,0.64,0.0019284 -0.656,0.64,0.0020453 -0.658,0.64,0.0014611 -0.66,0.64,0.0012263 -0.662,0.64,0.001401 -0.664,0.64,0.001751 -0.666,0.64,0.001868 -0.668,0.64,0.0018683 -0.67,0.64,0.0019854 -0.672,0.64,0.0019857 -0.674,0.64,0.0020445 -0.676,0.64,0.0022201 -0.678,0.64,0.0025115 -0.68,0.64,0.0025111 -0.682,0.64,0.0023963 -0.684,0.64,0.0025729 -0.686,0.64,0.0025737 -0.688,0.64,0.0028691 -0.69,0.64,0.0028666 -0.692,0.64,0.0025139 -0.694,0.64,0.0022209 -0.696,0.64,0.0022211 -0.698,0.64,0.0022201 -0.7,0.64,0.0028645 -0.702,0.64,0.0036274 -0.704,0.64,0.0039211 -0.706,0.64,0.003976 -0.708,0.64,0.0040348 -0.71,0.64,0.0036823 -0.712,0.64,0.0036818 -0.714,0.64,0.0039766 -0.716,0.64,0.0043863 -0.718,0.64,0.0047964 -0.72,0.64,0.0052644 -0.722,0.64,0.0054399 -0.724,0.64,0.0056759 -0.726,0.64,0.0057413 -0.728,0.64,0.00591 -0.73,0.64,0.0063824 -0.63,0.642,0.0018687 -0.632,0.642,0.0023963 -0.634,0.642,0.0027484 -0.636,0.642,0.0025708 -0.638,0.642,0.002338 -0.64,0.642,0.0023977 -0.642,0.642,0.0028655 -0.644,0.642,0.0031595 -0.646,0.642,0.0030425 -0.648,0.642,0.0026905 -0.65,0.642,0.002807 -0.652,0.642,0.0031582 -0.654,0.642,0.0028056 -0.656,0.642,0.0022196 -0.658,0.642,0.0020448 -0.66,0.642,0.0021609 -0.662,0.642,0.0027467 -0.664,0.642,0.0029207 -0.666,0.642,0.0023347 -0.668,0.642,0.0025689 -0.67,0.642,0.0028608 -0.672,0.642,0.0032708 -0.674,0.642,0.0036239 -0.676,0.642,0.0038597 -0.678,0.642,0.0039772 -0.68,0.642,0.0039772 -0.682,0.642,0.0039784 -0.684,0.642,0.0041536 -0.686,0.642,0.0045645 -0.688,0.642,0.0050965 -0.69,0.642,0.0053315 -0.692,0.642,0.0056245 -0.694,0.642,0.0060355 -0.696,0.642,0.0061527 -0.698,0.642,0.0061523 -0.7,0.642,0.0065644 -0.702,0.642,0.007094 -0.704,0.642,0.0072117 -0.706,0.642,0.0072736 -0.708,0.642,0.0078056 -0.71,0.642,0.008159 -0.712,0.642,0.0083944 -0.714,0.642,0.0089834 -0.716,0.642,0.0093392 -0.718,0.642,0.0098112 -0.72,0.642,0.010289 -0.722,0.642,0.011113 -0.724,0.642,0.011344 -0.726,0.642,0.011524 -0.728,0.642,0.011828 -0.73,0.642,0.01254 -0.63,0.644,0.0025115 -0.632,0.644,0.0033896 -0.634,0.644,0.0031556 -0.636,0.644,0.0025111 -0.638,0.644,0.0023363 -0.64,0.644,0.0035633 -0.642,0.644,0.0046781 -0.644,0.644,0.0044431 -0.646,0.644,0.0036812 -0.648,0.644,0.0035046 -0.65,0.644,0.0038012 -0.652,0.644,0.0044471 -0.654,0.644,0.004387 -0.656,0.644,0.0042118 -0.658,0.644,0.0045066 -0.66,0.644,0.0051551 -0.662,0.644,0.0059783 -0.664,0.644,0.0059192 -0.666,0.644,0.0059201 -0.668,0.644,0.0061527 -0.67,0.644,0.006622 -0.672,0.644,0.0070354 -0.674,0.644,0.0073887 -0.676,0.644,0.0076296 -0.678,0.644,0.0077475 -0.68,0.644,0.0082764 -0.682,0.644,0.0093343 -0.684,0.644,0.010393 -0.686,0.644,0.010511 -0.688,0.644,0.010455 -0.69,0.644,0.010984 -0.692,0.644,0.011696 -0.694,0.644,0.012171 -0.696,0.644,0.012524 -0.698,0.644,0.013115 -0.7,0.644,0.013644 -0.702,0.644,0.014177 -0.704,0.644,0.01484 -0.706,0.644,0.015008 -0.708,0.644,0.015842 -0.71,0.644,0.016495 -0.712,0.644,0.016971 -0.714,0.644,0.017155 -0.716,0.644,0.017464 -0.718,0.644,0.017877 -0.72,0.644,0.018765 -0.722,0.644,0.019653 -0.724,0.644,0.020485 -0.726,0.644,0.020846 -0.728,0.644,0.021036 -0.73,0.644,0.022002 -0.63,0.646,0.0035686 -0.632,0.646,0.0042735 -0.634,0.646,0.0037455 -0.636,0.646,0.0044511 -0.638,0.646,0.0066855 -0.64,0.646,0.0086924 -0.642,0.646,0.0086937 -0.644,0.646,0.007572 -0.646,0.646,0.0072785 -0.648,0.646,0.0088106 -0.65,0.646,0.010292 -0.652,0.646,0.010646 -0.654,0.646,0.0098774 -0.656,0.646,0.0094587 -0.658,0.646,0.010638 -0.66,0.646,0.011586 -0.662,0.646,0.011836 -0.664,0.646,0.011954 -0.666,0.646,0.01231 -0.668,0.646,0.013257 -0.67,0.646,0.014496 -0.672,0.646,0.015324 -0.674,0.646,0.015144 -0.676,0.646,0.015383 -0.678,0.646,0.015497 -0.68,0.646,0.015786 -0.682,0.646,0.016615 -0.684,0.646,0.017205 -0.686,0.646,0.018087 -0.688,0.646,0.019282 -0.69,0.646,0.020314 -0.692,0.646,0.020695 -0.694,0.646,0.021296 -0.696,0.646,0.022077 -0.698,0.646,0.023645 -0.7,0.646,0.024729 -0.702,0.646,0.025634 -0.704,0.646,0.026237 -0.706,0.646,0.027093 -0.708,0.646,0.028062 -0.71,0.646,0.029498 -0.712,0.646,0.030658 -0.714,0.646,0.031208 -0.716,0.646,0.03228 -0.718,0.646,0.034103 -0.72,0.646,0.035883 -0.722,0.646,0.03712 -0.724,0.646,0.038198 -0.726,0.646,0.039741 -0.728,0.646,0.041385 -0.73,0.646,0.042596 -0.63,0.648,0.0047323 -0.632,0.648,0.0044431 -0.634,0.648,0.0062011 -0.636,0.648,0.010443 -0.638,0.648,0.015009 -0.64,0.648,0.015197 -0.642,0.648,0.01212 -0.644,0.648,0.011643 -0.646,0.648,0.015783 -0.648,0.648,0.018714 -0.65,0.648,0.0186 -0.652,0.648,0.017059 -0.654,0.648,0.017051 -0.656,0.648,0.018309 -0.658,0.648,0.021413 -0.66,0.648,0.022736 -0.662,0.648,0.022328 -0.664,0.648,0.022388 -0.666,0.648,0.024199 -0.668,0.648,0.026011 -0.67,0.648,0.02757 -0.672,0.648,0.027224 -0.674,0.648,0.027523 -0.676,0.648,0.028912 -0.678,0.648,0.0302 -0.68,0.648,0.03141 -0.682,0.648,0.032367 -0.684,0.648,0.033589 -0.686,0.648,0.035612 -0.688,0.648,0.036883 -0.69,0.648,0.037732 -0.692,0.648,0.038281 -0.694,0.648,0.039816 -0.696,0.648,0.041146 -0.698,0.648,0.043285 -0.7,0.648,0.044781 -0.702,0.648,0.045858 -0.704,0.648,0.047445 -0.706,0.648,0.049332 -0.708,0.648,0.050751 -0.71,0.648,0.052432 -0.712,0.648,0.054871 -0.714,0.648,0.057338 -0.716,0.648,0.059418 -0.718,0.648,0.060633 -0.72,0.648,0.061113 -0.722,0.648,0.064068 -0.724,0.648,0.06646 -0.726,0.648,0.069084 -0.728,0.648,0.070372 -0.73,0.648,0.07199 -0.63,0.65,0.0075743 -0.632,0.65,0.0067487 -0.634,0.65,0.01314 -0.636,0.65,0.021262 -0.638,0.65,0.02348 -0.64,0.65,0.019879 -0.642,0.65,0.019872 -0.644,0.65,0.024848 -0.646,0.65,0.030994 -0.648,0.65,0.032637 -0.65,0.65,0.029848 -0.652,0.65,0.028202 -0.654,0.65,0.033044 -0.656,0.65,0.038557 -0.658,0.65,0.040714 -0.66,0.65,0.039224 -0.662,0.65,0.038838 -0.664,0.65,0.041707 -0.666,0.65,0.0457 -0.668,0.65,0.04667 -0.67,0.65,0.045556 -0.672,0.65,0.046053 -0.674,0.65,0.046804 -0.676,0.65,0.048713 -0.678,0.65,0.050441 -0.68,0.65,0.052782 -0.682,0.65,0.054198 -0.684,0.65,0.055948 -0.686,0.65,0.058134 -0.688,0.65,0.060214 -0.69,0.65,0.061608 -0.692,0.65,0.064501 -0.694,0.65,0.067674 -0.696,0.65,0.069712 -0.698,0.65,0.071984 -0.7,0.65,0.073946 -0.702,0.65,0.076031 -0.704,0.65,0.078124 -0.706,0.65,0.081659 -0.708,0.65,0.085289 -0.71,0.65,0.086991 -0.712,0.65,0.087607 -0.714,0.65,0.088731 -0.716,0.65,0.091383 -0.718,0.65,0.09601 -0.72,0.65,0.099264 -0.722,0.65,0.1024 -0.724,0.65,0.10451 -0.726,0.65,0.10828 -0.728,0.65,0.1113 -0.73,0.65,0.11378 -0.63,0.652,0.012468 -0.632,0.652,0.012118 -0.634,0.652,0.022256 -0.636,0.652,0.029243 -0.638,0.652,0.027912 -0.64,0.652,0.027965 -0.642,0.652,0.039212 -0.644,0.652,0.051412 -0.646,0.652,0.057093 -0.648,0.652,0.051962 -0.65,0.652,0.048844 -0.652,0.652,0.056367 -0.654,0.652,0.064339 -0.656,0.652,0.066577 -0.658,0.652,0.064866 -0.66,0.652,0.063617 -0.662,0.652,0.067959 -0.664,0.652,0.073566 -0.666,0.652,0.076815 -0.668,0.652,0.076199 -0.67,0.652,0.075337 -0.672,0.652,0.078369 -0.674,0.652,0.082909 -0.676,0.652,0.086375 -0.678,0.652,0.088189 -0.68,0.652,0.089465 -0.682,0.652,0.092357 -0.684,0.652,0.09663 -0.686,0.652,0.10038 -0.688,0.652,0.10273 -0.69,0.652,0.10542 -0.692,0.652,0.10719 -0.694,0.652,0.10811 -0.696,0.652,0.11114 -0.698,0.652,0.11513 -0.7,0.652,0.11749 -0.702,0.652,0.12225 -0.704,0.652,0.1284 -0.706,0.652,0.13238 -0.708,0.652,0.13386 -0.71,0.652,0.13295 -0.712,0.652,0.12964 -0.714,0.652,0.13212 -0.716,0.652,0.13531 -0.718,0.652,0.13851 -0.72,0.652,0.14086 -0.722,0.652,0.14574 -0.724,0.652,0.15183 -0.726,0.652,0.15559 -0.728,0.652,0.1589 -0.73,0.652,0.16293 -0.63,0.654,0.016504 -0.632,0.654,0.014301 -0.634,0.654,0.024522 -0.636,0.654,0.030614 -0.638,0.654,0.031406 -0.64,0.654,0.038486 -0.642,0.654,0.058602 -0.644,0.654,0.077396 -0.646,0.654,0.08011 -0.648,0.654,0.071219 -0.65,0.654,0.06936 -0.652,0.654,0.080238 -0.654,0.654,0.094294 -0.656,0.654,0.09541 -0.658,0.654,0.089546 -0.66,0.654,0.08989 -0.662,0.654,0.097264 -0.664,0.654,0.10496 -0.666,0.654,0.1084 -0.668,0.654,0.10744 -0.67,0.654,0.10846 -0.672,0.654,0.11436 -0.674,0.654,0.12008 -0.676,0.654,0.12184 -0.678,0.654,0.12412 -0.68,0.654,0.12537 -0.682,0.654,0.1308 -0.684,0.654,0.13445 -0.686,0.654,0.13952 -0.688,0.654,0.14159 -0.69,0.654,0.14495 -0.692,0.654,0.14927 -0.694,0.654,0.15596 -0.696,0.654,0.16015 -0.698,0.654,0.16344 -0.7,0.654,0.16468 -0.702,0.654,0.16831 -0.704,0.654,0.1726 -0.706,0.654,0.17826 -0.708,0.654,0.18105 -0.71,0.654,0.18299 -0.712,0.654,0.18973 -0.714,0.654,0.19642 -0.716,0.654,0.20262 -0.718,0.654,0.20611 -0.72,0.654,0.21028 -0.722,0.654,0.21279 -0.724,0.654,0.21491 -0.726,0.654,0.21776 -0.728,0.654,0.22405 -0.73,0.654,0.23086 -0.63,0.656,0.022017 -0.632,0.656,0.0174 -0.634,0.656,0.023682 -0.636,0.656,0.028098 -0.638,0.656,0.038227 -0.64,0.656,0.064196 -0.642,0.656,0.097293 -0.644,0.656,0.10935 -0.646,0.656,0.10034 -0.648,0.656,0.096876 -0.65,0.656,0.11505 -0.652,0.656,0.13975 -0.654,0.656,0.14638 -0.656,0.656,0.13765 -0.658,0.656,0.13413 -0.66,0.656,0.14369 -0.662,0.656,0.15683 -0.664,0.656,0.16067 -0.666,0.656,0.15842 -0.668,0.656,0.15687 -0.67,0.656,0.16304 -0.672,0.656,0.17132 -0.674,0.656,0.17699 -0.676,0.656,0.17806 -0.678,0.656,0.17885 -0.68,0.656,0.18537 -0.682,0.656,0.19242 -0.684,0.656,0.19862 -0.686,0.656,0.20111 -0.688,0.656,0.20406 -0.69,0.656,0.20695 -0.692,0.656,0.21051 -0.694,0.656,0.2173 -0.696,0.656,0.22171 -0.698,0.656,0.22624 -0.7,0.656,0.22929 -0.702,0.656,0.23535 -0.704,0.656,0.2436 -0.706,0.656,0.24776 -0.708,0.656,0.25246 -0.71,0.656,0.25671 -0.712,0.656,0.26237 -0.714,0.656,0.27024 -0.716,0.656,0.27451 -0.718,0.656,0.27688 -0.72,0.656,0.28303 -0.722,0.656,0.28804 -0.724,0.656,0.2928 -0.726,0.656,0.29851 -0.728,0.656,0.30299 -0.73,0.656,0.30729 -0.63,0.658,0.029209 -0.632,0.658,0.017425 -0.634,0.658,0.020773 -0.636,0.658,0.030532 -0.638,0.658,0.057244 -0.64,0.658,0.096566 -0.642,0.658,0.12143 -0.644,0.658,0.11825 -0.646,0.658,0.12004 -0.648,0.658,0.14688 -0.65,0.658,0.1847 -0.652,0.658,0.20114 -0.654,0.658,0.19331 -0.656,0.658,0.18789 -0.658,0.658,0.19989 -0.66,0.658,0.21879 -0.662,0.658,0.22785 -0.664,0.658,0.22121 -0.666,0.658,0.21877 -0.668,0.658,0.22804 -0.67,0.658,0.24069 -0.672,0.658,0.24659 -0.674,0.658,0.24478 -0.676,0.658,0.24544 -0.678,0.658,0.25362 -0.68,0.658,0.26187 -0.682,0.658,0.27027 -0.684,0.658,0.27032 -0.686,0.658,0.27147 -0.688,0.658,0.27806 -0.69,0.658,0.28318 -0.692,0.658,0.29073 -0.694,0.658,0.29819 -0.696,0.658,0.30481 -0.698,0.658,0.30833 -0.7,0.658,0.31242 -0.702,0.658,0.31494 -0.704,0.658,0.31899 -0.706,0.658,0.3235 -0.708,0.658,0.32705 -0.71,0.658,0.33144 -0.712,0.658,0.33652 -0.714,0.658,0.34383 -0.716,0.658,0.34714 -0.718,0.658,0.35413 -0.72,0.658,0.35908 -0.722,0.658,0.36323 -0.724,0.658,0.3676 -0.726,0.658,0.37026 -0.728,0.658,0.37726 -0.73,0.658,0.38381 -0.63,0.66,0.030908 -0.632,0.66,0.013909 -0.634,0.66,0.021728 -0.636,0.66,0.041442 -0.638,0.66,0.077291 -0.64,0.66,0.10709 -0.642,0.66,0.11906 -0.644,0.66,0.12926 -0.646,0.66,0.16267 -0.648,0.66,0.21445 -0.65,0.66,0.24682 -0.652,0.66,0.24143 -0.654,0.66,0.23301 -0.656,0.66,0.25036 -0.658,0.66,0.2771 -0.66,0.66,0.29269 -0.662,0.66,0.28908 -0.664,0.66,0.28379 -0.666,0.66,0.29212 -0.668,0.66,0.30412 -0.67,0.66,0.31125 -0.672,0.66,0.30914 -0.674,0.66,0.30965 -0.676,0.66,0.31328 -0.678,0.66,0.32273 -0.68,0.66,0.3334 -0.682,0.66,0.33668 -0.684,0.66,0.33912 -0.686,0.66,0.34466 -0.688,0.66,0.3532 -0.69,0.66,0.35797 -0.692,0.66,0.36277 -0.694,0.66,0.36713 -0.696,0.66,0.37318 -0.698,0.66,0.37856 -0.7,0.66,0.38378 -0.702,0.66,0.38924 -0.704,0.66,0.39716 -0.706,0.66,0.40304 -0.708,0.66,0.40603 -0.71,0.66,0.40618 -0.712,0.66,0.41278 -0.714,0.66,0.41977 -0.716,0.66,0.42424 -0.718,0.66,0.42776 -0.72,0.66,0.43172 -0.722,0.66,0.43608 -0.724,0.66,0.4406 -0.726,0.66,0.44516 -0.728,0.66,0.44902 -0.73,0.66,0.4532 -0.63,0.662,0.033294 -0.632,0.662,0.013709 -0.634,0.662,0.024646 -0.636,0.662,0.050416 -0.638,0.662,0.08081 -0.64,0.662,0.1013 -0.642,0.662,0.12041 -0.644,0.662,0.16305 -0.646,0.662,0.22637 -0.648,0.662,0.27357 -0.65,0.662,0.28153 -0.652,0.662,0.27658 -0.654,0.662,0.30073 -0.656,0.662,0.33337 -0.658,0.662,0.35728 -0.66,0.662,0.3549 -0.662,0.662,0.34571 -0.664,0.662,0.34957 -0.666,0.662,0.36738 -0.668,0.662,0.38113 -0.67,0.662,0.38298 -0.672,0.662,0.3793 -0.674,0.662,0.3806 -0.676,0.662,0.39157 -0.678,0.662,0.40384 -0.68,0.662,0.40642 -0.682,0.662,0.41027 -0.684,0.662,0.416 -0.686,0.662,0.42292 -0.688,0.662,0.42779 -0.69,0.662,0.43373 -0.692,0.662,0.43554 -0.694,0.662,0.43748 -0.696,0.662,0.445 -0.698,0.662,0.45151 -0.7,0.662,0.45626 -0.702,0.662,0.45992 -0.704,0.662,0.46151 -0.706,0.662,0.46432 -0.708,0.662,0.46809 -0.71,0.662,0.47391 -0.712,0.662,0.47777 -0.714,0.662,0.4823 -0.716,0.662,0.48741 -0.718,0.662,0.48999 -0.72,0.662,0.49379 -0.722,0.662,0.49728 -0.724,0.662,0.50214 -0.726,0.662,0.50556 -0.728,0.662,0.50788 -0.73,0.662,0.51131 -0.63,0.664,0.037712 -0.632,0.664,0.019742 -0.634,0.664,0.033455 -0.636,0.664,0.057662 -0.638,0.664,0.074882 -0.64,0.664,0.097549 -0.642,0.664,0.14136 -0.644,0.664,0.20733 -0.646,0.664,0.26804 -0.648,0.664,0.29119 -0.65,0.664,0.2962 -0.652,0.664,0.32082 -0.654,0.664,0.37233 -0.656,0.664,0.39935 -0.658,0.664,0.39946 -0.66,0.664,0.39288 -0.662,0.664,0.40236 -0.664,0.664,0.42583 -0.666,0.664,0.43642 -0.668,0.664,0.43586 -0.67,0.664,0.43141 -0.672,0.664,0.43583 -0.674,0.664,0.44781 -0.676,0.664,0.45604 -0.678,0.664,0.45904 -0.68,0.664,0.46102 -0.682,0.664,0.46656 -0.684,0.664,0.47302 -0.686,0.664,0.47971 -0.688,0.664,0.48575 -0.69,0.664,0.48941 -0.692,0.664,0.49394 -0.694,0.664,0.49884 -0.696,0.664,0.5034 -0.698,0.664,0.50615 -0.7,0.664,0.51055 -0.702,0.664,0.51488 -0.704,0.664,0.51878 -0.706,0.664,0.523 -0.708,0.664,0.52538 -0.71,0.664,0.52619 -0.712,0.664,0.53043 -0.714,0.664,0.53557 -0.716,0.664,0.53919 -0.718,0.664,0.54064 -0.72,0.664,0.54165 -0.722,0.664,0.5449 -0.724,0.664,0.54918 -0.726,0.664,0.55095 -0.728,0.664,0.55234 -0.73,0.664,0.55597 -0.63,0.666,0.042528 -0.632,0.666,0.0218 -0.634,0.666,0.033445 -0.636,0.666,0.049118 -0.638,0.666,0.070641 -0.64,0.666,0.10947 -0.642,0.666,0.17375 -0.644,0.666,0.23596 -0.646,0.666,0.2727 -0.648,0.666,0.29187 -0.65,0.666,0.32938 -0.652,0.666,0.38611 -0.654,0.666,0.42494 -0.656,0.666,0.43381 -0.658,0.666,0.4301 -0.66,0.666,0.44074 -0.662,0.666,0.46212 -0.664,0.666,0.47858 -0.666,0.666,0.48134 -0.668,0.666,0.47782 -0.67,0.666,0.4812 -0.672,0.666,0.493 -0.674,0.666,0.50363 -0.676,0.666,0.50889 -0.678,0.666,0.5095 -0.68,0.666,0.51155 -0.682,0.666,0.51949 -0.684,0.666,0.52738 -0.686,0.666,0.53124 -0.688,0.666,0.53374 -0.69,0.666,0.53602 -0.692,0.666,0.53999 -0.694,0.666,0.54665 -0.696,0.666,0.55212 -0.698,0.666,0.55515 -0.7,0.666,0.55745 -0.702,0.666,0.56006 -0.704,0.666,0.56458 -0.706,0.666,0.56802 -0.708,0.666,0.5705 -0.71,0.666,0.57314 -0.712,0.666,0.57595 -0.714,0.666,0.57879 -0.716,0.666,0.58204 -0.718,0.666,0.58453 -0.72,0.666,0.58711 -0.722,0.666,0.5896 -0.724,0.666,0.59072 -0.726,0.666,0.59113 -0.728,0.666,0.5935 -0.73,0.666,0.5961 -0.63,0.668,0.046282 -0.632,0.668,0.022884 -0.634,0.668,0.03188 -0.636,0.668,0.049031 -0.638,0.668,0.081071 -0.64,0.668,0.13315 -0.642,0.668,0.18997 -0.644,0.668,0.23471 -0.646,0.668,0.26995 -0.648,0.668,0.31451 -0.65,0.668,0.37639 -0.652,0.668,0.42883 -0.654,0.668,0.4478 -0.656,0.668,0.45011 -0.658,0.668,0.46203 -0.66,0.668,0.48709 -0.662,0.668,0.50829 -0.664,0.668,0.51239 -0.666,0.668,0.50856 -0.668,0.668,0.5129 -0.67,0.668,0.52536 -0.672,0.668,0.53385 -0.674,0.668,0.53801 -0.676,0.668,0.54048 -0.678,0.668,0.54465 -0.68,0.668,0.55205 -0.682,0.668,0.55984 -0.684,0.668,0.56463 -0.686,0.668,0.56736 -0.688,0.668,0.57111 -0.69,0.668,0.57635 -0.692,0.668,0.58174 -0.694,0.668,0.58486 -0.696,0.668,0.58652 -0.698,0.668,0.58868 -0.7,0.668,0.59191 -0.702,0.668,0.59555 -0.704,0.668,0.59885 -0.706,0.668,0.60118 -0.708,0.668,0.60404 -0.71,0.668,0.60667 -0.712,0.668,0.60909 -0.714,0.668,0.61117 -0.716,0.668,0.61346 -0.718,0.668,0.61556 -0.72,0.668,0.61833 -0.722,0.668,0.62004 -0.724,0.668,0.62091 -0.726,0.668,0.62218 -0.728,0.668,0.62431 -0.73,0.668,0.62576 -0.63,0.67,0.047295 -0.632,0.67,0.02044 -0.634,0.67,0.02975 -0.636,0.67,0.052963 -0.638,0.67,0.089627 -0.64,0.67,0.13654 -0.642,0.67,0.18212 -0.644,0.67,0.22638 -0.646,0.67,0.27982 -0.648,0.67,0.35041 -0.65,0.67,0.40981 -0.652,0.67,0.43944 -0.654,0.67,0.45235 -0.656,0.67,0.4725 -0.658,0.67,0.50112 -0.66,0.67,0.5251 -0.662,0.67,0.5313 -0.664,0.67,0.53175 -0.666,0.67,0.53766 -0.668,0.67,0.54936 -0.67,0.67,0.56142 -0.672,0.67,0.56728 -0.674,0.67,0.56979 -0.676,0.67,0.57417 -0.678,0.67,0.58262 -0.68,0.67,0.5892 -0.682,0.67,0.59378 -0.684,0.67,0.59636 -0.686,0.67,0.60031 -0.688,0.67,0.60614 -0.69,0.67,0.6104 -0.692,0.67,0.61469 -0.694,0.67,0.61721 -0.696,0.67,0.61965 -0.698,0.67,0.62344 -0.7,0.67,0.62631 -0.702,0.67,0.62949 -0.704,0.67,0.63126 -0.706,0.67,0.63326 -0.708,0.67,0.63566 -0.71,0.67,0.63853 -0.712,0.67,0.63966 -0.714,0.67,0.64128 -0.716,0.67,0.6432 -0.718,0.67,0.64454 -0.72,0.67,0.64618 -0.722,0.67,0.64636 -0.724,0.67,0.64846 -0.726,0.67,0.65061 -0.728,0.67,0.65133 -0.73,0.67,0.65244 -0.63,0.672,0.040532 -0.632,0.672,0.019774 -0.634,0.672,0.032003 -0.636,0.672,0.056807 -0.638,0.672,0.093607 -0.64,0.672,0.13632 -0.642,0.672,0.18313 -0.644,0.672,0.23277 -0.646,0.672,0.30126 -0.648,0.672,0.36712 -0.65,0.672,0.41426 -0.652,0.672,0.43868 -0.654,0.672,0.4654 -0.656,0.672,0.49925 -0.658,0.672,0.52593 -0.66,0.672,0.54059 -0.662,0.672,0.54492 -0.664,0.672,0.55178 -0.666,0.672,0.5634 -0.668,0.672,0.57863 -0.67,0.672,0.58605 -0.672,0.672,0.58916 -0.674,0.672,0.59394 -0.676,0.672,0.60101 -0.678,0.672,0.60839 -0.68,0.672,0.614 -0.682,0.672,0.61731 -0.684,0.672,0.6209 -0.686,0.672,0.62579 -0.688,0.672,0.63115 -0.69,0.672,0.63623 -0.692,0.672,0.63885 -0.694,0.672,0.64085 -0.696,0.672,0.64477 -0.698,0.672,0.64794 -0.7,0.672,0.65037 -0.702,0.672,0.65321 -0.704,0.672,0.65638 -0.706,0.672,0.65878 -0.708,0.672,0.66088 -0.71,0.672,0.6626 -0.712,0.672,0.66394 -0.714,0.672,0.66582 -0.716,0.672,0.6681 -0.718,0.672,0.66999 -0.72,0.672,0.67072 -0.722,0.672,0.67143 -0.724,0.672,0.67279 -0.726,0.672,0.67405 -0.728,0.672,0.67615 -0.73,0.672,0.67782 -0.63,0.674,0.048681 -0.632,0.674,0.021601 -0.634,0.674,0.038282 -0.636,0.674,0.060064 -0.638,0.674,0.093302 -0.64,0.674,0.13269 -0.642,0.674,0.18087 -0.644,0.674,0.24122 -0.646,0.674,0.30705 -0.648,0.674,0.37237 -0.65,0.674,0.41678 -0.652,0.674,0.44641 -0.654,0.674,0.47888 -0.656,0.674,0.51257 -0.658,0.674,0.54021 -0.66,0.674,0.55259 -0.662,0.674,0.56 -0.664,0.674,0.5715 -0.666,0.674,0.58473 -0.668,0.674,0.59717 -0.67,0.674,0.60438 -0.672,0.674,0.6091 -0.674,0.674,0.61605 -0.676,0.674,0.62472 -0.678,0.674,0.63228 -0.68,0.674,0.63636 -0.682,0.674,0.63948 -0.684,0.674,0.64373 -0.686,0.674,0.64951 -0.688,0.674,0.65502 -0.69,0.674,0.65928 -0.692,0.674,0.66153 -0.694,0.674,0.6656 -0.696,0.674,0.66768 -0.698,0.674,0.67102 -0.7,0.674,0.67362 -0.702,0.674,0.67811 -0.704,0.674,0.68069 -0.706,0.674,0.68265 -0.708,0.674,0.68542 -0.71,0.674,0.6878 -0.712,0.674,0.69 -0.714,0.674,0.69289 -0.716,0.674,0.69474 -0.718,0.674,0.69525 -0.72,0.674,0.69582 -0.722,0.674,0.69673 -0.724,0.674,0.69785 -0.726,0.674,0.69914 -0.728,0.674,0.70085 -0.73,0.674,0.70196 -0.63,0.676,0.052943 -0.632,0.676,0.023917 -0.634,0.676,0.036525 -0.636,0.676,0.05977 -0.638,0.676,0.094558 -0.64,0.676,0.13446 -0.642,0.676,0.19058 -0.644,0.676,0.25666 -0.646,0.676,0.32397 -0.648,0.676,0.37689 -0.65,0.676,0.41543 -0.652,0.676,0.45479 -0.654,0.676,0.49588 -0.656,0.676,0.52848 -0.658,0.676,0.54691 -0.66,0.676,0.55924 -0.662,0.676,0.57261 -0.664,0.676,0.58776 -0.666,0.676,0.60284 -0.668,0.676,0.61356 -0.67,0.676,0.62114 -0.672,0.676,0.62943 -0.674,0.676,0.63849 -0.676,0.676,0.64727 -0.678,0.676,0.65303 -0.68,0.676,0.65731 -0.682,0.676,0.66157 -0.684,0.676,0.6682 -0.686,0.676,0.67437 -0.688,0.676,0.67795 -0.69,0.676,0.68138 -0.692,0.676,0.68528 -0.694,0.676,0.6882 -0.696,0.676,0.69091 -0.698,0.676,0.69358 -0.7,0.676,0.69768 -0.702,0.676,0.7002 -0.704,0.676,0.70302 -0.706,0.676,0.70506 -0.708,0.676,0.7076 -0.71,0.676,0.70946 -0.712,0.676,0.71153 -0.714,0.676,0.71366 -0.716,0.676,0.71552 -0.718,0.676,0.71659 -0.72,0.676,0.71888 -0.722,0.676,0.72048 -0.724,0.676,0.72197 -0.726,0.676,0.7233 -0.728,0.676,0.72405 -0.73,0.676,0.72545 -0.63,0.678,0.054042 -0.632,0.678,0.024664 -0.634,0.678,0.0379 -0.636,0.678,0.061594 -0.638,0.678,0.09496 -0.64,0.678,0.14157 -0.642,0.678,0.20267 -0.644,0.678,0.27748 -0.646,0.678,0.326 -0.648,0.678,0.37484 -0.65,0.678,0.42662 -0.652,0.678,0.47729 -0.654,0.678,0.51257 -0.656,0.678,0.5355 -0.658,0.678,0.55132 -0.66,0.678,0.56904 -0.662,0.678,0.58898 -0.664,0.678,0.60433 -0.666,0.678,0.61607 -0.668,0.678,0.62624 -0.67,0.678,0.63738 -0.672,0.678,0.65038 -0.674,0.678,0.6608 -0.676,0.678,0.66697 -0.678,0.678,0.67307 -0.68,0.678,0.67931 -0.682,0.678,0.6862 -0.684,0.678,0.69286 -0.686,0.678,0.69743 -0.688,0.678,0.7006 -0.69,0.678,0.70399 -0.692,0.678,0.7082 -0.694,0.678,0.71149 -0.696,0.678,0.71565 -0.698,0.678,0.71923 -0.7,0.678,0.72276 -0.702,0.678,0.72429 -0.704,0.678,0.7267 -0.706,0.678,0.72912 -0.708,0.678,0.73191 -0.71,0.678,0.73427 -0.712,0.678,0.73655 -0.714,0.678,0.73914 -0.716,0.678,0.74024 -0.718,0.678,0.74076 -0.72,0.678,0.74169 -0.722,0.678,0.74399 -0.724,0.678,0.74566 -0.726,0.678,0.74811 -0.728,0.678,0.74955 -0.73,0.678,0.75126 -0.63,0.68,0.045119 -0.632,0.68,0.026144 -0.634,0.68,0.040652 -0.636,0.68,0.061874 -0.638,0.68,0.097605 -0.64,0.68,0.148 -0.642,0.68,0.20574 -0.644,0.68,0.26242 -0.646,0.68,0.31961 -0.648,0.68,0.37735 -0.65,0.68,0.43514 -0.652,0.68,0.48313 -0.654,0.68,0.51801 -0.656,0.68,0.53999 -0.658,0.68,0.56046 -0.66,0.68,0.58258 -0.662,0.68,0.60394 -0.664,0.68,0.62041 -0.666,0.68,0.6328 -0.668,0.68,0.64436 -0.67,0.68,0.65774 -0.672,0.68,0.67085 -0.674,0.68,0.67942 -0.676,0.68,0.68666 -0.678,0.68,0.69305 -0.68,0.68,0.70098 -0.682,0.68,0.70734 -0.684,0.68,0.71417 -0.686,0.68,0.71893 -0.688,0.68,0.72273 -0.69,0.68,0.72747 -0.692,0.68,0.73204 -0.694,0.68,0.73534 -0.696,0.68,0.73836 -0.698,0.68,0.74187 -0.7,0.68,0.74593 -0.702,0.68,0.7484 -0.704,0.68,0.74977 -0.706,0.68,0.75265 -0.708,0.68,0.75556 -0.71,0.68,0.75836 -0.712,0.68,0.76101 -0.714,0.68,0.76314 -0.716,0.68,0.76538 -0.718,0.68,0.76771 -0.72,0.68,0.76934 -0.722,0.68,0.77236 -0.724,0.68,0.77417 -0.726,0.68,0.77529 -0.728,0.68,0.77658 -0.73,0.68,0.77806 -0.63,0.682,0.056647 -0.632,0.682,0.026186 -0.634,0.682,0.039217 -0.636,0.682,0.066897 -0.638,0.682,0.10377 -0.64,0.682,0.15335 -0.642,0.682,0.21071 -0.644,0.682,0.26862 -0.646,0.682,0.33037 -0.648,0.682,0.39043 -0.65,0.682,0.44596 -0.652,0.682,0.48834 -0.654,0.682,0.51842 -0.656,0.682,0.54394 -0.658,0.682,0.56912 -0.66,0.682,0.59399 -0.662,0.682,0.61172 -0.664,0.682,0.62761 -0.666,0.682,0.64427 -0.668,0.682,0.66016 -0.67,0.682,0.67551 -0.672,0.682,0.6881 -0.674,0.682,0.6988 -0.676,0.682,0.70819 -0.678,0.682,0.71748 -0.68,0.682,0.72523 -0.682,0.682,0.73282 -0.684,0.682,0.73831 -0.686,0.682,0.74381 -0.688,0.682,0.74793 -0.69,0.682,0.75209 -0.692,0.682,0.75721 -0.694,0.682,0.76082 -0.696,0.682,0.76381 -0.698,0.682,0.76785 -0.7,0.682,0.77174 -0.702,0.682,0.77425 -0.704,0.682,0.77633 -0.706,0.682,0.77981 -0.708,0.682,0.78399 -0.71,0.682,0.78644 -0.712,0.682,0.7881 -0.714,0.682,0.79021 -0.716,0.682,0.79206 -0.718,0.682,0.79444 -0.72,0.682,0.79779 -0.722,0.682,0.79938 -0.724,0.682,0.80115 -0.726,0.682,0.80213 -0.728,0.682,0.80257 -0.73,0.682,0.80336 -0.63,0.684,0.059288 -0.632,0.684,0.027848 -0.634,0.684,0.043861 -0.636,0.684,0.069108 -0.638,0.684,0.10788 -0.64,0.684,0.16376 -0.642,0.684,0.21512 -0.644,0.684,0.27357 -0.646,0.684,0.34073 -0.648,0.684,0.40821 -0.65,0.684,0.45487 -0.652,0.684,0.48994 -0.654,0.684,0.52611 -0.656,0.684,0.55487 -0.658,0.684,0.58176 -0.66,0.684,0.60708 -0.662,0.684,0.62313 -0.664,0.684,0.64051 -0.666,0.684,0.65719 -0.668,0.684,0.67564 -0.67,0.684,0.69225 -0.672,0.684,0.70609 -0.674,0.684,0.71763 -0.676,0.684,0.72825 -0.678,0.684,0.7393 -0.68,0.684,0.74731 -0.682,0.684,0.75463 -0.684,0.684,0.762 -0.686,0.684,0.76758 -0.688,0.684,0.77329 -0.69,0.684,0.77772 -0.692,0.684,0.78172 -0.694,0.684,0.78644 -0.696,0.684,0.78986 -0.698,0.684,0.79249 -0.7,0.684,0.7954 -0.702,0.684,0.79937 -0.704,0.684,0.80292 -0.706,0.684,0.80495 -0.708,0.684,0.80682 -0.71,0.684,0.80994 -0.712,0.684,0.81262 -0.714,0.684,0.81604 -0.716,0.684,0.81827 -0.718,0.684,0.8205 -0.72,0.684,0.82285 -0.722,0.684,0.82475 -0.724,0.684,0.82628 -0.726,0.684,0.82857 -0.728,0.684,0.83011 -0.73,0.684,0.83112 -0.63,0.686,0.058237 -0.632,0.686,0.028756 -0.634,0.686,0.046822 -0.636,0.686,0.072234 -0.638,0.686,0.10992 -0.64,0.686,0.15682 -0.642,0.686,0.21503 -0.644,0.686,0.28647 -0.646,0.686,0.34947 -0.648,0.686,0.40487 -0.65,0.686,0.45121 -0.652,0.686,0.491 -0.654,0.686,0.52866 -0.656,0.686,0.56236 -0.658,0.686,0.58774 -0.66,0.686,0.61045 -0.662,0.686,0.62891 -0.664,0.686,0.64854 -0.666,0.686,0.66943 -0.668,0.686,0.69024 -0.67,0.686,0.70632 -0.672,0.686,0.72103 -0.674,0.686,0.73465 -0.676,0.686,0.74829 -0.678,0.686,0.75977 -0.68,0.686,0.77026 -0.682,0.686,0.77841 -0.684,0.686,0.78609 -0.686,0.686,0.79215 -0.688,0.686,0.79665 -0.69,0.686,0.80223 -0.692,0.686,0.8065 -0.694,0.686,0.81079 -0.696,0.686,0.81528 -0.698,0.686,0.81897 -0.7,0.686,0.82203 -0.702,0.686,0.82441 -0.704,0.686,0.82883 -0.706,0.686,0.83325 -0.708,0.686,0.83549 -0.71,0.686,0.83823 -0.712,0.686,0.84082 -0.714,0.686,0.84263 -0.716,0.686,0.8448 -0.718,0.686,0.84841 -0.72,0.686,0.85021 -0.722,0.686,0.85251 -0.724,0.686,0.85295 -0.726,0.686,0.8547 -0.728,0.686,0.856 -0.73,0.686,0.85758 -0.63,0.688,0.057861 -0.632,0.688,0.028644 -0.634,0.688,0.044661 -0.636,0.688,0.075305 -0.638,0.688,0.11441 -0.64,0.688,0.16497 -0.642,0.688,0.2243 -0.644,0.688,0.28513 -0.646,0.688,0.34953 -0.648,0.688,0.40602 -0.65,0.688,0.45604 -0.652,0.688,0.49745 -0.654,0.688,0.53578 -0.656,0.688,0.56722 -0.658,0.688,0.59257 -0.66,0.688,0.61591 -0.662,0.688,0.63516 -0.664,0.688,0.65857 -0.666,0.688,0.67939 -0.668,0.688,0.69865 -0.67,0.688,0.71687 -0.672,0.688,0.7344 -0.674,0.688,0.75118 -0.676,0.688,0.76554 -0.678,0.688,0.77772 -0.68,0.688,0.78793 -0.682,0.688,0.79814 -0.684,0.688,0.80604 -0.686,0.688,0.81257 -0.688,0.688,0.81971 -0.69,0.688,0.82554 -0.692,0.688,0.82992 -0.694,0.688,0.83375 -0.696,0.688,0.83859 -0.698,0.688,0.84189 -0.7,0.688,0.84573 -0.702,0.688,0.84997 -0.704,0.688,0.85413 -0.706,0.688,0.85683 -0.708,0.688,0.86035 -0.71,0.688,0.86419 -0.712,0.688,0.8672 -0.714,0.688,0.86972 -0.716,0.688,0.87159 -0.718,0.688,0.87434 -0.72,0.688,0.87687 -0.722,0.688,0.87859 -0.724,0.688,0.8805 -0.726,0.688,0.88175 -0.728,0.688,0.88277 -0.73,0.688,0.88384 -0.63,0.69,0.061426 -0.632,0.69,0.02894 -0.634,0.69,0.043151 -0.636,0.69,0.070563 -0.638,0.69,0.11597 -0.64,0.69,0.1596 -0.642,0.69,0.21901 -0.644,0.69,0.28274 -0.646,0.69,0.3446 -0.648,0.69,0.40369 -0.65,0.69,0.45747 -0.652,0.69,0.50213 -0.654,0.69,0.54101 -0.656,0.69,0.56931 -0.658,0.69,0.59461 -0.66,0.69,0.61935 -0.662,0.69,0.64342 -0.664,0.69,0.66687 -0.666,0.69,0.69028 -0.668,0.69,0.71029 -0.67,0.69,0.73094 -0.672,0.69,0.7502 -0.674,0.69,0.76891 -0.676,0.69,0.78478 -0.678,0.69,0.79813 -0.68,0.69,0.81039 -0.682,0.69,0.82141 -0.684,0.69,0.82873 -0.686,0.69,0.83545 -0.688,0.69,0.84205 -0.69,0.69,0.84829 -0.692,0.69,0.85364 -0.694,0.69,0.85818 -0.696,0.69,0.862 -0.698,0.69,0.86558 -0.7,0.69,0.87018 -0.702,0.69,0.87375 -0.704,0.69,0.87695 -0.706,0.69,0.88019 -0.708,0.69,0.88305 -0.71,0.69,0.8864 -0.712,0.69,0.8893 -0.714,0.69,0.89231 -0.716,0.69,0.89593 -0.718,0.69,0.89864 -0.72,0.69,0.89989 -0.722,0.69,0.90137 -0.724,0.69,0.90362 -0.726,0.69,0.90471 -0.728,0.69,0.90539 -0.73,0.69,0.90578 -0.63,0.692,0.066451 -0.632,0.692,0.032699 -0.634,0.692,0.048534 -0.636,0.692,0.076641 -0.638,0.692,0.11822 -0.64,0.692,0.17206 -0.642,0.692,0.23326 -0.644,0.692,0.29518 -0.646,0.692,0.35826 -0.648,0.692,0.41983 -0.65,0.692,0.46972 -0.652,0.692,0.51439 -0.654,0.692,0.55005 -0.656,0.692,0.57696 -0.658,0.692,0.60404 -0.66,0.692,0.6297 -0.662,0.692,0.65476 -0.664,0.692,0.6782 -0.666,0.692,0.70083 -0.668,0.692,0.72232 -0.67,0.692,0.74444 -0.672,0.692,0.76655 -0.674,0.692,0.7846 -0.676,0.692,0.80206 -0.678,0.692,0.81608 -0.68,0.692,0.83007 -0.682,0.692,0.84159 -0.684,0.692,0.84984 -0.686,0.692,0.85671 -0.688,0.692,0.86352 -0.69,0.692,0.869 -0.692,0.692,0.87491 -0.694,0.692,0.87938 -0.696,0.692,0.8836 -0.698,0.692,0.88772 -0.7,0.692,0.89136 -0.702,0.692,0.89571 -0.704,0.692,0.8985 -0.706,0.692,0.90186 -0.708,0.692,0.90519 -0.71,0.692,0.90956 -0.712,0.692,0.91211 -0.714,0.692,0.91485 -0.716,0.692,0.91709 -0.718,0.692,0.91816 -0.72,0.692,0.92047 -0.722,0.692,0.92178 -0.724,0.692,0.92319 -0.726,0.692,0.92376 -0.728,0.692,0.92458 -0.73,0.692,0.92593 -0.63,0.694,0.062771 -0.632,0.694,0.032404 -0.634,0.694,0.048704 -0.636,0.694,0.080462 -0.638,0.694,0.1244 -0.64,0.694,0.17613 -0.642,0.694,0.23676 -0.644,0.694,0.29667 -0.646,0.694,0.36092 -0.648,0.694,0.41883 -0.65,0.694,0.47067 -0.652,0.694,0.51338 -0.654,0.694,0.54843 -0.656,0.694,0.57859 -0.658,0.694,0.60791 -0.66,0.694,0.63382 -0.662,0.694,0.65853 -0.664,0.694,0.68241 -0.666,0.694,0.70675 -0.668,0.694,0.72911 -0.67,0.694,0.75424 -0.672,0.694,0.77528 -0.674,0.694,0.79453 -0.676,0.694,0.81194 -0.678,0.694,0.82815 -0.68,0.694,0.84339 -0.682,0.694,0.85427 -0.684,0.694,0.86455 -0.686,0.694,0.87303 -0.688,0.694,0.87998 -0.69,0.694,0.88715 -0.692,0.694,0.89297 -0.694,0.694,0.89711 -0.696,0.694,0.90103 -0.698,0.694,0.90567 -0.7,0.694,0.90979 -0.702,0.694,0.91368 -0.704,0.694,0.91748 -0.706,0.694,0.92101 -0.708,0.694,0.92545 -0.71,0.694,0.92858 -0.712,0.694,0.93002 -0.714,0.694,0.93184 -0.716,0.694,0.93404 -0.718,0.694,0.93699 -0.72,0.694,0.93921 -0.722,0.694,0.94099 -0.724,0.694,0.9421 -0.726,0.694,0.94208 -0.728,0.694,0.94221 -0.73,0.694,0.94271 -0.63,0.696,0.06464 -0.632,0.696,0.032196 -0.634,0.696,0.049498 -0.636,0.696,0.081938 -0.638,0.696,0.12491 -0.64,0.696,0.17814 -0.642,0.696,0.23819 -0.644,0.696,0.30367 -0.646,0.696,0.37294 -0.648,0.696,0.42936 -0.65,0.696,0.4753 -0.652,0.696,0.51737 -0.654,0.696,0.55272 -0.656,0.696,0.58438 -0.658,0.696,0.6135 -0.66,0.696,0.63867 -0.662,0.696,0.66308 -0.664,0.696,0.68737 -0.666,0.696,0.71256 -0.668,0.696,0.73764 -0.67,0.696,0.7612 -0.672,0.696,0.78407 -0.674,0.696,0.80553 -0.676,0.696,0.82538 -0.678,0.696,0.84377 -0.68,0.696,0.85735 -0.682,0.696,0.86934 -0.684,0.696,0.87991 -0.686,0.696,0.88857 -0.688,0.696,0.89638 -0.69,0.696,0.90299 -0.692,0.696,0.90803 -0.694,0.696,0.91267 -0.696,0.696,0.91732 -0.698,0.696,0.92155 -0.7,0.696,0.92546 -0.702,0.696,0.9293 -0.704,0.696,0.93191 -0.706,0.696,0.93518 -0.708,0.696,0.93908 -0.71,0.696,0.94213 -0.712,0.696,0.94499 -0.714,0.696,0.94708 -0.716,0.696,0.9499 -0.718,0.696,0.95198 -0.72,0.696,0.9536 -0.722,0.696,0.95466 -0.724,0.696,0.95623 -0.726,0.696,0.95714 -0.728,0.696,0.9585 -0.73,0.696,0.9592 -0.63,0.698,0.07051 -0.632,0.698,0.034508 -0.634,0.698,0.052806 -0.636,0.698,0.08321 -0.638,0.698,0.12557 -0.64,0.698,0.17913 -0.642,0.698,0.23903 -0.644,0.698,0.30274 -0.646,0.698,0.36603 -0.648,0.698,0.424 -0.65,0.698,0.4765 -0.652,0.698,0.51752 -0.654,0.698,0.55591 -0.656,0.698,0.58787 -0.658,0.698,0.61614 -0.66,0.698,0.64136 -0.662,0.698,0.66768 -0.664,0.698,0.69319 -0.666,0.698,0.71631 -0.668,0.698,0.74171 -0.67,0.698,0.76588 -0.672,0.698,0.78951 -0.674,0.698,0.81306 -0.676,0.698,0.8321 -0.678,0.698,0.85122 -0.68,0.698,0.86685 -0.682,0.698,0.87954 -0.684,0.698,0.89091 -0.686,0.698,0.89951 -0.688,0.698,0.90723 -0.69,0.698,0.91383 -0.692,0.698,0.91984 -0.694,0.698,0.92501 -0.696,0.698,0.92906 -0.698,0.698,0.93318 -0.7,0.698,0.93717 -0.702,0.698,0.94159 -0.704,0.698,0.94432 -0.706,0.698,0.94828 -0.708,0.698,0.9527 -0.71,0.698,0.95601 -0.712,0.698,0.95899 -0.714,0.698,0.96147 -0.716,0.698,0.96329 -0.718,0.698,0.9656 -0.72,0.698,0.96724 -0.722,0.698,0.96834 -0.724,0.698,0.96913 -0.726,0.698,0.96936 -0.728,0.698,0.97021 -0.73,0.698,0.9712 -0.63,0.7,0.066253 -0.632,0.7,0.03553 -0.634,0.7,0.054847 -0.636,0.7,0.089026 -0.638,0.7,0.13253 -0.64,0.7,0.18524 -0.642,0.7,0.24684 -0.644,0.7,0.31281 -0.646,0.7,0.37848 -0.648,0.7,0.43047 -0.65,0.7,0.47943 -0.652,0.7,0.52191 -0.654,0.7,0.55844 -0.656,0.7,0.58954 -0.658,0.7,0.6166 -0.66,0.7,0.643 -0.662,0.7,0.66805 -0.664,0.7,0.69428 -0.666,0.7,0.72148 -0.668,0.7,0.74492 -0.67,0.7,0.7702 -0.672,0.7,0.79381 -0.674,0.7,0.81757 -0.676,0.7,0.83824 -0.678,0.7,0.85705 -0.68,0.7,0.87326 -0.682,0.7,0.88745 -0.684,0.7,0.89927 -0.686,0.7,0.90929 -0.688,0.7,0.91709 -0.69,0.7,0.92373 -0.692,0.7,0.92994 -0.694,0.7,0.93598 -0.696,0.7,0.94049 -0.698,0.7,0.94446 -0.7,0.7,0.9486 -0.702,0.7,0.95283 -0.704,0.7,0.95709 -0.706,0.7,0.96032 -0.708,0.7,0.96279 -0.71,0.7,0.96543 -0.712,0.7,0.96847 -0.714,0.7,0.9707 -0.716,0.7,0.97318 -0.718,0.7,0.97547 -0.72,0.7,0.97709 -0.722,0.7,0.9786 -0.724,0.7,0.97988 -0.726,0.7,0.98087 -0.728,0.7,0.98158 -0.73,0.7,0.98248 -0.63,0.702,0.072946 -0.632,0.702,0.037208 -0.634,0.702,0.055461 -0.636,0.702,0.089198 -0.638,0.702,0.13341 -0.64,0.702,0.18613 -0.642,0.702,0.25834 -0.644,0.702,0.31477 -0.646,0.702,0.37862 -0.648,0.702,0.43501 -0.65,0.702,0.49156 -0.652,0.702,0.52765 -0.654,0.702,0.56421 -0.656,0.702,0.59426 -0.658,0.702,0.62202 -0.66,0.702,0.64872 -0.662,0.702,0.6739 -0.664,0.702,0.69912 -0.666,0.702,0.72549 -0.668,0.702,0.75014 -0.67,0.702,0.77608 -0.672,0.702,0.79981 -0.674,0.702,0.82151 -0.676,0.702,0.84288 -0.678,0.702,0.86212 -0.68,0.702,0.87807 -0.682,0.702,0.89249 -0.684,0.702,0.90413 -0.686,0.702,0.91413 -0.688,0.702,0.92252 -0.69,0.702,0.92944 -0.692,0.702,0.93612 -0.694,0.702,0.94185 -0.696,0.702,0.94744 -0.698,0.702,0.95166 -0.7,0.702,0.9562 -0.702,0.702,0.96052 -0.704,0.702,0.96426 -0.706,0.702,0.96816 -0.708,0.702,0.97149 -0.71,0.702,0.97474 -0.712,0.702,0.97775 -0.714,0.702,0.98097 -0.716,0.702,0.98293 -0.718,0.702,0.9849 -0.72,0.702,0.98764 -0.722,0.702,0.98928 -0.724,0.702,0.99033 -0.726,0.702,0.99085 -0.728,0.702,0.99133 -0.73,0.702,0.99141 -0.63,0.704,0.073118 -0.632,0.704,0.037336 -0.634,0.704,0.056401 -0.636,0.704,0.088793 -0.638,0.704,0.13211 -0.64,0.704,0.19294 -0.642,0.704,0.25398 -0.644,0.704,0.31563 -0.646,0.704,0.38109 -0.648,0.704,0.44097 -0.65,0.704,0.4885 -0.652,0.704,0.52788 -0.654,0.704,0.56386 -0.656,0.704,0.59527 -0.658,0.704,0.62371 -0.66,0.704,0.65001 -0.662,0.704,0.67477 -0.664,0.704,0.69997 -0.666,0.704,0.72606 -0.668,0.704,0.75384 -0.67,0.704,0.77808 -0.672,0.704,0.80274 -0.674,0.704,0.82648 -0.676,0.704,0.8475 -0.678,0.704,0.86689 -0.68,0.704,0.88376 -0.682,0.704,0.89784 -0.684,0.704,0.91061 -0.686,0.704,0.91979 -0.688,0.704,0.92813 -0.69,0.704,0.93529 -0.692,0.704,0.9424 -0.694,0.704,0.94823 -0.696,0.704,0.95281 -0.698,0.704,0.95733 -0.7,0.704,0.9619 -0.702,0.704,0.96706 -0.704,0.704,0.97096 -0.706,0.704,0.97469 -0.708,0.704,0.97842 -0.71,0.704,0.9818 -0.712,0.704,0.98536 -0.714,0.704,0.9879 -0.716,0.704,0.99086 -0.718,0.704,0.99344 -0.72,0.704,0.99577 -0.722,0.704,0.99656 -0.724,0.704,0.99817 -0.726,0.704,0.99838 -0.728,0.704,0.99951 -0.73,0.704,1.0003 -0.63,0.706,0.076694 -0.632,0.706,0.039346 -0.634,0.706,0.058602 -0.636,0.706,0.094277 -0.638,0.706,0.13732 -0.64,0.706,0.19221 -0.642,0.706,0.25507 -0.644,0.706,0.31882 -0.646,0.706,0.38117 -0.648,0.706,0.43925 -0.65,0.706,0.48892 -0.652,0.706,0.53314 -0.654,0.706,0.5676 -0.656,0.706,0.59902 -0.658,0.706,0.62802 -0.66,0.706,0.65447 -0.662,0.706,0.68085 -0.664,0.706,0.70669 -0.666,0.706,0.73374 -0.668,0.706,0.75958 -0.67,0.706,0.78208 -0.672,0.706,0.80797 -0.674,0.706,0.82977 -0.676,0.706,0.85042 -0.678,0.706,0.87002 -0.68,0.706,0.88725 -0.682,0.706,0.90262 -0.684,0.706,0.91405 -0.686,0.706,0.92412 -0.688,0.706,0.93336 -0.69,0.706,0.9412 -0.692,0.706,0.94838 -0.694,0.706,0.95392 -0.696,0.706,0.95868 -0.698,0.706,0.96351 -0.7,0.706,0.96885 -0.702,0.706,0.974 -0.704,0.706,0.97837 -0.706,0.706,0.98267 -0.708,0.706,0.98728 -0.71,0.706,0.9912 -0.712,0.706,0.99474 -0.714,0.706,0.9978 -0.716,0.706,1.0003 -0.718,0.706,1.003 -0.72,0.706,1.0046 -0.722,0.706,1.0066 -0.724,0.706,1.0072 -0.726,0.706,1.0082 -0.728,0.706,1.0091 -0.73,0.706,1.0104 -0.63,0.708,0.078932 -0.632,0.708,0.039678 -0.634,0.708,0.058948 -0.636,0.708,0.09663 -0.638,0.708,0.14149 -0.64,0.708,0.20031 -0.642,0.708,0.26192 -0.644,0.708,0.32957 -0.646,0.708,0.39024 -0.648,0.708,0.45097 -0.65,0.708,0.49553 -0.652,0.708,0.53743 -0.654,0.708,0.57177 -0.656,0.708,0.60274 -0.658,0.708,0.63124 -0.66,0.708,0.65876 -0.662,0.708,0.68477 -0.664,0.708,0.71029 -0.666,0.708,0.73648 -0.668,0.708,0.7614 -0.67,0.708,0.78662 -0.672,0.708,0.81029 -0.674,0.708,0.83566 -0.676,0.708,0.85743 -0.678,0.708,0.87603 -0.68,0.708,0.89311 -0.682,0.708,0.90784 -0.684,0.708,0.91996 -0.686,0.708,0.93051 -0.688,0.708,0.93888 -0.69,0.708,0.94707 -0.692,0.708,0.95395 -0.694,0.708,0.96012 -0.696,0.708,0.9663 -0.698,0.708,0.9714 -0.7,0.708,0.97789 -0.702,0.708,0.98293 -0.704,0.708,0.98802 -0.706,0.708,0.99198 -0.708,0.708,0.9957 -0.71,0.708,1.0001 -0.712,0.708,1.0039 -0.714,0.708,1.0069 -0.716,0.708,1.0106 -0.718,0.708,1.0128 -0.72,0.708,1.0145 -0.722,0.708,1.0156 -0.724,0.708,1.0169 -0.726,0.708,1.0182 -0.728,0.708,1.0186 -0.73,0.708,1.0195 -0.63,0.71,0.079011 -0.632,0.71,0.041596 -0.634,0.71,0.062829 -0.636,0.71,0.098014 -0.638,0.71,0.14639 -0.64,0.71,0.20426 -0.642,0.71,0.26709 -0.644,0.71,0.33297 -0.646,0.71,0.39635 -0.648,0.71,0.4527 -0.65,0.71,0.50036 -0.652,0.71,0.53981 -0.654,0.71,0.57524 -0.656,0.71,0.60576 -0.658,0.71,0.63487 -0.66,0.71,0.66317 -0.662,0.71,0.68764 -0.664,0.71,0.71446 -0.666,0.71,0.74076 -0.668,0.71,0.76501 -0.67,0.71,0.79153 -0.672,0.71,0.81698 -0.674,0.71,0.83992 -0.676,0.71,0.86071 -0.678,0.71,0.87961 -0.68,0.71,0.89601 -0.682,0.71,0.91048 -0.684,0.71,0.92372 -0.686,0.71,0.93519 -0.688,0.71,0.94189 -0.69,0.71,0.94911 -0.692,0.71,0.95635 -0.694,0.71,0.96228 -0.696,0.71,0.96909 -0.698,0.71,0.97593 -0.7,0.71,0.98247 -0.702,0.71,0.9873 -0.704,0.71,0.99254 -0.706,0.71,0.99855 -0.708,0.71,1.0035 -0.71,0.71,1.0082 -0.712,0.71,1.0124 -0.714,0.71,1.0162 -0.716,0.71,1.0201 -0.718,0.71,1.0226 -0.72,0.71,1.0255 -0.722,0.71,1.0276 -0.724,0.71,1.0291 -0.726,0.71,1.0301 -0.728,0.71,1.0309 -0.73,0.71,1.0316 -0.63,0.712,0.082592 -0.632,0.712,0.044188 -0.634,0.712,0.06406 -0.636,0.712,0.10422 -0.638,0.712,0.14794 -0.64,0.712,0.20609 -0.642,0.712,0.27122 -0.644,0.712,0.33768 -0.646,0.712,0.39829 -0.648,0.712,0.45529 -0.65,0.712,0.50659 -0.652,0.712,0.54536 -0.654,0.712,0.58091 -0.656,0.712,0.61194 -0.658,0.712,0.63997 -0.66,0.712,0.66619 -0.662,0.712,0.69174 -0.664,0.712,0.71761 -0.666,0.712,0.74434 -0.668,0.712,0.77086 -0.67,0.712,0.79435 -0.672,0.712,0.81731 -0.674,0.712,0.84052 -0.676,0.712,0.86272 -0.678,0.712,0.88162 -0.68,0.712,0.89885 -0.682,0.712,0.91228 -0.684,0.712,0.92518 -0.686,0.712,0.93594 -0.688,0.712,0.94535 -0.69,0.712,0.95352 -0.692,0.712,0.96181 -0.694,0.712,0.96873 -0.696,0.712,0.97508 -0.698,0.712,0.98216 -0.7,0.712,0.98983 -0.702,0.712,0.99608 -0.704,0.712,1.0022 -0.706,0.712,1.0084 -0.708,0.712,1.0146 -0.71,0.712,1.0202 -0.712,0.712,1.0252 -0.714,0.712,1.029 -0.716,0.712,1.0328 -0.718,0.712,1.0348 -0.72,0.712,1.0379 -0.722,0.712,1.0414 -0.724,0.712,1.0422 -0.726,0.712,1.0434 -0.728,0.712,1.045 -0.73,0.712,1.0465 -0.63,0.714,0.086116 -0.632,0.714,0.047025 -0.634,0.714,0.068597 -0.636,0.714,0.1062 -0.638,0.714,0.15556 -0.64,0.714,0.21572 -0.642,0.714,0.27859 -0.644,0.714,0.34451 -0.646,0.714,0.40914 -0.648,0.714,0.46531 -0.65,0.714,0.51255 -0.652,0.714,0.55249 -0.654,0.714,0.58782 -0.656,0.714,0.61704 -0.658,0.714,0.64524 -0.66,0.714,0.67165 -0.662,0.714,0.69635 -0.664,0.714,0.72055 -0.666,0.714,0.74649 -0.668,0.714,0.77207 -0.67,0.714,0.79806 -0.672,0.714,0.82235 -0.674,0.714,0.84503 -0.676,0.714,0.86661 -0.678,0.714,0.8857 -0.68,0.714,0.90234 -0.682,0.714,0.91613 -0.684,0.714,0.92912 -0.686,0.714,0.93978 -0.688,0.714,0.94924 -0.69,0.714,0.95789 -0.692,0.714,0.96629 -0.694,0.714,0.97444 -0.696,0.714,0.98236 -0.698,0.714,0.98978 -0.7,0.714,0.99731 -0.702,0.714,1.0046 -0.704,0.714,1.0124 -0.706,0.714,1.0196 -0.708,0.714,1.0266 -0.71,0.714,1.0336 -0.712,0.714,1.0381 -0.714,0.714,1.0429 -0.716,0.714,1.0482 -0.718,0.714,1.0522 -0.72,0.714,1.0554 -0.722,0.714,1.0579 -0.724,0.714,1.0602 -0.726,0.714,1.0619 -0.728,0.714,1.0634 -0.73,0.714,1.0651 -0.63,0.716,0.083901 -0.632,0.716,0.045275 -0.634,0.716,0.066761 -0.636,0.716,0.10382 -0.638,0.716,0.15274 -0.64,0.716,0.21609 -0.642,0.716,0.27589 -0.644,0.716,0.34269 -0.646,0.716,0.4047 -0.648,0.716,0.46229 -0.65,0.716,0.51047 -0.652,0.716,0.55128 -0.654,0.716,0.58569 -0.656,0.716,0.61851 -0.658,0.716,0.64462 -0.66,0.716,0.67057 -0.662,0.716,0.69704 -0.664,0.716,0.72284 -0.666,0.716,0.74901 -0.668,0.716,0.77851 -0.67,0.716,0.80321 -0.672,0.716,0.82783 -0.674,0.716,0.84898 -0.676,0.716,0.86985 -0.678,0.716,0.8894 -0.68,0.716,0.90618 -0.682,0.716,0.92138 -0.684,0.716,0.934 -0.686,0.716,0.94411 -0.688,0.716,0.95308 -0.69,0.716,0.96238 -0.692,0.716,0.97103 -0.694,0.716,0.97971 -0.696,0.716,0.98876 -0.698,0.716,0.99754 -0.7,0.716,1.007 -0.702,0.716,1.0161 -0.704,0.716,1.0249 -0.706,0.716,1.0337 -0.708,0.716,1.0419 -0.71,0.716,1.0485 -0.712,0.716,1.0559 -0.714,0.716,1.0625 -0.716,0.716,1.0669 -0.718,0.716,1.0715 -0.72,0.716,1.076 -0.722,0.716,1.0791 -0.724,0.716,1.0821 -0.726,0.716,1.0851 -0.728,0.716,1.0854 -0.73,0.716,1.0865 -0.63,0.718,0.083345 -0.632,0.718,0.044958 -0.634,0.718,0.067167 -0.636,0.718,0.10393 -0.638,0.718,0.15692 -0.64,0.718,0.21743 -0.642,0.718,0.2849 -0.644,0.718,0.35291 -0.646,0.718,0.41351 -0.648,0.718,0.46621 -0.65,0.718,0.5135 -0.652,0.718,0.55371 -0.654,0.718,0.58858 -0.656,0.718,0.62002 -0.658,0.718,0.64729 -0.66,0.718,0.67337 -0.662,0.718,0.70382 -0.664,0.718,0.72797 -0.666,0.718,0.75411 -0.668,0.718,0.77997 -0.67,0.718,0.80525 -0.672,0.718,0.82835 -0.674,0.718,0.85065 -0.676,0.718,0.87214 -0.678,0.718,0.89235 -0.68,0.718,0.91101 -0.682,0.718,0.92536 -0.684,0.718,0.93699 -0.686,0.718,0.94774 -0.688,0.718,0.95775 -0.69,0.718,0.96705 -0.692,0.718,0.97631 -0.694,0.718,0.98574 -0.696,0.718,0.99511 -0.698,0.718,1.0049 -0.7,0.718,1.016 -0.702,0.718,1.0273 -0.704,0.718,1.038 -0.706,0.718,1.0477 -0.708,0.718,1.0582 -0.71,0.718,1.0681 -0.712,0.718,1.0751 -0.714,0.718,1.0827 -0.716,0.718,1.0901 -0.718,0.718,1.0956 -0.72,0.718,1.0997 -0.722,0.718,1.1036 -0.724,0.718,1.1079 -0.726,0.718,1.1112 -0.728,0.718,1.1129 -0.73,0.718,1.1141 -0.63,0.72,0.089707 -0.632,0.72,0.050858 -0.634,0.72,0.071119 -0.636,0.72,0.10927 -0.638,0.72,0.16062 -0.64,0.72,0.23132 -0.642,0.72,0.28663 -0.644,0.72,0.35299 -0.646,0.72,0.41782 -0.648,0.72,0.4722 -0.65,0.72,0.51938 -0.652,0.72,0.55932 -0.654,0.72,0.59438 -0.656,0.72,0.62487 -0.658,0.72,0.65259 -0.66,0.72,0.67905 -0.662,0.72,0.70658 -0.664,0.72,0.73125 -0.666,0.72,0.75722 -0.668,0.72,0.78321 -0.67,0.72,0.80871 -0.672,0.72,0.83529 -0.674,0.72,0.85582 -0.676,0.72,0.87779 -0.678,0.72,0.89563 -0.68,0.72,0.9119 -0.682,0.72,0.92579 -0.684,0.72,0.93875 -0.686,0.72,0.95023 -0.688,0.72,0.9604 -0.69,0.72,0.97006 -0.692,0.72,0.97853 -0.694,0.72,0.98754 -0.696,0.72,0.99747 -0.698,0.72,1.0086 -0.7,0.72,1.021 -0.702,0.72,1.0342 -0.704,0.72,1.0478 -0.706,0.72,1.0619 -0.708,0.72,1.0738 -0.71,0.72,1.0842 -0.712,0.72,1.0946 -0.714,0.72,1.1052 -0.716,0.72,1.1144 -0.718,0.72,1.1218 -0.72,0.72,1.1288 -0.722,0.72,1.1333 -0.724,0.72,1.1367 -0.726,0.72,1.1395 -0.728,0.72,1.1438 -0.73,0.72,1.1474 -0.63,0.722,0.076725 -0.632,0.722,0.043671 -0.634,0.722,0.06565 -0.636,0.722,0.10292 -0.638,0.722,0.15107 -0.64,0.722,0.20983 -0.642,0.722,0.28036 -0.644,0.722,0.3452 -0.646,0.722,0.40503 -0.648,0.722,0.46375 -0.65,0.722,0.51206 -0.652,0.722,0.55218 -0.654,0.722,0.58842 -0.656,0.722,0.61949 -0.658,0.722,0.64836 -0.66,0.722,0.67462 -0.662,0.722,0.70053 -0.664,0.722,0.7272 -0.666,0.722,0.75444 -0.668,0.722,0.7818 -0.67,0.722,0.80748 -0.672,0.722,0.83237 -0.674,0.722,0.85613 -0.676,0.722,0.87826 -0.678,0.722,0.8967 -0.68,0.722,0.91382 -0.682,0.722,0.92771 -0.684,0.722,0.94106 -0.686,0.722,0.95227 -0.688,0.722,0.96311 -0.69,0.722,0.97289 -0.692,0.722,0.98296 -0.694,0.722,0.99365 -0.696,0.722,1.0047 -0.698,0.722,1.0159 -0.7,0.722,1.0292 -0.702,0.722,1.0433 -0.704,0.722,1.0585 -0.706,0.722,1.0742 -0.708,0.722,1.0913 -0.71,0.722,1.1054 -0.712,0.722,1.1178 -0.714,0.722,1.1307 -0.716,0.722,1.1398 -0.718,0.722,1.1488 -0.72,0.722,1.1562 -0.722,0.722,1.163 -0.724,0.722,1.1674 -0.726,0.722,1.172 -0.728,0.722,1.1776 -0.73,0.722,1.1816 -0.63,0.724,0.084147 -0.632,0.724,0.046127 -0.634,0.724,0.065873 -0.636,0.724,0.10529 -0.638,0.724,0.15739 -0.64,0.724,0.21428 -0.642,0.724,0.28025 -0.644,0.724,0.3468 -0.646,0.724,0.41143 -0.648,0.724,0.46584 -0.65,0.724,0.51643 -0.652,0.724,0.55611 -0.654,0.724,0.59257 -0.656,0.724,0.62462 -0.658,0.724,0.65482 -0.66,0.724,0.67899 -0.662,0.724,0.70562 -0.664,0.724,0.73321 -0.666,0.724,0.76032 -0.668,0.724,0.78583 -0.67,0.724,0.81118 -0.672,0.724,0.83617 -0.674,0.724,0.85974 -0.676,0.724,0.87975 -0.678,0.724,0.89944 -0.68,0.724,0.91611 -0.682,0.724,0.93088 -0.684,0.724,0.94441 -0.686,0.724,0.95608 -0.688,0.724,0.96616 -0.69,0.724,0.97676 -0.692,0.724,0.98709 -0.694,0.724,0.99818 -0.696,0.724,1.0107 -0.698,0.724,1.0241 -0.7,0.724,1.0387 -0.702,0.724,1.0555 -0.704,0.724,1.074 -0.706,0.724,1.0914 -0.708,0.724,1.1097 -0.71,0.724,1.1243 -0.712,0.724,1.1423 -0.714,0.724,1.1566 -0.716,0.724,1.1675 -0.718,0.724,1.1776 -0.72,0.724,1.1866 -0.722,0.724,1.1934 -0.724,0.724,1.2007 -0.726,0.724,1.2072 -0.728,0.724,1.2127 -0.73,0.724,1.2185 -0.63,0.726,0.085416 -0.632,0.726,0.046943 -0.634,0.726,0.069861 -0.636,0.726,0.11012 -0.638,0.726,0.16265 -0.64,0.726,0.22264 -0.642,0.726,0.29811 -0.644,0.726,0.35491 -0.646,0.726,0.41576 -0.648,0.726,0.47177 -0.65,0.726,0.51979 -0.652,0.726,0.56312 -0.654,0.726,0.59709 -0.656,0.726,0.62754 -0.658,0.726,0.65684 -0.66,0.726,0.68415 -0.662,0.726,0.71042 -0.664,0.726,0.7383 -0.666,0.726,0.76524 -0.668,0.726,0.79004 -0.67,0.726,0.81552 -0.672,0.726,0.84008 -0.674,0.726,0.86448 -0.676,0.726,0.88448 -0.678,0.726,0.90392 -0.68,0.726,0.92112 -0.682,0.726,0.93512 -0.684,0.726,0.94793 -0.686,0.726,0.95978 -0.688,0.726,0.96975 -0.69,0.726,0.98 -0.692,0.726,0.99072 -0.694,0.726,1.0025 -0.696,0.726,1.0154 -0.698,0.726,1.0296 -0.7,0.726,1.0467 -0.702,0.726,1.066 -0.704,0.726,1.0857 -0.706,0.726,1.1057 -0.708,0.726,1.1257 -0.71,0.726,1.1464 -0.712,0.726,1.1653 -0.714,0.726,1.1828 -0.716,0.726,1.1987 -0.718,0.726,1.213 -0.72,0.726,1.2256 -0.722,0.726,1.235 -0.724,0.726,1.2437 -0.726,0.726,1.2504 -0.728,0.726,1.2569 -0.73,0.726,1.2632 -0.63,0.728,0.085567 -0.632,0.728,0.046151 -0.634,0.728,0.068859 -0.636,0.728,0.1076 -0.638,0.728,0.15732 -0.64,0.728,0.21771 -0.642,0.728,0.28481 -0.644,0.728,0.3554 -0.646,0.728,0.41707 -0.648,0.728,0.47192 -0.65,0.728,0.52046 -0.652,0.728,0.56168 -0.654,0.728,0.59761 -0.656,0.728,0.62717 -0.658,0.728,0.65785 -0.66,0.728,0.6855 -0.662,0.728,0.71198 -0.664,0.728,0.73937 -0.666,0.728,0.76619 -0.668,0.728,0.79153 -0.67,0.728,0.81669 -0.672,0.728,0.84132 -0.674,0.728,0.86498 -0.676,0.728,0.88665 -0.678,0.728,0.9061 -0.68,0.728,0.92364 -0.682,0.728,0.93819 -0.684,0.728,0.95153 -0.686,0.728,0.96242 -0.688,0.728,0.97363 -0.69,0.728,0.98454 -0.692,0.728,0.9957 -0.694,0.728,1.0081 -0.696,0.728,1.0212 -0.698,0.728,1.0364 -0.7,0.728,1.0538 -0.702,0.728,1.0729 -0.704,0.728,1.0955 -0.706,0.728,1.1175 -0.708,0.728,1.1406 -0.71,0.728,1.1642 -0.712,0.728,1.1878 -0.714,0.728,1.209 -0.716,0.728,1.2294 -0.718,0.728,1.2458 -0.72,0.728,1.2585 -0.722,0.728,1.2715 -0.724,0.728,1.2825 -0.726,0.728,1.291 -0.728,0.728,1.2976 -0.73,0.728,1.304 -0.63,0.73,0.08942 -0.632,0.73,0.049986 -0.634,0.73,0.076874 -0.636,0.73,0.11174 -0.638,0.73,0.16191 -0.64,0.73,0.22533 -0.642,0.73,0.29268 -0.644,0.73,0.36374 -0.646,0.73,0.4235 -0.648,0.73,0.48202 -0.65,0.73,0.52926 -0.652,0.73,0.57016 -0.654,0.73,0.60652 -0.656,0.73,0.63769 -0.658,0.73,0.66469 -0.66,0.73,0.69087 -0.662,0.73,0.71907 -0.664,0.73,0.74408 -0.666,0.73,0.77067 -0.668,0.73,0.79753 -0.67,0.73,0.82201 -0.672,0.73,0.84738 -0.674,0.73,0.8718 -0.676,0.73,0.89088 -0.678,0.73,0.91032 -0.68,0.73,0.92637 -0.682,0.73,0.94049 -0.684,0.73,0.95376 -0.686,0.73,0.96599 -0.688,0.73,0.97652 -0.69,0.73,0.98838 -0.692,0.73,0.99969 -0.694,0.73,1.0115 -0.696,0.73,1.0249 -0.698,0.73,1.0413 -0.7,0.73,1.0606 -0.702,0.73,1.0814 -0.704,0.73,1.1052 -0.706,0.73,1.1322 -0.708,0.73,1.1603 -0.71,0.73,1.1859 -0.712,0.73,1.2105 -0.714,0.73,1.2359 -0.716,0.73,1.258 -0.718,0.73,1.2779 -0.72,0.73,1.2935 -0.722,0.73,1.3077 -0.724,0.73,1.3201 -0.726,0.73,1.3311 -0.728,0.73,1.3404 -0.73,0.73,1.3486 diff --git a/docs/.gitignore b/docs/.gitignore old mode 100644 new mode 100755 diff --git a/docs/Makefile b/docs/Makefile old mode 100644 new mode 100755 diff --git a/docs/conf.py b/docs/conf.py old mode 100644 new mode 100755 diff --git a/docs/devel/general_info.rst b/docs/devel/general_info.rst old mode 100644 new mode 100755 diff --git a/docs/devel/index.rst b/docs/devel/index.rst old mode 100644 new mode 100755 diff --git a/docs/devel/packages/devices/awg5014b.rst b/docs/devel/packages/devices/awg5014b.rst old mode 100644 new mode 100755 diff --git a/docs/devel/packages/devices/dpo7104.rst b/docs/devel/packages/devices/dpo7104.rst old mode 100644 new mode 100755 diff --git a/docs/devel/packages/devices/index.rst b/docs/devel/packages/devices/index.rst old mode 100644 new mode 100755 diff --git a/docs/devel/packages/devices/model4g.rst b/docs/devel/packages/devices/model4g.rst old mode 100644 new mode 100755 diff --git a/docs/devel/packages/gui.rst b/docs/devel/packages/gui.rst old mode 100644 new mode 100755 diff --git a/docs/devel/packages/index.rst b/docs/devel/packages/index.rst old mode 100644 new mode 100755 diff --git a/docs/devel/packages/interface.rst b/docs/devel/packages/interface.rst old mode 100644 new mode 100755 diff --git a/docs/devel/packages/iteration.rst b/docs/devel/packages/iteration.rst old mode 100644 new mode 100755 diff --git a/docs/devel/pulse_program_execution.rst b/docs/devel/pulse_program_execution.rst old mode 100644 new mode 100755 diff --git a/docs/index.rst b/docs/index.rst old mode 100644 new mode 100755 diff --git a/docs/installation.rst b/docs/installation.rst old mode 100644 new mode 100755 diff --git a/docs/user/examples/acquisition.rst b/docs/user/examples/acquisition.rst old mode 100644 new mode 100755 diff --git a/docs/user/examples/acquisition_acquiring.png b/docs/user/examples/acquisition_acquiring.png old mode 100644 new mode 100755 diff --git a/docs/user/examples/data_explorer.rst b/docs/user/examples/data_explorer.rst old mode 100644 new mode 100755 diff --git a/docs/user/examples/data_explorer_menu.png b/docs/user/examples/data_explorer_menu.png old mode 100644 new mode 100755 diff --git a/docs/user/examples/index.rst b/docs/user/examples/index.rst old mode 100644 new mode 100755 diff --git a/docs/user/examples/virtual_setup.rst b/docs/user/examples/virtual_setup.rst deleted file mode 100644 index 0f72eb4..0000000 --- a/docs/user/examples/virtual_setup.rst +++ /dev/null @@ -1,10 +0,0 @@ -############# -Virtual Setup -############# - -The Virtual Setup is an application that allows the user to prepare output variables as functions of linear swept virtual variables. This serves as a utility to for the ‘From File’ option of the ‘Output variable editor dialog’ in Acquisition. - -.. figure:: virtual_setup_menu.* - :alt: Example of virtual variable linear sweep and dependent functions. - -In the top panel there is fields to enter the virtual variable name, initial value, final value, steps, and order in the same syntax as the ‘Variable configuration’ portion of the ‘Acquisition’ program. In the bottom panel dependent variables can be setup. They are defined as entered functions of the linear virtual variables. Upon completion, the ‘Evaluation / Write to CSV’ button will generate a CSV file composed of the values of both the virtual variables and the dependent variables following the same variable sweep format of ‘Acquisition’ by the order of the virtual variables. The dependent variables can then be utilized in Acquisition by adding them through the ‘From File’ option and setting them all to the same order number in order to be incremented together. diff --git a/docs/user/examples/virtual_setup_menu.png b/docs/user/examples/virtual_setup_menu.png deleted file mode 100644 index 1b1979f..0000000 Binary files a/docs/user/examples/virtual_setup_menu.png and /dev/null differ diff --git a/docs/user/general_concepts/devices.rst b/docs/user/general_concepts/devices.rst old mode 100644 new mode 100755 diff --git a/docs/user/general_concepts/index.rst b/docs/user/general_concepts/index.rst old mode 100644 new mode 100755 diff --git a/docs/user/general_concepts/resources.rst b/docs/user/general_concepts/resources.rst old mode 100644 new mode 100755 diff --git a/docs/user/general_concepts/variables.rst b/docs/user/general_concepts/variables.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/action/data_capture.rst b/docs/user/gui/action/data_capture.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/action/data_capture_panel.png b/docs/user/gui/action/data_capture_panel.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/action/data_capture_panel.xcf b/docs/user/gui/action/data_capture_panel.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/action/data_capture_sweep.png b/docs/user/gui/action/data_capture_sweep.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/action/data_capture_sweep.xcf b/docs/user/gui/action/data_capture_sweep.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/action/index.rst b/docs/user/gui/action/index.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/action/smooth_reset.rst b/docs/user/gui/action/smooth_reset.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/action/smooth_reset_panel.png b/docs/user/gui/action/smooth_reset_panel.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/action/smooth_reset_panel.xcf b/docs/user/gui/action/smooth_reset_panel.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/device_config.rst b/docs/user/gui/config/device_config.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/device_config_connection.png b/docs/user/gui/config/device_config_connection.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/device_config_connection.xcf b/docs/user/gui/config/device_config_connection.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/device_config_list.png b/docs/user/gui/config/device_config_list.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/device_config_list.xcf b/docs/user/gui/config/device_config_list.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/device_config_resources.png b/docs/user/gui/config/device_config_resources.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/device_config_resources.xcf b/docs/user/gui/config/device_config_resources.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/index.rst b/docs/user/gui/config/index.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/measurement_config.rst b/docs/user/gui/config/measurement_config.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/measurement_config_list.png b/docs/user/gui/config/measurement_config_list.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/measurement_config_list_settings.png b/docs/user/gui/config/measurement_config_list_settings.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/measurement_config_scalar.png b/docs/user/gui/config/measurement_config_scalar.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/measurement_config_scalar.xcf b/docs/user/gui/config/measurement_config_scalar.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/measurement_config_scalar_settings.png b/docs/user/gui/config/measurement_config_scalar_settings.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/measurement_config_scaling.png b/docs/user/gui/config/measurement_config_scaling.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/pulse_program_config.rst b/docs/user/gui/config/pulse_program_config.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/pulse_program_config_acquisition.png b/docs/user/gui/config/pulse_program_config_acquisition.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/pulse_program_config_delays.png b/docs/user/gui/config/pulse_program_config_delays.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/pulse_program_config_outputs.png b/docs/user/gui/config/pulse_program_config_outputs.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/variable_config.rst b/docs/user/gui/config/variable_config.rst old mode 100644 new mode 100755 index 65a4cd0..c9bc563 --- a/docs/user/gui/config/variable_config.rst +++ b/docs/user/gui/config/variable_config.rst @@ -23,10 +23,10 @@ The variable configuration panel is used to set up :ref:`output variables ` would result in th \ \ 0.0 V \ 5.0 V ============== ============== ======== ======= ======= - Between steps of variables in order 2, if **gate 1** set to smoothly transition, resource **v1** is smoothly stepped from 0.0 V to -5.0 V. + Between steps of variables in order 2, if **gate 1** set to smoothly transition, resource **v1** is smoothly stepped from 0.0 V to -5.0 V. Also, before each step in order 2 occurs, **gate 1 condition** is evaluated for its current boolean value. Everytime, it should evaluate to true since **gate 1** always has a value of 0.0 V at the end of order 1. #. Resource **v1** is smoothly stepped from 0 V to -2.5 V. @@ -113,11 +113,6 @@ Arbitrary Values are provided directly as a sequence of comma-separated numbers (with ignored whitespace). For example, the input "1, 32 , -5,6.543,0,0 , 1" would result in the values: 1, 32, -5, 6.543, 0, 0, 1. -From File ---------- - -Values are provided from a column of comma-separated values (CSV) file. Clicking “Load CSV” opens dialog to select a CSV file from the directory. Heading names of columns of the CSV table are displayed which can be then be selected and preview first three values. Values from selected column of the CSV are auto-filled as an arbitrary input. - .. _variable_config_condition_variable_editor_dialog: Condition variable editor dialog @@ -148,3 +143,5 @@ The condition editor is accessed by double-clicking a condition in the :ref:`con .. The operator, the arguments and their types are what define a condition as has been described :ref:`here `. + + diff --git a/docs/user/gui/config/variable_config_condition_editor.png b/docs/user/gui/config/variable_config_condition_editor.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/variable_config_condition_editor.xcf b/docs/user/gui/config/variable_config_condition_editor.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/variable_config_condition_variable_editor.png b/docs/user/gui/config/variable_config_condition_variable_editor.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/variable_config_condition_variable_editor.xcf b/docs/user/gui/config/variable_config_condition_variable_editor.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/variable_config_editor.png b/docs/user/gui/config/variable_config_editor.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/variable_config_editor.xcf b/docs/user/gui/config/variable_config_editor.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/variable_config_list.png b/docs/user/gui/config/variable_config_list.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/config/variable_config_list.xcf b/docs/user/gui/config/variable_config_list.xcf old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/index.rst b/docs/user/gui/display/index.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/plots/colormapped.rst b/docs/user/gui/display/plots/colormapped.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/plots/colormapped_hilighted.png b/docs/user/gui/display/plots/colormapped_hilighted.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/plots/colormapped_normal.png b/docs/user/gui/display/plots/colormapped_normal.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/plots/index.rst b/docs/user/gui/display/plots/index.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/plots/surface.rst b/docs/user/gui/display/plots/surface.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/plots/surface_normal.png b/docs/user/gui/display/plots/surface_normal.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/plots/surface_waveform.png b/docs/user/gui/display/plots/surface_waveform.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/plots/two_dimensional.png b/docs/user/gui/display/plots/two_dimensional.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/plots/two_dimensional.rst b/docs/user/gui/display/plots/two_dimensional.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/table.png b/docs/user/gui/display/table.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/table.rst b/docs/user/gui/display/table.rst old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/table_filter_editor.png b/docs/user/gui/display/table_filter_editor.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/display/table_filter_list.png b/docs/user/gui/display/table_filter_list.png old mode 100644 new mode 100755 diff --git a/docs/user/gui/index.rst b/docs/user/gui/index.rst old mode 100644 new mode 100755 diff --git a/docs/user/index.rst b/docs/user/index.rst old mode 100644 new mode 100755 diff --git a/docs/user/pulse_programs.rst b/docs/user/pulse_programs.rst old mode 100644 new mode 100755 diff --git a/docs/user/pulse_programs_acquisition.png b/docs/user/pulse_programs_acquisition.png old mode 100644 new mode 100755 diff --git a/docs/user/pulse_programs_multiple_01.png b/docs/user/pulse_programs_multiple_01.png old mode 100644 new mode 100755 diff --git a/docs/user/pulse_programs_multiple_02.png b/docs/user/pulse_programs_multiple_02.png old mode 100644 new mode 100755 diff --git a/docs/user/pulse_programs_single.png b/docs/user/pulse_programs_single.png old mode 100644 new mode 100755 diff --git a/examples/SpanishAcquisition.egg-info/PKG-INFO b/examples/SpanishAcquisition.egg-info/PKG-INFO old mode 100644 new mode 100755 diff --git a/examples/SpanishAcquisition.egg-info/SOURCES.txt b/examples/SpanishAcquisition.egg-info/SOURCES.txt old mode 100644 new mode 100755 diff --git a/examples/SpanishAcquisition.egg-info/dependency_links.txt b/examples/SpanishAcquisition.egg-info/dependency_links.txt old mode 100644 new mode 100755 diff --git a/examples/SpanishAcquisition.egg-info/top_level.txt b/examples/SpanishAcquisition.egg-info/top_level.txt old mode 100644 new mode 100755 diff --git a/examples/__init__.py b/examples/__init__.py old mode 100644 new mode 100755 diff --git a/examples/dist/SpanishAcquisition-2.0.2b-py2.6.egg b/examples/dist/SpanishAcquisition-2.0.2b-py2.6.egg old mode 100644 new mode 100755 diff --git a/examples/virtual_setup.py b/examples/virtual_setup.py old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 1b1b1a5..36e5c49 --- a/setup.py +++ b/setup.py @@ -9,11 +9,11 @@ def included_package(p): setup( name='SpanishAcquisition', - version='2.1', + version='2.0.3', author='Dmitri Iouchtchenko', author_email='diouchtc@uwaterloo.ca', - maintainer='Kyle Willick', - maintainer_email='kyle.willick@uwaterloo.ca', + maintainer='Kaveh Gharavi', + maintainer_email='kayghar@gmail.com', description='Package for interfacing with devices and building user ' 'interfaces.', license='BSD', diff --git a/spacq/__init__.py b/spacq/__init__.py old mode 100644 new mode 100755 index 8e4933f..2f7444b --- a/spacq/__init__.py +++ b/spacq/__init__.py @@ -1 +1 @@ -VERSION = '2.1' +VERSION = '2.0.3' diff --git a/spacq/devices/__init__.py b/spacq/devices/__init__.py index 24d2b02..5251995 100755 --- a/spacq/devices/__init__.py +++ b/spacq/devices/__init__.py @@ -1,2 +1,2 @@ -from . import agilent, iqc, oxford, rohde_schwarz, tektronix, keithley, cryomagnetics, lakeshore, stanford_research_systems, basel -manufacturers = [agilent, iqc, oxford, rohde_schwarz, tektronix, keithley, cryomagnetics, lakeshore, stanford_research_systems, basel] +from . import agilent, iqc, oxford, rohde_schwarz, tektronix, keithley, cryomagnetics, lakeshore, stanford_research_systems +manufacturers = [agilent, iqc, oxford, rohde_schwarz, tektronix, keithley, cryomagnetics, lakeshore, stanford_research_systems] diff --git a/spacq/devices/abstract_device.py b/spacq/devices/abstract_device.py old mode 100644 new mode 100755 index 53b5231..ae5e8bc --- a/spacq/devices/abstract_device.py +++ b/spacq/devices/abstract_device.py @@ -6,15 +6,13 @@ from spacq.tool.box import Enum, Synchronized -from packaging import version - """ Hardware device abstraction interface. """ # PyVISA, Linux GPIB, PyVISA USB. -drivers = Enum(['pyvisa', 'lgpib', 'pyvisa_usb', 'telnet']) +drivers = Enum(['pyvisa', 'lgpib', 'pyvisa_usb']) # Try to import all available drivers. @@ -28,18 +26,10 @@ else: available_drivers.append(drivers.lgpib) -try: - import telnetlib - import socket -except ImportError: - pass -else: - available_drivers.append(drivers.telnet) - try: import visa try: - legacyVisa = version.parse(visa.__version__) < version.parse('1.5') + legacyVisa = visa.__version__ < '1.5' except: legacyVisa = 1 # Some of the mutilated/old visas don't have __version__, but they are all legacy @@ -126,7 +116,7 @@ def _connected(self): class AbstractDevice(SuperDevice): """ - A class for controlling devices which can be connected to either via Ethernet and (PyVISA or Telnet) or GPIB and Linux GPIB. + A class for controlling devices which can be connected to either via Ethernet and PyVISA or GPIB and Linux GPIB. """ max_timeout = 15 # s @@ -141,16 +131,12 @@ def _setup(self): self.status = [] - def __init__(self, ip_address=None, host_address=None, gpib_board=0, gpib_pad=None, gpib_sad=0, + def __init__(self, ip_address=None, gpib_board=0, gpib_pad=None, gpib_sad=0, usb_resource=None, autoconnect=True): """ Ethernet (tcpip::::instr): ip_address: Address on which the device is listening on port 111. - Telnet (): - host_address: String that list the IP address of the host. - Named this way to avoid issues with ip_address used for ethernet connections - GPIB (gpib[gpib_board]::[::]::instr): gpib_board: GPIB board index. Defaults to 0. gpib_pad: Primary address of the device. @@ -175,17 +161,6 @@ def __init__(self, ip_address=None, host_address=None, gpib_board=0, gpib_pad=No } else: raise NotImplementedError('PyVISA required, but not available.') - - elif host_address is not None: - if drivers.telnet in available_drivers: - log.debug('Using telnet with host_address="{0}".'.format(host_address)) - self.driver = drivers.telnet - self.connection_resource = { - 'host': '{0}'.format(host_address) - } - else: - raise NotImplementedError('Telnetlib required, but not available.') - elif gpib_pad is not None: if drivers.lgpib in available_drivers: log.debug('Using Linux GPIB with gpib_board="{0}", gpib_pad="{1}", ' @@ -215,7 +190,7 @@ def __init__(self, ip_address=None, host_address=None, gpib_board=0, gpib_pad=No else: raise NotImplementedError('PyVISA required, but not available.') else: - raise ValueError('Either an IP, Host Address, GPIB, or USB address must be specified.') + raise ValueError('Either an IP, GPIB, or USB address must be specified.') if autoconnect: self.connect() @@ -232,16 +207,9 @@ def connect(self): if self.driver == drivers.pyvisa: try: - if not(legacyVisa): - rm = visa.ResourceManager() - self.device = rm.open_resource(**self.connection_resource) - else: - self.device = visa.Instrument(**self.connection_resource) + self.device = visa.Instrument(**self.connection_resource) except visa.VisaIOError as e: raise DeviceNotFoundError('Could not open device at "{0}".'.format(self.connection_resource), e) - elif self.driver == drivers.telnet: - self.device = telnetlib.Telnet(timeout=2, **self.connection_resource) - elif self.driver == drivers.lgpib: try: self.device = Gpib.Gpib(**self.connection_resource) @@ -343,16 +311,6 @@ def write(self, message): raise DeviceTimeout(e) else: raise - - elif self.driver == drivers.telnet: - try: - self.device.write(message) - except Exception: - if e is socket.timeout: - raise DeviceTimeout(e) - else: - raise - elif self.driver == drivers.lgpib: try: self.device.write(message) @@ -361,7 +319,6 @@ def write(self, message): raise DeviceTimeout(e) else: raise - elif self.driver == drivers.pyvisa_usb: # Send the message raw. if not(legacyVisa): @@ -384,16 +341,6 @@ def read_raw(self, chunk_size=512): buf = self.device.read_raw() except visa.VisaIOError as e: raise - - elif self.driver == drivers.telnet: - try: - buf = self.device.read_until('\r\n') - except Exception as e: - if e is socket.timeout: - raise DeviceTimeout(e) - else: - raise - elif self.driver == drivers.lgpib: status = 0 while status == 0: diff --git a/spacq/devices/agilent/__init__.py b/spacq/devices/agilent/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/dm34401a.py b/spacq/devices/agilent/dm34401a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/dm34410a.py b/spacq/devices/agilent/dm34410a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/mock/__init__.py b/spacq/devices/agilent/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/mock/mock_dm34401a.py b/spacq/devices/agilent/mock/mock_dm34401a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/mock/mock_dm34410a.py b/spacq/devices/agilent/mock/mock_dm34410a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/mock/mock_nwa8753et.py b/spacq/devices/agilent/mock/mock_nwa8753et.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/mock/tests/__init__.py b/spacq/devices/agilent/mock/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/mock/tests/test_mock_dm34401a.py b/spacq/devices/agilent/mock/tests/test_mock_dm34401a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/mock/tests/test_mock_dm34410a.py b/spacq/devices/agilent/mock/tests/test_mock_dm34410a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/nwa8753et.py b/spacq/devices/agilent/nwa8753et.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/tests/__init__.py b/spacq/devices/agilent/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/tests/server/__init__.py b/spacq/devices/agilent/tests/server/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/tests/server/test_dm34401a.py b/spacq/devices/agilent/tests/server/test_dm34401a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/agilent/tests/server/test_dm34410a.py b/spacq/devices/agilent/tests/server/test_dm34410a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/basel/__init__.py b/spacq/devices/basel/__init__.py deleted file mode 100644 index 48693af..0000000 --- a/spacq/devices/basel/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -import logging -log = logging.getLogger(__name__) - -name = 'Physics Basel' - -from . import dacsp927 -models = [dacsp927] -log.debug('Found models for "{0}": {1}'.format(name, ''.join(str(x) for x in models))) - -from .mock import mock_dacsp927 -mock_models = [mock_dacsp927] -log.debug('Found mock models for "{0}": {1}'.format(name, ''.join(str(x) for x in mock_models))) diff --git a/spacq/devices/basel/dacsp927.py b/spacq/devices/basel/dacsp927.py deleted file mode 100644 index 1358c23..0000000 --- a/spacq/devices/basel/dacsp927.py +++ /dev/null @@ -1,122 +0,0 @@ -from __future__ import division - -import logging -log = logging.getLogger(__name__) - -import numpy -import time - -from spacq.interface.resources import Resource -from spacq.interface.units import Quantity -from spacq.tool.box import Synchronized - -from ..abstract_device import AbstractDevice, AbstractSubdevice -from ..tools import quantity_unwrapped, quantity_wrapped, BinaryEncoder - -""" -Physics Basel Low Noise/High Resolution DAC SP 927 -Control the output voltages on all the ports. -""" - -class Port(AbstractSubdevice): - """ - An output port on the voltage source. - """ - def _setup(self): - AbstractSubdevice._setup(self) - - # Resources. - read_write = ['voltage'] - for name in read_write: - self.resources[name] = Resource(self, name, name) - - self.resources['voltage'].units = 'V' - - @Synchronized() - def _connected(self): - AbstractSubdevice._connected(self) - - # Turn on port - output = self.device.ask_raw('{0} ON\r\n'.format(self.num)).strip('\r\n') - if output != 0: - Warning("Device not connected!") - # Gets current voltage in hex, convert it to volts and save the result - result_hex = self.device.ask_raw('{0} V?\r\n'.format(self.num)).strip('\r\n') - if result_hex is not "": - result = self.hex_to_voltage(result_hex) - self.currentVoltage = result - else: - self.currentVoltage = 0 - - # Converts from hex to voltage (see user manual for more info) - def hex_to_voltage(self, number): - return int(number,16)/838848 - 10 - - # Converts from hex to voltage (see user manual for more info) - def voltage_to_hex(self, voltage): - return hex(int(round(((voltage+10)*838848), 0)))[2:] #remove 0x that python adds automatically to hex - - def __init__(self, device, num, *args, **kwargs): - """ - Initialize the output port. - device: The voltage source to which this Port belongs. - num: The index of this port. - """ - AbstractSubdevice.__init__(self, device, *args, **kwargs) - self.num = num - - @property - @quantity_wrapped('V') - def voltage(self): - return self.currentVoltage - - @voltage.setter - @quantity_unwrapped('V') - def voltage(self, value): - """ - Set the voltage on this port, as a quantity in V. - """ - value_hex = self.voltage_to_hex(value) - output = self.device.ask_raw('{0} {1}\r\n'.format(self.num, value_hex)).strip('\r\n') - if output != 0: - Warning("Voltage not properly set!") - - result_hex = self.device.ask_raw('{0} V?\r\n'.format(self.num)).strip('\r\n') - result = self.hex_to_voltage(result_hex) - self.currentVoltage = result - -class dacsp927(AbstractDevice): - """ - Interface for the Physics Basel DAC SP 927 voltage source - """ - - def _setup(self): - AbstractDevice._setup(self) - - self.ports = [] - for num in range(8): - port = Port(self, num+1, **self.port_settings) # Naming convention for DAC SP 927 goes 1 to 8 - self.ports.append(port) - self.subdevices['port{0}'.format(num+1)] = port - - def __init__(self, port_settings=None, *args, **kwargs): - """ - Initialize the voltage source and all its ports. - port_settings: A dictionary of values to give to each port upon creation. - """ - - if port_settings is None: - self.port_settings = {} - else: - self.port_settings = port_settings - - AbstractDevice.__init__(self, *args, **kwargs) - - @Synchronized() - def _connected(self): - AbstractDevice._connected(self) - # Add any initialization here. Careful: if you reconnect it will run this - - -name = 'dacsp927 Voltage Source' -implementation = dacsp927 diff --git a/spacq/devices/basel/mock/__init__.py b/spacq/devices/basel/mock/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/spacq/devices/basel/mock/mock_dacsp927.py b/spacq/devices/basel/mock/mock_dacsp927.py deleted file mode 100644 index cb8235c..0000000 --- a/spacq/devices/basel/mock/mock_dacsp927.py +++ /dev/null @@ -1,27 +0,0 @@ -from ...mock.mock_abstract_device import MockAbstractDevice -from ..dacsp927 import dacsp927 - -""" -Mock DAC SP 927 voltage source -*******This is not complete************ -""" - - -class mockdacsp927(MockAbstractDevice, dacsp927): - """ - Mock interface for the DAC SP 927 voltage source - """ - - def __init__(self, *args, **kwargs): - self.mocking = dacsp927 - - MockAbstractDevice.__init__(self, *args, **kwargs) - - def _reset(self): - self.mock_state['frequency'] = 1000 # Hz - self.mock_state['BNCAmplitude'] = 0.5 # V - - - -name = 'dacsp927 Voltage Source' -implementation = mockdacsp927 diff --git a/spacq/devices/config.py b/spacq/devices/config.py old mode 100644 new mode 100755 index 8c5ee58..9076d15 --- a/spacq/devices/config.py +++ b/spacq/devices/config.py @@ -69,7 +69,6 @@ class DeviceConfig(object): address_modes = Enum([ 'ethernet', - 'telnet', 'gpib', 'usb', ]) @@ -79,7 +78,6 @@ def __init__(self, name): # Connection configuration. self.address_mode = None - self.host_address = None self.ip_address = None self.gpib_board = 0 self.gpib_pad = 0 @@ -189,11 +187,6 @@ def connect(self): raise ConnectionError('No IP address specified.') address['ip_address'] = self.ip_address - - elif self.address_mode == self.address_modes.telnet: - if self.host_address is None: - raise ConnectionError('No Host address specified.') - address['host_address'] = self.host_address elif self.address_mode == self.address_modes.gpib: address['gpib_board'] = self.gpib_board address['gpib_pad'] = self.gpib_pad diff --git a/spacq/devices/cryomagnetics/gui/__init__.py b/spacq/devices/cryomagnetics/gui/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/__init__.py b/spacq/devices/iqc/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/ch4_voltage_source.py b/spacq/devices/iqc/ch4_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/ch6_voltage_source.py b/spacq/devices/iqc/ch6_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/gui/__init__.py b/spacq/devices/iqc/gui/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/gui/ch4_voltage_source.py b/spacq/devices/iqc/gui/ch4_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/gui/ch6_voltage_source.py b/spacq/devices/iqc/gui/ch6_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/gui/voltage_source.py b/spacq/devices/iqc/gui/voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/mock/__init__.py b/spacq/devices/iqc/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/mock/mock_ch4_voltage_source.py b/spacq/devices/iqc/mock/mock_ch4_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/mock/mock_ch6_voltage_source.py b/spacq/devices/iqc/mock/mock_ch6_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/mock/mock_voltage_source.py b/spacq/devices/iqc/mock/mock_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/mock/tests/__init__.py b/spacq/devices/iqc/mock/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/mock/tests/test_mock_ch6_voltage_source.py b/spacq/devices/iqc/mock/tests/test_mock_ch6_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/mock/tests/test_mock_voltage_source.py b/spacq/devices/iqc/mock/tests/test_mock_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/tests/__init__.py b/spacq/devices/iqc/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/tests/server/__init__.py b/spacq/devices/iqc/tests/server/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/tests/server/test_ch6_voltage_source.py b/spacq/devices/iqc/tests/server/test_ch6_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/tests/server/test_voltage_source.py b/spacq/devices/iqc/tests/server/test_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/tests/test_ch6_voltage_source.py b/spacq/devices/iqc/tests/test_ch6_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/tests/test_voltage_source.py b/spacq/devices/iqc/tests/test_voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/iqc/voltage_source.py b/spacq/devices/iqc/voltage_source.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/__init__.py b/spacq/devices/keithley/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/mock/__init__.py b/spacq/devices/keithley/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/mock/mock_sourceMeter2401.py b/spacq/devices/keithley/mock/mock_sourceMeter2401.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/mock/mock_sourceMeter2450.py b/spacq/devices/keithley/mock/mock_sourceMeter2450.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/mock/mock_voltagesource230.py b/spacq/devices/keithley/mock/mock_voltagesource230.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/mock/tests/__init__.py b/spacq/devices/keithley/mock/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/mock/tests/test_mock_voltagesource230.py b/spacq/devices/keithley/mock/tests/test_mock_voltagesource230.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/sourceMeter2401.py b/spacq/devices/keithley/sourceMeter2401.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/sourceMeter2450.py b/spacq/devices/keithley/sourceMeter2450.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/tests/__init__.py b/spacq/devices/keithley/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/tests/server/__init__.py b/spacq/devices/keithley/tests/server/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/tests/server/test_voltagesource230.py b/spacq/devices/keithley/tests/server/test_voltagesource230.py old mode 100644 new mode 100755 diff --git a/spacq/devices/keithley/voltagesource230.py b/spacq/devices/keithley/voltagesource230.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/__init__.py b/spacq/devices/lakeshore/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/mock/__init__.py b/spacq/devices/lakeshore/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/mock/mock_model218.py b/spacq/devices/lakeshore/mock/mock_model218.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/mock/mock_tc335.py b/spacq/devices/lakeshore/mock/mock_tc335.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/mock/tests/__init__.py b/spacq/devices/lakeshore/mock/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/mock/tests/test_mock_tc335.py b/spacq/devices/lakeshore/mock/tests/test_mock_tc335.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/model218.py b/spacq/devices/lakeshore/model218.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/tc335.py b/spacq/devices/lakeshore/tc335.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/tests/__init__.py b/spacq/devices/lakeshore/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/tests/server/__init__.py b/spacq/devices/lakeshore/tests/server/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/lakeshore/tests/server/test_tc335.py b/spacq/devices/lakeshore/tests/server/test_tc335.py old mode 100644 new mode 100755 diff --git a/spacq/devices/mock/__init__.py b/spacq/devices/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/mock/mock_abstract_device.py b/spacq/devices/mock/mock_abstract_device.py old mode 100644 new mode 100755 diff --git a/spacq/devices/mock/tests/__init__.py b/spacq/devices/mock/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/mock/tests/test_mock_abstract_device.py b/spacq/devices/mock/tests/test_mock_abstract_device.py old mode 100644 new mode 100755 diff --git a/spacq/devices/oxford/__init__.py b/spacq/devices/oxford/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/oxford/ips120_10.py b/spacq/devices/oxford/ips120_10.py old mode 100644 new mode 100755 diff --git a/spacq/devices/oxford/mock/__init__.py b/spacq/devices/oxford/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/oxford/mock/mock_ips120_10.py b/spacq/devices/oxford/mock/mock_ips120_10.py old mode 100644 new mode 100755 diff --git a/spacq/devices/oxford/mock/tests/__init__.py b/spacq/devices/oxford/mock/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/oxford/mock/tests/test_mock_ips120_10.py b/spacq/devices/oxford/mock/tests/test_mock_ips120_10.py old mode 100644 new mode 100755 diff --git a/spacq/devices/oxford/tests/__init__.py b/spacq/devices/oxford/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/oxford/tests/server/__init__.py b/spacq/devices/oxford/tests/server/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/oxford/tests/server/test_ips120_10.py b/spacq/devices/oxford/tests/server/test_ips120_10.py old mode 100644 new mode 100755 diff --git a/spacq/devices/rohde_schwarz/__init__.py b/spacq/devices/rohde_schwarz/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/rohde_schwarz/mock/__init__.py b/spacq/devices/rohde_schwarz/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/rohde_schwarz/mock/mock_smf100a.py b/spacq/devices/rohde_schwarz/mock/mock_smf100a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/rohde_schwarz/mock/tests/__init__.py b/spacq/devices/rohde_schwarz/mock/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/rohde_schwarz/mock/tests/test_mock_smf100a.py b/spacq/devices/rohde_schwarz/mock/tests/test_mock_smf100a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/rohde_schwarz/smf100a.py b/spacq/devices/rohde_schwarz/smf100a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/rohde_schwarz/tests/__init__.py b/spacq/devices/rohde_schwarz/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/rohde_schwarz/tests/server/__init__.py b/spacq/devices/rohde_schwarz/tests/server/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/rohde_schwarz/tests/server/test_smf100a.py b/spacq/devices/rohde_schwarz/tests/server/test_smf100a.py old mode 100644 new mode 100755 diff --git a/spacq/devices/sample/__init__.py b/spacq/devices/sample/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/sample/abc1234.py b/spacq/devices/sample/abc1234.py old mode 100644 new mode 100755 diff --git a/spacq/devices/sample/mock/__init__.py b/spacq/devices/sample/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/sample/mock/mock_abc1234.py b/spacq/devices/sample/mock/mock_abc1234.py old mode 100644 new mode 100755 diff --git a/spacq/devices/sample/mock/tests/__init__.py b/spacq/devices/sample/mock/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/sample/mock/tests/test_mock_abc1234.py b/spacq/devices/sample/mock/tests/test_mock_abc1234.py old mode 100644 new mode 100755 diff --git a/spacq/devices/sample/tests/__init__.py b/spacq/devices/sample/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/sample/tests/server/__init__.py b/spacq/devices/sample/tests/server/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/sample/tests/server/test_abc1234.py b/spacq/devices/sample/tests/server/test_abc1234.py old mode 100644 new mode 100755 diff --git a/spacq/devices/stanford_research_systems/__init__.py b/spacq/devices/stanford_research_systems/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/stanford_research_systems/mock/__init__.py b/spacq/devices/stanford_research_systems/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/stanford_research_systems/mock/mock_sg382.py b/spacq/devices/stanford_research_systems/mock/mock_sg382.py old mode 100644 new mode 100755 diff --git a/spacq/devices/stanford_research_systems/mock/mock_sim900.py b/spacq/devices/stanford_research_systems/mock/mock_sim900.py old mode 100644 new mode 100755 diff --git a/spacq/devices/stanford_research_systems/mock/mock_sr830dsp.py b/spacq/devices/stanford_research_systems/mock/mock_sr830dsp.py old mode 100644 new mode 100755 diff --git a/spacq/devices/stanford_research_systems/sg382.py b/spacq/devices/stanford_research_systems/sg382.py old mode 100644 new mode 100755 diff --git a/spacq/devices/stanford_research_systems/sim900.py b/spacq/devices/stanford_research_systems/sim900.py old mode 100644 new mode 100755 diff --git a/spacq/devices/stanford_research_systems/sr830dsp.py b/spacq/devices/stanford_research_systems/sr830dsp.py old mode 100644 new mode 100755 index 958275a..4dfc103 --- a/spacq/devices/stanford_research_systems/sr830dsp.py +++ b/spacq/devices/stanford_research_systems/sr830dsp.py @@ -30,9 +30,6 @@ class SR830DSP(AbstractDevice): min_freq = .001 # Hz max_freq = 102000 # Hz - min_phase = -360 # degrees - max_phase = 729 # degrees - def _setup(self): AbstractDevice._setup(self) @@ -41,7 +38,7 @@ def _setup(self): #for name in read_only: # self.resources[name] = Resource(self, name) - read_write = ['reference_freq', 'reference_amplitude', 'reference_phase'] + read_write = ['reference_freq', 'reference_amplitude'] for name in read_write: self.resources[name] = Resource(self, name, name) @@ -54,6 +51,8 @@ def _setup(self): self.resources['amplitude_x'].units = 'V' self.resources['amplitude_y'].units = 'V' self.resources['amplitude_R'].units = 'V' + #self.resources['integration_time'].allowed_values = self.allowed_nplc + #self.resources['auto_zero'].allowed_values = self.allowed_auto_zero @Synchronized() def _connected(self): @@ -89,21 +88,6 @@ def reference_freq(self, value): self.write('FREQ {0}'.format(value)) - @property - def reference_phase(self): - """ - The phase of the internal oscillator - """ - - return float(self.ask('PHAS?')) - - @reference_phase.setter - def reference_phase(self, value): - if float(value) < self.min_phase or float(value) > self.max_phase: - raise ValueError('Value {0} not within the allowed bounds: {1} to {2}'.format(value, self.min_phase, self.max_phase)) - - self.write('PHAS {0}'.format(value)) - @property @Synchronized() @quantity_wrapped('V') diff --git a/spacq/devices/tektronix/__init__.py b/spacq/devices/tektronix/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/awg5014b.py b/spacq/devices/tektronix/awg5014b.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/dpo7104.py b/spacq/devices/tektronix/dpo7104.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/mock/__init__.py b/spacq/devices/tektronix/mock/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/mock/mock_awg5014b.py b/spacq/devices/tektronix/mock/mock_awg5014b.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/mock/mock_dpo7104.py b/spacq/devices/tektronix/mock/mock_dpo7104.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/mock/tests/__init__.py b/spacq/devices/tektronix/mock/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/mock/tests/test_mock_awg5014b.py b/spacq/devices/tektronix/mock/tests/test_mock_awg5014b.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/mock/tests/test_mock_dpo7104.py b/spacq/devices/tektronix/mock/tests/test_mock_dpo7104.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/tests/__init__.py b/spacq/devices/tektronix/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/tests/server/__init__.py b/spacq/devices/tektronix/tests/server/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/tests/server/test_awg5014b.py b/spacq/devices/tektronix/tests/server/test_awg5014b.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tektronix/tests/server/test_dpo7104.py b/spacq/devices/tektronix/tests/server/test_dpo7104.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tests/__init__.py b/spacq/devices/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tests/server/__init__.py b/spacq/devices/tests/server/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tests/server/test_abstract_device.py b/spacq/devices/tests/server/test_abstract_device.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tests/server/test_config.py b/spacq/devices/tests/server/test_config.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tests/test_abstract_device.py b/spacq/devices/tests/test_abstract_device.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tests/test_config.py b/spacq/devices/tests/test_config.py old mode 100644 new mode 100755 diff --git a/spacq/devices/tests/test_tools.py b/spacq/devices/tests/test_tools.py old mode 100644 new mode 100755 diff --git a/spacq/gui/__init__.py b/spacq/gui/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/action/__init__.py b/spacq/gui/action/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/action/smooth_reset.py b/spacq/gui/action/smooth_reset.py old mode 100644 new mode 100755 diff --git a/spacq/gui/config/__init__.py b/spacq/gui/config/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/config/device/__init__.py b/spacq/gui/config/device/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/config/device/device_config.py b/spacq/gui/config/device/device_config.py old mode 100644 new mode 100755 index 7407eb2..3c3b368 --- a/spacq/gui/config/device/device_config.py +++ b/spacq/gui/config/device/device_config.py @@ -57,22 +57,6 @@ def __init__(self, parent, connection_callback=None, *args, **kwargs): self.ip_address_input = IpAddrCtrl(self) ethernet_sizer.Add(self.ip_address_input, flag=wx.CENTER) - ### Telnet - telnet_static_box = wx.StaticBox(self) - telnet_box = wx.StaticBoxSizer(telnet_static_box, wx.VERTICAL) - address_sizer.Add(telnet_box, proportion=1) - - self.address_mode_tel = wx.RadioButton(self, label='Telnet') - telnet_box.Add(self.address_mode_tel) - - telnet_sizer = wx.FlexGridSizer(rows=2, cols=2, hgap=5) - telnet_box.Add(telnet_sizer, flag=wx.EXPAND) - - telnet_sizer.Add(wx.StaticText(self, label='Host:'), - flag=wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT) - self.host_address_input = IpAddrCtrl(self) - telnet_sizer.Add(self.host_address_input, flag=wx.CENTER) - ### GPIB. self.gpib_static_box = wx.StaticBox(self) gpib_box = wx.StaticBoxSizer(self.gpib_static_box, wx.VERTICAL) @@ -148,8 +132,6 @@ def __init__(self, parent, connection_callback=None, *args, **kwargs): def get_address_mode(self): if self.address_mode_eth.Value: return DeviceConfig.address_modes.ethernet - elif self.address_mode_tel.Value: - return DeviceConfig.address_modes.telnet elif self.address_mode_gpib.Value: return DeviceConfig.address_modes.gpib elif self.address_mode_usb.Value: @@ -168,9 +150,6 @@ def GetValue(self): else: dev_cfg.ip_address = None - ## Telnet - dev_cfg.host_address = self.host_address_input.GetAddress() - ## GPIB. dev_cfg.gpib_board = self.gpib_board_input.Value dev_cfg.gpib_pad = self.gpib_pad_input.Value @@ -211,10 +190,6 @@ def SetValue(self, dev_cfg): if dev_cfg.ip_address: self.ip_address_input.SetValue(dev_cfg.ip_address) - ## Telnet - if dev_cfg.host_address: - self.host_address_input.SetValue(dev_cfg.host_address) - ## GPIB. self.gpib_board_input.Value = dev_cfg.gpib_board self.gpib_pad_input.Value = dev_cfg.gpib_pad diff --git a/spacq/gui/config/device/resource_tree.py b/spacq/gui/config/device/resource_tree.py old mode 100644 new mode 100755 diff --git a/spacq/gui/config/devices.py b/spacq/gui/config/devices.py old mode 100644 new mode 100755 diff --git a/spacq/gui/config/pulse.py b/spacq/gui/config/pulse.py old mode 100644 new mode 100755 diff --git a/spacq/gui/config/scaling.py b/spacq/gui/config/scaling.py old mode 100644 new mode 100755 diff --git a/spacq/gui/config/virtual_variables.py b/spacq/gui/config/virtual_variables.py old mode 100644 new mode 100755 index 048e3b2..c721b5b --- a/spacq/gui/config/virtual_variables.py +++ b/spacq/gui/config/virtual_variables.py @@ -175,7 +175,7 @@ def __init__(self, parent, *args, **kwargs): count_setup = wx.BoxSizer(wx.HORIZONTAL) static_panel_box.Add(count_setup, flag=wx.ALL, border=5) - label = wx.StaticText(self, label='Number of Dependent Variables') + label = wx.StaticText(self, label='Number of Virtual Variables') self.dependent_count = wx.SpinCtrl(self, min=1, initial=2, max=100) button = wx.Button(self, label='Update') self.Bind(wx.EVT_BUTTON, self.OnUpdate, button) diff --git a/spacq/gui/display/__init__.py b/spacq/gui/display/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/__init__.py b/spacq/gui/display/plot/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/colormapped.py b/spacq/gui/display/plot/colormapped.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/common/__init__.py b/spacq/gui/display/plot/common/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/common/chaco_plot.py b/spacq/gui/display/plot/common/chaco_plot.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/live/__init__.py b/spacq/gui/display/plot/live/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/live/list.py b/spacq/gui/display/plot/live/list.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/live/list_3d.py b/spacq/gui/display/plot/live/list_3d.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/plotmath/__init__.py b/spacq/gui/display/plot/plotmath/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/plotmath/common/__init__.py b/spacq/gui/display/plot/plotmath/common/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/plotmath/derivative.py b/spacq/gui/display/plot/plotmath/derivative.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/plotmath/function.py b/spacq/gui/display/plot/plotmath/function.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/static/__init__.py b/spacq/gui/display/plot/static/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/static/colormapped.py b/spacq/gui/display/plot/static/colormapped.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/static/common/__init__.py b/spacq/gui/display/plot/static/common/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/static/common/plot_setup.py b/spacq/gui/display/plot/static/common/plot_setup.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/static/delegator.py b/spacq/gui/display/plot/static/delegator.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/static/surface.py b/spacq/gui/display/plot/static/surface.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/static/two_dimensional.py b/spacq/gui/display/plot/static/two_dimensional.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/surface.py b/spacq/gui/display/plot/surface.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/plot/two_dimensional.py b/spacq/gui/display/plot/two_dimensional.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/table/__init__.py b/spacq/gui/display/table/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/table/filter.py b/spacq/gui/display/table/filter.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/table/generic.py b/spacq/gui/display/table/generic.py old mode 100644 new mode 100755 diff --git a/spacq/gui/display/waveform.py b/spacq/gui/display/waveform.py old mode 100644 new mode 100755 diff --git a/spacq/gui/global_store.py b/spacq/gui/global_store.py old mode 100644 new mode 100755 diff --git a/spacq/gui/tool/__init__.py b/spacq/gui/tool/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/tool/box.py b/spacq/gui/tool/box.py old mode 100644 new mode 100755 diff --git a/spacq/gui/tool/tests/__init__.py b/spacq/gui/tool/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/gui/tool/tests/test_box.py b/spacq/gui/tool/tests/test_box.py old mode 100644 new mode 100755 diff --git a/spacq/interface/__init__.py b/spacq/interface/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/interface/list_columns.py b/spacq/interface/list_columns.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/__init__.py b/spacq/interface/pulse/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/parser.py b/spacq/interface/pulse/parser.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/program.py b/spacq/interface/pulse/program.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tests/__init__.py b/spacq/interface/pulse/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tests/resources/01.pulse b/spacq/interface/pulse/tests/resources/01.pulse old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tests/resources/02.pulse b/spacq/interface/pulse/tests/resources/02.pulse old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tests/resources/non-square b/spacq/interface/pulse/tests/resources/non-square old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tests/test_parser.py b/spacq/interface/pulse/tests/test_parser.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tests/test_program.py b/spacq/interface/pulse/tests/test_program.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tests/test_tree.py b/spacq/interface/pulse/tests/test_tree.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tool/__init__.py b/spacq/interface/pulse/tool/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tool/box.py b/spacq/interface/pulse/tool/box.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tool/tests/__init__.py b/spacq/interface/pulse/tool/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tool/tests/test_box.py b/spacq/interface/pulse/tool/tests/test_box.py old mode 100644 new mode 100755 diff --git a/spacq/interface/pulse/tree.py b/spacq/interface/pulse/tree.py old mode 100644 new mode 100755 diff --git a/spacq/interface/tests/__init__.py b/spacq/interface/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/interface/tests/test_list_columns.py b/spacq/interface/tests/test_list_columns.py old mode 100644 new mode 100755 diff --git a/spacq/interface/tests/test_resources.py b/spacq/interface/tests/test_resources.py old mode 100644 new mode 100755 diff --git a/spacq/interface/tests/test_units.py b/spacq/interface/tests/test_units.py old mode 100644 new mode 100755 diff --git a/spacq/interface/tests/test_waveform.py b/spacq/interface/tests/test_waveform.py old mode 100644 new mode 100755 diff --git a/spacq/interface/waveform.py b/spacq/interface/waveform.py old mode 100644 new mode 100755 diff --git a/spacq/iteration/__init__.py b/spacq/iteration/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/iteration/tests/__init__.py b/spacq/iteration/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/iteration/tests/resources/01.pulse b/spacq/iteration/tests/resources/01.pulse old mode 100644 new mode 100755 diff --git a/spacq/iteration/virtual_variables.py b/spacq/iteration/virtual_variables.py old mode 100644 new mode 100755 diff --git a/spacq/tests/__init__.py b/spacq/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/tests/tool/__init__.py b/spacq/tests/tool/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/tests/tool/box.py b/spacq/tests/tool/box.py old mode 100644 new mode 100755 diff --git a/spacq/tool/__init__.py b/spacq/tool/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/tool/box.py b/spacq/tool/box.py old mode 100644 new mode 100755 diff --git a/spacq/tool/tests/__init__.py b/spacq/tool/tests/__init__.py old mode 100644 new mode 100755 diff --git a/spacq/tool/tests/test_box.py b/spacq/tool/tests/test_box.py old mode 100644 new mode 100755