pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
x03daop
2016-09-09 17:42:46 +02:00
parent b4a8a263b8
commit 28ae56c33a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/devices.properties
View File

@@ -75,9 +75,9 @@ RefocusBladeRing=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:RI|||
RefocusBladeWall=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:WA|||
RefocusYTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:oy|Read||true
RefocusZTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:oz|Read||true
RefocusXRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:oRx|Read||true
RefocusXRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRx.A X03DA-OP-RMU:oRx|Read||true
RefocusYRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRy.A X03DA-OP-RMU:oRy|||true
RefocusZRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:oRz|Read||true
RefocusZRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRz.A X03DA-OP-RMU:oRz|Read||true
MonoEnergy=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:CERBK|Read||true
MonoCff=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkcff|Read||true
MonoBeta=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkbeta|Read||true

3
script/scan_guard.py
View File

@@ -852,7 +852,7 @@ class ScanGuard(object):
logging.info("test mode. simulated beam loss in %g seconds.", self.test_time_seconds)
while self.running:
self._ringcurrent.pv.poll() #pend_event(timeout=1)
self._ringcurrent.pv.poll() #pend_event(timeout=1)
new_beam_ok = self.check_beam()
if new_beam_ok != self.beam_ok:
@@ -980,6 +980,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.attended = False
main(args)