fix issue #606: added the new command set to support new synth. Also reviwed... (403ede87) · Commits · INAF / DISCOS

Noto/Servers/NotoPyLocalOscillator/src/NotoLocalOscillatorImpl/CommandLine.py

+75 −48

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ import socket
		import time
		import decimal
		from NotoLocalOscillatorImpl import CommandLineError
		import ReceiversErrorsImpl

		QUERYERROR="SYST:ERR? \n"

		@@ -47,9 +48,9 @@ class CommandLine:
		if self.sock==None:
		self.sock=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
		except socket.error,msg:
		exc=CommandLineError(msg);
		self.sock=None
		raise exc
		return False
		return True

		def close(self):
		if self.connected:
		@@ -62,67 +63,84 @@ class CommandLine:
		try:
		if self.connected==False:
		self.sock.connect((self.ip,self.port))
		self.connected=True
		self.sock.sendall('*CLS\n;SYST:ERR?\n++read\n')
		msg=self.sock.recv(1024)
		self.connected=True
		except socket.error, msg:
		exc=CommandLineError(msg);
		raise exc
		self.close()
		return False
		return True

		def check(self):
		try:
		self.create()
		self.connect()
		if (self.create() and self.connect()):
		return True
		except Exception:
		else:
		return False

		def setPower(self,power):
		cmd="POW "+str(power)+"DBM;SYST:ERR?\n"
		cmd="POW:LEV "+str(power)+"\n"
		#can raise an error......
		msg=self.query(cmd)
		return msg
		res,msg=self.command(cmd)
		return res,msg

		def getPower(self):
		QUERYPOWER="POW?;SYST:ERR?\n"
		cmd=QUERYPOWER
		cmd="POW:LEV?\n"
		now=time.time()
		if now<self.powerTime:
		return "Read from internal memory",self.power
		if now-30<self.powerTime:
		return True,"Read from internal memory",self.power
		#can raise an error.....
		msg=self.query(cmd)
		commands=msg.split(';')
		if len(commands)>1:
		self.power=int(decimal.Decimal(commands[0]))# unit is MHZ
		self.powerTime=time.time()+30
		err_msg=commands[1]
		res,msg=self.query(cmd)
		if res:
		self.power=float(msg)
		self.powerTime=time.time()
		return True,"Read from device",self.power
		# commands=msg.split(';')
		# if len(commands)>1:
		# self.power=int(decimal.Decimal(commands[0]))
		# self.powerTime=time.time()
		# err_msg=commands[1]
		# return True,err_msg,self.power
		# else:
		# self.power=-1.0
		# err_msg='Communication Error with synth'
		# return False,err_msg,self.power
		else:
		self.power=-1.0
		err_msg='Communication Error with synth'
		return err_msg,self.power
		self.freq=-1.0
		err_msg=msg
		return False,err_msg,self.power

		def setFrequency(self,freq):
		cmd='FREQ '+str(freq)+ 'MHZ;SYST:ERR?'
		cmd='FREQ '+str(freq)+ 'MHZ\n'
		#can raise an error......
		msg=self.query(cmd)
		return msg
		res,msg=self.command(cmd)
		return res,msg

		def getFrequency(self):
		cmd='FREQ?;SYST:ERR?'
		cmd='FREQ?'
		now=time.time()
		if now<self.freqTime:
		return "Read from internal memory",self.freq
		if now-30<self.freqTime:
		return True,"Read from internal memory",self.freq
		#can raise an error.....
		msg=self.query(cmd)
		commands=msg.split(';')
		if len(commands)>1:
		self.freq=int(decimal.Decimal(commands[0]))/1e6
		self.freqTime=time.time()+30
		err_msg=commands[1]
		res,msg=self.query(cmd)
		if res:
		self.freq=float(msg)/1e6
		self.powerTime=time.time()
		return True,"Read from device",self.freq
		# commands=msg.split(';')
		# if len(commands)>1:
		# self.freq=int(decimal.Decimal(commands[0]))/1e6
		# self.freqTime=time.time()
		# err_msg=commands[1]
		# return True,err_msg,self.freq
		# else:
		# self.freq=-1.0
		# err_msg='Communication Error with synth'
		# return False,err_msg,self.freq
		else:
		self.freq=-1.0
		err_msg='Communication Error with synth'
		return err_msg,self.freq
		err_msg=msg
		return False,err_msg,self.freq


		def readStatus(self):
		'''
		@@ -146,6 +164,18 @@ class CommandLine:
		def rfOff(self):
		pass

		def command(self,cmd):
		msg=""
		if self.check():
		try:
		self.sock.sendall(cmd)
		except socket.error,msg:
		self.close()
		return False,msg
		return True,msg
		else:
		return False,"connection is not available"

		def query(self,cmd):
		msg=""
		if self.check():
		@@ -153,21 +183,18 @@ class CommandLine:
		self.sock.sendall(cmd+'\n++read\n')
		except socket.error,msg:
		self.close()
		exc=CommandLineError(msg);
		raise exc
		return False,msg
		try:
		msg=self.sock.recv(1024)
		except socket.error,msg:
		self.close()
		exc=CommandLineError(msg);
		raise exc
		return False,msg
		if len(msg)==0:
		self.sock.close()
		raise CommandLineError("disconnection from remote side");
		return msg
		self.close()
		return False,"disconnection from remote side"
		return True,msg
		else:
		exc=CommandLineError("connection is not available");
		raise exc
		return False,"connection is not available"

Noto/Servers/NotoPyLocalOscillator/src/NotoLocalOscillatorImpl/NotoLocalOscillator.py

+22 −23

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ class NotoLocalOscillator(Receivers__POA.LocalOscillator, CharacteristicComponen
		try:
		self.cl.configure(IP,PORT)
		except CommandLineError as ex:
		msg="cannot get synthesiser IP %s with message %s" %(IP,ex.__str__)
		msg="cannot connect to synthesiser, IP %s, error message is %s" %(IP,ex.__str__)
		exc=ComponentErrorsImpl.SocketErrorExImpl()
		exc.setData('Reason',msg)
		raise exc
		@@ -117,34 +117,33 @@ class NotoLocalOscillator(Receivers__POA.LocalOscillator, CharacteristicComponen
		addProperty(self, 'isLocked', devio_ref=GenericDevIO(value=1))

		def set(self,rf_power,rf_freq):
		try:
		self.cl.setFrequency(rf_freq)
		except CommandLineError as ex:
		msg="cannot set frequency with message %s" % (ex.__str__)
		exc=ReceiversErrorsImpl.SynthetiserErrorExImpl()
		exc.setData('Details',msg);
		raise exc.getReceiversErrorsEx()
		try:
		self.cl.setPower(rf_power)
		except CommandLineError as ex:
		msg="cannot set power with message %s" % (ex.__str__)
		exc=ReceiversErrorsImpl.SynthetiserErrorExImpl()
		exc.setData('Details',msg);
		raise exc.getReceiversErrorsEx()
		res,msg=self.cl.setFrequency(rf_freq)
		if not res:
		ex=ReceiversErrorsImpl.SynthetiserErrorExImpl()
		ex.setData('Details',msg);
		raise ex.getReceiversErrorsEx()
		res,msg=self.cl.setPower(rf_power)
		if not res:
		ex=ReceiversErrorsImpl.SynthetiserErrorExImpl()
		ex.setData('Details',msg);
		raise ex.getReceiversErrorsEx()
		userLogger.logNotice("Synthesiser set to %f MHz at power %f dBm\n"%(rf_freq,rf_power))

		def get(self):
		txt=""
		power=0.0
		freq=0.0
		try:
		txt,power=self.cl.getPower()
		txt,freq=self.cl.getFrequency()
		except CommandLineError as ex:
		msg="cannot get readout values with message %s" % (ex.__str__)
		exc=ReceiversErrorsImpl.SynthetiserErrorExImpl()
		exc.setData('Details',msg);
		raise exc.getReceiversErrorsEx()
		res=True
		res,txt,power=self.cl.getPower()
		if not res:
		ex=ReceiversErrorsImpl.SynthetiserErrorExImpl()
		ex.setData('Details',txt)
		raise ex.getReceiversErrorsEx()
		res,txt,freq=self.cl.getFrequency()
		if not res:
		ex=ReceiversErrorsImpl.SynthetiserErrorExImpl()
		ex.setData('Details',txt)
		raise ex.getReceiversErrorsEx()
		return (power,freq)

		def rfon(self):

Noto/Servers/NotoPyLocalOscillator/src/NotoLocalOscillatorImpl/devios.py

+15 −16

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ from math import fabs
		from NotoLocalOscillatorImpl import CommandLine
		from NotoLocalOscillatorImpl import CommandLineError
		from IRAPy import logger

		import ReceiversErrorsImpl

		SYNTH_TOLLERANCE = 1.

		@@ -25,13 +25,12 @@ class amplitudeDevIO(DevIO):
		def read(self):
		txt=""
		self.value=0.0
		try:
		txt,self.value=self.cl.getPower()
		except CommandLineError as ex:
		msg="cannot get readout values with message %s" % (ex.__str__)
		exc=ComponentErrors.IRALibraryResourceExImpl()
		exc.setData('Description',msg);
		raise exc.getComponentErrorsEx()
		res=True
		res,txt,self.value=self.cl.getPower()
		if not res:
		ex=ReceiversErrorsImpl.SynthetiserErrorExImpl()
		ex.setData('Details',txt)
		raise ex
		return self.value

		def write(self, value):
		@@ -45,15 +44,15 @@ class frequencyDevIO(DevIO):
		def read(self):
		txt=""
		self.value=0.0
		try:
		txt,self.value=self.cl.getFrequency()
		except CommandLineError as ex:
		msg="cannot get values readout with message %s" % (ex.__str__)
		exc=ComponentErrors.IRALibraryResourceExImpl()
		exc.setData('Description',msg);
		raise exc.getComponentErrorsEx()
		res=True
		res,txt,self.value=self.cl.getFrequency()
		if not res:
		ex=ReceiversErrorsImpl.SynthetiserErrorExImpl()
		ex.setData('Details',txt)
		raise ex
		return self.value


		def write(self, value):
		pass