Commit c214e55e authored by SRT Operator's avatar SRT Operator
Browse files

some changes in Receievers boss tui

parent 9ed7c82a

Common/Clients/ReceiversBossTextClient/src/ReceiversBossTextClient.cpp

+7 −4
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ int main(int argc, char *argv[]) { 
		goto ErrorLabel;

	}

	component=COMPONENT_INTERFACE::_narrow(obj.in());

	ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"OK, reference is: %d",component.ptr()));

	ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"Receivers Boss reference is: %d",component.ptr()));

	ACE_OS::sleep(1);



	try {
@@ -318,13 +318,16 @@ int main(int argc, char *argv[]) { 
		obj=info->reference;

		if (CORBA::is_nil(obj.in())) {

			ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_NOTICE,"Dewar positioner not available"));

			dewar=DEWAR_INTERFACE::_nil();

		}

		else {

			dewar=DEWAR_INTERFACE::_narrow(obj.in());

			ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"Dewar reference is: %d",dewar.ptr()));

		}

	}

	catch(...) {

		ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_NOTICE,"Dewar positioner not available"));

	}

	dewar=DEWAR_INTERFACE::_narrow(obj.in());

	ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"OK, reference is: %d",dewar.ptr()));

	ACE_OS::sleep(1);

	try {

		/* Add all component properties here */
@@ -538,7 +541,7 @@ int main(int argc, char *argv[]) { 
			}

		}

		// automatic update of some controls.

		updateDewar(dewar.out());

		updateDewar(dewar.in());

		//sleep for the required ammount of time

		tv.set(0,MAINTHREADSLEEPTIME*1000);

		client.run(tv);

Common/Clients/ReceiversBossTextClient/src/updateDewar.i

+19 −9
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
#ifndef _UPDATEDEWAR_I_

#define _UPDATEDEWAR_I_



void updateDewar(Receivers::DewarPositioner_ptr& dewar);

void updateDewar(Receivers::DewarPositioner_ptr dewar);



void updateDewar(Receivers::DewarPositioner_ptr& dewar)

void updateDewar(Receivers::DewarPositioner_ptr dewar)

{

	char *corbaStr;

	IRA::CString configuration;

	bool isRewRequired;

	bool isRewRequired,isRewinding;

	double position,iStaticPos,iParPos,dParPos;

	bool isReady;

	Receivers::TDewarPositionerScanInfo_var info;
@@ -27,6 +27,7 @@ void updateDewar(Receivers::DewarPositioner_ptr& dewar) 
			configuration=corbaStr;

			CORBA::string_free(corbaStr);

			isRewRequired=dewar->isRewindingRequired();

			isRewinding=dewar->isRewinding();

			position=dewar->getPosition();

			isReady=dewar->isReady();

			info=dewar->getScanInfo();
@@ -37,14 +38,15 @@ void updateDewar(Receivers::DewarPositioner_ptr& dewar) 
		else {

			configuration="none";

			isRewRequired=false;

			isRewinding=false;

			position=0.0;

			isReady=true;

			iStaticPos=iParPos=dParPos=0;

		}

	}

	catch (...) {

		_EXCPT(ClientErrors::UnknownExImpl,impl,"::Main()");

		_IRA_LOGGUARD_LOG_EXCEPTION(guard,impl,LM_ERROR);

		/*_EXCPT(ClientErrors::UnknownExImpl,impl,"::Main()");

		_IRA_LOGGUARD_LOG_EXCEPTION(guard,impl,LM_ERROR);*/

		return;

	}

	outString="Configuration: "+configuration;
