Commit 962e0abe authored by TheDebbio's avatar TheDebbio
Browse files

review poly coeff

parent d739896b

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

+6 −9
Original line number Diff line number Diff line
@@ -17,14 +17,11 @@ 
	<xs:import namespace="urn:schemas-cosylab-com:CDB:1.0" schemaLocation="CDB.xsd"/>

	<xs:import namespace="urn:schemas-cosylab-com:BACI:1.0" schemaLocation="BACI.xsd"/>



	

	<xs:complexType name="NoiseMarkPolySequence">

		<xs:sequence>	

			<xs:element name="LCoeffs" type="xs:string" />

			<xs:element name="RCoeffs" type="xs:string" />

		</xs:sequence>

	<xs:complexType name="NoiseMarkPolyAttr">

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

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

	</xs:complexType>



	<xs:element name="NoiseMarkPoly" type="NoiseMarkPolySequence"/>

	<xs:element name="NoiseMarkPoly" type="NoiseMarkPolyAttr"/>



</xs:schema>

Medicina/Configuration/CDB/alma/DataBlock/MedicinaCBand/NoiseMark/CCC/CCC.xml

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
             	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"	

				   >

	<LCoeffs>"5.88"</LCoeffs>

	<RCoeffs>"5.71"</RCoeffs>

</NoiseMarkPoly>
 
 No newline at end of file
 
	LCoeffs="5.88"

	RCoeffs="5.7"

/>

Medicina/Configuration/CDB/alma/DataBlock/MedicinaCBand/NoiseMark/CHC/CHC.xml

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
      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"			

		>				

	<LCoeffs>"31.593 -0.0023"</LCoeffs>

	<RCoeffs>"32.764 -0.0023"</RCoeffs>

</NoiseMarkPoly>
 
 No newline at end of file
 


	LCoeffs="31.593 -0.0023"

	RCoeffs="32.764 -0.0023"

/>

Medicina/Servers/MedicinaCBand/src/Configuration.cpp

+11 −1
Original line number Diff line number Diff line
@@ -394,8 +394,13 @@ void CConfiguration::readNoiseMarkPoly(const IRA::CString & p_conf_path, 
 	/* Collecting LCP "C0 C1 .."" coefficients from appropriate configuration file */ 

	int l_start=0;

	_GET_STRING_ATTRIBUTE("LCoeffs","LCP noise mark poly coefficients :", l_value, p_conf_path);	

	MED_TRACE_FMT("%s\n",(const char*)l_value);	

	MED_TRACE_FMT("%s\n",(const char*)p_conf_path);	

	while(IRA::CIRATools::getNextToken(l_value, l_start, ' ', l_token)){		

		MED_TRACE_FMT("%s\n",(const char*)l_value);	

		MED_TRACE_FMT("%s\n",(const char*)l_token);

		p_conf_setup.m_noise_mark_lcp_coeffs.push_back(l_token.ToDouble());

		MED_TRACE_FMT("%f\n",l_token.ToDouble());

	}	

	/* wo token convert string to value */

	if (!l_start)
@@ -406,8 +411,13 @@ void CConfiguration::readNoiseMarkPoly(const IRA::CString & p_conf_path, 
		p_conf_setup.m_noise_mark_lcp_coeffs.push_back(l_value.ToDouble());

	l_start=0;

	_GET_STRING_ATTRIBUTE("RCoeffs","RCP noise mark poly coefficients :", l_value, p_conf_path);	

	MED_TRACE_FMT("%s\n",(const char*)l_value);	

	MED_TRACE_FMT("%s\n",(const char*)p_conf_path);

	while(IRA::CIRATools::getNextToken(l_value, l_start, ' ', l_token)){	

		MED_TRACE_FMT("%s\n",(const char*)l_value);	

		MED_TRACE_FMT("%s\n",(const char*)l_token);	

		p_conf_setup.m_noise_mark_rcp_coeffs.push_back(l_token.ToDouble());

		MED_TRACE_FMT("%f\n",l_token.ToDouble());

	}

	MED_TRACE_MSG("OUT");

}

Medicina/Servers/MedicinaCBand/src/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#

# user definable C-compilation flags

USER_CFLAGS = -DMED_DEBUG_LVL

USER_CFLAGS =

# availables:-DMED_DEBUG_LVL  -DEXCLUDE_MIXER -DEXCLUDE_MONITOR -DSTOP_MONITOR_PROPERTY



#