Skip to content

Commit b6e8c30

Browse files
jonathanvanleeuwenjonathanvanleeuwen
committed
Now runs parallel processing in py37
1 parent e808ed2 commit b6e8c30

11 files changed

+106
-111
lines changed

‎Parser/EyeParser.py

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -615,25 +615,20 @@ def callbackParser(self, results):
615615
def parse(self):
616616
self.startBussyBar()
617617
self.parseStartTime = time.time()
618-
# Only run parallel if system version is lover than 3.7
619-
if (self.par['runParallel'] == 'Yes' and sys.version_info[0] < 3) \
620-
or self.par['runParallel'] == 'Yes' and (sys.version_info[0] == 3 and sys.version_info[1] < 7):
621-
try:
622-
self.ui.statusL.setText(self.MCPL)
623-
self.ui.statusL.show()
624-
self.repaint()
625-
# Start threading System resources
626-
results = []
627-
for sub in self.files:
628-
results.append(self.pool.apply_async(parseWrapper,
629-
args = (sub, self.par, ),
630-
callback=self.callbackParser))
631-
except:
632-
self.ui.statusL.setText(self.MCERRORL)
633-
self.ui.statusL.show()
634-
self.parseSingleCore()
635-
else:
636-
self.parseSingleCore()
618+
try:
619+
self.ui.statusL.setText(self.MCPL)
620+
self.ui.statusL.show()
621+
self.repaint()
622+
# Start threading System resources
623+
results = []
624+
for sub in self.files:
625+
results.append(self.pool.apply_async(parseWrapper,
626+
args = (sub, self.par, ),
627+
callback=self.callbackParser))
628+
except:
629+
self.ui.statusL.setText(self.MCERRORL)
630+
self.ui.statusL.show()
631+
self.parseSingleCore()
637632

638633
if len(self.files) == 0:
639634
self.stopBussyBar()

‎Parser/EyeParser.pyc

3 Bytes
Binary file not shown.

‎Parser/__pycache__/eyeParserBuilder.cpython-35.pyc

19 KB
Binary file not shown.

‎Parser/__pycache__/eyeParserBuilder.cpython-36.pyc

15.2 KB
Binary file not shown.

‎Parser/__pycache__/eyeParserBuilder.cpython-37.pyc

15.2 KB
Binary file not shown.

‎Parser/__pycache__/parseFuncs3x.cpython-35.pyc

32.2 KB
Binary file not shown.

‎Parser/__pycache__/parseFuncs3x.cpython-36.pyc

29.3 KB
Binary file not shown.

‎Parser/__pycache__/parseFuncs3x.cpython-37.pyc

28.4 KB
Binary file not shown.

