From ae7b5380725d6af72428a98715a5859bc4ff3d57 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Thu, 16 Oct 2025 12:40:55 +0200 Subject: [PATCH] DAQ/GUI: mount uses refernce tools if reference=True otherwise uses sample spreadsheet --- daq/src/aaredaq/daq.py | 4 ++++ daq/src/aaredaq/server.py | 8 ++++++-- gui/src/aaregui/threads/daq_worker.py | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index 1cc6649a..bf45d736 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -1258,6 +1258,10 @@ class AareDAQ: def sample_spreadsheet(self) -> SampleShortInfoList: return self.__cfg.spreadsheet + @property + def reference_tools(self) -> SampleShortInfoList: + return self.__cfg.reference_tools + def sample_spreadsheet_user(self, pgroup: str) -> SampleShortInfoList: sample = self.sample_spreadsheet sample.s = list(filter(lambda x: x.user == pgroup, sample.s)) diff --git a/daq/src/aaredaq/server.py b/daq/src/aaredaq/server.py index fa8cc974..559e3667 100644 --- a/daq/src/aaredaq/server.py +++ b/daq/src/aaredaq/server.py @@ -197,10 +197,14 @@ async def sample(token: str = Depends(oauth2_scheme)) -> SampleShortInfo: @app.post("/sample/mount") -async def mount(dbid: int, token: str = Depends(oauth2_scheme)): +async def mount(dbid: int, token: str = Depends(oauth2_scheme), reference: bool = False): token_data = auth.parse_token(token) auth.check_jwt_rw(cfg, auth.parse_token(token)) - st = daq.sample_spreadsheet + + if reference: + st = daq.reference_tools + else: + st = daq.sample_spreadsheet index = -1 for i in range(len(st.s)): diff --git a/gui/src/aaregui/threads/daq_worker.py b/gui/src/aaregui/threads/daq_worker.py index a887b202..3656cdde 100644 --- a/gui/src/aaregui/threads/daq_worker.py +++ b/gui/src/aaregui/threads/daq_worker.py @@ -384,8 +384,8 @@ class DAQWorker(QObject): self.generic_post("sample/unmount") @Slot(SampleShortInfo) - def mount(self, s: SampleShortInfo): - self.generic_post(f"sample/mount?dbid={s.db_id}") + def mount(self, s: SampleShortInfo, reference: bool = False): + self.generic_post(f"sample/mount?dbid={s.db_id}&reference={reference}") @Slot(SampleShortInfo) def sample_manual(self, s: SampleShortInfo):