changed limit from min pressure to total vacuum pressure

Author: NicholasBratvold

ulc_mm_package/hardware/real/pneumatic_module.py

@@ -260,6 +260,7 @@ def __init__(
         self.mprls_pwr_pin = mprls_pwr_pin
         self.prev_poll_time_s: float = 0.0
         self.prev_pressure: float = 0.0
+        self.ambient_pressure: float = 0.0
         self.prev_status = PressureSensorRead.ALL_GOOD
 
         self.io_error_counter = 0

ulc_mm_package/hardware/scope_routines.py

@@ -411,6 +411,8 @@ def checkPressureDifference(
             raise
 
         # Check if there is a pressure leak
+        mscope.pneumatic_module.mpr.ambient_pressure = ambient_pressure
+        mscope.pneumatic_module.mpr.final_pressure = final_pressure
         pressure_diff = ambient_pressure - final_pressure
         if pressure_diff < MIN_PRESSURE_DIFF:
             raise PressureLeak(

ulc_mm_package/image_processing/flow_control.py

@@ -3,11 +3,12 @@
 
 import numpy as np
 
-from ulc_mm_package.scope_constants import CAMERA_SELECTION, DOWNSAMPLE_FACTOR, MIN_PRESSURE
+from ulc_mm_package.scope_constants import CAMERA_SELECTION, DOWNSAMPLE_FACTOR
 from ulc_mm_package.image_processing.ewma_filtering_utils import EWMAFiltering
 from ulc_mm_package.image_processing.processing_constants import (
     FLOW_CONTROL_EWMA_ALPHA,
     TOL_PERC,
+    MAX_VACUUM_PRESSURE,
 )
 from ulc_mm_package.image_processing.flowrate import FlowRateEstimator
 
@@ -221,7 +222,7 @@ def _adjustSyringe(self, flow_error: float):
             try:
                 # Increase pressure, move syringe down
                 pressure, pressure_read = self.pneumatic_module.getPressure()
-                if not self.pneumatic_module.is_locked() and pressure > MIN_PRESSURE:
+                if not self.pneumatic_module.is_locked() and pressure > (self.pneumatic_module.mpr.ambient_pressure - MAX_VACUUM_PRESSURE):
                     self.pneumatic_module.threadedDecreaseDutyCycle()
             except SyringeEndOfTravel:
                 raise CantReachTargetFlowrate(self.flowrate)

ulc_mm_package/image_processing/processing_constants.py

@@ -32,7 +32,7 @@ class FLOWRATE(enum.Enum):
 FLOW_CONTROL_EWMA_ALPHA = 0.05
 TOL_PERC = 0.1
 FAILED_CORR_PERC_TOLERANCE = 0.75
-MIN_PRESSURE = 650
+MAX_VACUUM_PRESSURE = 400 # mBar
 
 # Factor by which to multiply the ewma feebdack adjustment delay (in frames) to set the window size
 # of the past measurements to check for failed xcorrs.