@@ -0,0 +1,86 | |||
|
1 | ## CHANGELOG: | |
|
2 | ||
|
3 | ### 2.3 | |
|
4 | ||
|
5 | ### 2.2.5: | |
|
6 | * splitProfiles and combineProfiles modules were added to VoltageProc and Signal Chain GUI. | |
|
7 | * nProfiles of USRP data (hdf5) is the number of profiles thera are in one second. | |
|
8 | * jroPlotter works directly with data objects instead of dictionaries | |
|
9 | * script "schain" was added to Signal Chain installer | |
|
10 | ||
|
11 | ### 2.2.4.1: | |
|
12 | * jroIO_usrp.py is update to read Sandra's data | |
|
13 | * decimation in Spectra and RTI plots is always enabled. | |
|
14 | * time* window option added to GUI | |
|
15 | ||
|
16 | ### 2.2.4: | |
|
17 | * jroproc_spectra_lags.py added to schainpy | |
|
18 | * Bug fixed in schainGUI: ProcUnit was created with the same id in some cases. | |
|
19 | * Bug fixed in jroHeaderIO: Header size validation. | |
|
20 | ||
|
21 | ### 2.2.3.1: | |
|
22 | * Filtering block by time has been added. | |
|
23 | * Bug fixed plotting RTI, CoherenceMap and others using xmin and xmax parameters. The first day worked | |
|
24 | properly but the next days did not. | |
|
25 | ||
|
26 | ### 2.2.3: | |
|
27 | * Bug fixed in GUI: Error getting(reading) Code value | |
|
28 | * Bug fixed in GUI: Flip option always needs channelList field | |
|
29 | * Bug fixed in jrodata: when one branch modified a value in "dataOut" (example: dataOut.code) this value | |
|
30 | was modified for every branch (because this was a reference). It was modified in data.copy() | |
|
31 | * Bug fixed in jroproc_voltage.profileSelector(): rangeList replaces to profileRangeList. | |
|
32 | ||
|
33 | ### 2.2.2: | |
|
34 | * VoltageProc: ProfileSelector, Reshape, Decoder with nTxs!=1 and getblock=True was tested | |
|
35 | * Rawdata and testRawdata.py added to Signal Chain project | |
|
36 | ||
|
37 | ### 2.2.1: | |
|
38 | * Bugs fixed in GUI | |
|
39 | * Views were improved in GUI | |
|
40 | * Support to MST* ISR experiments | |
|
41 | * Bug fixed getting noise using hyldebrant. (minimum number of points > 20%) | |
|
42 | * handleError added to jroplotter.py | |
|
43 | ||
|
44 | ### 2.2.0: | |
|
45 | * GUI: use of external plotter | |
|
46 | * Compatible with matplotlib 1.5.0 | |
|
47 | ||
|
48 | ### 2.1.5: | |
|
49 | * serializer module added to Signal Chain | |
|
50 | * jroplotter.py added to Signal Chain | |
|
51 | ||
|
52 | ### 2.1.4.2: | |
|
53 | * A new Plotter Class was added | |
|
54 | * Project.start() does not accept filename as a parameter anymore | |
|
55 | ||
|
56 | ### 2.1.4.1: | |
|
57 | * Send notifications when an error different to ValueError is detected | |
|
58 | ||
|
59 | ### 2.1.4: | |
|
60 | * Sending error notifications to signal chain administrator | |
|
61 | * Login to email server added | |
|
62 | ||
|
63 | ### 2.1.3.3: | |
|
64 | * Colored Button Icons were added to GUI | |
|
65 | ||
|
66 | ### 2.1.3.2: | |
|
67 | * GUI: user interaction enhanced | |
|
68 | * controller_api.py: Safe access to ControllerThead | |
|
69 | ||
|
70 | ### 2.1.3.1: | |
|
71 | * GUI: every icon were resized | |
|
72 | * jroproc_voltage.py: Print a message when "Read from code" option is selected and the code is not defined inside data file | |
|
73 | ||
|
74 | ### 2.1.3: | |
|
75 | * jroplot_heispectra.py: SpectraHeisScope was not showing the right channels | |
|
76 | * jroproc_voltage.py: Bug fixed selecting profiles (self.nProfiles took a wrong value), | |
|
77 | Bug fixed selecting heights by block (selecting profiles instead heights) | |
|
78 | * jroproc_voltage.py: New feature added: decoding data by block using FFT. | |
|
79 | * jroIO_heispectra.py: Bug fixed in FitsReader. Using local Fits instance instead schainpy.mode.data.jrodata.Fits. | |
|
80 | * jroIO_heispectra.py: Channel index list does not exist. | |
|
81 | ||
|
82 | ### 2.1.2: | |
|
83 | * jroutils_ftp.py: Bug fixed, Any error sending file stopped the Server Thread | |
|
84 | Server thread opens and closes remote server each time file list is sent | |
|
85 | * jroplot_spectra.py: Noise path was not being created when noise data is saved. | |
|
86 | * jroIO_base.py: startTime can be greater than endTime. Example: SpreadF [18:00 * 07:00] No newline at end of file |
@@ -903,7 +903,7 class ReadUnitConf(ProcUnitConf): | |||
|
903 | 903 | self.startTime = opConfObj.getParameterValue('startTime') |
|
904 | 904 | self.endTime = opConfObj.getParameterValue('endTime') |
|
905 | 905 | |
|
906 | class Project(): | |
|
906 | class Project(Process): | |
|
907 | 907 | |
|
908 | 908 | id = None |
|
909 | 909 | name = None |
@@ -917,7 +917,7 class Project(): | |||
|
917 | 917 | plotterQueue = None |
|
918 | 918 | |
|
919 | 919 | def __init__(self, plotter_queue=None): |
|
920 | ||
|
920 | Process.__init__(self) | |
|
921 | 921 | self.id = None |
|
922 | 922 | self.name = None |
|
923 | 923 | self.description = None |
@@ -1268,7 +1268,11 class Project(): | |||
|
1268 | 1268 | raise NotImplementedError, "Use schainpy.controller_api.ControllerThread instead Project class" |
|
1269 | 1269 | |
|
1270 | 1270 | |
|
1271 | def run(self): | |
|
1271 | def run(self, filename=None): | |
|
1272 | ||
|
1273 | # self.writeXml(filename) | |
|
1274 | self.createObjects() | |
|
1275 | self.connectObjects() | |
|
1272 | 1276 | |
|
1273 | 1277 | |
|
1274 | 1278 | print "*"*60 |
@@ -1319,10 +1323,3 class Project(): | |||
|
1319 | 1323 | procUnitConfObj.close() |
|
1320 | 1324 | |
|
1321 | 1325 | print "Process finished" |
|
1322 | ||
|
1323 | def start(self, filename=None): | |
|
1324 | ||
|
1325 | self.writeXml(filename) | |
|
1326 | self.createObjects() | |
|
1327 | self.connectObjects() | |
|
1328 | self.run() |
@@ -9,14 +9,4 from data import * | |||
|
9 | 9 | from io import * |
|
10 | 10 | from proc import * |
|
11 | 11 | from graphics import * |
|
12 |
from utils import * |
|
|
13 | ||
|
14 | global_type_string = 'string' | |
|
15 | global_type_integer = 'int' | |
|
16 | global_type_floatList = 'floatList' | |
|
17 | global_type_pairsList = 'pairsList' | |
|
18 | global_type_boolean = 'bolean' | |
|
19 | global_type_float = 'float' | |
|
20 | global_type_colormap = 'colormap' | |
|
21 | global_type_list = 'list' | |
|
22 | global_type_float = 'float' | |
|
12 | from utils import * No newline at end of file |
@@ -6,34 +6,6 from schainpy.model import * | |||
|
6 | 6 | from figure import Figure, isRealtime |
|
7 | 7 | |
|
8 | 8 | class CorrelationPlot(Figure): |
|
9 | parameters = { | |
|
10 | 'id': global_type_string, | |
|
11 | 'wintitle': global_type_string, | |
|
12 | 'channelList': global_type_list, | |
|
13 | 'showprofile': global_type_string, | |
|
14 | 'xmin': global_type_float, | |
|
15 | 'xmax': global_type_float, | |
|
16 | 'ymin': global_type_float, | |
|
17 | 'ymax': global_type_float, | |
|
18 | 'zmin': global_type_float, | |
|
19 | 'zmax': global_type_float, | |
|
20 | 'save': global_type_boolean, | |
|
21 | 'figpath': global_type_string, | |
|
22 | 'figfile': global_type_string, | |
|
23 | 'show': global_type_boolean, | |
|
24 | 'ftp': global_type_boolean, | |
|
25 | 'wr_period': global_type_integer, | |
|
26 | 'server': global_type_string, | |
|
27 | 'folder': global_type_string, | |
|
28 | 'username': global_type_string, | |
|
29 | 'password': global_type_string, | |
|
30 | 'ftp_wei': global_type_integer, | |
|
31 | 'exp_code': global_type_integer, | |
|
32 | 'sub_exp_code': global_type_integer, | |
|
33 | 'plot_pos': global_type_integer, | |
|
34 | 'realtime': global_type_boolean, | |
|
35 | } | |
|
36 | ||
|
37 | 9 | isConfig = None |
|
38 | 10 | __nsubplots = None |
|
39 | 11 |
@@ -14,35 +14,6 class MomentsPlot(Figure): | |||
|
14 | 14 | WIDTHPROF = None |
|
15 | 15 | HEIGHTPROF = None |
|
16 | 16 | PREFIX = 'prm' |
|
17 | ||
|
18 | parameters = { | |
|
19 | 'id': global_type_string, | |
|
20 | 'wintitle': global_type_string, | |
|
21 | 'channelList': global_type_list, | |
|
22 | 'showprofile': global_type_boolean, | |
|
23 | 'xmin': global_type_float, | |
|
24 | 'xmax': global_type_float, | |
|
25 | 'ymin': global_type_float, | |
|
26 | 'ymax': global_type_float, | |
|
27 | 'zmin': global_type_float, | |
|
28 | 'zmax': global_type_float, | |
|
29 | 'save': global_type_boolean, | |
|
30 | 'figpath': global_type_string, | |
|
31 | 'figfile': global_type_string, | |
|
32 | 'show': global_type_boolean, | |
|
33 | 'ftp': global_type_boolean, | |
|
34 | 'wr_period': global_type_integer, | |
|
35 | 'server': global_type_string, | |
|
36 | 'folder': global_type_string, | |
|
37 | 'username': global_type_string, | |
|
38 | 'password': global_type_string, | |
|
39 | 'ftp_wei': global_type_string, | |
|
40 | 'exp_code': global_type_integer, | |
|
41 | 'sub_exp_code': global_type_integer, | |
|
42 | 'plot_pos': global_type_integer, | |
|
43 | 'realtime': global_type_boolean, | |
|
44 | } | |
|
45 | ||
|
46 | 17 | def __init__(self, **kwargs): |
|
47 | 18 | Figure.__init__(self, **kwargs) |
|
48 | 19 | self.isConfig = False |
@@ -605,40 +576,6 class ParametersPlot(Figure): | |||
|
605 | 576 | nplots = None |
|
606 | 577 | nchan = None |
|
607 | 578 | |
|
608 | parameters = { | |
|
609 | 'id': global_type_string, | |
|
610 | 'wintitle': global_type_string, | |
|
611 | 'channelList': global_type_list, | |
|
612 | 'paramIndex': global_type_integer, | |
|
613 | 'colormap': global_type_colormap, | |
|
614 | 'xmin': global_type_float, | |
|
615 | 'xmax': global_type_float, | |
|
616 | 'ymin': global_type_float, | |
|
617 | 'ymax': global_type_float, | |
|
618 | 'zmin': global_type_float, | |
|
619 | 'zmax': global_type_float, | |
|
620 | 'timerange': global_type_float, | |
|
621 | 'showSNR': global_type_boolean, | |
|
622 | 'SNRthresh': global_type_float, | |
|
623 | 'SNRmin': global_type_float, | |
|
624 | 'SNRmax': global_type_float, | |
|
625 | 'save': global_type_boolean, | |
|
626 | 'figpath': global_type_string, | |
|
627 | 'lastone': global_type_integer, | |
|
628 | 'figfile': global_type_string, | |
|
629 | 'ftp': global_type_boolean, | |
|
630 | 'wr_period': global_type_integer, | |
|
631 | 'show': global_type_boolean, | |
|
632 | 'server': global_type_string, | |
|
633 | 'folder': global_type_string, | |
|
634 | 'username': global_type_string, | |
|
635 | 'password': global_type_string, | |
|
636 | 'ftp_wei': global_type_integer, | |
|
637 | 'exp_code': global_type_integer, | |
|
638 | 'sub_exp_code': global_type_integer, | |
|
639 | 'plot_pos': global_type_integer, | |
|
640 | } | |
|
641 | ||
|
642 | 579 | def __init__(self, **kwargs): |
|
643 | 580 | Figure.__init__(self, **kwargs) |
|
644 | 581 | self.timerange = None |
@@ -846,46 +783,6 class Parameters1Plot(Figure): | |||
|
846 | 783 | HEIGHTPROF = None |
|
847 | 784 | PREFIX = 'prm' |
|
848 | 785 | |
|
849 | parameters = { | |
|
850 | 'id': global_type_string, | |
|
851 | 'wintitle': global_type_string, | |
|
852 | 'channelList': global_type_list, | |
|
853 | 'showprofile': global_type_boolean, | |
|
854 | 'xmin': global_type_float, | |
|
855 | 'xmax': global_type_float, | |
|
856 | 'ymin': global_type_float, | |
|
857 | 'ymax': global_type_float, | |
|
858 | 'zmin': global_type_float, | |
|
859 | 'zmax': global_type_float, | |
|
860 | 'timerange': global_type_float, | |
|
861 | 'parameterIndex': global_type_float, | |
|
862 | 'onlyPositive': global_type_boolean, | |
|
863 | 'SNRthresh': global_type_float, | |
|
864 | 'SNR': global_type_boolean, | |
|
865 | 'SNRmin': global_type_float, | |
|
866 | 'SNRmax': global_type_float, | |
|
867 | 'onlySNR': global_type_boolean, | |
|
868 | 'DOP': global_type_boolean, | |
|
869 | 'zlabel': global_type_string, | |
|
870 | 'parameterName': global_type_string, | |
|
871 | 'parameterObject': global_type_string, | |
|
872 | 'save': global_type_boolean, | |
|
873 | 'figpath': global_type_string, | |
|
874 | 'lastone': global_type_integer, | |
|
875 | 'figfile': global_type_string, | |
|
876 | 'ftp': global_type_boolean, | |
|
877 | 'wr_period': global_type_integer, | |
|
878 | 'show': global_type_string, | |
|
879 | 'server': global_type_string, | |
|
880 | 'folder': global_type_string, | |
|
881 | 'username': global_type_string, | |
|
882 | 'password': global_type_string, | |
|
883 | 'ftp_wei': global_type_integer, | |
|
884 | 'exp_code': global_type_integer, | |
|
885 | 'sub_exp_code': global_type_integer, | |
|
886 | 'plot_pos': global_type_integer, | |
|
887 | } | |
|
888 | ||
|
889 | 786 | def __init__(self, **kwargs): |
|
890 | 787 | Figure.__init__(self, **kwargs) |
|
891 | 788 | self.timerange = 2*60*60 |
@@ -1315,42 +1212,6 class EWDriftsPlot(Figure): | |||
|
1315 | 1212 | HEIGHTPROF = None |
|
1316 | 1213 | PREFIX = 'drift' |
|
1317 | 1214 | |
|
1318 | parameters = { | |
|
1319 | 'id': global_type_string, | |
|
1320 | 'wintitle': global_type_string, | |
|
1321 | 'channelList': global_type_string, | |
|
1322 | 'xmin': global_type_float, | |
|
1323 | 'xmax': global_type_float, | |
|
1324 | 'ymin': global_type_float, | |
|
1325 | 'ymax': global_type_float, | |
|
1326 | 'zmin': global_type_float, | |
|
1327 | 'zmax': global_type_float, | |
|
1328 | 'zmaxVertfloat': global_type_float, | |
|
1329 | 'zminVertfloat': global_type_float, | |
|
1330 | 'zmaxZonafloat': global_type_float, | |
|
1331 | 'zminZonafloat': global_type_float, | |
|
1332 | 'timerange': global_type_float, | |
|
1333 | 'SNRthresh': global_type_float, | |
|
1334 | 'SNRmin': global_type_float, | |
|
1335 | 'SNRmax': global_type_float, | |
|
1336 | 'SNR_1': global_type_boolean, | |
|
1337 | 'save': global_type_boolean, | |
|
1338 | 'figpath': global_type_string, | |
|
1339 | 'lastone': global_type_float, | |
|
1340 | 'figfile': global_type_string, | |
|
1341 | 'ftp': global_type_string, | |
|
1342 | 'wr_period': global_type_integer, | |
|
1343 | 'show': global_type_string, | |
|
1344 | 'server': global_type_string, | |
|
1345 | 'folder': global_type_string, | |
|
1346 | 'username': global_type_string, | |
|
1347 | 'password': global_type_string, | |
|
1348 | 'ftp_wei': global_type_integer, | |
|
1349 | 'exp_code': global_type_integer, | |
|
1350 | 'sub_exp_code': global_type_integer, | |
|
1351 | 'plot_pos': global_type_integer, | |
|
1352 | } | |
|
1353 | ||
|
1354 | 1215 | def __init__(self, **kwargs): |
|
1355 | 1216 | Figure.__init__(self, **kwargs) |
|
1356 | 1217 | self.timerange = 2*60*60 |
@@ -1555,31 +1416,6 class PhasePlot(Figure): | |||
|
1555 | 1416 | |
|
1556 | 1417 | PREFIX = 'mphase' |
|
1557 | 1418 | |
|
1558 | parameters = { | |
|
1559 | 'id': global_type_string, | |
|
1560 | 'wintitle': global_type_string, | |
|
1561 | 'pairsList': global_type_pairsList, | |
|
1562 | 'showprofile': global_type_boolean, | |
|
1563 | 'xmin': global_type_float, | |
|
1564 | 'xmax': global_type_float, | |
|
1565 | 'ymin': global_type_float, | |
|
1566 | 'ymax': global_type_float, | |
|
1567 | 'timerange': global_type_float, | |
|
1568 | 'save': global_type_boolean, | |
|
1569 | 'figpath': global_type_string, | |
|
1570 | 'figfile': global_type_string, | |
|
1571 | 'show': global_type_boolean, | |
|
1572 | 'ftp': global_type_boolean, | |
|
1573 | 'wr_period': global_type_integer, | |
|
1574 | 'server': global_type_string, | |
|
1575 | 'folder': global_type_string, | |
|
1576 | 'username': global_type_string, | |
|
1577 | 'password': global_type_string, | |
|
1578 | 'ftp_wei': global_type_integer, | |
|
1579 | 'exp_code': global_type_integer, | |
|
1580 | 'sub_exp_code': global_type_integer, | |
|
1581 | 'plot_pos': global_type_integer, | |
|
1582 | } | |
|
1583 | 1419 | |
|
1584 | 1420 | def __init__(self, **kwargs): |
|
1585 | 1421 | Figure.__init__(self, **kwargs) |
@@ -1754,40 +1590,6 class NSMeteorDetection1Plot(Figure): | |||
|
1754 | 1590 | nChannels = None |
|
1755 | 1591 | nParam = None |
|
1756 | 1592 | |
|
1757 | parameters = { | |
|
1758 | 'id': global_type_string, | |
|
1759 | 'wintitle': global_type_string, | |
|
1760 | 'channelList': global_type_list, | |
|
1761 | 'showprofile': global_type_boolean, | |
|
1762 | 'xmin': global_type_float, | |
|
1763 | 'xmax': global_type_float, | |
|
1764 | 'ymin': global_type_float, | |
|
1765 | 'ymax': global_type_float, | |
|
1766 | 'SNRmin': global_type_float, | |
|
1767 | 'SNRmax': global_type_float, | |
|
1768 | 'vmin': global_type_float, | |
|
1769 | 'vmax': global_type_float, | |
|
1770 | 'wmin': global_type_float, | |
|
1771 | 'wmax': global_type_float, | |
|
1772 | 'mode': global_type_string, | |
|
1773 | 'save': global_type_boolean, | |
|
1774 | 'figpath': global_type_string, | |
|
1775 | 'figfile': global_type_string, | |
|
1776 | 'show': global_type_boolean, | |
|
1777 | 'ftp': global_type_string, | |
|
1778 | 'wr_period': global_type_integer, | |
|
1779 | 'server': global_type_string, | |
|
1780 | 'folder': global_type_string, | |
|
1781 | 'username': global_type_string, | |
|
1782 | 'password': global_type_string, | |
|
1783 | 'ftp_wei': global_type_integer, | |
|
1784 | 'exp_code': global_type_integer, | |
|
1785 | 'sub_exp_code': global_type_integer, | |
|
1786 | 'plot_pos': global_type_integer, | |
|
1787 | 'realtime': global_type_boolean, | |
|
1788 | 'xaxis': global_type_string, | |
|
1789 | } | |
|
1790 | ||
|
1791 | 1593 | def __init__(self, **kwargs): |
|
1792 | 1594 | Figure.__init__(self, **kwargs) |
|
1793 | 1595 | self.isConfig = False |
@@ -1972,40 +1774,6 class NSMeteorDetection2Plot(Figure): | |||
|
1972 | 1774 | nChannels = None |
|
1973 | 1775 | nParam = None |
|
1974 | 1776 | |
|
1975 | parameters = { | |
|
1976 | 'id': global_type_string, | |
|
1977 | 'wintitle': global_type_string, | |
|
1978 | 'channelList': global_type_list, | |
|
1979 | 'showprofile': global_type_boolean, | |
|
1980 | 'xmin': global_type_float, | |
|
1981 | 'xmax': global_type_float, | |
|
1982 | 'ymin': global_type_float, | |
|
1983 | 'ymax': global_type_float, | |
|
1984 | 'SNRmin': global_type_float, | |
|
1985 | 'SNRmax': global_type_float, | |
|
1986 | 'vmin': global_type_float, | |
|
1987 | 'vmax': global_type_float, | |
|
1988 | 'wmin': global_type_float, | |
|
1989 | 'wmax': global_type_float, | |
|
1990 | 'mode': global_type_string, | |
|
1991 | 'save': global_type_boolean, | |
|
1992 | 'figpath': global_type_string, | |
|
1993 | 'figfile': global_type_string, | |
|
1994 | 'show': global_type_string, | |
|
1995 | 'ftp': global_type_boolean, | |
|
1996 | 'wr_period': global_type_integer, | |
|
1997 | 'server': global_type_string, | |
|
1998 | 'folder': global_type_string, | |
|
1999 | 'username': global_type_string, | |
|
2000 | 'password': global_type_string, | |
|
2001 | 'ftp_wei': global_type_integer, | |
|
2002 | 'exp_code': global_type_integer, | |
|
2003 | 'sub_exp_code': global_type_integer, | |
|
2004 | 'plot_pos': global_type_integer, | |
|
2005 | 'realtime': global_type_boolean, | |
|
2006 | 'xaxis': global_type_string, | |
|
2007 | } | |
|
2008 | ||
|
2009 | 1777 | def __init__(self, **kwargs): |
|
2010 | 1778 | Figure.__init__(self, **kwargs) |
|
2011 | 1779 | self.isConfig = False |
@@ -231,40 +231,6 class CrossSpectraPlot(Figure): | |||
|
231 | 231 | HEIGHTPROF = None |
|
232 | 232 | PREFIX = 'cspc' |
|
233 | 233 | |
|
234 | parameters = { | |
|
235 | 'id': global_type_string, | |
|
236 | 'wintitle': global_type_string, | |
|
237 | 'pairsList': global_type_pairsList, | |
|
238 | 'xmin': global_type_float, | |
|
239 | 'xmax': global_type_float, | |
|
240 | 'ymin': global_type_float, | |
|
241 | 'ymax': global_type_float, | |
|
242 | 'zmin': global_type_float, | |
|
243 | 'zmax': global_type_float, | |
|
244 | 'coh_min': global_type_float, | |
|
245 | 'coh_max': global_type_float, | |
|
246 | 'phase_min': global_type_float, | |
|
247 | 'phase_max': global_type_float, | |
|
248 | 'save': global_type_boolean, | |
|
249 | 'figpath': global_type_string, | |
|
250 | 'figfile': global_type_string, | |
|
251 | 'ftp': global_type_boolean, | |
|
252 | 'wr_period': global_type_integer, | |
|
253 | 'power_cmap': global_type_colormap, | |
|
254 | 'coherence_cmap': global_type_colormap, | |
|
255 | 'phase_cmap': global_type_colormap, | |
|
256 | 'show': global_type_boolean, | |
|
257 | 'server': global_type_string, | |
|
258 | 'folder': global_type_string, | |
|
259 | 'username': global_type_string, | |
|
260 | 'password': global_type_string, | |
|
261 | 'ftp_wei': global_type_integer, | |
|
262 | 'exp_code': global_type_integer, | |
|
263 | 'sub_exp_code': global_type_integer, | |
|
264 | 'plot_pos': global_type_integer, | |
|
265 | 'xaxis': global_type_string, | |
|
266 | } | |
|
267 | ||
|
268 | 234 | def __init__(self, **kwargs): |
|
269 | 235 | Figure.__init__(self, **kwargs) |
|
270 | 236 | self.isConfig = False |
@@ -687,38 +653,6 class CoherenceMap(Figure): | |||
|
687 | 653 | HEIGHTPROF = None |
|
688 | 654 | PREFIX = 'cmap' |
|
689 | 655 | |
|
690 | parameters = { | |
|
691 | 'id': 'string', | |
|
692 | 'wintitle': 'string', | |
|
693 | 'pairsList': 'pairsLists', | |
|
694 | 'showprofile': 'boolean', | |
|
695 | 'xmin': 'float', | |
|
696 | 'xmax': 'float', | |
|
697 | 'ymin': 'float', | |
|
698 | 'ymax': 'float', | |
|
699 | 'zmin': 'float', | |
|
700 | 'zmax': 'float', | |
|
701 | 'timerange': 'float', | |
|
702 | 'phase_min': 'float', | |
|
703 | 'phase_max': 'float', | |
|
704 | 'save': 'boolean', | |
|
705 | 'figpath': 'string', | |
|
706 | 'figfile': 'string', | |
|
707 | 'ftp': 'boolean', | |
|
708 | 'wr_period': 'int', | |
|
709 | 'coherence_cmap': 'colormap', | |
|
710 | 'phase_cmap': 'colormap', | |
|
711 | 'show': 'boolean', | |
|
712 | 'server': 'string', | |
|
713 | 'folder': 'string', | |
|
714 | 'username': 'string', | |
|
715 | 'password': 'string', | |
|
716 | 'ftp_wei': 'int', | |
|
717 | 'exp_code': 'int', | |
|
718 | 'sub_exp_code': 'int', | |
|
719 | 'plot_pos': 'int', | |
|
720 | } | |
|
721 | ||
|
722 | 656 | def __init__(self, **kwargs): |
|
723 | 657 | Figure.__init__(self, **kwargs) |
|
724 | 658 | self.timerange = 2*60*60 |
@@ -1177,32 +1111,6 class Noise(Figure): | |||
|
1177 | 1111 | __nsubplots = None |
|
1178 | 1112 | |
|
1179 | 1113 | PREFIX = 'noise' |
|
1180 | ||
|
1181 | parameters = { | |
|
1182 | 'id': global_type_string, | |
|
1183 | 'wintitle': global_type_string, | |
|
1184 | 'channelList': global_type_list, | |
|
1185 | 'showprofile': global_type_boolean, | |
|
1186 | 'xmin': global_type_float, | |
|
1187 | 'xmax': global_type_float, | |
|
1188 | 'ymin': global_type_float, | |
|
1189 | 'ymax': global_type_float, | |
|
1190 | 'timerange': global_type_float, | |
|
1191 | 'save': global_type_boolean, | |
|
1192 | 'figpath': global_type_string, | |
|
1193 | 'figfile': global_type_string, | |
|
1194 | 'show': global_type_boolean, | |
|
1195 | 'ftp': global_type_boolean, | |
|
1196 | 'wr_period': global_type_integer, | |
|
1197 | 'server': global_type_string, | |
|
1198 | 'folder': global_type_string, | |
|
1199 | 'username': global_type_string, | |
|
1200 | 'password': global_type_string, | |
|
1201 | 'ftp_wei': global_type_integer, | |
|
1202 | 'exp_code': global_type_integer, | |
|
1203 | 'sub_exp_code': global_type_integer, | |
|
1204 | 'plot_pos': global_type_integer, | |
|
1205 | } | |
|
1206 | 1114 | |
|
1207 | 1115 | def __init__(self, **kwargs): |
|
1208 | 1116 | Figure.__init__(self, **kwargs) |
@@ -1403,34 +1311,6 class BeaconPhase(Figure): | |||
|
1403 | 1311 | __nsubplots = None |
|
1404 | 1312 | |
|
1405 | 1313 | PREFIX = 'beacon_phase' |
|
1406 | ||
|
1407 | parameters = { | |
|
1408 | 'id': global_type_string, | |
|
1409 | 'wintitle': global_type_string, | |
|
1410 | 'pairsList': global_type_pairsList, | |
|
1411 | 'showprofile': global_type_boolean, | |
|
1412 | 'xmin': global_type_float, | |
|
1413 | 'xmax': global_type_float, | |
|
1414 | 'ymin': global_type_float, | |
|
1415 | 'ymax': global_type_float, | |
|
1416 | 'hmin': global_type_float, | |
|
1417 | 'hmax': global_type_float, | |
|
1418 | 'timerange': global_type_float, | |
|
1419 | 'save': global_type_boolean, | |
|
1420 | 'figpath': global_type_string, | |
|
1421 | 'figfile': global_type_string, | |
|
1422 | 'show': global_type_boolean, | |
|
1423 | 'ftp': global_type_boolean, | |
|
1424 | 'wr_period': global_type_integer, | |
|
1425 | 'server': global_type_string, | |
|
1426 | 'folder': global_type_string, | |
|
1427 | 'username': global_type_string, | |
|
1428 | 'password': global_type_string, | |
|
1429 | 'ftp_wei': global_type_integer, | |
|
1430 | 'exp_code': global_type_integer, | |
|
1431 | 'sub_exp_code': global_type_integer, | |
|
1432 | 'plot_pos': global_type_integer, | |
|
1433 | } | |
|
1434 | 1314 | |
|
1435 | 1315 | def __init__(self, **kwargs): |
|
1436 | 1316 | Figure.__init__(self, **kwargs) |
@@ -1291,7 +1291,9 class JRODataReader(JRODataIO): | |||
|
1291 | 1291 | nTxs = 1, |
|
1292 | 1292 | realtime=False, |
|
1293 | 1293 | blocksize=None, |
|
1294 |
blocktime=None |
|
|
1294 | blocktime=None, | |
|
1295 | verbose=True, | |
|
1296 | **kwargs): | |
|
1295 | 1297 | |
|
1296 | 1298 | if path == None: |
|
1297 | 1299 | raise ValueError, "[Reading] The path is not valid" |
@@ -1300,6 +1302,7 class JRODataReader(JRODataIO): | |||
|
1300 | 1302 | if ext == None: |
|
1301 | 1303 | ext = self.ext |
|
1302 | 1304 | |
|
1305 | self.verbose=verbose | |
|
1303 | 1306 | self.path = path |
|
1304 | 1307 | self.startDate = startDate |
|
1305 | 1308 | self.endDate = endDate |
@@ -1323,7 +1326,7 class JRODataReader(JRODataIO): | |||
|
1323 | 1326 | startTime=startTime, endTime=endTime, |
|
1324 | 1327 | set=set, expLabel=expLabel, ext=ext, |
|
1325 | 1328 | walk=walk) |
|
1326 | filenameList = filenameList[:-1] | |
|
1329 | if filenameList is not None: filenameList = filenameList[:-1] | |
|
1327 | 1330 | |
|
1328 | 1331 | if pathList is not None and filenameList is not None and online: |
|
1329 | 1332 | self.onlineWithDate = True |
@@ -1362,7 +1365,6 class JRODataReader(JRODataIO): | |||
|
1362 | 1365 | self.path = path |
|
1363 | 1366 | self.foldercounter = foldercounter |
|
1364 | 1367 | last_set = None |
|
1365 | ||
|
1366 | 1368 | else: |
|
1367 | 1369 | print "[Reading] Searching files in offline mode ..." |
|
1368 | 1370 | pathList, filenameList = self.__searchFilesOffLine(path, startDate=startDate, endDate=endDate, |
@@ -1790,7 +1792,7 class JRODataWriter(JRODataIO): | |||
|
1790 | 1792 | |
|
1791 | 1793 | return 1 |
|
1792 | 1794 | |
|
1793 | def setup(self, dataOut, path, blocksPerFile, profilesPerBlock=64, set=None, ext=None, datatype=4): | |
|
1795 | def setup(self, dataOut, path, blocksPerFile, profilesPerBlock=64, set=None, ext=None, datatype=4, verbose=True): | |
|
1794 | 1796 | """ |
|
1795 | 1797 | Setea el tipo de formato en la cual sera guardada la data y escribe el First Header |
|
1796 | 1798 |
@@ -119,11 +119,6 class Metadata(object): | |||
|
119 | 119 | self.parmConfObjList.append(parmConfObj) |
|
120 | 120 | |
|
121 | 121 | class FitsWriter(Operation): |
|
122 | parameters = { | |
|
123 | 'path': global_type_string, | |
|
124 | 'dataBlocksPerFile': global_type_integer, | |
|
125 | 'metadatafile': global_type_string, | |
|
126 | } | |
|
127 | 122 | def __init__(self, **kwargs): |
|
128 | 123 | Operation.__init__(self, **kwargs) |
|
129 | 124 | self.isConfig = False |
@@ -602,14 +602,6 class ParamWriter(Operation): | |||
|
602 | 602 | |
|
603 | 603 | lastTime = None |
|
604 | 604 | |
|
605 | parameters = { | |
|
606 | 'path': global_type_string, | |
|
607 | 'blocksPerFile':global_type_integer, | |
|
608 | 'metadataList': global_type_list, | |
|
609 | 'dataList': global_type_list, | |
|
610 | 'mode': global_type_integer, | |
|
611 | } | |
|
612 | ||
|
613 | 605 | def __init__(self, **kwargs): |
|
614 | 606 | Operation.__init__(self, **kwargs) |
|
615 | 607 | self.isConfig = False |
@@ -41,9 +41,6 class PrintInfo(Operation): | |||
|
41 | 41 | class BeamSelector(Operation): |
|
42 | 42 | profileIndex = None |
|
43 | 43 | nProfiles = None |
|
44 | parameters = { | |
|
45 | 'beam': global_type_string, | |
|
46 | } | |
|
47 | 44 | |
|
48 | 45 | def __init__(self): |
|
49 | 46 |
@@ -162,12 +162,6 class IncohInt4SpectraHeis(Operation): | |||
|
162 | 162 | __dataReady = False |
|
163 | 163 | |
|
164 | 164 | n = None |
|
165 | parameters = { | |
|
166 | 'n': global_type_float, | |
|
167 | 'timeInterval': global_type_integer, | |
|
168 | 'overlapping': global_type_boolean, | |
|
169 | } | |
|
170 | ||
|
171 | 165 | |
|
172 | 166 | def __init__(self, **kwargs): |
|
173 | 167 |
@@ -2220,13 +2220,6 class SMDetection(Operation): | |||
|
2220 | 2220 | return arrayParameters |
|
2221 | 2221 | |
|
2222 | 2222 | class CorrectSMPhases(Operation): |
|
2223 | parameters = { | |
|
2224 | 'phaseOffsets': global_type_pairsList, | |
|
2225 | 'hmin': global_type_float, | |
|
2226 | 'hmax': global_type_float, | |
|
2227 | 'azimuth': global_type_float, | |
|
2228 | 'channelPositions': global_type_pairsList, | |
|
2229 | } | |
|
2230 | 2223 | |
|
2231 | 2224 | def run(self, dataOut, phaseOffsets, hmin = 50, hmax = 150, azimuth = 45, channelPositions = None): |
|
2232 | 2225 |
@@ -742,12 +742,6 class IncohInt(Operation): | |||
|
742 | 742 | |
|
743 | 743 | __timeInterval = None |
|
744 | 744 | |
|
745 | parameters = { | |
|
746 | 'n': global_type_float, | |
|
747 | 'timeInterval': global_type_integer, | |
|
748 | 'overlapping': global_type_boolean, | |
|
749 | } | |
|
750 | ||
|
751 | 745 | n = None |
|
752 | 746 | |
|
753 | 747 |
@@ -334,38 +334,6 class CohInt(Operation): | |||
|
334 | 334 | |
|
335 | 335 | n = None |
|
336 | 336 | |
|
337 | parameters = { | |
|
338 | 'id': global_type_string, | |
|
339 | 'wintitle': global_type_string, | |
|
340 | 'pairsList': global_type_pairsList, | |
|
341 | 'showprofile': global_type_boolean, | |
|
342 | 'xmin': global_type_float, | |
|
343 | 'xmax': global_type_float, | |
|
344 | 'ymin': global_type_float, | |
|
345 | 'ymax': global_type_float, | |
|
346 | 'zmin': global_type_float, | |
|
347 | 'zmax': global_type_float, | |
|
348 | 'timerange': global_type_float, | |
|
349 | 'phase_min': global_type_float, | |
|
350 | 'phase_max': global_type_float, | |
|
351 | 'save': global_type_boolean, | |
|
352 | 'figpath': global_type_string, | |
|
353 | 'figfile': global_type_string, | |
|
354 | 'ftp': global_type_boolean, | |
|
355 | 'wr_period': global_type_integer, | |
|
356 | 'coherence_cmap': global_type_colormap, | |
|
357 | 'phase_cmap': global_type_colormap, | |
|
358 | 'show': global_type_boolean, | |
|
359 | 'server': global_type_string, | |
|
360 | 'folder': global_type_string, | |
|
361 | 'username': global_type_string, | |
|
362 | 'password': global_type_string, | |
|
363 | 'ftp_wei': global_type_integer, | |
|
364 | 'exp_code': global_type_integer, | |
|
365 | 'sub_exp_code': global_type_integer, | |
|
366 | 'plot_pos': global_type_integer, | |
|
367 | } | |
|
368 | ||
|
369 | 337 | def __init__(self, **kwargs): |
|
370 | 338 | |
|
371 | 339 | Operation.__init__(self, **kwargs) |
@@ -579,14 +547,6 class Decoder(Operation): | |||
|
579 | 547 | |
|
580 | 548 | nCode = None |
|
581 | 549 | nBaud = None |
|
582 | ||
|
583 | parameters = { | |
|
584 | 'code': global_type_list, | |
|
585 | 'nCode': global_type_integer, | |
|
586 | 'nBaud': global_type_integer, | |
|
587 | 'mode': global_type_integer, | |
|
588 | 'osamp': global_type_float, | |
|
589 | } | |
|
590 | 550 | |
|
591 | 551 | def __init__(self, **kwargs): |
|
592 | 552 | |
@@ -1149,9 +1109,6 class SplitProfiles(Operation): | |||
|
1149 | 1109 | dataOut.ippSeconds /= n |
|
1150 | 1110 | |
|
1151 | 1111 | class CombineProfiles(Operation): |
|
1152 | parameters = { | |
|
1153 | 'n': global_type_integer, | |
|
1154 | } | |
|
1155 | 1112 | def __init__(self, **kwargs): |
|
1156 | 1113 | |
|
1157 | 1114 | Operation.__init__(self, **kwargs) |
@@ -74,7 +74,6 opObj11.addParameter(name='zmax', value='50.0', format='float') | |||
|
74 | 74 | |
|
75 | 75 | #--------------------------- Parameters Processing Unit ------------------------------------ |
|
76 | 76 | |
|
77 | <<<<<<< HEAD | |
|
78 | 77 | procUnitConfObj1 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=procUnitConfObj0.getId()) |
|
79 | 78 | # |
|
80 | 79 | opObj10 = procUnitConfObj1.addOperation(name='SMDetection', optype='other') |
@@ -92,23 +91,5 opObj12.addParameter(name='mode',value='2',format='int') | |||
|
92 | 91 | #-------------------------------------------------------------------------------------------------- |
|
93 | 92 | |
|
94 | 93 | controllerObj.start() |
|
95 | ======= | |
|
96 | # procUnitConfObj1 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=procUnitConfObj0.getId()) | |
|
97 | # # | |
|
98 | # opObj10 = procUnitConfObj1.addOperation(name='SMDetection', optype='other') | |
|
99 | # opObj10.addParameter(name='azimuth', value='45', format='float') | |
|
100 | # opObj10.addParameter(name='hmin', value='60', format='float') | |
|
101 | # opObj10.addParameter(name='hmax', value='120', format='float') | |
|
102 | ||
|
103 | # opObj12 = procUnitConfObj1.addOperation(name='ParamWriter', optype='other') | |
|
104 | # opObj12.addParameter(name='path', value=pathfile) | |
|
105 | # opObj12.addParameter(name='blocksPerFile', value='1000', format='int') | |
|
106 | # opObj12.addParameter(name='metadataList',value='type,heightList,paramInterval,timeZone',format='list') | |
|
107 | # opObj12.addParameter(name='dataList',value='data_param,utctime',format='list') | |
|
108 | # opObj12.addParameter(name='mode',value='2',format='int') | |
|
109 | ||
|
110 | #-------------------------------------------------------------------------------------------------- | |
|
111 | controllerObj.createObjects() | |
|
112 | controllerObj.connectObjects() | |
|
113 | controllerObj.run() | |
|
114 | >>>>>>> online_data_hour | |
|
94 | ||
|
95 |
@@ -1,1 +1,1 | |||
|
1 | <Project description="Testing USRP data reader" id="191" name="test01"><ReadUnit datatype="Voltage" id="1911" inputId="0" name="VoltageReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="Voltage" /><Parameter format="str" id="191112" name="path" value="/home/nanosat/driftsJohn" /><Parameter format="date" id="191113" name="startDate" value="2017/09/08" /><Parameter format="date" id="191114" name="endDate" value="2017/09/08" /><Parameter format="time" id="191115" name="startTime" value="00:00:00" /><Parameter format="time" id="191116" name="endTime" value="23:59:59" /><Parameter format="int" id="191118" name="cursor" value="5" /><Parameter format="int" id="191119" name="skip" value="102" /><Parameter format="int" id="191120" name="delay" value="10" /><Parameter format="int" id="191121" name="walk" value="1" /><Parameter format="int" id="191122" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="SpectraProc" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self"><Parameter format="int" id="191211" name="nFFTPoints" value="10" /></Operation><Operation id="19122" name="CohInt" priority="2" type="external"><Parameter format="float" id="191221" name="n" value="128" /></Operation><Operation id="19123" name="PublishData" priority="3" type="other"><Parameter format="int" id="191231" name="zeromq" value="1" /><Parameter format="bool" id="191232" name="verbose" value="0" /></Operation></ProcUnit></Project> No newline at end of file | |
|
1 | <Project description="Claire" id="002" name="script02"><ReadUnit datatype="VoltageReader" id="21" inputId="0" name="VoltageReader"><Operation id="211" name="run" priority="1" type="self"><Parameter format="str" id="2111" name="datatype" value="VoltageReader" /><Parameter format="str" id="2112" name="path" value="/media/nanosat/0BDE10E00BDE10E0/CLAIRE" /><Parameter format="date" id="2113" name="startDate" value="2017/07/26" /><Parameter format="date" id="2114" name="endDate" value="2017/07/26" /><Parameter format="time" id="2115" name="startTime" value="15:00:00" /><Parameter format="time" id="2116" name="endTime" value="16:00:00" /><Parameter format="int" id="2118" name="delay" value="30" /><Parameter format="int" id="2119" name="walk" value="1" /><Parameter format="int" id="2120" name="online" value="0" /></Operation><Operation id="212" name="printNumberOfBlock" priority="2" type="self" /></ReadUnit><ProcUnit datatype="VoltageProc" id="22" inputId="21" name="VoltageProc"><Operation id="221" name="run" priority="1" type="self" /></ProcUnit><ProcUnit datatype="SpectraProc" id="23" inputId="22" name="SpectraProc"><Operation id="231" name="run" priority="1" type="self"><Parameter format="int" id="2311" name="nFFTPoints" value="128" /><Parameter format="int" id="2312" name="nProfiles" value="128" /><Parameter format="pairslist" id="2313" name="pairsList" value="(0,1),(0,2),(1,2)" /></Operation><Operation id="232" name="setRadarFrequency" priority="2" type="self"><Parameter format="float" id="2321" name="frequency" value="445000000.0" /></Operation><Operation id="233" name="IncohInt" priority="3" type="other"><Parameter format="float" id="2331" name="timeInterval" value="128" /></Operation><Operation id="234" name="removeDC" priority="4" type="self"><Parameter format="int" id="2341" name="mode" value="2" /></Operation><Operation id="235" name="RTIPlot" priority="5" type="other"><Parameter format="int" id="2351" name="id" value="237" /><Parameter format="float" id="2352" name="xmin" value="9.0" /><Parameter format="float" id="2353" name="xmax" value="16.0" /><Parameter format="float" id="2354" name="zmin" value="15.0" /><Parameter format="float" id="2355" name="zmax" value="50.0" /></Operation></ProcUnit></Project> No newline at end of file |
General Comments 0
You need to be logged in to leave comments.
Login now