Merge pull request #15 from ISISComputingGroup/Ticket7562_scale_min_t…

…ime_lag fix minimum time lag stripping, add prec to min time lag
ISISComputingGroup · Jan 16, 2023 · 96c92ce · 96c92ce
2 parents d013636 + 9da3ac6
commit 96c92ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/correlator_pcaspy.py b/correlator_pcaspy.py
@@ -33,6 +33,7 @@
 from pvdb import STATIC_PV_DATABASE, Records
 from config import Constants, PV, LSiPVSeverity, Macro, Defaults
 
+NANOSECONDS_TO_SECONDS = 1e9
 
 def get_base_pv(reason: str) -> str:
     """
@@ -276,7 +277,9 @@ def take_data(self) -> None:
         no_repetitions = self.get_converted_pv_value(Records.REPETITIONS.name)
         wait_in_seconds = self.get_converted_pv_value(Records.WAIT.name)
         wait_at_start = self.get_converted_pv_value(Records.WAIT_AT_START.name)
-        min_time_lag = self.get_converted_pv_value(Records.MIN_TIME_LAG.name)
+        min_time_lag_ns = self.get_converted_pv_value(Records.MIN_TIME_LAG.name)
+        # Convert min time lag to seconds for comparison against lag data
+        min_time_lag = min_time_lag_ns / NANOSECONDS_TO_SECONDS
         self.already_started = True
         first_repetition = 1
 

diff --git a/record.py b/record.py
@@ -55,7 +55,7 @@ def float_pv_with_unit(unit: str):
         pv_definition (Dict): Contains the fields which define the PV
     """
 
-    return {'type': 'float', 'unit': unit, 'info_field': {'archive': 'VAL', 'INTEREST': 'HIGH'}}
+    return {'type': 'float', 'unit': unit, 'info_field': {'archive': 'VAL', 'INTEREST': 'HIGH'}, 'prec': 3}
 
 # pylint: disable=unused-argument
 def null_device_setter(*args, **kwargs):