Closedown

This commit is contained in:
x03daop
2016-04-05 16:40:01 +02:00
parent a9bf980ee0
commit 2f411463b4

View File

@@ -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:
@@ -908,7 +908,7 @@ def main(args):
guard = ScanGuard()
guard.ringcurrent_trip_lo = args.riculo
logging.debug(guard.ringcurrent_trip_lo)
guard.ringcurrent_dead_band = args.ricuhi - guard.ringcurrent_trip_lo
if args.ricuhi >= args.riculo:
guard.ringcurrent_dead_band = 1 #args.ricuhi - guard.ringcurrent_trip_lo
else:
raise ValueError("invalid ring current trip arguments")
@@ -972,7 +972,7 @@ if True: #__name__ == '__main__':
help="test controls (simulate beam loss after 15 seconds)")
parser.add_argument("-l", "--loglevel", dest="loglevel", default="INFO",
choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"])
args.loglevel = "DEBUG"
args = parser.parse_args()
#args.loglevel = "DEBUG"
main(args)