diff --git a/eeg_test_thread.py b/eeg_test_thread.py index 89a523c..50bff96 100644 --- a/eeg_test_thread.py +++ b/eeg_test_thread.py @@ -50,7 +50,7 @@ class EEGTestThread(BaseThread): listFolder="./matrix_test/short_concat_stim/out", noiseFilepath="./matrix_test/behavioural_stim/stimulus/wav/noise/noise.wav", red_coef="./calibration/out/reduction_coefficients/mat_red_coef.npy", - cal_coef="./calibration/out/calibration_coefficients/da_cal_coef.npy", + cal_coef="./calibration/out/calibration_coefficients/mat_cal_coef.npy", socketio=None, participant=None, srt_50=None, s_50=None): self.test_name = 'eeg_test' self.noise_path = noiseFilepath @@ -62,11 +62,13 @@ class EEGTestThread(BaseThread): self.question = [] self.response = [] + with open('./test_params.json') as json_file: + self.params = json.load(json_file) + self.reduction_coef = np.load(red_coef)*np.load(cal_coef) # Percent speech inteligibility (estimated using behavioural measure) # to present stimuli at - self.si = np.array([20.0, 35.0, 50.0, 65.0, 80.0, 90.0]) self.trial_ind = 0 self._stopevent = Event() diff --git a/matrix_test_thread.py b/matrix_test_thread.py index 23e3b81..13aa699 100644 --- a/matrix_test_thread.py +++ b/matrix_test_thread.py @@ -418,7 +418,7 @@ class AdaptiveTrack(): def __init__(self, target, red_coef, cal_coef): ''' ''' - self.snr = 0.0 + self.snr = 10.0 self.direction = 0 # Record SNRs presented with each trial of the adaptive track self.snrTrack = np.empty(180) diff --git a/requirements.txt b/requirements.txt index 79d78f3..1ecde8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,157 @@ -Flask_SocketIO==3.0.2 -Flask==1.0.2 -six==1.10.0 -pywebview==2.1 -webview==0.1.5 +appnope==0.1.0 +backcall==0.1.0 +cffi==1.12.1 +Click==7.0 +cycler==0.10.0 +Cython==0.29.5 +decorator==4.3.2 +dill==0.2.9 +fancycompleter==0.8 +Flask==1.1.1 +Flask-SocketIO==4.1.0 +ipdb==0.12 +ipython==7.2.0 +ipython-genutils==0.2.0 +itsdangerous==1.1.0 +jedi==0.13.2 +Jinja2==2.10.1 +joblib==0.13.1 +kiwisolver==1.0.1 +llvmlite==0.27.1 +MarkupSafe==1.1.1 +matplotlib==3.0.2 +mne==0.17.0 +natsort==6.0.0 +numba==0.42.1 +numpy==1.16.1 +pandas==0.24.2 +parso==0.3.3 +pdbpp==0.9.5 +pexpect==4.6.0 +pickleshare==0.7.5 +prompt-toolkit==2.0.8 +ptyprocess==0.6.0 +pudb==2018.1 +pycparser==2.19 +Pygments==2.3.1 +pyobjc==5.2 +pyobjc-core==5.2 +pyobjc-framework-Accounts==5.2 +pyobjc-framework-AddressBook==5.2 +pyobjc-framework-AdSupport==5.2 +pyobjc-framework-AppleScriptKit==5.2 +pyobjc-framework-AppleScriptObjC==5.2 +pyobjc-framework-ApplicationServices==5.2 +pyobjc-framework-Automator==5.2 +pyobjc-framework-AVFoundation==5.2 +pyobjc-framework-AVKit==5.2 +pyobjc-framework-BusinessChat==5.2 +pyobjc-framework-CalendarStore==5.2 +pyobjc-framework-CFNetwork==5.2 +pyobjc-framework-CloudKit==5.2 +pyobjc-framework-Cocoa==5.2 +pyobjc-framework-Collaboration==5.2 +pyobjc-framework-ColorSync==5.2 +pyobjc-framework-Contacts==5.2 +pyobjc-framework-ContactsUI==5.2 +pyobjc-framework-CoreAudio==5.2 +pyobjc-framework-CoreAudioKit==5.2 +pyobjc-framework-CoreBluetooth==5.2 +pyobjc-framework-CoreData==5.2 +pyobjc-framework-CoreLocation==5.2 +pyobjc-framework-CoreMedia==5.2 +pyobjc-framework-CoreMediaIO==5.2 +pyobjc-framework-CoreML==5.2 +pyobjc-framework-CoreServices==5.2 +pyobjc-framework-CoreSpotlight==5.2 +pyobjc-framework-CoreText==5.2 +pyobjc-framework-CoreWLAN==5.2 +pyobjc-framework-CryptoTokenKit==5.2 +pyobjc-framework-DictionaryServices==5.2 +pyobjc-framework-DiscRecording==5.2 +pyobjc-framework-DiscRecordingUI==5.2 +pyobjc-framework-DiskArbitration==5.2 +pyobjc-framework-DVDPlayback==5.2 +pyobjc-framework-EventKit==5.2 +pyobjc-framework-ExceptionHandling==5.2 +pyobjc-framework-ExternalAccessory==5.2 +pyobjc-framework-FinderSync==5.2 +pyobjc-framework-FSEvents==5.2 +pyobjc-framework-GameCenter==5.2 +pyobjc-framework-GameController==5.2 +pyobjc-framework-GameKit==5.2 +pyobjc-framework-GameplayKit==5.2 +pyobjc-framework-ImageCaptureCore==5.2 +pyobjc-framework-IMServicePlugIn==5.2 +pyobjc-framework-InputMethodKit==5.2 +pyobjc-framework-InstallerPlugins==5.2 +pyobjc-framework-InstantMessage==5.2 +pyobjc-framework-Intents==5.2 +pyobjc-framework-IOSurface==5.2 +pyobjc-framework-iTunesLibrary==5.2 +pyobjc-framework-LatentSemanticMapping==5.2 +pyobjc-framework-LaunchServices==5.2 +pyobjc-framework-libdispatch==5.2 +pyobjc-framework-LocalAuthentication==5.2 +pyobjc-framework-MapKit==5.2 +pyobjc-framework-MediaAccessibility==5.2 +pyobjc-framework-MediaLibrary==5.2 +pyobjc-framework-MediaPlayer==5.2 +pyobjc-framework-MediaToolbox==5.2 +pyobjc-framework-ModelIO==5.2 +pyobjc-framework-MultipeerConnectivity==5.2 +pyobjc-framework-NaturalLanguage==5.2 +pyobjc-framework-NetFS==5.2 +pyobjc-framework-Network==5.2 +pyobjc-framework-NetworkExtension==5.2 +pyobjc-framework-NotificationCenter==5.2 +pyobjc-framework-OpenDirectory==5.2 +pyobjc-framework-OSAKit==5.2 +pyobjc-framework-Photos==5.2 +pyobjc-framework-PhotosUI==5.2 +pyobjc-framework-PreferencePanes==5.2 +pyobjc-framework-PubSub==5.2 +pyobjc-framework-QTKit==5.2 +pyobjc-framework-Quartz==5.2 +pyobjc-framework-SafariServices==5.2 +pyobjc-framework-SceneKit==5.2 +pyobjc-framework-ScreenSaver==5.2 +pyobjc-framework-ScriptingBridge==5.2 +pyobjc-framework-SearchKit==5.2 +pyobjc-framework-Security==5.2 +pyobjc-framework-SecurityFoundation==5.2 +pyobjc-framework-SecurityInterface==5.2 +pyobjc-framework-ServiceManagement==5.2 +pyobjc-framework-Social==5.2 +pyobjc-framework-SpriteKit==5.2 +pyobjc-framework-StoreKit==5.2 +pyobjc-framework-SyncServices==5.2 +pyobjc-framework-SystemConfiguration==5.2 +pyobjc-framework-UserNotifications==5.2 +pyobjc-framework-VideoSubscriberAccount==5.2 +pyobjc-framework-VideoToolbox==5.2 +pyobjc-framework-Vision==5.2 +pyobjc-framework-WebKit==5.2 +pyparsing==2.3.1 +PyQt5==5.12 +PyQt5-sip==4.19.14 +pysndfile==1.3.2 +pyswarm==0.6 +python-dateutil==2.8.0 +python-engineio==3.8.2.post1 +python-socketio==4.2.0 +pytz==2019.1 +pywebview==3.0 +resampy==0.2.1 +scikit-learn==0.20.2 +scipy==1.2.1 +seaborn==0.9.0 +six==1.12.0 +sounddevice==0.3.12 +SoundFile==0.10.2 +traitlets==4.3.2 +urwid==2.0.1 +wcwidth==0.1.7 +Werkzeug==0.15.5 +wmctrl==0.3 +xlrd==1.2.0 diff --git a/templates/index.html b/templates/index.html index f154687..e184be1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -87,7 +87,7 @@ Behavioral Matrix Test Decoder EEG recording /da/ EEG recording - Click EEG recording + Tone EEG recording