V3 Alpha: more changes for blog post

chipaudette · Oct 25, 2014 · 5bb293d · 5bb293d
1 parent b6283e6
commit 5bb293d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Data/2014-10-03 V3 Alpha/analyzeAlpha_detection.py b/Data/2014-10-03 V3 Alpha/analyzeAlpha_detection.py
@@ -16,10 +16,16 @@
 guard_band_Hz = np.array([[3.0, 6.5], [13.0, 18.0]])
 
 # detectection parameters
-use_detect_rules = 2    # 1 = Alpha only, 2 = Alpha and Guard Thres, 3 = Alpha and Ratio
-det_thresh_uV = 3.5     # 3.5 for NFFT = 256, 2.5 for NFFT = 512
-guard_thresh_uV = 2.5   # 2.5
 det_thresh_ratio = 3.5
+use_detect_rules = 2    # 1 = Alpha only, 2 = Alpha and Guard Thres, 3 = Alpha and Ratio
+if 0:
+    det_thresh_uV = 3.5     # 3.5 for NFFT = 256, 2.5 for NFFT = 512
+    guard_thresh_uV = 2.5   # 2.5
+else:
+    det_thresh_uV = 3.8     # 3.5 for NFFT = 256, 2.5 for NFFT = 512
+    guard_thresh_uV = 1.6   # 2.5
+
+
 
 #if (NFFT < 512):
 #    if 0:
@@ -47,7 +53,7 @@
 t_other_sec = [0, 0]    # default
 
 # define which data to load
-case = 4  # choose which case to load
+case = 4 # choose which case to load
 pname = 'SavedData/'
 if (case == 1):
     fname = 'openBCI_raw_2014-10-04_18-50-20_RightForehead_countebackby3.txt'

diff --git a/Data/2014-10-03 V3 Alpha/analyzeAlpha_detection_allFiles.py b/Data/2014-10-03 V3 Alpha/analyzeAlpha_detection_allFiles.py
@@ -135,7 +135,7 @@ def getFileInfo(case):
 
 # %% more calculations on false alarms and such
 # get example data at target thresh2
-if 1:
+if 0:
     targ_thresh1 = 3.75
     targ_thresh2 = 2.55 # for rule 2 or 4
     I = np.argmin(np.abs(thresh2 - targ_thresh2))