Commit 3461f5f7 authored by Carlo Migoni's avatar Carlo Migoni
Browse files

Merge branch 'latest64' of https://github.com/discos/discos into latest64

parents 99e4b736 7a7531b7

Common/Servers/AntennaBoss/src/BossCore_prepareScan.i

+5 −5
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ Antenna::EphemGenerator_ptr CBossCore::prepareScan( 
				bool result;

				ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"OTF_ON_SECONDARY_TRACK"));

				currentGeneratorFlux=prepareOTFSecondary(useInternals,secondary,secSourceName,secRa,secDec,secLon,secLat,secVrad,secVelFrame,secVelDef,result);

				ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"GENERATORE %u",currentGeneratorFlux.in()));

				ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"GENERATORE %lu",(unsigned long)currentGeneratorFlux.in()));

				if (!result) {

					_EXCPT(AntennaErrors::SecondaryScanErrorExImpl,ex,"CBossCore::prepareScan()");

					throw ex;
@@ -194,7 +194,7 @@ Antenna::EphemGenerator_ptr CBossCore::prepareScan( 
				bool result;

				ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"OTF_ON_LAST_COMMANDED_TRACK"));

				currentGeneratorFlux=prepareOTFSecondary(useInternals,lastPar,secSourceName,secRa,secDec,secLon,secLat,secVrad,secVelFrame,secVelDef,result);

				ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"GENERATORE %u",currentGeneratorFlux.in()));

				ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"GENERATORE %lu",(unsigned long)currentGeneratorFlux.in()));

				if (!result) {

					_EXCPT(AntennaErrors::SecondaryScanErrorExImpl,ex,"CBossCore::prepareScan()");

					throw ex;
@@ -240,12 +240,12 @@ Antenna::EphemGenerator_ptr CBossCore::prepareScan( 
		if (!useInternals) {

			ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"LOADING_REQUIRED_PRIMARY_GENERATOR"));

			currentGenerator=loadPrimaryGenerator(generatorType);

			ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"PRIMARY_GENERATOR_IS: %x",currentGenerator.in()));

			ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"PRIMARY_GENERATOR_IS: %lx",(unsigned long)currentGenerator.in()));

		}

		else {

			ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"LOADING_REQUIRED_INTERNAL_GENERATOR"));

			currentGenerator=loadInternalGenerator(generatorType);

			ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"INTERNAL_GENERATOR_IS: %x",currentGenerator.in()));

			ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"INTERNAL_GENERATOR_IS: %lx",(unsigned long)currentGenerator.in()));

		}

	}

	catch (ACSErr::ACSbaseExImpl& ex) {
@@ -407,7 +407,7 @@ Antenna::EphemGenerator_ptr CBossCore::prepareScan( 
			double roundAz=slaDranrm(m_lastEncoderAzimuth);

			section=tracker->setSubScan(primary.targetName,roundAz,m_lastAzimuthSection,m_lastEncoderElevation,m_lastEncoderRead,primary.otf.lon1,primary.otf.lat1,primary.otf.lon2,primary.otf.lat2,primary.otf.coordFrame,

					primary.otf.geometry,primary.otf.subScanFrame,primary.otf.description,primary.otf.direction,startUT,primary.otf.subScanDuration);

			ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"SECTION_IS: %ld",section));

			ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"SECTION_IS: %d",section));

			if (secondaryActive) {

				copyTrack(lastPar,secondary);

			}

Common/Servers/AntennaBoss/src/Configuration.cpp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
	} \

	else { \

		FIELD=tmpw; \

		ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \

		ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \

	} \

}

Common/Servers/AntennaBoss/src/coordinateGrabber.cpp

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) 
		throw Impl;

	}

	ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_INFO,"GOT_COMPONENENT_ANTENNABOSS"));

	ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_DEBUG,"Reference is: %d",boss.ptr()));

	ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_DEBUG,"Reference is: %ld",(long int)boss.ptr()));

	try {

		info=client.manager()->get_default_component(client.handle(),"IDL:alma/Antenna/Observatory:1.0");

		observatory=Antenna::Observatory::_narrow(info->reference);
@@ -149,7 +149,7 @@ int main(int argc, char *argv[]) 
		throw Impl;

	}

	ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_INFO,"GOT_COMPONENENT_OBSERVATORY"));

	ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_DEBUG,"Reference is: %d",observatory.ptr()));

	ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_DEBUG,"Reference is: %ld",(long int)observatory.ptr()));

	ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_INFO,"ALL_COMPONENTS_RETRIEVED"));

	ACE_OS::sleep(1);	

	try	{