Skip to content
Snippets Groups Projects
Commit de02d188 authored by aorlati's avatar aorlati
Browse files

Some Noto Active Surface updates

parent e2eafa1d
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
Name="WeatherStation" Name="WeatherStation"
Code="NotoWeatherStationImpl" Code="NotoWeatherStationImpl"
Type="IDL:alma/Weather/WeatherStation:1.0" Type="IDL:alma/Weather/GenericWeatherStation:1.0"
Container="WeatherStationContainer" Container="WeatherStationContainer"
Default="true" Default="true"
KeepAliveTime="-1" KeepAliveTime="-1"
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
Code="TotalPowerImpl" Code="TotalPowerImpl"
Type="IDL:alma/Backends/TotalPower:1.0" Type="IDL:alma/Backends/TotalPower:1.0"
Container="TotalPowerContainer" Container="TotalPowerContainer"
Default="true"
KeepAliveTime="-1" KeepAliveTime="-1"
ImplLang="cpp" ImplLang="cpp"
/> />
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
RepetitionCacheTime="2000000" RepetitionCacheTime="2000000"
RepetitionExpireTime="5000000" RepetitionExpireTime="5000000"
DataPort="9001" DataPort="9001"
DataIPAddress="192.167.187.17" DataIPAddress="192.167.187.40"
DataLatency="3000000" DataLatency="3000000"
SenderSleepTime="300000" SenderSleepTime="300000"
SenderResponseTime="1000000" SenderResponseTime="1000000"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<toolAgainstInterfaceRepository></toolAgainstInterfaceRepository> <toolAgainstInterfaceRepository></toolAgainstInterfaceRepository>
<toolAgainstNameService></toolAgainstNameService> <toolAgainstNameService></toolAgainstNameService>
<containers> <containers>
<select>15</select> <select>20</select>
<againstManagerHost></againstManagerHost> <againstManagerHost></againstManagerHost>
<againstManagerPort></againstManagerPort> <againstManagerPort></againstManagerPort>
<againstCDB></againstCDB> <againstCDB></againstCDB>
...@@ -127,6 +127,33 @@ ...@@ -127,6 +127,33 @@
<remoteHost>MASTERHOST</remoteHost> <remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount> <remoteAccount>discos</remoteAccount>
</container> </container>
<container>
<name>MinorServoBossContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>ExternalClientsContainer</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</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>NotoActiveSurfaceContainer</name> <name>NotoActiveSurfaceContainer</name>
<type>cpp</type> <type>cpp</type>
...@@ -137,7 +164,7 @@ ...@@ -137,7 +164,7 @@
<remoteAccount>discos</remoteAccount> <remoteAccount>discos</remoteAccount>
</container> </container>
<container> <container>
<name>MinorServoBossContainer</name> <name>NotoActiveSurfaceContainer01</name>
<type>cpp</type> <type>cpp</type>
<heapSizeMB></heapSizeMB> <heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings> <useDedicatedSettings>true</useDedicatedSettings>
...@@ -146,7 +173,7 @@ ...@@ -146,7 +173,7 @@
<remoteAccount>discos</remoteAccount> <remoteAccount>discos</remoteAccount>
</container> </container>
<container> <container>
<name>ExternalClientsContainer</name> <name>NotoActiveSurfaceContainer02</name>
<type>cpp</type> <type>cpp</type>
<heapSizeMB></heapSizeMB> <heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings> <useDedicatedSettings>true</useDedicatedSettings>
...@@ -155,8 +182,17 @@ ...@@ -155,8 +182,17 @@
<remoteAccount>discos</remoteAccount> <remoteAccount>discos</remoteAccount>
</container> </container>
<container> <container>
<name>PyCalmuxContainer</name> <name>NotoActiveSurfaceContainer03</name>
<type>py</type> <type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
<container>
<name>NotoActiveSurfaceContainer04</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB> <heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings> <useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase> <scriptBase>0</scriptBase>
......
...@@ -160,7 +160,7 @@ void CNotoActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetCom ...@@ -160,7 +160,7 @@ void CNotoActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetCom
{ {
m_status=Management::MNG_FAILURE; m_status=Management::MNG_FAILURE;
} }
*/
m_antennaBoss = Antenna::AntennaBoss::_nil(); m_antennaBoss = Antenna::AntennaBoss::_nil();
try try
{ {
...@@ -173,7 +173,7 @@ void CNotoActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetCom ...@@ -173,7 +173,7 @@ void CNotoActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetCom
m_status=Management::MNG_WARNING; m_status=Management::MNG_WARNING;
throw Impl; throw Impl;
} }
*/
m_enable = true; m_enable = true;
ACS_LOG(LM_FULL_INFO, "CNotoActiveSurfaceBossCore::execute()", (LM_INFO,"CNotoActiveSurfaceBossCore::NotoActiveSurfaceBoss_LOCATED")); ACS_LOG(LM_FULL_INFO, "CNotoActiveSurfaceBossCore::execute()", (LM_INFO,"CNotoActiveSurfaceBossCore::NotoActiveSurfaceBoss_LOCATED"));
} }
...@@ -1366,10 +1366,13 @@ void CNotoActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& new ...@@ -1366,10 +1366,13 @@ void CNotoActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& new
{ {
for (int l = 1; l <= actuatorsInCircle[i]; l++) for (int l = 1; l <= actuatorsInCircle[i]; l++)
{ {
//printf("i = %d, l = %d, ",i,l);
for (int s = 0; s < NPOSITIONS; s++) for (int s = 0; s < NPOSITIONS; s++)
{ {
usdCorrections >> actuatorsCorrections[s]; usdCorrections >> actuatorsCorrections[s];
// printf("corr = %f ", actuatorsCorrections[s]);
} }
//printf("\n");
if(!CORBA::is_nil(usd[i][l])) if(!CORBA::is_nil(usd[i][l]))
{ {
usd[i][l]->posTable(actuatorsCorrections, NPOSITIONS, DELTAEL, THRESHOLDPOS); usd[i][l]->posTable(actuatorsCorrections, NPOSITIONS, DELTAEL, THRESHOLDPOS);
......
...@@ -69,8 +69,8 @@ NT_DOC:=NTDox ...@@ -69,8 +69,8 @@ NT_DOC:=NTDox
NT_ERRORS:= #ActiveSurfaceErrors NotoActiveSurfaceErrors NT_ERRORS:= #ActiveSurfaceErrors NotoActiveSurfaceErrors
NT_INTERFACES:=NotoAntennaInterface NotoReceiversInterface NotoWeatherStationInterface NotoActiveSurfaceInterface \ NT_INTERFACES:=NotoAntennaInterface NotoReceiversInterface NotoWeatherStationInterface NotoActiveSurfaceInterface \
NT_LIBRARIES:= NT_LIBRARIES:=
NT_SERVERS:= NotoReceivers NotoMount NotoWeatherStation NotoActiveSurface NotoMinorServo NotoPyLocalOscillator NotoPyIfDistributor NT_SERVERS:= NotoReceivers NotoMount NotoWeatherStation NotoActiveSurfaceBoss NotoMinorServo NotoPyLocalOscillator NotoPyIfDistributor
NT_CLIENTS:=NotoMountTextClient NT_CLIENTS:=NotoMountTextClient NotoActiveSurfaceGUIClient
NT_MISC:=NotoScripts NT_MISC:=NotoScripts
ifeq ($(STATION),SRT) ifeq ($(STATION),SRT)
...@@ -140,6 +140,7 @@ ifeq ($(STATION),Medicina) ...@@ -140,6 +140,7 @@ ifeq ($(STATION),Medicina)
BackendsImplementation_MODULES:=TotalPower NoiseGenerator XBackend BackendsImplementation_MODULES:=TotalPower NoiseGenerator XBackend
ReceiversImplementation_MODULES:=ReceiversBoss ReceiversImplementation_MODULES:=ReceiversBoss
WeatherStationImplementation_MODULES:=MedWeatherStation Metrology WeatherStationImplementation_MODULES:=MedWeatherStation Metrology
MedicinaActiveSurfaceImplementation_MODULES:=MedicinaActiveSurfaceBoss
CDB_SVN_LOCATION="Medicina/Configuration/CDB" CDB_SVN_LOCATION="Medicina/Configuration/CDB"
SYSTEM_SVN_MODULES=Common Medicina SYSTEM_SVN_MODULES=Common Medicina
...@@ -152,7 +153,7 @@ ifeq ($(STATION),Noto) ...@@ -152,7 +153,7 @@ ifeq ($(STATION),Noto)
NotoAntennaInterface \ NotoAntennaInterface \
SlaLibrary IRALibrary TextWindowLibrary ParserLibrary PyTestingLibrary \ SlaLibrary IRALibrary TextWindowLibrary ParserLibrary PyTestingLibrary \
AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool \ AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool \
TotalPower NotoMount CustomLogger NotoMinorServo\ TotalPower NotoMount CustomLogger NotoMinorServo NotoActiveSurfaceBoss \
AntennaBossTextClient ObservatoryTextClient GenericBackendTextClient ReceiversBossTextClient SystemTerminal SchedulerTextClient MinorServoBossTextClient\ AntennaBossTextClient ObservatoryTextClient GenericBackendTextClient ReceiversBossTextClient SystemTerminal SchedulerTextClient MinorServoBossTextClient\
NotoMountTextClient CustomLoggingClient Scripts NotoMountTextClient CustomLoggingClient Scripts
...@@ -168,6 +169,7 @@ ifeq ($(STATION),Noto) ...@@ -168,6 +169,7 @@ ifeq ($(STATION),Noto)
ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients
BackendsImplementation_MODULES:=TotalPower BackendsImplementation_MODULES:=TotalPower
ReceiversImplementation_MODULES:=ReceiversBoss ReceiversImplementation_MODULES:=ReceiversBoss
NotoActiveSurfaceImplementation_MODULES:=NotoActiveSurfaceBoss
CDB_SVN_LOCATION="Noto/Configuration/CDB" CDB_SVN_LOCATION="Noto/Configuration/CDB"
SYSTEM_SVN_MODULES=Common Medicina Noto SYSTEM_SVN_MODULES=Common Medicina Noto
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment