Merge branch 'main' into unfuck_polling_plan

Author: Tom-Willemsen

doc/callbacks/file_writing.md

@@ -49,7 +49,7 @@ of the scan, in `C:\instrument\var\logs\bluesky\output_files\`.
 
 Optional parameters, not shown above, include:
 - `output_dir` parameter is optional, if not input the file will by default be placed in 
-`\\isis\inst$\ndx<inst>\user\TEST\scans\<rbnumber>`. 
+`\\isis\inst$\ndx<inst>\user\bluesky_scans\<rbnumber>`. 
 - `postfix` an optional suffix to append to the end of the file name, to disambiguate scans. Default is no suffix.
 
 The data is prepended on the first event with the names and units of each logged field, and then subsequently the data 

doc/dev/troubleshooting.md

@@ -43,7 +43,7 @@ showing how to do this.
 
 ### Scientist-facing data
 
-Scientist-facing output files are written to `<isis share>\inst$\NDX<inst>\user\test\scans\<current rb number>` by 
+Scientist-facing output files are written to `<isis share>\inst$\NDX<inst>\user\bluesky_scans\<current rb number>` by 
 default.
 
 Custom file-output paths can be specified by passing extra arguments to 

src/ibex_bluesky_core/callbacks/_fitting.py

@@ -146,7 +146,7 @@ def __init__(
 
         self.livefit = livefit
         self.postfix = postfix
-        self.output_dir = Path(output_dir or get_default_output_path() / "fitting")
+        self.output_dir = Path(output_dir or get_default_output_path())
         self.current_start_document: str | None = None
 
         self.x = x

src/ibex_bluesky_core/callbacks/_utils.py

@@ -34,7 +34,7 @@ def get_instrument() -> str:
 def get_default_output_path() -> Path:
     output_dir_env = os.environ.get(OUTPUT_DIR_ENV_VAR)
     return (
-        Path("//isis.cclrc.ac.uk/inst$") / node() / "user" / "TEST" / "scans"
+        Path("//isis.cclrc.ac.uk/inst$") / node() / "user" / "bluesky_scans"
         if output_dir_env is None
         else Path(output_dir_env)
     )