Commit cc2f55f0 authored by Andrea Orlat's avatar Andrea Orlat
Browse files

new Noto configuration, BandaXY replaced with setupXY, second commit

parent becc61f0

Common/Interfaces/ReceiversInterface/config/CDB/schemas/ReceiversModeSetup.xsd

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
	<xs:attribute name="Polarization" type="xs:string" use="required"/>

	<!-- value in MHz of the local oscillator for this configuration (0..IFs)-->

	<xs:attribute name="DefaultLO" type="xs:string" use="required"/>

	<!-- multiplier to the primary sunthetizer, integer value, optional, default 1-->

	<xs:attribute name="LOMultiplier" type="xs:string" use="optional"/>	

	<!-- Local Oscillator fixed conversion (MHz), used to convert to the generator frequency (0..IFs)-->

	<xs:attribute name="FixedLO2" type="xs:string" use="required"/>

	<!-- represent the lower limit of validity range of the local oscillator (MHZ) (0..IFs)-->

Common/Servers/TotalPower/src/CommandLine.cpp

+7 −1
Original line number Diff line number Diff line
@@ -969,7 +969,13 @@ void CCommandLine::setDefaultConfiguration() throw (ComponentErrors::TimeoutExIm 
	else {

		_THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::setDefaultConfiguration()");

	}

	externalCalibrationSwitching(0); // disable the fast cal diode switching bot fro intern and external source 

	try {

		 // disable the fast cal diode switching both from intern and external source

		externalCalibrationSwitching(0);

	}

	catch (...) {

		//

	}

	ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_INFO,"DEFAULTS_ARE_SET"));

	m_setTpiIntegration=false;

Noto/CDB/alma/DataBlock/BandaC/NormalModeSetup/NormalModeSetup.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
	IFs="2"

	Polarization="L R"

	DefaultLO="4600.0 4600.0"

	LOMultiplier="1 1"

	FixedLO2="0.0 0.0"

	LOMin="4600.0 4600.0"

	LOMax="4600.0 4600.0"

Noto/CDB/alma/DataBlock/BandaK/NormalModeSetup/NormalModeSetup.xml

+8 −7
Original line number Diff line number Diff line
@@ -11,15 +11,16 @@ 
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	

	Mode="NORMAL"

	RFMin="5700.0 5700.0"

	RFMax="7700.0 7700.0"

	RFMin="21500.0 21500.0"

	RFMax="23000.0 23000.0"

	IFMin="100.0 100.0"

	IFBandwidth="2000.0 2000.0"

	IFBandwidth="400.0 400.0"

	Feeds="1"

	IFs="2"

	Polarization="L R"

	DefaultLO="5600.0 5600.0"

	FixedLO2="4100.0 4100.0"

	LOMin="5500.0 5500.0"

	LOMax="7500.0 7500.0"

	DefaultLO="21869.0 21869.0"

	LOMultiplier="19 19"

	FixedLO2="0 0"

	LOMin="21400.0 21400.0"

	LOMax="22900.0 22900.0"

/>

Noto/CDB/alma/DataBlock/BandaK/Synthesizer/Synthesizer.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ 
				xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

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



<SynthesizerEntry><Frequency>9700.0</Frequency><OutputPower>4</OutputPower></SynthesizerEntry>

<SynthesizerEntry><Frequency>1151.0</Frequency><OutputPower>16</OutputPower></SynthesizerEntry>



</LocalOscillatorLookUpTable>
 
 No newline at end of file