add FPLR extractors

Author: mayofaulkner

projects/alejandro_FPLROptoChoiceWorld.py

@@ -0,0 +1,33 @@
+"""Bpod extractor for alejandro's FPLOptoChoiceWorld and FPROptoChoiceWorld task.
+
+This is the same as biasedChoiceWorld with the addition of one dataset, `trials.laserStimulation`; The trials which the
+laser was on. For th FPLOptoChoiceWorld protocol the laser was on when the stimulus was on the left hand side and for
+the FPROptoChoiceWorld protocol the laser was on when the stimulus was on the right hand side of the screen
+
+"""
+import numpy as np
+from ibllib.io.extractors.base import BaseBpodTrialsExtractor, run_extractor_classes
+from ibllib.io.extractors.bpod_trials import BiasedTrials
+
+
+class TrialsFPLROpto(BaseBpodTrialsExtractor):
+    var_names = BiasedTrials.var_names + ('laser_stimulation',)
+    save_names = BiasedTrials.save_names + ('_ibl_trials.laserStimulation.npy',)
+
+    def _extract(self, extractor_classes=None, **kwargs) -> dict:
+
+        # Extract common biased choice world datasets
+        out, _ = run_extractor_classes(
+            [BiasedTrials], session_path=self.session_path, bpod_trials=self.bpod_trials,
+            settings=self.settings, save=False, task_collection=self.task_collection)
+
+        # Extract laser stimulation dataset
+        laser_stimulation = np.zeros_like(out['table']['contrastLeft'])
+        if 'FPR' in self.settings['PYBPOD_PROTOCOL']:
+            laser_stimulation[~np.isnan(out['table']['contrastRight'])] = 1
+        elif 'FPL' in self.settings['PYBPOD_PROTOCOL']:
+            laser_stimulation[~np.isnan(out['table']['contrastLeft'])] = 1
+
+        out['laser_stimulation'] = laser_stimulation
+
+        return {k: out[k] for k in self.var_names}  # Ensures all datasets present and ordered

projects/task_extractor_map.json

@@ -3,6 +3,6 @@
   "_iblrig_tasks_neuromodulatorChoiceWorld": "projects.neuromodulators.TrialsTableNeuromodulator",
   "nate_optoBiasedChoiceWorld": "projects.nate_optoBiasedChoiceWorld.TrialsOpto",
   "FPChoiceWorld": "BiasedTrials",
-  "FPROptoChoiceWorld": "BiasedTrials",
-  "FPLOptoChoiceWorld": "BiasedTrials"
+  "FPROptoChoiceWorld": "projects.alejandro_FPLROptoChoiceWorld.TrialsFPLROpto",
+  "FPLOptoChoiceWorld": "projects.alejandro_FPLROptoChoiceWorld.TrialsFPLROpto"
 }