Merge branch 'main' of github.com:mackelab/labproject into main

mackelab · Feb 11, 2024 · 5d78912 · 5d78912
2 parents b2f631f + 2d6bea9
commit 5d78912
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 45 deletions.
diff --git a/docs/notebooks/application1_copy.ipynb b/docs/notebooks/application1_copy.ipynb
diff --git a/docs/notebooks/distances_violin.pdf b/docs/notebooks/distances_violin.pdf
diff --git a/labproject/ddm_basics.ipynb b/labproject/ddm_basics.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 91,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -32,7 +32,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 92,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -41,7 +41,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 93,
    "metadata": {},
    "outputs": [
     {
@@ -171,7 +171,7 @@
        "[6148 rows x 4 columns]"
       ]
      },
-     "execution_count": 3,
+     "execution_count": 93,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -192,7 +192,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 94,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -226,7 +226,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 95,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -243,14 +243,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 96,
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Info: Params [  2.16533471 -11.81124181   0.81819066   1.07893973   0.14297845] gave 98.07763681783106\n"
+      "Info: Params [  2.50225873 -19.87853757   0.61999986   0.85736089   0.16312348] gave 108.65103566473294\n"
      ]
     }
    ],
@@ -273,7 +273,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 97,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -283,7 +283,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 98,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -298,7 +298,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 99,
    "metadata": {},
    "outputs": [],
    "source": [

diff --git a/labproject/roitman_utils.py b/labproject/roitman_utils.py
@@ -29,10 +29,10 @@ def filter_roitman_data(
     """
 
     # extract values
-    #rt = df[(df["animal"] == animal) & (df["coherence"] == coherence)]["rt"].values / 1000
+    rt = df[(df["animal"] == animal) & (df["coherence"] == coherence)]["rt"].values / 1000
     rt = df[(df["coherence"] == coherence)]["rt"].values / 1000
 
-    #decision = df[(df["animal"] == animal) & (df["coherence"] == coherence)]["decision"].values
+    decision = df[(df["animal"] == animal) & (df["coherence"] == coherence)]["decision"].values
     decision = df[ (df["coherence"] == coherence)]["decision"].values
 
     if n_trial == "all":