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

Porting latest stable updates into master

parents bd1a7cb4 5bcaba11

CHANGELOG.md

+5 −1
Original line number Original line Diff line number Diff line
@@ -56,11 +56,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 




    issue #402 - Fixed an issue in the ReceiversBossTui that was preventing the UI to find any derotator in the system.

    issue #402 - Fixed an issue in the ReceiversBossTui that was preventing the UI to find any derotator in the system.





## [discos1.0.3]

## [discos1.0.3] 25-10-2019

### Added

### Added

### Changed

### Changed

    issue #454 - Timestamp of the Fits now is referred to the middle of the sample according to all others metadata

    issue #454 - Timestamp of the Fits now is referred to the middle of the sample according to all others metadata

    issue #455 - The SRT Active Surface GUI has been splitted into a management GUI and a user GUI

    issue #455 - The SRT Active Surface GUI has been splitted into a management GUI and a user GUI

    issue #459 - The DiscosConsole layout has been reviewed. The console windows now open without overlapping

    issue #459 - The DiscosConsole layout has been reviewed. The console windows now open without overlapping

    issue #463 - X band receiver pointing model updated

    issue #469 - XBackend initialization and setup procedure improved

    some other minor refinements

### Fixed

### Fixed

    issue #452 - The Total Power component erroneously assigned a timestamp to the samples in case more samples were needed to reach total integration time

    issue #452 - The Total Power component erroneously assigned a timestamp to the samples in case more samples were needed to reach total integration time

    issue #473 - The SRT AS USDs now retry 5 times to communicate with the hardware before setting their state to unavailable

Common/Servers/Refraction/include/RefractionCore.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ public: 
	 * @param waveLen  wave length in meters

	 * @param waveLen  wave length in meters

	 * @param corrected corrected zenith distance

	 * @param corrected corrected zenith distance

	*/

	*/

    void getCorrection(double observed, double waveLen, double *corrected);

    void getCorrection(double observed, double waveLen, double& corrected);





	/**

	/**

	 * This function gets meteo parameters from metrology component every one

	 * This function gets meteo parameters from metrology component every one

Common/Servers/Refraction/src/RefractionCore.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -115,7 +115,7 @@ void CRefractionCore::cleanUp() 
	}

	}

}

}





void CRefractionCore::getCorrection(double obsZenithDistance,double waveLen, double *corZenithDistance)

void CRefractionCore::getCorrection(double obsZenithDistance,double waveLen, double &corZenithDistance)

{

{

	AUTO_TRACE("CRefractionCore::getCorrection()");

	AUTO_TRACE("CRefractionCore::getCorrection()");

	//double elevation;

	//double elevation;
@@ -130,9 +130,9 @@ void CRefractionCore::getCorrection(double obsZenithDistance,double waveLen, dou 
		double tlr = 0.0065;

		double tlr = 0.0065;

		double eps = 1e-8;

		double eps = 1e-8;





		slaRefro(obsZenithDistance, hm, tdk, m_pressure, m_humidity, wl, phi, tlr, eps, corZenithDistance);

		slaRefro(obsZenithDistance, hm, tdk, m_pressure, m_humidity, wl, phi, tlr, eps, &corZenithDistance);

	}

	}

	else *corZenithDistance = (double)0;

	else corZenithDistance = 0.0;

}

}





void CRefractionCore::getMeteoParameters()

void CRefractionCore::getMeteoParameters()

Common/Servers/Refraction/src/RefractionImpl.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,7 @@ void RefractionImpl::getCorrection (CORBA::Double obsZenithDistance,CORBA::Doubl 
    //CSecAreaResourceWrapper<CRefractionCore> resource=m_core->Get();

    //CSecAreaResourceWrapper<CRefractionCore> resource=m_core->Get();





	//resource->getCorrection(obsZenithDistance, &corZenithDistance);	

	//resource->getCorrection(obsZenithDistance, &corZenithDistance);	

	boss->getCorrection(obsZenithDistance,waveLength,&corZenithDistance);

	boss->getCorrection(obsZenithDistance,waveLength,corZenithDistance);

}

}





/* --------------- [ MACI DLL support functions ] -----------------*/

/* --------------- [ MACI DLL support functions ] -----------------*/

Common/Servers/Sardara/src/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ LIBRARIES_L = 
SardaraImpl_OBJECTS = SardaraImpl Configuration CommandLine SenderThread ControlThread

SardaraImpl_OBJECTS = SardaraImpl Configuration CommandLine SenderThread ControlThread

SardaraImpl_LIBS = IRALibrary GenericBackendStubs SardaraStubs TotalPowerStubs ManagmentDefinitionsStubs ReceiversDefinitionsStubs BackendsDefinitionsStubs bulkDataStubs bulkDataSenderStubs GenericIFDistributorStubs\

SardaraImpl_LIBS = IRALibrary GenericBackendStubs SardaraStubs TotalPowerStubs ManagmentDefinitionsStubs ReceiversDefinitionsStubs BackendsDefinitionsStubs bulkDataStubs bulkDataSenderStubs GenericIFDistributorStubs\

  bulkDataReceiverStubs ACSBulkDataError ComponentErrors BackendsErrors ParserErrors ManagementErrors \

  bulkDataReceiverStubs ACSBulkDataError ComponentErrors BackendsErrors ParserErrors ManagementErrors \

  DiscosBackendProtocolLib

  DiscosBackendProtocolLib DiscosVersion





#

#

# <brief description of lllll library>

# <brief description of lllll library>