Merge branch 'master' into fix-issue-655 (f46a2148) · Commits · INAF / DISCOS

CHANGELOG.md

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -97,7 +97,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/

	## [next release]		## [next release]
	## Added		## Added
	issue 655 - ACU Component for Noto and Medicina is now capble to prevent seldom mode changes coming from ACU reset		issue #655 - ACU Component for Noto and Medicina is now capble to prevent seldom mode changes coming from ACU reset
			issue #653 - added a couple of scriptsto ease vnc conection from remote a file copying. The scripts support
			linux and macos
	## Fixed		## Fixed
	issue #448 - Added Sky Offsets to calibration tool client		issue #448 - Added Sky Offsets to calibration tool client
	issue #585 - Fixed misshandled schedule with NULL as backend (Dry Run)		issue #585 - Fixed misshandled schedule with NULL as backend (Dry Run)

Common/Interfaces/CommonInterface/include/AntennaModule.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,7 @@ public:
	frame=Antenna::ANT_LGROUP;		frame=Antenna::ANT_LGROUP;
	return true;		return true;
	}		}
	else if (strcasecmp(str,"UNDEF")==0) {		else if (strcasecmp(str,"NULL")==0) {
	frame=Antenna::ANT_UNDEF_FRAME;		frame=Antenna::ANT_UNDEF_FRAME;
	return true;		return true;
	}		}
	@@ -129,7 +129,7 @@ public:
	return "LGRP";		return "LGRP";
	}		}
	else { //if (frame==Antenna::ANT_UNDEF_FRAME) {		else { //if (frame==Antenna::ANT_UNDEF_FRAME) {
	return "UNDEF";		return "NULL";
	}		}
	};		};

	@@ -146,7 +146,7 @@ public:
	frame=Antenna::ANT_REDSHIFT;		frame=Antenna::ANT_REDSHIFT;
	return true;		return true;
	}		}
	else if (strcasecmp(str,"UNDEF")==0) {		else if (strcasecmp(str,"NULL")==0) {
	frame=Antenna::ANT_UNDEF_DEF;		frame=Antenna::ANT_UNDEF_DEF;
	return true;		return true;
	}		}
	@@ -166,7 +166,7 @@ public:
	return "Z";		return "Z";
	}		}
	else { // if (frame==Antenna::ANT_UNDEF_DEF) {		else { // if (frame==Antenna::ANT_UNDEF_DEF) {
	return "UNDEF";		return "NULL";
	}		}
	};		};
	};		};

Common/Libraries/IRALibrary/src/IRAPy/Connection.py

0 → 100644

+45 −0

Original line number	Original line	Diff line number	Diff line
			# Author:
			# Giuseppe Carboni, <giuseppe.carboni@inaf.it>

			import socket
			import time
			from contextlib import contextmanager

			import ComponentErrorsImpl


			class Connection(object):
			"""This class implements a contextmanager for a socket.
			Usage example:

			with Connection(('127.0.0.1', 10000)) as s:
			s.sendall('COMMAND\n')
			answer = s.recv(1024)

			:param: address, a tuple containing IP address and PORT for the socket
			:param: timeout, connection timeout, in seconds
			"""

			def __init__(self, address, timeout=2):
			self.address = address

			def __enter__(self):
			self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
			connected = 1
			t0 = time.time()
			while time.time() - t0 < timeout:
			connected = self.s.connect_ex(self.address)
			if connected == 0:
			break
			time.sleep(0.01)
			if connected:
			reason = 'Could not reach the device!'
			from IRAPy import logger
			logger.logError(reason)
			exc = ComponentErrorsImpl.SocketErrorExImpl()
			exc.setData('Reason', reason)
			raise exc
			return self.s

			def __exit__(self, type, value, traceback):
			self.s.close()

Common/Libraries/IRALibrary/src/IRAPy/init.py

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,10 +6,12 @@ C{from IRAPy import logger}
	list of modules:		list of modules:
	- customlogging: custom logging functionalities to replace standard logging		- customlogging: custom logging functionalities to replace standard logging
	- bsqueue: BoundedSortedQueue class implements a priority queue structure		- bsqueue: BoundedSortedQueue class implements a priority queue structure
			- Connection: Connection class implements a contextmanager for a socket

	"""		"""
	import customlogging		import customlogging
	import ACSLog		import ACSLog
			import Connection

	#Some comments required here. The custom logger mechanism is not working in python.		#Some comments required here. The custom logger mechanism is not working in python.
	#do the way to separate the system logs to the ones do be shown to the user is to use different		#do the way to separate the system logs to the ones do be shown to the user is to use different

