Commit 5c9f50ec authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

Merge pull request #517 from discos/stable 

Hotfix#515 from stable to master
parents 590ce504 8c362d6c

Common/Servers/Scheduler/include/Core.h

+4 −2
Original line number Diff line number Diff line
@@ -68,8 +68,10 @@ public: 
	 * @throw ComponentErrors::TimerErrorExImpl

	 * @throw ComponentErrors::CouldntGetComponentExImpl

	 * @thorw ManagementErrors::ProcedureFileLoadingErrorExImpl

	 * @throw ComponentErrors::UnexpectedExImpl

	*/

	virtual void execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::MemoryAllocationExImpl,ManagementErrors::ProcedureFileLoadingErrorExImpl);

	virtual void execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::MemoryAllocationExImpl,

	  ManagementErrors::ProcedureFileLoadingErrorExImpl,ComponentErrors::UnexpectedExImpl);

	

	/**

	 * This function initializes the core, all preliminary operation are performed here.

Common/Servers/Scheduler/include/Core_Resource.h

+4 −10
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
									m_antennaRTime=new Antenna::TRunTimeParameters; m_antennaRTime->targetName=""; \

									m_antennaRTime->axis=Management::MNG_NO_AXIS; \

									m_servoRunTime=new MinorServo::TRunTimeParameters; m_servoRunTime->scanAxis=""; \

									m_subScanConf.signal=Management::MNG_SIGNAL_NONE;

									m_subScanConf.signal=Management::MNG_SIGNAL_NONE; \

									m_parser=NULL;
@@ -45,13 +46,6 @@ 
					  ACS_LOG(LM_FULL_INFO, "Core::execute()", (LM_INFO,"RECEIVERS_NC_READY")); \

					  m_defaultBackendInstance=m_config->getDefaultBackendInstance(); \

					  m_defaultDataReceiverInstance=m_config->getDefaultDataReceiverInstance(); \

					  try { \

					  	m_parser=new CParser<CCore>(this,10,true);\

					  } \

					  catch (...) { \

						_EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"CCore::execute()"); \

						throw dummy; \

	                  } \

	              if (!m_timer.init()) { \

		                _EXCPT(ComponentErrors::TimerErrorExImpl,dummy,"CCore::initialize()"); \

		                 dummy.setReason("Timer could not be initialized"); \

Common/Servers/Scheduler/include/SchedulerImpl.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public: 
	 * logs the COMPSTATE_OPERATIONAL

	 * @throw ACSErr::ACSbaseExImpl

	*/

	virtual void execute() throw (ACSErr::ACSbaseExImpl);

	virtual void execute();

	

	/** 

	 * Called by the container before destroying the server in a normal situation. This function takes charge of

Common/Servers/Scheduler/src/Core.cpp

+15 −2
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ void CCore::initialize() 
	m_lastWeatherTime=0;

}



void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::MemoryAllocationExImpl,ManagementErrors::ProcedureFileLoadingErrorExImpl)

void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors::CouldntGetComponentExImpl,

  ComponentErrors::MemoryAllocationExImpl,ManagementErrors::ProcedureFileLoadingErrorExImpl,

  ComponentErrors::UnexpectedExImpl)

{

	Antenna::TSiteInformation_var site;

	Antenna::Observatory_var observatory=Antenna::Observatory::_nil();
@@ -51,6 +53,8 @@ void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors:: 
		Impl.setComponentName((const char*)m_config->getObservatoryComponent());

		throw Impl;				

	}

	/*catch (...) {

	}*/

	ACS_LOG(LM_FULL_INFO,"CCore::execute()",(LM_INFO,"OBSERVATORY_LOCATED"));	

	try	{	

		site=observatory->getSiteSummary();  //throw CORBA::SYSTEMEXCEPTION
@@ -72,9 +76,10 @@ void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors:: 
		Impl.setComponentName((const char*)observatory->name());

		throw Impl;

	}

	RESOURCE_EXEC;

	loadCustomLogger(m_customLogger,m_customLoggerError); // throw ComponentErrors::CouldntGetComponentExImpl

	

	RESOURCE_EXEC;



	// spawn schedule executor thread........

	try {

		CCore *tmp=this;
@@ -91,6 +96,14 @@ void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors:: 
	ACS::TimeInterval sleepTime=m_config->getScheduleExecutorSleepTime()*10;

	m_schedExecuter->setSleepTime(sleepTime);



   try {

		m_parser=new CParser<CCore>(this,10,true);\

	}

	catch (...) {

		_EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"CCore::execute()");

		throw dummy;

	}



	//add local commands

	m_parser->add("tsys",new function1<CCore,non_constant,void_type,O<doubleSeq_type> >(this,&CCore::_callTSys),0);

	m_parser->add("wait",new function1<CCore,non_constant,void_type,I<double_type> >(this,&CCore::_wait),1);

Common/Servers/Scheduler/src/Core_Operations.i

