Commit 18eca172 authored by SRT Operator's avatar SRT Operator
Browse files

Patch for new synth

parent 638992c0

Common/Servers/LocalOscillator/src/LocalOscillatorImpl.cpp

+3 −2
Original line number Diff line number Diff line
@@ -181,9 +181,9 @@ void LocalOscillatorImpl::set(CORBA::Double rf_ampl, CORBA::Double rf_freq) thro 
         CUSTOM_LOG(LM_FULL_INFO,"LocalOscillatorImpl::set()",(LM_NOTICE,"SYNTHESIZER SET to freq: %f power:%f ",rf_freq,rf_ampl));





 		 m_freq=rf_freq;

 		 m_freq=rf_freq*MULTIPLY;

 		 m_ampl=rf_ampl;



			 cout <<"AAA:"<< m_ampl<< endl;

 		 } catch (GPIBException& ex)

 		 {

 			CUSTOM_LOG(LM_FULL_INFO,"LocalOscillatorImpl::set()",(LM_DEBUG,"LocalOscillatorImpl::set() %s",ex.what()));
@@ -206,6 +206,7 @@ void LocalOscillatorImpl::get(CORBA::Double& rf_ampl, CORBA::Double& rf_freq) th 
 	{

     		CSecAreaResourceWrapper<CommandLine> line=m_commandLine->Get();

 	 		line->getFreq(rf_freq); // get frequency

//                        rf_freq=rf_freq/MULTIPLY;

 	 		line->getPower(rf_ampl); // get  amplitude

 	        CUSTOM_LOG(LM_FULL_INFO,"LocalOscillatorImpl::get()",(LM_NOTICE,"SYNTHESIZER READ freq: %f power:%f ",rf_freq,rf_ampl));

Common/Servers/LocalOscillator/src/testCommandLine.cpp

+5 −5
Original line number Diff line number Diff line
@@ -13,25 +13,25 @@ int main(int argv, char** argc) 
	double freq;



	try{

		cl->configure(0,19,0,T10s,1,0);

		cl->configure(1,20,0,T10s,1,0);

//		cout <<"configured" <<endl;

		cl->query("*IDN?",reply);

		cout << "sent *IDN?" << endl;



		cl->query("SYST:ERR?",reply);

                cout <<reply.c_str() << endl;

                cout << "sent UNIT:FREQ Mhz" << endl;

//                cout << "sent UNIT:FREQ Mhz" << endl;

//                cl->sendCMD("UNIT:FREQ khz ");

//                cout << "sent UNIT:FREQ?" << endl;

                cl->query("UNIT:FREQ?",reply);

                cout <<reply.c_str() << endl;

//                cl->query("UNIT:FREQ?",reply);

//                cout <<reply.c_str() << endl;







//		cl->sendCMD("*RST");

//		cl->query("SYST:ERR?",reply);



//		cl->setFreq(10000);// set 10000 MHz.

////		cl->setFreq(10000);// set 10000 MHz.

//		cl->query("SYST:ERR?",reply);

//		cout <<reply.c_str() << endl;

Common/Servers/LocalOscillator/src/CommandLine.cpp

+1 −1

File changed.

Contains only whitespace changes.