From 5f68de3eef91fa4ea8f215394aa2c378f10215c0 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Sat, 4 Jul 2020 20:24:42 +0200 Subject: [PATCH] commented scan num, step num and sub-folder logic --- slic/core/scanner/scanbackend.py | 10 ++++++---- slic/core/scanner/scanner.py | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/slic/core/scanner/scanbackend.py b/slic/core/scanner/scanbackend.py index fef49f66..bfb20dfb 100644 --- a/slic/core/scanner/scanbackend.py +++ b/slic/core/scanner/scanbackend.py @@ -99,11 +99,13 @@ class ScanBackend: def get_filename(self, istep): filename = os.path.join(self.data_base_dir, self.filename) - if self.make_scan_sub_dir: - filebase = os.path.basename(self.filename) - filename = os.path.join(filename, filebase) +#TODO: no settable file names in sf_daq, but need it for other methods... +# if self.make_scan_sub_dir: +# filebase = os.path.basename(self.filename) +# filename = os.path.join(filename, filebase) - filename += "_step{:04d}".format(istep) +#TODO: sf_daq counts runs +# filename += "_step{:04d}".format(istep) return filename diff --git a/slic/core/scanner/scanner.py b/slic/core/scanner/scanner.py index 47984c37..99b7439e 100644 --- a/slic/core/scanner/scanner.py +++ b/slic/core/scanner/scanner.py @@ -53,7 +53,8 @@ class Scanner: Returns: ScanBackend: Scan instance. """ - filename = self.filename_generator.get_next_run_filename(filename) + #TODO: sf_daq counts runs +# filename = self.filename_generator.get_next_run_filename(filename) if not acquisitions: acquisitions = self.default_acquisitions