+11 −11
Original line number Diff line number Diff line
@@ -523,11 +523,11 @@ void CCore::_fTrack(const char *dev) throw (ComponentErrors::CouldntGetComponent 
		impl.setComponentName(backend->name());

		throw impl;

	}

	for (unsigned t=0;t<bckinputFreq->length();t++) {

	/*for (unsigned t=0;t<bckinputFreq->length();t++) {

		printf("bck freq :%lf\n",bckinputFreq[t]);

		printf("bck bw:%lf\n",bckinputBW[t]);



	}

	}*/

	if (inputSection->length()!=(unsigned)inputs) {

		_EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CCore::_fTrack()");

		impl.setReason("inconsistent data from the backend inputs number");
@@ -535,7 +535,7 @@ void CCore::_fTrack(const char *dev) throw (ComponentErrors::CouldntGetComponent 
	}

	//---------------------------------------------------------------------------------------------------

	//4) info from antenna--------------------------------------------------------------------------------

	printf("RestFrequency : %lf\n",m_restFrequency[0]);

	//printf("RestFrequency : %lf\n",m_restFrequency[0]);

	try {

		m_antennaBoss->getTopocentricFrequency(m_restFrequency,topocentricFreq.out());

	}
@@ -563,7 +563,7 @@ void CCore::_fTrack(const char *dev) throw (ComponentErrors::CouldntGetComponent 
		_EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCore::_fTrack()");

		throw impl;

	}

	for (unsigned t=0;t<topocentricFreq->length();t++) printf("topocentric Freq :%lf\n",topocentricFreq[t]);

	//for (unsigned t=0;t<topocentricFreq->length();t++) printf("topocentric Freq :%lf\n",topocentricFreq[t]);

	// just to make sure the topocentric sequence has the right dimension!

	if (topocentricFreq->length()!=m_restFrequency.length()) {

		topocentricFreq->length(m_restFrequency.length());
@@ -580,7 +580,7 @@ void CCore::_fTrack(const char *dev) throw (ComponentErrors::CouldntGetComponent 
		throw impl;

	}

	IFNumber=IFNumberRO->get_sync(comp.out()); // number of output IFs of the receeever

	printf("if number :%ld\n",IFNumber);

	//printf("if number :%ld\n",IFNumber);

	try {

		m_receiversBoss->getIFOutput(bckinputFeed,bckinputIF,fndoutputFreq.out(),fndoutputBw.out(),fndoutputPol.out(),fndoutputLO.out());

	}
@@ -607,10 +607,10 @@ void CCore::_fTrack(const char *dev) throw (ComponentErrors::CouldntGetComponent 
		impl.setReason("inconsistent data from the receivers if outputs");

		throw impl;

	}

	for (unsigned t=0;t<fndoutputFreq->length();t++) {

	/*for (unsigned t=0;t<fndoutputFreq->length();t++) {

		printf("Frequency :%lf\n",fndoutputFreq[t]);

		printf("BandWidth :%lf\n",fndoutputBw[t]);

	}

	}*/

	//---------------------------------------------------------------------------------------------------

	//5) let's start with some computations  -----------------------------------------------------------------------------

	sectionFreq.length(sections);
@@ -621,16 +621,16 @@ void CCore::_fTrack(const char *dev) throw (ComponentErrors::CouldntGetComponent 
		inputLO[j]=fndoutputLO[j]; //if (device=="BCK")

		if ((device=="ALL") || (device=="LO")) {

			currentSection=inputSection[j];

			printf("currentSection :%ld\n",currentSection);

			//printf("currentSection :%ld\n",currentSection);

			if (topocentricFreq->length()==1) {

				inputLO[j]=IRA::CIRATools::roundNearest(topocentricFreq[0]-bckinputFreq[j]-

						(bckinputBW[j]/2.0),digits);

				printf("inputLO[j] :%lf\n",inputLO[j]);

				//printf("inputLO[j] :%lf\n",inputLO[j]);

			}

			else {

				inputLO[j]=IRA::CIRATools::roundNearest(topocentricFreq[currentSection]-bckinputFreq[j]-

						(bckinputBW[j]/2.0),digits);

				printf("inputLO[j] :%lf\n",inputLO[j]);

				//printf("inputLO[j] :%lf\n",inputLO[j]);

			}

			//lo[bckinputIF[j]]=inputLO[j]; // local oscillator per IFs

		}
@@ -644,7 +644,7 @@ void CCore::_fTrack(const char *dev) throw (ComponentErrors::CouldntGetComponent 
			if (bckinputIF[i]==j) {

				if((lo[j] < 0.0 ) || (inputLO[i] < lo[j])) { // change the local oscillator value if ......

					lo[j] = inputLO[i];

					printf("lo changed: #if: %ld, value: %lf  \n",j,lo[j]);

					//printf("lo changed: #if: %ld, value: %lf  \n",j,lo[j]);

				}

			}

		}