‎Parser/settings.json

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,102 @@
11
{
2-
"Eyetracker": "Tobii",
2+
"Eyetracker": "Eyelink",
33
"Eyelink": {
4-
"default": {
5-
"duplicateValues": "No",
6-
"eyetracker": "Eyelink",
7-
"longFormat": "No",
8-
"longSaveAs": "CSV",
9-
"nrCores": 7,
10-
"pxMode": "Automatic",
11-
"pxPerDeg": 48.0,
12-
"rawSaveAs": "pickle",
13-
"runParallel": "Yes",
14-
"sampFreq": 1000.0,
15-
"saveAs": "pickle",
16-
"saveExtension": "Parsed",
17-
"saveLongExtension": "Long",
18-
"saveRawExtension": "Raw",
19-
"saveRawFiles": "No",
20-
"screenDist": 75.0,
21-
"screenW": 52.5,
22-
"screenX": 1920.0,
23-
"screenY": 1080.0,
24-
"startTrialKey": "start_trial",
25-
"stopTrialKey": "stop_trial",
26-
"variableKey": "var"
27-
},
284
"par": {
29-
"duplicateValues": "No",
30-
"eyetracker": "Eyelink",
31-
"longFormat": "No",
32-
"longSaveAs": "CSV",
33-
"nrCores": 7,
34-
"pxMode": "Automatic",
35-
"pxPerDeg": 48.0,
36-
"rawSaveAs": "pickle",
37-
"runParallel": "Yes",
38-
"sampFreq": 1000.0,
39-
"saveAs": "pickle",
40-
"saveExtension": "Parsed",
41-
"saveLongExtension": "Long",
42-
"saveRawExtension": "Raw",
43-
"saveRawFiles": "No",
44-
"screenDist": 75.0,
45-
"screenW": 52.5,
46-
"screenX": 1920.0,
47-
"screenY": 1080.0,
48-
"startTrialKey": "start_trial",
49-
"stopTrialKey": "stop_trial",
5+
"duplicateValues": "Yes",
6+
"eyetracker": "Eyelink",
7+
"longFormat": "No",
8+
"longSaveAs": "CSV",
9+
"nrCores": "7",
10+
"pxMode": "Automatic",
11+
"pxPerDeg": 48.0,
12+
"rawSaveAs": "pickle",
13+
"runParallel": "Yes",
14+
"sampFreq": 1000,
15+
"saveAs": "pickle",
16+
"saveExtension": "Parsed",
17+
"saveLongExtension": "Long",
18+
"saveRawExtension": "Raw",
19+
"saveRawFiles": "No",
20+
"screenDist": 75.0,
21+
"screenW": 52.5,
22+
"screenX": 1920.0,
23+
"screenY": 1080.0,
24+
"startTrialKey": "start_trial",
25+
"stopTrialKey": "stop_trial",
5026
"variableKey": "var"
51-
}
52-
},
53-
"Tobii": {
27+
},
5428
"default": {
55-
"duplicateValues": "No",
56-
"eyetracker": "Tobii",
57-
"longFormat": "No",
58-
"longSaveAs": "CSV",
59-
"nrCores": 7,
60-
"pxMode": "Manual",
61-
"pxPerDeg": 48.0,
62-
"rawSaveAs": "pickle",
63-
"runParallel": "Yes",
64-
"sampFreq": 300.0,
65-
"saveAs": "pickle",
66-
"saveExtension": "Parsed",
67-
"saveLongExtension": "Long",
68-
"saveRawExtension": "Raw",
69-
"saveRawFiles": "No",
70-
"screenDist": 75.0,
71-
"screenW": 52.5,
72-
"screenX": 1680.0,
73-
"screenY": 1050.0,
74-
"startTrialKey": "start_trial",
75-
"stopTrialKey": "stop_trial",
29+
"duplicateValues": "No",
30+
"eyetracker": "Eyelink",
31+
"longFormat": "No",
32+
"longSaveAs": "CSV",
33+
"nrCores": 7,
34+
"pxMode": "Automatic",
35+
"pxPerDeg": 48.0,
36+
"rawSaveAs": "pickle",
37+
"runParallel": "Yes",
38+
"sampFreq": 1000.0,
39+
"saveAs": "pickle",
40+
"saveExtension": "Parsed",
41+
"saveLongExtension": "Long",
42+
"saveRawExtension": "Raw",
43+
"saveRawFiles": "No",
44+
"screenDist": 75.0,
45+
"screenW": 52.5,
46+
"screenX": 1920.0,
47+
"screenY": 1080.0,
48+
"startTrialKey": "start_trial",
49+
"stopTrialKey": "stop_trial",
7650
"variableKey": "var"
77-
},
51+
}
52+
},
53+
"Tobii": {
7854
"par": {
79-
"duplicateValues": "No",
80-
"eyetracker": "Tobii",
81-
"longFormat": "No",
82-
"longSaveAs": "CSV",
83-
"nrCores": 7,
84-
"pxMode": "Manual",
85-
"pxPerDeg": 48.0,
86-
"rawSaveAs": "pickle",
87-
"runParallel": "Yes",
88-
"sampFreq": 300.0,
89-
"saveAs": "pickle",
90-
"saveExtension": "Parsed",
91-
"saveLongExtension": "Long",
92-
"saveRawExtension": "Raw",
93-
"saveRawFiles": "No",
94-
"screenDist": 75.0,
95-
"screenW": 52.5,
96-
"screenX": 1680.0,
97-
"screenY": 1050.0,
98-
"startTrialKey": "start_trial",
99-
"stopTrialKey": "stop_trial",
55+
"duplicateValues": "No",
56+
"eyetracker": "Tobii",
57+
"longFormat": "No",
58+
"longSaveAs": "CSV",
59+
"nrCores": "7",
60+
"pxMode": "Manual",
61+
"pxPerDeg": 48.0,
62+
"rawSaveAs": "pickle",
63+
"runParallel": "No",
64+
"sampFreq": 300,
65+
"saveAs": "pickle",
66+
"saveExtension": "Parsed",
67+
"saveLongExtension": "Long",
68+
"saveRawExtension": "Raw",
69+
"saveRawFiles": "No",
70+
"screenDist": 75.0,
71+
"screenW": 52.5,
72+
"screenX": 1680.0,
73+
"screenY": 1050.0,
74+
"startTrialKey": "start_trial",
75+
"stopTrialKey": "stop_trial",
76+
"variableKey": "var"
77+
},
78+
"default": {
79+
"duplicateValues": "No",
80+
"eyetracker": "Tobii",
81+
"longFormat": "No",
82+
"longSaveAs": "CSV",
83+
"nrCores": 7,
84+
"pxMode": "Manual",
85+
"pxPerDeg": 48.0,
86+
"rawSaveAs": "pickle",
87+
"runParallel": "Yes",
88+
"sampFreq": 300.0,
89+
"saveAs": "pickle",
90+
"saveExtension": "Parsed",
91+
"saveLongExtension": "Long",
92+
"saveRawExtension": "Raw",
93+
"saveRawFiles": "No",
94+
"screenDist": 75.0,
95+
"screenW": 52.5,
96+
"screenX": 1680.0,
97+
"screenY": 1050.0,
98+
"startTrialKey": "start_trial",
99+
"stopTrialKey": "stop_trial",
100100
"variableKey": "var"
101101
}
102102
}

‎Plotter/__pycache__/plotCode_GUI.cpython-36.pyc

4.75 KB
Binary file not shown.

‎Plotter/__pycache__/plotterGUICode.cpython-36.pyc

20.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)