Optimizing event detection code

open-ephys · Oct 10, 2012 · 7335162 · 7335162
1 parent 6a04e27
commit 7335162
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Source/Processors/DataThreads/FPGAThread.h b/Source/Processors/DataThreads/FPGAThread.h
@@ -57,7 +57,6 @@ class FPGAThread : public DataThread
 
     int getNumEventChannels();
 
-
     void setOutputHigh();
     void setOutputLow();
 

diff --git a/Source/Processors/EventDetector.cpp b/Source/Processors/EventDetector.cpp
@@ -28,11 +28,11 @@
 
 
 EventDetector::EventDetector()
-	: GenericProcessor("Event Detector"), state(false), threshold(50.0), bufferZone(5.0f)
+	: GenericProcessor("Event Detector"), state(false), threshold(200.0), bufferZone(5.0f)
 
 {
 
-    parameters.add(Parameter("thresh", 0.0, 200.0, 50.0, 0));
+    parameters.add(Parameter("thresh", 0.0, 500.0, 200.0, 0));
 
 }
 
@@ -76,7 +76,7 @@ void EventDetector::process(AudioSampleBuffer &buffer,
     for (int i = 0; i < nSamples; i++)
     {
 
-        if ((*buffer.getSampleData(0, i) > threshold) && !state)
+        if ((*buffer.getSampleData(0, i) < -threshold) && !state)
         {
 
             // generate midi event
@@ -85,7 +85,7 @@ void EventDetector::process(AudioSampleBuffer &buffer,
 
             state = true;
 
-        } else if ((*buffer.getSampleData(0, i) < threshold - bufferZone)  && state)
+        } else if ((*buffer.getSampleData(0, i) > -threshold + bufferZone)  && state)
         {
             state = false;
         }