Commit 7557336f authored by TheDebbio's avatar TheDebbio
Browse files

added lo2 comp/cont

parent 04da624a

Medicina/Configuration/CDB/MACI/Components/RECEIVERS/LO2/LO2.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<!--

   - History:

   -   

-->

<Component xmlns="urn:schemas-cosylab-com:Component: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"

              

	Name="LO"

	Code="MedicinaLocalOscillatorImpl.MedicinaLocalOscillator"

	Type="IDL:alma/Receivers/LocalOscillator:1.0"

	Container="LocalOscillatorContainer2"

	KeepAliveTime="10"

	Default="true"

   ImplLang="py"

/>

Medicina/Configuration/CDB/MACI/Containers/LocalOscillatorContainer2/LocalOscillatorContainer2.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- 

 *  Author Infos

 *  ============

 *  Name:         Andrea Orlati

 *  E-mail:       andrea.orlati@inaf.it

-->

<Container xmlns="urn:schemas-cosylab-com:Container:1.0"

           xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" 

           xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 

           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

           xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0" 

           Timeout="30.0"

           UseIFR="true"

           ManagerRetry="10"

           ImplLang="py"

           Recovery="false">



    <Autoload>

        <cdb:_ string="baci" />

    </Autoload>



    <LoggingConfig 

		centralizedLogger="Log"

		minLogLevel="5"

		minLogLevelLocal="5"

		dispatchPacketSize="0"

		immediateDispatchLevel="8"

		flushPeriodSeconds="1"

	>

    </LoggingConfig>



</Container>

Medicina/Servers/MedicinaCBand/src/Configuration.cpp

+2 −0
Original line number Diff line number Diff line
@@ -94,12 +94,14 @@ void CConfiguration::init(maci::ContainerServices *Services) 
	_GET_DWORD_ATTRIBUTE("RepetitionCacheTime","Log repetition filter, caching time (uSec):",m_repetitionCacheTime,"");

	_GET_DWORD_ATTRIBUTE("RepetitionExpireTime","Log repetition filter, expire time (uSec):",m_repetitionExpireTime,"");	

	/** TEST */

	fprintf(stderr, "---- CONF ----" );

	fprintf(stderr, "LO 1st %s \n", (const char*)m_localOscillatorInstance1st);

	fprintf(stderr, "LO 1st %s \n", (const char*)m_localOscillatorInstance2nd);

	fprintf(stderr, "LNA address %S \n", (const char*)m_LNAIPAddress);

	fprintf(stderr, "LNA port %u \n", m_LNAPort);

	fprintf(stderr, "Dewar address %S \n", (const char*)m_dewarIPAddress);

	fprintf(stderr, "Dewar port %u \n", m_dewarPort);

	fprintf(stderr, "---- * ----" );

	/* END TEST */	

	/* Get available configurations, access every conf file, filling associated parameters struct */	

	const std::vector<ReceiverConfHandler::ConfigurationName> l_available_confs= m_conf_hnd.getAvailableConfs();

Medicina/Servers/MedicinaCBand/src/MixerOperator.cpp

+9 −9
Original line number Diff line number Diff line
@@ -171,14 +171,14 @@ bool MixerOperator::isLocked() 


/* *** PRIVATE *** */



void MixerOperator::loadDevice(Receivers::LocalOscillator_var p_loDev, const char * p_lo_name){



	

void MixerOperator::loadDevice(Receivers::LocalOscillator_var p_loDev, const char * p_lo_name)

{	

    if ((!CORBA::is_nil(p_loDev)) && (m_mixer_fault)) { // if reference was already taken, but an error was found....dispose the reference

        #ifndef EXCLUDE_MIXER

            try {

                releaseComponents();

        }catch (...) { //dispose silently...if an error...no matter

            }catch (...) { 

                //dispose silently...if an error...no matter

            }

        #endif

        p_loDev= Receivers::LocalOscillator::_nil();