Commit 55623866 authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Merge branch 'master' into stable

parents 11852857 6ee94f3b

.gitignore

+38 −0
Original line number Diff line number Diff line
@@ -5,3 +5,41 @@ lib/ 
object/

*~

*.swp



# Files generated by the building process

Common/Clients/CaltoolClient/src/calibrationtool_ui.py

Common/Clients/CaltoolClient/src/calibrationtool_ui.pye

Common/Errors/AntennaErrors/idl/AntennaErrors.idl

Common/Errors/BackendsErrors/idl/BackendsErrors.idl

Common/Errors/ClientErrors/idl/ClientErrors.idl

Common/Errors/ComponentErrors/idl/ComponentErrors.idl

Common/Errors/ManagementErrors/idl/ManagementErrors.idl

Common/Errors/MetrologyErrors/idl/ACSErrTypeFPGACommunication.idl

Common/Errors/MetrologyErrors/idl/ACSErrTypeFPGAConnection.idl

Common/Errors/MinorServoErrors/idl/MinorServoErrors.idl

Common/Errors/ParserErrors/idl/ParserErrors.idl

Common/Errors/ReceiversErrors/idl/DerotatorErrors.idl

Common/Errors/ReceiversErrors/idl/ReceiversErrors.idl

Common/Errors/XBackendErrors/idl/XBackendsErrors.idl

Common/Interfaces/AntennaInterface/idl/AntennaBoss.idl

Common/Interfaces/AntennaInterface/idl/Moon.idl

Common/Interfaces/AntennaInterface/idl/Mount.idl

Common/Interfaces/AntennaInterface/idl/OTF.idl

Common/Interfaces/AntennaInterface/idl/Observatory.idl

Common/Interfaces/AntennaInterface/idl/SkySource.idl

Common/Interfaces/CommonInterface/idl/AntennaDefinitions.idl

Common/Interfaces/CommonInterface/idl/BackendsDefinitions.idl

Common/Interfaces/CommonInterface/idl/ManagmentDefinitions.idl

Common/Interfaces/CommonInterface/idl/MinorServoDefinitions.idl

Common/Interfaces/CommonInterface/idl/ReceiversDefinitions.idl

Common/Interfaces/ManagmentInterface/idl/CustomLogger.idl

Common/Interfaces/ReceiversInterface/idl/DewarPositionerDefinitions.idl

Common/Interfaces/XBackendInterface/idl/XBackends.idl

Common/Misc/PMUpdate/src/PMUpdate_gui.py

Noto/Errors/NotoActiveSurfaceErrors/idl/ASErrors.idl

Noto/Interfaces/NotoActiveSurfaceInterface/idl/NotoActiveSurfaceBoss.idl

SRT/Clients/SRTActiveSurfaceGUIClient/include/SRTActiveSurfaceGUI.h

SRT/Clients/SRTActiveSurfaceGUIClient/src/moc_SRTActiveSurfaceCore.cpp

SRT/Clients/SRTActiveSurfaceGUIClient/src/moc_SRTActiveSurfaceGUIui.cpp

SRT/Errors/SRTActiveSurfaceErrors/idl/ASErrors.idl

SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.idl

CHANGELOG.md

+37 −4
Original line number Diff line number Diff line
@@ -4,16 +4,49 @@ All notable changes to this project will be documented in this file. 
The format is based on [Keep a Changelog](http://keepachangelog.com/)

and this project adheres to [Semantic Versioning](http://semver.org/



## [Unreleased]

## [discos1.0] 07-11-2018

### Added

	

	issue #261 - Added startup procedure scripts also for Noto and Medicina. The startup command is 

	'discos --start'. Also command line scripts are now avialble 'discosup' and 'discosdown'. The console

	can be start with 'discosConsole --start'. 

	

	issue #325 - added command 'dmed=config' to control the Medicina DMed (IF distributor). The device just 

	allows to setup a set of programmable attenuators in order to control the singal levels. config select

	which configuration to apply between a set of predefined one.

	

	issue #323 - The metClient moved to common part as it is now the general cleint for weather stations. 

	Also the autopark wind threshld is now read from confiugration and not hardcoded.



	issue #324 - full support for CHC receiver at Medicina telescope now added.The receiver will be available

	under two diffent configurations: 1.2 GHz and 150MHz bandwidth. The respective setup are achived by issueing

	the following procedures "SETUPCHC" and "SETUPCHCL".  



	issue #361 - written the PyCalMux component and integrated into the Noto line. Station procedures now execute

	the `calmux=<configuration>` script in order to commute to the TotalPower noise calibration channel.



	issue #368 - added a `calmux` command to the OperatorInput commands list. Internally it calls the `setup`

	method of the PyCalmux component.



	issue #369 - Now the Noto StationProcedures performs a default setup to the CalMux device letting it set the

	calibration noise mark coming from TotalPower as the default one.



### Changed



### Fixed 

	issue #316 - several related commits. The operation releated to the Medicina K band receivers now relys on a

	new componet which is derived directly form the SRT one. larg part of the code is shared between the two

	servants.

	

- InjectCommand blocks if the system is down @aorlati

	issue #301 - Noto Weather station has now Generic interface. in this way the MeteoClient can be used in Noto

	as wll as Medicina and SRT.



### Fixed 



## 

	issue #366 - Now the PyCalmux component is kept alive after it gets instanced for the first time in order to

	avoid setting the default values to the controlled device every time the component is retrieved from some

	outside code/program.



	issue #367 - The PyCalmux component now uses a smarter way to open a socket to the CalMux device in order to

	avoid raising unwanted socket errors.



##

Common/Clients/CaltoolClient/src/calibrationtoolclient.py

+6 −0
Original line number Diff line number Diff line 
#! /usr/bin/env python

# -*- coding: utf-8 -*-

from Acspy.Clients.SimpleClient import PySimpleClient

import Acspy.Common.Err

import maciErrType
@@ -285,6 +286,11 @@ class Application(Qt.QDialog,calibrationtool_ui.Ui_CalibrationToolDialog): 
		self.thread.run=False  

                try:

 		     self.simpleClient.releaseComponent(self.componentname)

 		     self.simpleClient.releaseComponent(self.scheduler._get_name())

 		     self.simpleClient.releaseComponent(self.boss._get_name())

     





		     self.simpleClient.disconnect()

                except Exception,ex:

                      print "exception"