bp/BPLabs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes post initial pilot. Rmoved reliance on remote javascript. Removed use of multiple SNRs for concatenated matrix training stimulus

Browse Source
This commit is contained in:
Sam Perry
2019-01-30 09:20:25 +00:00
parent 26017e5a57
commit 35317ee223
6 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
da_test_thread.py
-1
View File
@@ -80,7 +80,6 @@ class DaTestThread(BaseThread):
'''
self.waitForPageLoad()
self.socketio.emit('test_ready', namespace='/main')
set_trace()
for wav in self.stim_paths[self.trial_ind:]:
self.saveState(out=self.backupFilepath)
self.displayInstructions()
eeg_mat_train_thread.py
+4 -1
View File
@@ -71,7 +71,7 @@ class EEGMatTrainThread(BaseThread):
# Percent speech inteligibility (estimated using behavioural measure)
# to present stimuli at
self.si = np.array([20.0, 50.0, 90.0, 100.0])
self.si = np.array([])
self.trial_ind = 0
self._stopevent = Event()
@@ -106,6 +106,9 @@ class EEGMatTrainThread(BaseThread):
x = logit(self.si * 0.01)
snrs = (x/(4*s_50))+srt_50
self.snr_fs = 10**(-snrs/20)
self.snr_fs = np.append(self.snr_fs, np.inf)
self.si = np.append(self.si, np.inf)
snrs = np.append(snrs, np.inf)
self.snr_fs[self.snr_fs == np.inf] = 0.
if (self.snr_fs == -np.inf).any():
raise ValueError("Noise infinitely louder than signal for an SNR (SNRs: {})".format(self.snr_fs))
eeg_story_train_thread.py
+1 -1
View File
@@ -65,7 +65,7 @@ class EEGStoryTrainThread(BaseThread):
self.socketio.on_event('finalise_results', self.finaliseResults, namespace='/main')
self.loadStimulus()
self.dev_mode = True
self.dev_mode = False
def setQuestion(self, q):
self.socketio.emit('set_question', data=q[0], namespace='/main')
main.py
+6 -6
View File
@@ -14,12 +14,12 @@ server_lock = Lock()
logger = logging.getLogger(__name__)
# log = logging.getLogger('werkzeug')
# log.setLevel(logging.ERROR)
# log = logging.getLogger('engineio')
# log.setLevel(logging.ERROR)
# log = logging.getLogger('socketio')
# log.setLevel(logging.ERROR)
log = logging.getLogger('werkzeug')
log.setLevel(logging.ERROR)
log = logging.getLogger('engineio')
log.setLevel(logging.ERROR)
log = logging.getLogger('socketio')
log.setLevel(logging.ERROR)
def url_ok(url, port):
templates/index.html
+4 -4
View File
@@ -2,10 +2,10 @@
<link rel="stylesheet" media="screen" href = "{{ url_for('static', filename='bootstrap.min.css') }}">
<meta name="viewport" content = "width=device-width, initial-scale=1.0">
<head>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="http://code.highcharts.com/highcharts.js"></script>
<script type="text/javascript" src = "/static/bootstrap.bundle.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.3.6/socket.io.min.js"></script>
<script type="text/javascript" src="/static/bower_components/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/bower_components/highcharts/highcharts.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="/static/bower_components/socket.io-client/dist/socket.io.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap-waitingfor/build/bootstrap-waitingfor.js"></script>
<style>
templates/participant_index.html
+4 -4
View File
@@ -3,10 +3,10 @@
<link rel=stylesheet type=text/css href="{{ url_for('static', filename='style.css') }}">
<meta name="viewport" content = "width=device-width, initial-scale=1.0">
<head>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="http://code.highcharts.com/highcharts.js"></script>
<script type="text/javascript" src = "/static/bootstrap.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.3.6/socket.io.min.js"></script>
<script type="text/javascript" src="/static/bower_components/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/bower_components/highcharts/highcharts.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="/static/bower_components/socket.io-client/dist/socket.io.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap-waitingfor/build/bootstrap-waitingfor.js"></script>
<style>