Merge pull request #140 from lucidcode/bugfix/artifact-filter-sequence

Run artifact filter before evaluating trigger threshold

Author: IAmCoder

software/rem.py

@@ -22,16 +22,16 @@ def detect(self, variance, global_variance):
         if (self.config.get('TrackFace') or self.config.get('TensorFlow')) and not self.face.has_face:
             return self.eye_movements
 
-        if variance < self.config.get('TriggerThreshold'):
-            return self.eye_movements
-
         artifact_filter = self.config.get('ArtifactFilter')
         artifact_variance = variance + variance * (1.0 - artifact_filter)
         if artifact_filter != 0 and global_variance > artifact_variance:
             if artifact_filter >= 0.5:
                 self.eye_movements = 0
             return self.eye_movements
 
+        if variance < self.config.get('TriggerThreshold'):
+            return self.eye_movements
+
         if now - self.last_eye_movement > 1000:
             self.last_eye_movement = now
             if self.eye_movements < 8:

software/version.py

@@ -1 +1 @@
-version = '1.2.9'
+version = '1.3.0'