refactoring controllers into separate modules

background.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -20,7 +20,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -32,7 +32,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -88,7 +88,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -102,7 +102,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,

controllers.ipynb

@@ -501,7 +501,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -515,7 +515,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,

controllers/camera.ipynb

@@ -0,0 +1,155 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import cv2\n",
+    "import time, os\n",
+    "import threading\n",
+    "import multiprocessing as mp\n",
+    "import matplotlib.pyplot as plt\n",
+    "\n",
+    "import nbimporter\n",
+    "from utils import FPSTimes"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "class WebcamStream(FPSTimes):\n",
+    "    # check camera output formats with FFMPEG\n",
+    "    # https://stackoverflow.com/questions/15301608/how-to-query-a-webcams-output-formats\n",
+    "    #\n",
+    "    # ffmpeg -list_devices true -f dshow -i dummy\n",
+    "    # ffmpeg -list_options true -f dshow -i video=\"HD USB Camera\"\n",
+    "    #\n",
+    "    # Also\n",
+    "    # https://stackoverflow.com/questions/39308664/opencv-cant-set-mjpg-compression-for-usb-camera\n",
+    "    \n",
+    "    default_cfg = {\n",
+    "        'source': 0,\n",
+    "        'frame_width': 1024,\n",
+    "        'frame_height': 768,\n",
+    "        'fps': 20,\n",
+    "        'api': '',  # 700 -> cv2.CAP_DSHOW\n",
+    "        'verbose': True,\n",
+    "    }\n",
+    "    \n",
+    "    def __init__(self, cfg):\n",
+    "        super(WebcamStream, self).__init__()\n",
+    "        \n",
+    "        self.cfg = cfg\n",
+    "        self.frame = None\n",
+    "        self.stopped = False\n",
+    "        \n",
+    "        # preparing a MPEG video stream\n",
+    "        self.stream = cv2.VideoCapture(cfg['source'], cfg['api']) if cfg['api'] else cv2.VideoCapture(cfg['source'])\n",
+    "        self.stream.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc('M', 'J', 'P', 'G'))\n",
+    "        self.stream.set(cv2.CAP_PROP_FRAME_WIDTH, cfg['frame_width'])\n",
+    "        self.stream.set(cv2.CAP_PROP_FRAME_HEIGHT, cfg['frame_height'])\n",
+    "        self.stream.set(cv2.CAP_PROP_FPS, cfg['fps'])\n",
+    "        self.stream.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc('M', 'J', 'P', 'G'))  # cv2.VideoWriter_fourcc('H', '2', '6', '4')\n",
+    "\n",
+    "    def start(self):\n",
+    "        self._th = threading.Thread(target=self.update, args=())\n",
+    "        self._th.start()\n",
+    "\n",
+    "    def stop(self):\n",
+    "        self.stopped = True\n",
+    "        time.sleep(0.3)   # wait until device is released\n",
+    "        self._th.join()\n",
+    "        print('Camera released')\n",
+    "            \n",
+    "    def update(self):\n",
+    "        x_res = self.stream.get(cv2.CAP_PROP_FRAME_WIDTH)\n",
+    "        y_res = self.stream.get(cv2.CAP_PROP_FRAME_HEIGHT)\n",
+    "        fps = self.stream.get(cv2.CAP_PROP_FPS)\n",
+    "        print('Webcam stream %s:%s at %.2f FPS started' % (x_res, y_res, fps))\n",
+    "        \n",
+    "        while not self.stopped:\n",
+    "            (self.grabbed, self.frame) = self.stream.read()\n",
+    "            self.count()  # count FPS\n",
+    "        self.stream.release()\n",
+    "            \n",
+    "    def read(self):\n",
+    "        return self.frame"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Testing streaming"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Webcam stream 960.0:720.0 at 20.00 FPS started\n",
+      "Camera released\n"
+     ]
+    }
+   ],
+   "source": [
+    "vs = WebcamStream(WebcamStream.default_cfg)\n",
+    "vs.start()  # stream runs in a separate thread\n",
+    "\n",
+    "try:\n",
+    "    while True:\n",
+    "        frame = vs.read()\n",
+    "        if frame is not None:\n",
+    "            frame = cv2.putText(frame, '%.2f FPS' % vs.get_avg_fps(), (10, 20), \n",
+    "                        cv2.FONT_HERSHEY_DUPLEX, .5, (255, 255, 255))\n",
+    "            cv2.imshow('Webcam', frame)\n",
+    "\n",
+    "        k = cv2.waitKey(33)\n",
+    "        if k == ord('q'):\n",
+    "            break\n",
+    "\n",
+    "finally:\n",
+    "    cv2.destroyAllWindows()\n",
+    "    vs.stop()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.10"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

controllers/position.ipynb

@@ -0,0 +1,211 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 10,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import numpy as np\n",
+    "import threading\n",
+    "import time, os\n",
+    "import cv2\n",
+    "import matplotlib.pyplot as plt\n",
+    "import multiprocessing as mp\n",
+    "\n",
+    "import nbimporter\n",
+    "from utils import FPSTimes\n",
+    "from camera import WebcamStream"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 11,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "class PositionTracker(FPSTimes):\n",
+    "\n",
+    "    default_cfg = {\n",
+    "        'background_file': 'background.png',\n",
+    "        'arena_x': 512,\n",
+    "        'arena_y': 384,\n",
+    "        'arena_radius': 350,\n",
+    "        'log_file': 'test_position_log.csv'\n",
+    "    }\n",
+    "    \n",
+    "    def __init__(self, status, video_stream, cfg):\n",
+    "        super(PositionTracker, self).__init__()\n",
+    "        \n",
+    "        self.status = status\n",
+    "        self.cfg = cfg\n",
+    "        self.video_stream = video_stream\n",
+    "        self.background = cv2.imread(cfg['background_file'], 1)\n",
+    "        self.x, self.y = None, None\n",
+    "        self.contour = []\n",
+    "        self.stopped = False\n",
+    "\n",
+    "        self.mask = np.zeros(shape=self.background.shape, dtype=\"uint8\")\n",
+    "        cv2.circle(self.mask, (cfg['arena_x'], cfg['arena_y']), cfg['arena_radius'], (255,255,255), -1)\n",
+    "\n",
+    "        with open(cfg['log_file'], 'w') as f:\n",
+    "            f.write(\"time,x,y\\n\")\n",
+    "\n",
+    "    def start(self):\n",
+    "        self._th = threading.Thread(target=self.update, args=())\n",
+    "        self._th.start()\n",
+    "    \n",
+    "    def stop(self):\n",
+    "        self.stopped = True\n",
+    "        self._th.join()\n",
+    "        print('Position tracker stopped')\n",
+    "        \n",
+    "    def update(self):\n",
+    "        while not self.stopped:\n",
+    "            frame = self.video_stream.read()\n",
+    "            if frame is None:\n",
+    "                time.sleep(0.05)\n",
+    "                continue\n",
+    "                \n",
+    "            self.count()  # count FPS\n",
+    "            self.detect_position(frame)\n",
+    "\n",
+    "            if self.status.value == 2:\n",
+    "                with open(self.cfg['log_file'], 'a') as f:\n",
+    "                    f.write(\",\".join([str(x) for x in (self.frame_times[-1], self.x, self.y)]) + \"\\n\")         \n",
+    "       \n",
+    "    def detect_position(self, frame):\n",
+    "        masked_frame = cv2.bitwise_and(src1=frame, src2=self.mask)\n",
+    "\n",
+    "        # Substracts background from current frame\n",
+    "        subject = cv2.subtract(masked_frame, self.background)\n",
+    "\n",
+    "        # Converts subject to grey scale\n",
+    "        subject_gray = cv2.cvtColor(subject, cv2.COLOR_BGR2GRAY)\n",
+    "\n",
+    "        # Applies blur and thresholding to the subject\n",
+    "        kernel_size = (25,25)\n",
+    "        frame_blur = cv2.GaussianBlur(subject_gray, kernel_size, 0)\n",
+    "        _, thresh = cv2.threshold(frame_blur, 40, 255, cv2.THRESH_BINARY)\n",
+    "\n",
+    "        # Finds contours and selects the contour with the largest area\n",
+    "        contours, hierarchy = cv2.findContours(thresh.copy(), cv2.RETR_TREE, cv2.CHAIN_APPROX_NONE)\n",
+    "\n",
+    "        if len(contours) == 0:\n",
+    "            return\n",
+    "        contour = contours[np.argmax(list(map(cv2.contourArea, contours)))]\n",
+    "        M = cv2.moments(contour)\n",
+    "        if (M['m00'] == 0):\n",
+    "            return\n",
+    "\n",
+    "        self.x = int(M['m10'] / M['m00'])\n",
+    "        self.y = int(M['m01'] / M['m00'])\n",
+    "        self.contour = contour"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Testing position detection"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 14,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Webcam stream 960.0:720.0 at 20.00 FPS started\n",
+      "Camera released\n",
+      "Position tracker stopped\n"
+     ]
+    }
+   ],
+   "source": [
+    "# controller status: 1 - detecting, 2 - detecting + logging\n",
+    "status = mp.Value('i', 1)\n",
+    "\n",
+    "# let's use a webcam stream\n",
+    "vs = WebcamStream(WebcamStream.default_cfg)\n",
+    "vs.start()  # stream runs in a separate thread\n",
+    "\n",
+    "# init controller\n",
+    "pt_cfg = PositionTracker.default_cfg\n",
+    "pt_cfg['background_file'] = os.path.join('..', 'assets', 'background.png')\n",
+    "pt = PositionTracker(status, vs, pt_cfg)\n",
+    "pt.start()\n",
+    "\n",
+    "try:\n",
+    "    while True:\n",
+    "        frame = vs.read()\n",
+    "        if frame is not None:\n",
+    "            masked_frame = cv2.bitwise_and(src1=frame, src2=pt.mask)\n",
+    "            #masked_frame = cv2.subtract(masked_frame, pt.background)\n",
+    "            #masked_frame = cv2.cvtColor(masked_frame, cv2.COLOR_BGR2GRAY)\n",
+    "            \n",
+    "            if pt.x is not None:\n",
+    "                color = (127, 255, 0) if status.value == 1 else (0, 0, 255)\n",
+    "                cv2.circle(masked_frame, (pt.x, pt.y), 10, color, -1)\n",
+    "                cv2.drawContours(masked_frame, [pt.contour], 0, color, 1, cv2.LINE_AA)\n",
+    "                \n",
+    "            cv2.imshow('Webcam', masked_frame)\n",
+    "\n",
+    "        k = cv2.waitKey(33)\n",
+    "        if k == ord('q'):\n",
+    "            break\n",
+    "            \n",
+    "        if k == ord('s'):\n",
+    "            status.value = 2 if status.value == 1 else 1\n",
+    "finally:\n",
+    "    cv2.destroyAllWindows()\n",
+    "    vs.stop(), pt.stop()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.10"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

controllers/utils.ipynb

@@ -0,0 +1,85 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import numpy as np\n",
+    "import time"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "BGR_COLOR = {\n",
+    "    'red': (0,0,255),\n",
+    "    'green': (127,255,0),\n",
+    "    'blue': (255,127,0),\n",
+    "    'yellow': (0,127,255),\n",
+    "    'black': (0,0,0),\n",
+    "    'white': (255,255,255)\n",
+    "}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "class FPSTimes:\n",
+    "    \n",
+    "    def __init__(self, buffer=100):\n",
+    "        self.frame_times = []\n",
+    "        self.buffer = buffer\n",
+    "        \n",
+    "    def count(self):\n",
+    "        self.frame_times.append(time.time())\n",
+    "        if len(self.frame_times) > self.buffer:\n",
+    "            self.frame_times.pop(0)\n",
+    "        \n",
+    "    def get_time_diffs(self):\n",
+    "        return np.diff(np.array(self.frame_times))\n",
+    "        \n",
+    "    def get_avg_fps(self):\n",
+    "        diffs = self.get_time_diffs()\n",
+    "        if len(diffs) > 0:\n",
+    "            return (1.0/diffs).mean()\n",
+    "        return 0"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.10"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

controllers/video.ipynb

@@ -0,0 +1,164 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import cv2\n",
+    "import time, os\n",
+    "import threading\n",
+    "import numpy as np\n",
+    "import multiprocessing as mp\n",
+    "import matplotlib.pyplot as plt\n",
+    "\n",
+    "import nbimporter\n",
+    "from utils import FPSTimes\n",
+    "from camera import WebcamStream"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 8,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "class VideoWriter(FPSTimes):\n",
+    "    # precise timing https://stackoverflow.com/questions/42565297/precise-loop-timing-in-python\n",
+    "    \n",
+    "    default_cfg = {\n",
+    "        'fps': 20,\n",
+    "        'file_path': 'test_video.avi',\n",
+    "    }\n",
+    "    \n",
+    "    def __init__(self, status, video_stream, cfg):\n",
+    "        super(VideoWriter, self).__init__()\n",
+    "        \n",
+    "        self.cfg = cfg\n",
+    "        self.video_stream = video_stream  # cv2 video stream\n",
+    "        self.stopped = False\n",
+    "        self.status = status\n",
+    "        \n",
+    "        fourcc = cv2.VideoWriter_fourcc(*'XVID')\n",
+    "        res_x, res_y = int(video_stream.stream.get(3)), int(video_stream.stream.get(4))\n",
+    "        self.out = cv2.VideoWriter(cfg['file_path'], fourcc, cfg['fps'], (res_x, res_y))\n",
+    "\n",
+    "    @property\n",
+    "    def latency(self):\n",
+    "        return 1.0/self.cfg['fps']\n",
+    "        \n",
+    "    def start(self):\n",
+    "        self._th = threading.Thread(target=self.update, args=())\n",
+    "        self._th.start()\n",
+    "    \n",
+    "    def stop(self):\n",
+    "        self.stopped = True\n",
+    "        time.sleep(0.2)   # wait until device is released\n",
+    "        self._th.join()\n",
+    "        print('Video writer stopped')\n",
+    "        \n",
+    "    def update(self):\n",
+    "        next_frame = time.time() + self.latency\n",
+    "        \n",
+    "        while not self.stopped:\n",
+    "            if self.status.value == 2:\n",
+    "                if time.time() < next_frame:\n",
+    "                    continue\n",
+    "\n",
+    "                frame = self.video_stream.read()\n",
+    "                if frame is not None:\n",
+    "                    self.count()  # count FPS\n",
+    "                    self.out.write(frame)\n",
+    "\n",
+    "                    frames_missed = np.floor((time.time() - next_frame) * self.cfg['fps'])\n",
+    "                    next_frame += self.latency * frames_missed + self.latency\n",
+    "            else:\n",
+    "                time.sleep(0.05)\n",
+    "            \n",
+    "        self.out.release()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Testing video recording"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 13,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Webcam stream 960.0:720.0 at 20.00 FPS started\n",
+      "Camera released\n",
+      "Video writer stopped\n"
+     ]
+    }
+   ],
+   "source": [
+    "# let's use a webcam stream\n",
+    "vs = WebcamStream(WebcamStream.default_cfg)\n",
+    "vs.start()  # stream runs in a separate thread\n",
+    "\n",
+    "# recording status: 1 - idle, 2 - recording\n",
+    "status = mp.Value('i', 1)\n",
+    "\n",
+    "# start/stop recording by pressing 's'\n",
+    "vw = VideoWriter(status, vs, VideoWriter.default_cfg)\n",
+    "vw.start()\n",
+    "\n",
+    "try:\n",
+    "    while True:\n",
+    "        frame = vs.read()\n",
+    "        if frame is not None:\n",
+    "            color = (127, 255, 0) if status.value == 1 else (0, 0, 255)\n",
+    "            frame = cv2.circle(frame, (20, 20), 15, color, -1)\n",
+    "            cv2.imshow('Webcam', frame)\n",
+    "\n",
+    "        k = cv2.waitKey(33)\n",
+    "        if k == ord('q'):\n",
+    "            break\n",
+    "            \n",
+    "        if k == ord('s'):\n",
+    "            status.value = 2 if status.value == 1 else 1\n",
+    "finally:\n",
+    "    cv2.destroyAllWindows()\n",
+    "    vs.stop(), vw.stop()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.10"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

sandbox/sound.ipynb

@@ -3,7 +3,6 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "id": "6c693209",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -16,7 +15,6 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "id": "19bdae6a",
    "metadata": {
     "scrolled": false
    },
@@ -32,7 +30,6 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "id": "6863eedc",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -43,7 +40,6 @@
   },
   {
    "cell_type": "markdown",
-   "id": "cda62a58",
    "metadata": {},
    "source": [
     "### List available devices"
@@ -52,7 +48,6 @@
   {
    "cell_type": "code",
    "execution_count": 5,
-   "id": "a5504f48",
    "metadata": {
     "scrolled": true
    },
@@ -100,7 +95,6 @@
   {
    "cell_type": "code",
    "execution_count": 6,
-   "id": "b5c1ccbe",
    "metadata": {},
    "outputs": [
     {
@@ -120,7 +114,6 @@
   },
   {
    "cell_type": "markdown",
-   "id": "7ff264f8",
    "metadata": {},
    "source": [
     "### Play pure tone of a sample frequency"
@@ -129,7 +122,6 @@
   {
    "cell_type": "code",
    "execution_count": 8,
-   "id": "b8de8497",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -148,7 +140,6 @@
   {
    "cell_type": "code",
    "execution_count": 7,
-   "id": "f22e0b7d",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -170,7 +161,6 @@
   {
    "cell_type": "code",
    "execution_count": 12,
-   "id": "4dab0ea9",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -181,7 +171,6 @@
   {
    "cell_type": "code",
    "execution_count": 10,
-   "id": "81fcd1e9",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -197,7 +186,6 @@
   },
   {
    "cell_type": "markdown",
-   "id": "1b83ab86",
    "metadata": {},
    "source": [
     "### Plot pure tone"
@@ -206,7 +194,6 @@
   {
    "cell_type": "code",
    "execution_count": 9,
-   "id": "427da2ad",
    "metadata": {
     "scrolled": true
    },
@@ -242,7 +229,6 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "b71db3e2",
    "metadata": {},
    "outputs": [],
    "source": []
@@ -250,7 +236,6 @@
   {
    "cell_type": "code",
    "execution_count": 22,
-   "id": "f2e0104c",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -297,7 +282,6 @@
   {
    "cell_type": "code",
    "execution_count": 17,
-   "id": "8ce68442",
    "metadata": {},
    "outputs": [
     {
@@ -318,7 +302,6 @@
   {
    "cell_type": "code",
    "execution_count": 23,
-   "id": "035cba14",
    "metadata": {},
    "outputs": [
     {
@@ -351,7 +334,6 @@
   {
    "cell_type": "code",
    "execution_count": 25,
-   "id": "c4b4eef1",
    "metadata": {},
    "outputs": [
     {
@@ -379,7 +361,6 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "5e3822f8",
    "metadata": {},
    "outputs": [],
    "source": []
@@ -387,7 +368,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -401,7 +382,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,

sit.ipynb

@@ -550,7 +550,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -564,7 +564,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,