Porting stable into master (132a6d20) · Commits · INAF / DISCOS

.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

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"

Common/Servers/Sardara/include/CommandLine.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -485,7 +485,7 @@ private:

		ContainerServices* m_services;
		Backends::TotalPower_var m_totalPower;
		Receivers::GenericIFDistributor_var m_ifDistributor;
		//Receivers::GenericIFDistributor_var m_ifDistributor;

		/**
		* List the fields of the backend status

Common/Servers/Sardara/src/CommandLine.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ void CCommandLine::Init(CConfiguration *config) throw (ComponentErrors::SocketEr
		throw Impl;
		}

		m_ifDistributor = Receivers::GenericIFDistributor::_nil();
		/*m_ifDistributor = Receivers::GenericIFDistributor::_nil();
		try {
		m_ifDistributor = m_services->getComponent<Receivers::GenericIFDistributor>("RECEIVERS/SRTIFDistributor");
		}
		@@ -148,7 +148,7 @@ void CCommandLine::Init(CConfiguration *config) throw (ComponentErrors::SocketEr
		_ADD_BACKTRACE(ComponentErrors::CouldntGetComponentExImpl,Impl,ex,"CCommadLine::Init()");
		Impl.setComponentName("RECEIVERS/SRTIFDistributor");
		throw Impl;
		}
		}*/

		char *Station;
		IRA::CString cStation;
		@@ -519,7 +519,7 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const
		}
		ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"TOTALPOWER_FILTER_CONFIGURED %ld,FILTER=%lf",inputId,filter));
		}
		if ((m_SL00==true \|\| m_SL00S==true) && m_stationSRT == true) {
		/*if ((m_SL00==true \|\| m_SL00S==true) && m_stationSRT == true) {
		try {
		if (newBW==128.00) {
		m_ifDistributor->setup("BW-NARROW");
		@@ -542,7 +542,7 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const
		_EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setAttenuation()");
		impl.log(LM_ERROR);
		}
		}
		}*/
		}
		}
		catch (...) {
		@@ -773,10 +773,10 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C
		m_inputsNumber=m_sectionsNumber;
		m_SL00=true;
		m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false;
		if (m_stationSRT == true) {
		/*if (m_stationSRT == true) {
		m_ifDistributor->setup("BW-UNFILTERED");
		ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_BW-UNFILTERED_CONFIGURED"));
		}
		}*/
		}
		if (config.Compare("SP00")==0) {
		m_filter = 730.0;
		@@ -825,10 +825,10 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C
		m_sectionsNumber=m_sectionsNumber/2;
		m_SL00S=true;
		m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SP00S=false;
		if (m_stationSRT == true) {
		/*if (m_stationSRT == true) {
		m_ifDistributor->setup("BW-UNFILTERED");
		ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_BW-UNFILTERED_CONFIGURED"));
		}
		}*/
		}
		if (config.Compare("SP00S")==0) {
		m_filter = 730.0;

Common/Servers/Scheduler/src/Core.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors::
		// no range checks because * is allowed
		m_parser->add("skydip",new function3<CCore,non_constant,void_type,I<elevation_type<rad,false> >,I<elevation_type<rad,false> >,I<interval_type> >(this,&CCore::skydip),3);
		m_parser->add("agc","_tp_agc",2,"NONE");
		m_parser->add("ifd","_ifd",1,"SRT");
		// m_parser->add("ifd","_ifd",1,"SRT");
		m_parser->add("calmux","_calmux",1);
		m_parser->add("dmed","_dmed",1,"Medicina");
		m_parser->add("restFrequency",new function1<CCore,non_constant,void_type,I<doubleSeq_type> >(this,&CCore::_setRestFrequency),1);