From 873aea94a4248d4d8f70f7ac463f95187a609e37 Mon Sep 17 00:00:00 2001
From: Runner PC Cavity Lab <johannes.schabbauer@tuwien.ac.at>
Date: Thu, 6 Feb 2025 16:45:24 +0100
Subject: [PATCH] SPCM: Increased waiting time, 10m measurements work with this
settings now
---
FastComtecMCS8A/MCS8A_default_config.SET | 7 +++----
FastComtecMCS8A/blacs_workers.py | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/FastComtecMCS8A/MCS8A_default_config.SET b/FastComtecMCS8A/MCS8A_default_config.SET
index 2d4fc21..2f611f4 100644
--- a/FastComtecMCS8A/MCS8A_default_config.SET
+++ b/FastComtecMCS8A/MCS8A_default_config.SET
@@ -1,5 +1,5 @@
[MCS8A A] 208 FW 3.104 SV 1.243
-range=44736
+range=89408
periods=2
sweepmode=22fc3088
fstchan=0
@@ -35,9 +35,8 @@ smoothpts=5
wndwidth=163
wndheight=286
sysdef=0
-showstarts=0
[CHN1]
-range=44736
+range=89408
active=1
bitshift=18
cftfak=2580100
@@ -51,7 +50,7 @@ calfact3=0
calunit=nsec
caluse=1
[CHN2]
-range=44736
+range=89408
active=1
bitshift=18
cftfak=2580100
diff --git a/FastComtecMCS8A/blacs_workers.py b/FastComtecMCS8A/blacs_workers.py
index dac0f3d..d7c93d2 100644
--- a/FastComtecMCS8A/blacs_workers.py
+++ b/FastComtecMCS8A/blacs_workers.py
@@ -59,7 +59,7 @@ class MCS8AWorker(Worker):
# TODO: How to handle parameters (start new measurment when they changed, or treat parameters statically)
with h5py.File(h5_file,'r') as f:
stop_time = f["devices/" + f["connection table"].attrs["master_pseudoclock"]].attrs["stop_time"]
- if getattr(self.device.get_acq_status(),"started") != 1 or time.perf_counter()-getattr(self,"start_time",-self.maxduration)>self.maxduration-stop_time-0.5:
+ if getattr(self.device.get_acq_status(),"started") != 1 or time.perf_counter()-getattr(self,"start_time",-self.maxduration)>self.maxduration-stop_time-2:
while getattr(self.device.get_acq_status(),"started") == 1:
# If the current measurement doesn't have enought time left for this shot, wait until measurment ends.
time.sleep(0.1)
--
GitLab