@@ -74,11 +76,19 @@ void updateDewar(Receivers::DewarPositioner_ptr& dewar) 
	extraLabel4->setStyle(TW::CStyle(TW::CColorPair::WHITE_BLACK,0));

	extraLabel4->Refresh();

	if (isRewRequired) {

		if (isRewinding) {

			outString="Rewinding required (rewinding...)";

			extraLabel5->setValue(outString);

			extraLabel5->setStyle(TW::CStyle(TW::CColorPair::YELLOW_BLACK,0));

			extraLabel5->Refresh();

		}

		else { 

			outString="Rewinding required";

			extraLabel5->setValue(outString);

			extraLabel5->setStyle(TW::CStyle(TW::CColorPair::RED_BLACK,0));

			extraLabel5->Refresh();

		}

	}

	else {

		outString="Rewinding not required";

		extraLabel5->setValue(outString);

Common/Servers/DewarPositioner/src/derotatorPosition.py

+8 −2
Original line number Diff line number Diff line 
#!/usr/bin/env python



from Acspy.Clients.SimpleClient import PySimpleClient

from Acspy.Common.TimeHelper import getTimeStamp

from DewarPositioner.posgenerator import PosGenerator

import time



client = PySimpleClient()

latitude = 0.68928288149012062



dp = client.getComponent('RECEIVERS/DewarPositioner')

antenna = client.getComponent('ANTENNA/Boss')



counter = 0



while True:

    position = dp.getPosition()

    print "%d -> %.2f" %(counter, position)

    t = getTimeStamp().value + 1*10*6 # 100 ms in the future

    az, el = antenna.getRawCoordinates(t) # Values in radians

    parallactic = PosGenerator.getParallacticAngle(latitude, az, el)

    print "%d -> %.2f  -- parallactic: %.2f" %(counter, position, parallactic)

    counter += 1

    time.sleep(3)

SRT/Configuration/CDB/alma/AS/Boss/Boss.xml

+3 −2
Original line number Diff line number Diff line
@@ -339,8 +339,9 @@ 
   -   Thu Mar 27 10:53:42 UTC 2014 modified by jDAL

   -   Thu Mar 27 10:56:05 UTC 2014 modified by jDAL

   -   Thu Mar 27 11:32:19 UTC 2014 modified by jDAL

   -   Tue Apr 14 13:42:55 UTC 2015 modified by jDAL

-->

<SRTActiveSurfaceBoss xmlns="urn:schemas-cosylab-com:SRTActiveSurfaceBoss:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" WatchingThreadTime="200000" RepetitionCacheTime="2000000" RepetitionExpireTime="5000000" profile="3">

<SRTActiveSurfaceBoss xmlns="urn:schemas-cosylab-com:SRTActiveSurfaceBoss:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" WatchingThreadTime="200000" RepetitionCacheTime="2000000" RepetitionExpireTime="5000000" profile="0">

	<status />

	<enabled />

	<pprofile />

SRT/Configuration/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml

+7 −0
Original line number Diff line number Diff line
@@ -317,6 +317,13 @@ 
   -   Thu Mar 27 08:48:16 UTC 2014 modified by jDAL

   -   Thu Mar 27 11:13:49 UTC 2014 modified by jDAL

   -   Tue Apr 01 07:44:20 UTC 2014 modified by jDAL

   -   Tue Apr 14 10:25:02 UTC 2015 modified by jDAL

   -   Tue Apr 14 13:28:48 UTC 2015 modified by jDAL

   -   Wed Apr 15 08:26:12 UTC 2015 modified by jDAL

   -   Wed Apr 15 09:19:41 UTC 2015 modified by jDAL

   -   Wed Apr 15 14:31:51 UTC 2015 modified by jDAL

   -   Thu Apr 16 07:40:54 UTC 2015 modified by jDAL

   -   Thu Apr 16 09:06:42 UTC 2015 modified by jDAL

-->

<usd xmlns="urn:schemas-cosylab-com:usd:1.0" sector="1" lan="3" serialAddress="10" cammaLen="8.744388159275005E-308" cammaPos="3.098460999370908E-265" calibrate="0">

	<delay min_value="0" max_value="255" units="512 uSec" default_value="5" description="delay on reply" />