diff --git a/script/scan_guard.py b/script/scan_guard.py index f1b23605..184605ea 100644 --- a/script/scan_guard.py +++ b/script/scan_guard.py @@ -127,7 +127,7 @@ class TripDevice(MonitoredDevice): return True val = self.pv.getValue() - if last_beam_status: + if last_beam_status: result = self.trip_lo <= val <= self.trip_hi else: result = self.trip_lo + self.dead_band <= val <= self.trip_hi - self.dead_band @@ -908,7 +908,7 @@ def main(args): guard.ringcurrent_trip_lo = args.riculo logging.debug(guard.ringcurrent_trip_lo) if args.ricuhi >= args.riculo: - guard.ringcurrent_dead_band = args.ricuhi - guard.ringcurrent_trip_lo + guard.ringcurrent_dead_band = 1 #args.ricuhi - guard.ringcurrent_trip_lo else: raise ValueError("invalid ring current trip arguments") logging.debug(guard.ringcurrent_trip_hi) @@ -972,7 +972,7 @@ if True: #__name__ == '__main__': parser.add_argument("-l", "--loglevel", dest="loglevel", default="INFO", choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]) args = parser.parse_args() - args.loglevel = "DEBUG" + #args.loglevel = "DEBUG" main(args)