diff --git a/Common/Servers/Sardara/include/CommandLine.h b/Common/Servers/Sardara/include/CommandLine.h index 4b7869e2d30c013daf0bf9f316274a91ac882dd5..846c9dfa901e83e911fb41c128a422c9aa220098 100644 --- a/Common/Servers/Sardara/include/CommandLine.h +++ b/Common/Servers/Sardara/include/CommandLine.h @@ -780,7 +780,6 @@ ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl,BackendsErrors::Mal bool m_SC00; bool m_SL00; bool m_SP00; - bool m_SC00S; bool m_SL00S; bool m_SP00S; bool m_SCC00; diff --git a/Common/Servers/Sardara/src/CommandLine.cpp b/Common/Servers/Sardara/src/CommandLine.cpp index e86ac7050bd1a137be9cf43808430ddf7f24f7da..d8dd17334a53c644a2c40fd5bcbc05b1c3798900 100644 --- a/Common/Servers/Sardara/src/CommandLine.cpp +++ b/Common/Servers/Sardara/src/CommandLine.cpp @@ -51,7 +51,8 @@ CCommandLine::CCommandLine(ContainerServices *service): CSocket(), // SRT configurations m_SK00=false; m_SK00S=false; m_SK77=false; m_SK77S=false; - m_SC00=false; m_SC00S=false; + m_SCC00=false; m_SCC00S=false; + m_SCH00=false; m_SCH00S=false; m_SL00=false; m_SL00S=false; m_SP00=false; m_SP00S=false; m_stationSRT=false; @@ -780,7 +781,8 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C if (m_stationSRT==true) { m_SK77=m_SK77S=false; m_SK00=m_SK00S=false; - m_SC00=m_SC00S=false; + m_SCC00=m_SCC00S=false; + m_SCH00=m_SCH00S=false; m_SL00=m_SL00S=false; m_SP00=m_SP00S=false; m_stokes=false; @@ -797,10 +799,16 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C m_SK00=true; m_CK=true; } - if (config.Compare("SC00")==0) { + if (config.Compare("SCC00")==0) { + m_filter=1250.0; + m_inputsNumber=m_sectionsNumber; + m_SCC00=true; + m_CK=true; + } + if (config.Compare("SCH00")==0) { m_filter=1250.0; m_inputsNumber=m_sectionsNumber; - m_SC00=true; + m_SCH00=true; m_CK=true; } if (config.Compare("SL00")==0) { @@ -833,11 +841,19 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C m_stokes=true; m_CK=true; } - if (config.Compare("SC00S")==0) { + if (config.Compare("SCC00S")==0) { + m_filter=1250.0; + m_inputsNumber=m_sectionsNumber; + m_sectionsNumber=m_sectionsNumber/2; + m_SCC00S=true; + m_stokes=true; + m_CK=true; + } + if (config.Compare("SCH00S")==0) { m_filter=1250.0; m_inputsNumber=m_sectionsNumber; m_sectionsNumber=m_sectionsNumber/2; - m_SC00S=true; + m_SCH00S=true; m_stokes=true; m_CK=true; } diff --git a/SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml b/SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml index 3209a71418e723c0adbf1774f1f32eee4f71c28b..8f3f0584733dbbd6f52175b0f1eb4c7af6b170aa 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml @@ -12,7 +12,7 @@ GREGORIAN 1 1500.0 - 7.0 + 7.0 0 1 L R 0 0 @@ -27,7 +27,7 @@ GREGORIAN 7 1500.0 - 7.0 + 7.0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 L R L R L R L R L R L R L R 0 0 1 1 2 2 3 3 4 4 5 5 6 6 @@ -36,13 +36,28 @@ - SC00 + SCC00 2 TRUE BWG 1 1500.0 - 9.0 + 9.0 + 0 1 + L R + 0 0 + 0 1 + 1024 + + + + SCH00 + 2 + TRUE + BWG + 1 + 1500.0 + 9.0 0 1 L R 0 0 @@ -57,7 +72,7 @@ PRIMARY 1 1500.0 - 10.0 + 10.0 2 3 L R 0 0 @@ -72,7 +87,7 @@ PRIMARY 1 500.0 - 10.0 + 10.0 0 1 L R 0 0 @@ -87,7 +102,7 @@ GREGORIAN 1 1500.0 - 7.0 + 7.0 0 1 2 3 S S 0 0 @@ -102,7 +117,7 @@ GREGORIAN 7 1500.0 - 7.0 + 7.0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 S S S S S S S S S S S S S S 0 0 1 1 2 2 3 3 4 4 5 5 6 6 @@ -111,13 +126,28 @@ - SC00S + SCC00S + 2 + TRUE + BWG + 1 + 1500.0 + 9.0 + 0 1 + S S + 0 0 + 0 1 + 1024 + + + + SCH00S 2 TRUE BWG 1 1500.0 - 9.0 + 9.0 0 1 S S 0 0 @@ -132,7 +162,7 @@ PRIMARY 1 1500.0 - 10.0 + 10.0 2 3 S S 0 0 @@ -147,7 +177,7 @@ PRIMARY 1 500.0 - 10.0 + 10.0 0 1 S S 0 0