server, adc: to convert the range use numpy multiplication instead of for loops

48ab52b7 · Milosz Malczak · 0bc9bf1a · 48ab52b7 · 48ab52b7 · 48ab52b7
Commit 48ab52b7 authored Jul 08, 2019 by Milosz Malczak
Showing with 37 additions and 6 deletions

ZMQ_pickle_numpy.txt ...ion/transport_measurements/numpy/ZMQ/ZMQ_pickle_numpy.txt +33 -0

devices_access.py software/fec/devices_access.py +0 -1

ADC.py software/server/ADC.py +4 -5

No files found.
--- a/documentation/transport_measurements/numpy/ZMQ/ZMQ_pickle_numpy.txt
+++ b/documentation/transport_measurements/numpy/ZMQ/ZMQ_pickle_numpy.txt
+Internal trigger on channel 3
+Sampled signal: 100kHz sine wave Channel 3(0-3)
+number of presamples = 0
+number of acquisitions = 5
+
+Number of channels: 1
+Postsamples: 2       ,Best: 0.000348301138729, medium: 0.000550635065883, variance: 0.000000047366427, 
+Postsamples: 10      ,Best: 0.000461454037577, medium: 0.000526003725827, variance: 0.000000003548800, 
+Postsamples: 100     ,Best: 0.000462563941255, medium: 0.000495669757947, variance: 0.000000003910958, 
+Postsamples: 1000    ,Best: 0.000553337857127, medium: 0.000591656984761, variance: 0.000000000848302, 
+Postsamples: 10000   ,Best: 0.001199614955112, medium: 0.001400555809960, variance: 0.000000083604953, 
+Postsamples: 100000  ,Best: 0.009175091981888, medium: 0.009955899463966, variance: 0.000000581141384, 
+Number of channels: 2
+Postsamples: 2       ,Best: 0.000560321845114, medium: 0.000657741213217, variance: 0.000000019798963, 
+Postsamples: 10      ,Best: 0.000396790914237, medium: 0.000510842958465, variance: 0.000000004297638, 
+Postsamples: 100     ,Best: 0.000466407043859, medium: 0.000544681213796, variance: 0.000000002719812, 
+Postsamples: 1000    ,Best: 0.000678118085489, medium: 0.000708730565384, variance: 0.000000001086168, 
+Postsamples: 10000   ,Best: 0.001665899064392, medium: 0.001762239960954, variance: 0.000000013653408, 
+Postsamples: 100000  ,Best: 0.013350506778806, medium: 0.013670049980283, variance: 0.000000035133733, 
+Number of channels: 3
+Postsamples: 2       ,Best: 0.000519986962900, medium: 0.000617402140051, variance: 0.000000020240062, 
+Postsamples: 10      ,Best: 0.000473888125271, medium: 0.000521169649437, variance: 0.000000001374883, 
+Postsamples: 100     ,Best: 0.000563303939998, medium: 0.000574354827404, variance: 0.000000000044251, 
+Postsamples: 1000    ,Best: 0.000640509882942, medium: 0.000731211388484, variance: 0.000000005015219, 
+Postsamples: 10000   ,Best: 0.001860267948359, medium: 0.002135418169200, variance: 0.000000073110321, 
+Postsamples: 100000  ,Best: 0.020235259085894, medium: 0.022502767853439, variance: 0.000002600408086, 
+Number of channels: 4
+Postsamples: 2       ,Best: 0.000602992018685, medium: 0.000993753038347, variance: 0.000000219134286, 
+Postsamples: 10      ,Best: 0.000668875174597, medium: 0.000691790785640, variance: 0.000000001824391, 
+Postsamples: 100     ,Best: 0.000635306118056, medium: 0.000712181488052, variance: 0.000000002817673, 
+Postsamples: 1000    ,Best: 0.000856020022184, medium: 0.000883606215939, variance: 0.000000000333740, 
+Postsamples: 10000   ,Best: 0.002299087820575, medium: 0.002595677832142, variance: 0.000000037116888, 
+Postsamples: 100000  ,Best: 0.024646013975143, medium: 0.025756353605539, variance: 0.000000865654250, 
--- a/software/fec/devices_access.py
+++ b/software/fec/devices_access.py
@@ -144,7 +144,6 @@ class DevicesAccess():
            return([0, 0, 0])

        data = np.transpose(data)
-        data = data.tolist()
        data_dict = {}
        for channel in self.__channels:
            data_dict[str(channel)] = data[channel]

--- a/software/server/ADC.py
+++ b/software/server/ADC.py
@@ -9,7 +9,7 @@ logger = logging.getLogger(__name__)
 sys.path.append('../')
 from general.zmq_rpc import ZMQ_RPC
 from general.zmq_rpc import RPC_Error
-
+import numpy as np

 class ADC:

@@ -71,10 +71,9 @@ class ADC:
        for channel_idx, data_channel in data.items():
            range = self.__channels[int(channel_idx)].range
            mult = range_multiplier[range]
-            data_channel = [value * mult for value in data_channel]
-            """conversion to the 10V scale"""
-            data_channel = [(value / 2**16 * 10) for value in data_channel]
-            """conversionfrom raw to V"""
+            conv_fact = mult * 10 / 2**16
+            data_channel = data_channel * conv_fact 
+            """conversion from raw to the 10V scale"""

            self.__channels[int(channel_idx)].timestamp_pre_post_data =\
                    {'timestamp': timestamp, 'pre_post': pre_post,