Common/Servers/FitsWriter/include/SummarySchema.h

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -36,24 +36,24 @@
	#define SCHEMA_HEADER_ENTRY21 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"FITSVER","FITS version" )		#define SCHEMA_HEADER_ENTRY21 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"FITSVER","FITS version" )
	#define SCHEMA_HEADER_ENTRY22 ( 0, _FILE_LONG_TYPE,_FILE_SINGLE_ENTRY,"NUSEBAND","Number of sections" )		#define SCHEMA_HEADER_ENTRY22 ( 0, _FILE_LONG_TYPE,_FILE_SINGLE_ENTRY,"NUSEBAND","Number of sections" )
	#define SCHEMA_HEADER_ENTRY23 ( 0, _FILE_DOUBLE_TYPE,_FILE_MULTI_ENTRY,"FREQRESOL","Frequency resolution of the Nth section (MHz)" )		#define SCHEMA_HEADER_ENTRY23 ( 0, _FILE_DOUBLE_TYPE,_FILE_MULTI_ENTRY,"FREQRESOL","Frequency resolution of the Nth section (MHz)" )
	#define SCHEMA_HEADER_ENTRY24 ( 0, _FILE_DOUBLE_TYPE,_FILE_MULTI_ENTRY,"RESTFREQ","Rest frequency of the Nth setcion (MHz)" )		#define SCHEMA_HEADER_ENTRY24 ( 0, _FILE_DOUBLE_TYPE,_FILE_MULTI_ENTRY,"RESTFREQ","Rest frequency of the Nth section (MHz)" )
	#define SCHEMA_HEADER_ENTRY25 ( 0, _FILE_DOUBLE_TYPE,_FILE_MULTI_ENTRY,"FREQ","Start frequency of the Nth section(MHz)" )		#define SCHEMA_HEADER_ENTRY25 ( 0, _FILE_DOUBLE_TYPE,_FILE_MULTI_ENTRY,"FREQ","Start frequency of the Nth section(MHz)" )
	#define SCHEMA_HEADER_ENTRY26 ( 0, _FILE_DOUBLE_TYPE,_FILE_MULTI_ENTRY,"BWID","Bandwidth of the Nth section (MHz)" )		#define SCHEMA_HEADER_ENTRY26 ( 0, _FILE_DOUBLE_TYPE,_FILE_MULTI_ENTRY,"BWID","Bandwidth of the Nth section (MHz)" )
	#define SCHEMA_HEADER_ENTRY27 ( 0, _FILE_LONG_TYPE,_FILE_MULTI_ENTRY,"FREQBINS","Number of spectral bins of the Nth section" )		#define SCHEMA_HEADER_ENTRY27 ( 0, _FILE_LONG_TYPE,_FILE_MULTI_ENTRY,"FREQBINS","Number of spectral bins of the Nth section" )
	#define SCHEMA_HEADER_ENTRY28 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"VRAD","Radial velocity" )		#define SCHEMA_HEADER_ENTRY28 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"VRAD","Radial velocity" )
	#define SCHEMA_HEADER_ENTRY29 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"VFRAME","Radial velocity reference frame" )		#define SCHEMA_HEADER_ENTRY29 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"VFRAME","Radial velocity reference frame" )
	#define SCHEMA_HEADER_ENTRY30 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"VDEF","Radial velocity definition" )		#define SCHEMA_HEADER_ENTRY30 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"VDEF","Radial velocity definition" )
	#define SCHEMA_HEADER_ENTRY31 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"DATE-OBS","Observation time" )		#define SCHEMA_HEADER_ENTRY31 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"DATE-OBS","Observation time (YYYY-MM-DDThh:mm:ss.sss UT)" )
	#define SCHEMA_HEADER_ENTRY32 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"PINAME","Name if the PI of the project" )		#define SCHEMA_HEADER_ENTRY32 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"PINAME","Name if the PI of the project" )
	#define SCHEMA_HEADER_ENTRY33 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"WCSNAME","Astronomical basis frame" )		#define SCHEMA_HEADER_ENTRY33 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"WCSNAME","Astronomical basis frame" )
	#define SCHEMA_HEADER_ENTRY34 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"SCANDIR","(Optional) scan direction" )		#define SCHEMA_HEADER_ENTRY34 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"SCANDIR","(Optional) scan direction" )
	#define SCHEMA_HEADER_ENTRY35 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"DUTYCYC","(Optional) On-Off-Cal duty cycle" )		#define SCHEMA_HEADER_ENTRY35 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"DUTYCYC","(Optional) On-Off-Cal duty cycle" )
	#define SCHEMA_HEADER_ENTRY36 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"USRFRAME","Description of the user frame" )		#define SCHEMA_HEADER_ENTRY36 ( 0, _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"USRFRAME","Description of the user frame" )
	#define SCHEMA_HEADER_ENTRY37 ( 0, _FILE_STRING_TYPE,_FILE_MULTI_ENTRY,"POLATYPE","LCP, RCP, HLP, VLP, stokes type of the Nth section" )		#define SCHEMA_HEADER_ENTRY37 ( 0, _FILE_STRING_TYPE,_FILE_MULTI_ENTRY,"POLATYPE","LCP, RCP, HLP, VLP, stokes type of the Nth section" )
	#define SCHEMA_HEADER_ENTRY38 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"XMINDEG","Scan start x coordinate (degree, optional)")		#define SCHEMA_HEADER_ENTRY38 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"XMINDEG","Scan start x coordinate (deg, optional)")
	#define SCHEMA_HEADER_ENTRY39 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"XMAXDEG","Scan end x coordinate (degree, optional)" )		#define SCHEMA_HEADER_ENTRY39 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"XMAXDEG","Scan end x coordinate (deg, optional)" )
	#define SCHEMA_HEADER_ENTRY40 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"YMINDEG","Scan start y coordinate (degree, optional)" )		#define SCHEMA_HEADER_ENTRY40 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"YMINDEG","Scan start y coordinate (deg, optional)" )
	#define SCHEMA_HEADER_ENTRY41 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"YMAXDEG","Scan end y coordinate (degree, optional)" )		#define SCHEMA_HEADER_ENTRY41 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"YMAXDEG","Scan end y coordinate (deg, optional)" )
	#define SCHEMA_HEADER_ENTRY42 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"SCANOFF","Scan offset (deg)" )		#define SCHEMA_HEADER_ENTRY42 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"SCANOFF","Scan offset (deg)" )
	#define SCHEMA_HEADER_ENTRY43 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"SCANLEN","Scan span (deg)" )		#define SCHEMA_HEADER_ENTRY43 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"SCANLEN","Scan span (deg)" )
	#define SCHEMA_HEADER_ENTRY44 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"SCANSTART","Scan start (deg)" )		#define SCHEMA_HEADER_ENTRY44 ( 0, _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"SCANSTART","Scan start (deg)" )