Skip to content
Snippets Groups Projects
Unverified Commit 5cbd0a53 authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

Fix issue #699: Medicina primary receiver cal diode control (#710) 


* fix issue #699: CDB preparation for the Calmux component

* fix issue #699: now primary focus receiver, in Medicina,  will fire the diode by controlling the calmux

* Update PyCalmux.xml

Co-authored-by: default avatarGiuseppe Carboni <giuseppecarboni89@live.com>
parent e597dfcf
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 175 additions and 4 deletions
Common/Libraries/ComponentProxy/include/BackendsProxy.h
+ 2
− 0
View file @ 5cbd0a53
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <HolographyC.h> #include <HolographyC.h>
#include <NoiseGeneratorC.h> #include <NoiseGeneratorC.h>
#include <TotalPowerC.h> #include <TotalPowerC.h>
#include <CalMuxC.h>
#include "ComponentProxy.h" #include "ComponentProxy.h"
...@@ -16,6 +17,7 @@ namespace Backends ...@@ -16,6 +17,7 @@ namespace Backends
PROXY_COMPONENT(Holography); PROXY_COMPONENT(Holography);
PROXY_COMPONENT(NoiseGenerator); PROXY_COMPONENT(NoiseGenerator);
PROXY_COMPONENT(TotalPower); PROXY_COMPONENT(TotalPower);
PROXY_COMPONENT(CalMux);
}; };
#endif #endif
Common/Servers/ReceiversBoss/include/RecvBossCore.h
+ 2
− 0
View file @ 5cbd0a53
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <acsncSimpleSupplier.h> #include <acsncSimpleSupplier.h>
#include <ParserConnector.h> #include <ParserConnector.h>
#include "Configuration.h" #include "Configuration.h"
#include <BackendsProxy.h>
#define _RECVBOSSCORE_MAX_IFS 4 #define _RECVBOSSCORE_MAX_IFS 4
#elif COMPILE_TARGET_NT #elif COMPILE_TARGET_NT
...@@ -350,6 +351,7 @@ private: ...@@ -350,6 +351,7 @@ private:
ACS::Time m_feedsEpoch; ACS::Time m_feedsEpoch;
ACS::Time m_IFsEpoch; ACS::Time m_IFsEpoch;
ACS::Time m_modeEpoch; ACS::Time m_modeEpoch;
Backends::CalMux_proxy m_xalMux_proxy;
#elif COMPILE_TARGET_NT #elif COMPILE_TARGET_NT
......
Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i
+ 8
− 4
View file @ 5cbd0a53
...@@ -45,6 +45,8 @@ void CRecvBossCore::initialize(maci::ContainerServices* services,CConfiguration ...@@ -45,6 +45,8 @@ void CRecvBossCore::initialize(maci::ContainerServices* services,CConfiguration
catch (...) { catch (...) {
_THROW_EXCPT(ComponentErrors::UnexpectedExImpl,"CRecvBossCore::initialize()"); _THROW_EXCPT(ComponentErrors::UnexpectedExImpl,"CRecvBossCore::initialize()");
} }
m_calMux_proxy.setContainerServices(services);
m_calMux_proxy.setComponentName("IDL:alma/Backends/CalMux:1.0");
ACS_LOG(LM_FULL_INFO,"CRecvBossCore::initialize()",(LM_INFO,"ReceiversBoss notification channel open")); ACS_LOG(LM_FULL_INFO,"CRecvBossCore::initialize()",(LM_INFO,"ReceiversBoss notification channel open"));
} }
...@@ -108,13 +110,14 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon ...@@ -108,13 +110,14 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon
} }
} }
else if (m_currentRecvCode=="XXP") { else if (m_currentRecvCode=="XXP") {
m_calMux_proxy->calOn();
// turn the marca on through the FS // turn the marca on through the FS
IRA::CString fsBuffer("calon\n"); /*IRA::CString fsBuffer("calon\n");
if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) { if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {
_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOn()"); _EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOn()");
m_status=Management::MNG_FAILURE; m_status=Management::MNG_FAILURE;
throw impl; throw impl;
} }*/
} }
else { else {
_EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CRecvBossCore::calOn()"); _EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CRecvBossCore::calOn()");
...@@ -173,12 +176,13 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo ...@@ -173,12 +176,13 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo
} }
else if (m_currentRecvCode=="XXP") { else if (m_currentRecvCode=="XXP") {
// turn the marca on through thr FS // turn the marca on through thr FS
IRA::CString fsBuffer("caloff\n"); /*IRA::CString fsBuffer("caloff\n");
if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) { if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {
_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOff()"); _EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOff()");
m_status=Management::MNG_FAILURE; m_status=Management::MNG_FAILURE;
throw impl; throw impl;
} }*/
m_calMux_proxy->calOff();
} }
else { else {
_EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CRecvBossCore::calOff()"); _EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CRecvBossCore::calOff()");
......
Medicina/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml 0 → 100644
+ 19
− 0
View file @ 5cbd0a53
<?xml version="1.0" encoding="utf-8"?>
<!--
Giuseppe Carboni <giuseppe.carboni@inaf.it>
-->
<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="PyCalmux"
Code="Calmux.PyCalmuxImpl"
Type="IDL:alma/Backends/CalMux:1.0"
Container="PyCalmuxContainer"
ImplLang="py"
KeepAliveTime="-1"
Default="false"
/>
Medicina/CDB/MACI/Containers/PyCalmuxContainer/PyCalmuxContainer.xml 0 → 100644
+ 27
− 0
View file @ 5cbd0a53
<?xml version="1.0" encoding="ISO-8859-1"?>
<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"
ImplLang="py"
Timeout="30.0"
UseIFR="true"
ManagerRetry="10"
Recovery="false">
<Autoload>
<cdb:_ string="baci" />
</Autoload>
<LoggingConfig
centralizedLogger="Log"
minLogLevel="5"
minLogLevelLocal="5"
dispatchPacketSize="0"
immediateDispatchLevel="8"
flushPeriodSeconds="1"
>
</LoggingConfig>
</Container>
Medicina/CDB/alma/BACKENDS/PyCalmux/PyCalmux.xml 0 → 100644
+ 11
− 0
View file @ 5cbd0a53
<?xml version='1.0' encoding='ISO-8859-1'?>
<!--
Andrea Orlati, andrea.orlati@inaf.it
-->
<PyCalmux
xmlns="urn:schemas-cosylab-com:PyCalmux: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"
IP="127.0.0.1"
PORT="12500"/>
Medicina/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml 0 → 100755
+ 11
− 0
View file @ 5cbd0a53
<?xml version='1.0' encoding='ISO-8859-1'?>
<CalMuxTable xmlns="urn:schemas-cosylab-com:CalMuxTable: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">
<BackendEntry><Backend>TotalPower</Backend><Channel>0</Channel><Polarity>1</Polarity></BackendEntry>
<BackendEntry><Backend>DBBC</Backend><Channel>6</Channel><Polarity>0</Polarity></BackendEntry>
</CalMuxTable>
Medicina/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+ 12
− 0
View file @ 5cbd0a53
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
initialize=CCC initialize=CCC
setSection=0,*,730.0,*,*,*,* setSection=0,*,730.0,*,*,*,*
setSection=1,*,730.0,*,*,*,* setSection=1,*,730.0,*,*,*,*
dmed=default
calmux=TotalPower
device=0 device=0
calOff calOff
restFrequency=0 restFrequency=0
...@@ -29,6 +31,8 @@ ...@@ -29,6 +31,8 @@
setSection=1,*,300.0,*,*,*,* setSection=1,*,300.0,*,*,*,*
setAttenuation=0,8 setAttenuation=0,8
setAttenuation=1,12 setAttenuation=1,12
dmed=default
calmux=TotalPower
device=0 device=0
calOff calOff
restFrequency=0 restFrequency=0
...@@ -42,6 +46,8 @@ ...@@ -42,6 +46,8 @@
servoSetup=KKC servoSetup=KKC
chooseBackend=TotalPower chooseBackend=TotalPower
initialize=KKC initialize=KKC
dmed=default
calmux=TotalPower
device=0 device=0
setAttenuation=0,9 setAttenuation=0,9
setAttenuation=1,9 setAttenuation=1,9
...@@ -61,6 +67,8 @@ ...@@ -61,6 +67,8 @@
initialize=XXP initialize=XXP
setSection=0,*,730.0,*,*,*,* setSection=0,*,730.0,*,*,*,*
setSection=1,*,730.0,*,*,*,* setSection=1,*,730.0,*,*,*,*
dmed=default
calmux=TotalPower
device=0 device=0
calOff calOff
restFrequency=0 restFrequency=0
...@@ -77,6 +85,8 @@ ...@@ -77,6 +85,8 @@
initialize=CCCL initialize=CCCL
setSection=0,*,300.0,*,*,*,* setSection=0,*,300.0,*,*,*,*
setSection=1,*,300.0,*,*,*,* setSection=1,*,300.0,*,*,*,*
dmed=default
calmux=TotalPower
setAttenuation=0,8 setAttenuation=0,8
setAttenuation=1,8 setAttenuation=1,8
device=0 device=0
...@@ -95,6 +105,8 @@ ...@@ -95,6 +105,8 @@
initialize=CHCL initialize=CHCL
setSection=0,*,300.0,*,*,*,* setSection=0,*,300.0,*,*,*,*
setSection=1,*,300.0,*,*,*,* setSection=1,*,300.0,*,*,*,*
dmed=default
calmux=TotalPower
setAttenuation=0,8 setAttenuation=0,8
setAttenuation=1,8 setAttenuation=1,8
device=0 device=0
......
Medicina/Configuration/CDB/MACI/Components/BACKENDS/PyCalmux/PyCalmux.xml 0 → 100644
+ 19
− 0
View file @ 5cbd0a53
<?xml version="1.0" encoding="utf-8"?>
<!--
Giuseppe Carboni <giuseppe.carboni@inaf.it>
-->
<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="PyCalmux"
Code="Calmux.PyCalmuxImpl"
Type="IDL:alma/Backends/CalMux:1.0"
Container="PyCalmuxContainer"
ImplLang="py"
KeepAliveTime="-1"
Default="false"
/>
Medicina/Configuration/CDB/MACI/Containers/PyCalmuxContainer/PyCalmuxContainer.xml 0 → 100644
+ 27
− 0
View file @ 5cbd0a53
<?xml version="1.0" encoding="ISO-8859-1"?>
<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"
ImplLang="py"
Timeout="30.0"
UseIFR="true"
ManagerRetry="10"
Recovery="false">
<Autoload>
<cdb:_ string="baci" />
</Autoload>
<LoggingConfig
centralizedLogger="Log"
minLogLevel="5"
minLogLevelLocal="5"
dispatchPacketSize="0"
immediateDispatchLevel="8"
flushPeriodSeconds="1"
>
</LoggingConfig>
</Container>
Medicina/Configuration/CDB/alma/BACKENDS/PyCalmux/PyCalmux.xml 0 → 100644
+ 11
− 0
View file @ 5cbd0a53
<?xml version='1.0' encoding='ISO-8859-1'?>
<!--
Andrea Orlati, andrea.orlati@inaf.it
-->
<PyCalmux
xmlns="urn:schemas-cosylab-com:PyCalmux: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"
IP="192.168.51.202"
PORT="5003"/>
Medicina/Configuration/CDB/alma/DataBlock/PyCalmux/Mapping/Mapping.xml 0 → 100755
+ 11
− 0
View file @ 5cbd0a53
<?xml version='1.0' encoding='ISO-8859-1'?>
<CalMuxTable xmlns="urn:schemas-cosylab-com:CalMuxTable: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">
<BackendEntry><Backend>TotalPower</Backend><Channel>0</Channel><Polarity>1</Polarity></BackendEntry>
<BackendEntry><Backend>DBBC</Backend><Channel>6</Channel><Polarity>0</Polarity></BackendEntry>
</CalMuxTable>
Medicina/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+ 6
− 0
View file @ 5cbd0a53
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
chooseBackend=TotalPower chooseBackend=TotalPower
initialize=CCC initialize=CCC
dmed=default dmed=default
calmux=TotalPower
setSection=0,*,730.0,*,*,*,* setSection=0,*,730.0,*,*,*,*
setSection=1,*,730.0,*,*,*,* setSection=1,*,730.0,*,*,*,*
device=0 device=0
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
chooseBackend=TotalPower chooseBackend=TotalPower
initialize=CHC initialize=CHC
dmed=default dmed=default
calmux=TotalPower
setSection=0,*,300.0,*,*,*,* setSection=0,*,300.0,*,*,*,*
setSection=1,*,300.0,*,*,*,* setSection=1,*,300.0,*,*,*,*
setAttenuation=0,8 setAttenuation=0,8
...@@ -45,6 +47,7 @@ ...@@ -45,6 +47,7 @@
chooseBackend=TotalPower chooseBackend=TotalPower
initialize=KKC initialize=KKC
dmed=default dmed=default
calmux=TotalPower
device=0 device=0
setAttenuation=0,9 setAttenuation=0,9
setAttenuation=1,9 setAttenuation=1,9
...@@ -63,6 +66,7 @@ ...@@ -63,6 +66,7 @@
chooseBackend=TotalPower chooseBackend=TotalPower
initialize=XXP initialize=XXP
dmed=default dmed=default
calmux=TotalPower
setSection=0,*,730.0,*,*,*,* setSection=0,*,730.0,*,*,*,*
setSection=1,*,730.0,*,*,*,* setSection=1,*,730.0,*,*,*,*
device=0 device=0
...@@ -80,6 +84,7 @@ ...@@ -80,6 +84,7 @@
chooseBackend=TotalPower chooseBackend=TotalPower
initialize=CCCL initialize=CCCL
dmed=default dmed=default
calmux=TotalPower
setSection=0,*,300.0,*,*,*,* setSection=0,*,300.0,*,*,*,*
setSection=1,*,300.0,*,*,*,* setSection=1,*,300.0,*,*,*,*
setAttenuation=0,8 setAttenuation=0,8
...@@ -99,6 +104,7 @@ ...@@ -99,6 +104,7 @@
chooseBackend=TotalPower chooseBackend=TotalPower
initialize=CHCL initialize=CHCL
dmed=default dmed=default
calmux=TotalPower
setSection=0,*,300.0,*,*,*,* setSection=0,*,300.0,*,*,*,*
setSection=1,*,300.0,*,*,*,* setSection=1,*,300.0,*,*,*,*
setAttenuation=0,8 setAttenuation=0,8
......
Medicina/Misc/MedScripts/app-defaults/discosStartup.xml
+ 9
− 0
View file @ 5cbd0a53
...@@ -118,6 +118,15 @@ ...@@ -118,6 +118,15 @@
<remoteHost>MASTERHOST</remoteHost> <remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount> <remoteAccount>discos</remoteAccount>
</container> </container>
<container>
<name>PyCalmuxContainer</name>
<type>py</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container> <container>
<name>PointContainer</name> <name>PointContainer</name>
<type>cpp</type> <type>cpp</type>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment