Merge pull request #298 from pellet/dev/add_site_param_to_generate_save_fn

Added a configurable `site` parameter into `generate_save_fn`

Author: JohnGriffiths

eegnb/__init__.py

@@ -47,11 +47,12 @@ def generate_save_fn(
     experiment: str,
     subject_id: int,
     session_nb: int,
+    site="local",
     data_dir=DATA_DIR,
 ) -> Path:
     """Generates a file name with the proper trial number for the current subject/experiment combo"""
     recording_dir = get_recording_dir(
-        board_name, experiment, subject_id, session_nb, data_dir=data_dir
+        board_name, experiment, subject_id, session_nb, site, data_dir=data_dir
     )
 
     # generate filename based on recording date-and-timestamp and then append to recording_dir

eegnb/experiments/Experiment.py

@@ -108,7 +108,7 @@ def setup(self, instructions=True):
                 random_id = random.randint(1000,10000)
                 # Generating save function
                 experiment_directory = self.name.replace(' ', '_')
-                self.save_fn = generate_save_fn(self.eeg.device_name, experiment_directory, random_id, random_id, "unnamed")
+                self.save_fn = generate_save_fn(self.eeg.device_name, experiment_directory, random_id, random_id, data_dir="unnamed")
 
                 print(
                     f"No path for a save file was passed to the experiment. Saving data to {self.save_fn}"

eegnb/experiments/auditory_oddball/auditory_erp_arrayin.py

@@ -82,7 +82,7 @@ def present(eeg: Optional[EEG]=None, save_fn=None,
         if save_fn is None:  # If no save_fn passed, generate a new unnamed save file
             # random_id = random.randint(1000,10000)
             random_id = 9999
-            save_fn = generate_save_fn(eeg.device_name, "auditory_erp_arrayin", random_id, random_id, "unnamed")
+            save_fn = generate_save_fn(eeg.device_name, "auditory_erp_arrayin", random_id, random_id, data_dir="unnamed")
             print(
                 f"No path for a save file was passed to the experiment. Saving data to {save_fn}"
             )