From da05820ac2ea52ba65ed5180c35dbfc03e8018b9 2016-11-30 20:52:54 From: Fiorella Quino Date: 2016-11-30 20:52:54 Subject: [PATCH] DDS-JARS-RC devices will stop in that order if SIR changes ABS beam git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@248 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71 --- diff --git a/apps/abs/models.py b/apps/abs/models.py index cce1343..b2c1df2 100644 --- a/apps/abs/models.py +++ b/apps/abs/models.py @@ -792,12 +792,30 @@ class ABSConfiguration(Configuration): # Se manda a cero RC para poder realizar cambio de beam confs = Configuration.objects.filter(experiment = self.experiment) - confrc='' - for conf in confs: - if conf.device.device_type.name == 'rc': - confrc = conf - confrc.stop_device() - break + confdds = '' + confjars = '' + confrc = '' + + #TO STOP DEVICES: DDS-JARS-RC + for i in range(0,len(confs)): + if i==0: + for conf in confs: + if conf.device.device_type.name == 'dds': + confdds = conf + confdds.stop_device() + break + if i==1: + for conf in confs: + if conf.device.device_type.name == 'jars': + confjars = conf + confjars.stop_device() + break + if i==2: + for conf in confs: + if conf.device.device_type.name == 'rc': + confrc = conf + confrc.stop_device() + break if beam_pos > 0: beam_pos = beam_pos - 1 @@ -851,10 +869,14 @@ class ABSConfiguration(Configuration): sock.close() sock = None - #Start RC + #Start DDS-RC-JARS + if confdds: + confdds.start_device() if confrc: #print confrc confrc.start_device() + if confjars: + confjars.start_device() self.message = "ABS Beam has been changed"