diff --git a/Noto/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml b/Noto/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml
index 2190324a9f53dbe5e4d8067055cdcd747833d3c6..0caca7ec20c1762917ab0fa7e1fad18101b805b5 100644
--- a/Noto/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml
+++ b/Noto/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml
@@ -10,7 +10,7 @@
Name="WeatherStation"
Code="NotoWeatherStationImpl"
- Type="IDL:alma/Weather/WeatherStation:1.0"
+ Type="IDL:alma/Weather/GenericWeatherStation:1.0"
Container="WeatherStationContainer"
Default="true"
KeepAliveTime="-1"
diff --git a/Noto/Configuration/CDB/MACI/Components/BACKENDS/TotalPower/TotalPower.xml b/Noto/Configuration/CDB/MACI/Components/BACKENDS/TotalPower/TotalPower.xml
index 332550d6fff8b14658b33f7d8d4515b696f1bdda..ba08992d614b5507532b531bcea213612ce8e82e 100644
--- a/Noto/Configuration/CDB/MACI/Components/BACKENDS/TotalPower/TotalPower.xml
+++ b/Noto/Configuration/CDB/MACI/Components/BACKENDS/TotalPower/TotalPower.xml
@@ -12,7 +12,6 @@
Code="TotalPowerImpl"
Type="IDL:alma/Backends/TotalPower:1.0"
Container="TotalPowerContainer"
- Default="true"
KeepAliveTime="-1"
ImplLang="cpp"
/>
diff --git a/Noto/Configuration/CDB/alma/BACKENDS/TotalPower/TotalPower.xml b/Noto/Configuration/CDB/alma/BACKENDS/TotalPower/TotalPower.xml
index 4e5107dd7cab07fb93dcb96f5a9fd8b154906949..05b5037dca74dac3d4729fcef2e949d28fcdc6cd 100644
--- a/Noto/Configuration/CDB/alma/BACKENDS/TotalPower/TotalPower.xml
+++ b/Noto/Configuration/CDB/alma/BACKENDS/TotalPower/TotalPower.xml
@@ -18,14 +18,14 @@
RepetitionCacheTime="2000000"
RepetitionExpireTime="5000000"
DataPort="9001"
- DataIPAddress="192.167.187.17"
+ DataIPAddress="192.167.187.40"
DataLatency="3000000"
SenderSleepTime="300000"
SenderResponseTime="1000000"
ControlSleepTime="900000"
ControlResponseTime="1000000"
BoardsNumber="4"
- DataBufferSize="64">
+ DataBufferSize="64">
<time/>
<backendName/>
<bandWidth/>
diff --git a/Noto/Misc/NotoScripts/app-defaults/discosStartup.xml b/Noto/Misc/NotoScripts/app-defaults/discosStartup.xml
index e3e8d7d66968979a4c525c7eefee840a31966d4e..b061347cb45a5125279b30a735d921de5290bc88 100644
--- a/Noto/Misc/NotoScripts/app-defaults/discosStartup.xml
+++ b/Noto/Misc/NotoScripts/app-defaults/discosStartup.xml
@@ -14,7 +14,7 @@
<toolAgainstInterfaceRepository></toolAgainstInterfaceRepository>
<toolAgainstNameService></toolAgainstNameService>
<containers>
- <select>15</select>
+ <select>20</select>
<againstManagerHost></againstManagerHost>
<againstManagerPort></againstManagerPort>
<againstCDB></againstCDB>
@@ -127,6 +127,33 @@
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</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>
<name>NotoActiveSurfaceContainer</name>
<type>cpp</type>
@@ -137,7 +164,7 @@
<remoteAccount>discos</remoteAccount>
</container>
<container>
- <name>MinorServoBossContainer</name>
+ <name>NotoActiveSurfaceContainer01</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
@@ -146,7 +173,7 @@
<remoteAccount>discos</remoteAccount>
</container>
<container>
- <name>ExternalClientsContainer</name>
+ <name>NotoActiveSurfaceContainer02</name>
<type>cpp</type>
<heapSizeMB></heapSizeMB>
<useDedicatedSettings>true</useDedicatedSettings>
@@ -154,9 +181,18 @@
<remoteHost>MASTERHOST</remoteHost>
<remoteAccount>discos</remoteAccount>
</container>
- <container>
- <name>PyCalmuxContainer</name>
- <type>py</type>
+ <container>
+ <name>NotoActiveSurfaceContainer03</name>
+ <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>
<useDedicatedSettings>true</useDedicatedSettings>
<scriptBase>0</scriptBase>
diff --git a/Noto/Servers/NotoActiveSurfaceBoss/src/NotoActiveSurfaceBossCore.cpp b/Noto/Servers/NotoActiveSurfaceBoss/src/NotoActiveSurfaceBossCore.cpp
index 2583f1a429d886b7c81839351244407a3adc0ccb..4b9a60f78490ee860fa6dfb237f66e6566981165 100644
--- a/Noto/Servers/NotoActiveSurfaceBoss/src/NotoActiveSurfaceBossCore.cpp
+++ b/Noto/Servers/NotoActiveSurfaceBoss/src/NotoActiveSurfaceBossCore.cpp
@@ -160,7 +160,7 @@ void CNotoActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetCom
{
m_status=Management::MNG_FAILURE;
}
-
+*/
m_antennaBoss = Antenna::AntennaBoss::_nil();
try
{
@@ -173,7 +173,7 @@ void CNotoActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetCom
m_status=Management::MNG_WARNING;
throw Impl;
}
-*/
+
m_enable = true;
ACS_LOG(LM_FULL_INFO, "CNotoActiveSurfaceBossCore::execute()", (LM_INFO,"CNotoActiveSurfaceBossCore::NotoActiveSurfaceBoss_LOCATED"));
}
@@ -1366,10 +1366,13 @@ void CNotoActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& new
{
for (int l = 1; l <= actuatorsInCircle[i]; l++)
{
+ //printf("i = %d, l = %d, ",i,l);
for (int s = 0; s < NPOSITIONS; s++)
{
usdCorrections >> actuatorsCorrections[s];
+ // printf("corr = %f ", actuatorsCorrections[s]);
}
+ //printf("\n");
if(!CORBA::is_nil(usd[i][l]))
{
usd[i][l]->posTable(actuatorsCorrections, NPOSITIONS, DELTAEL, THRESHOLDPOS);
diff --git a/SystemMake/Makefile b/SystemMake/Makefile
index 32834ba76e90d7ddda34afe9b2e7f7db7d45fc96..2dca9aea0f1dbaea76316ef111304214226765d4 100644
--- a/SystemMake/Makefile
+++ b/SystemMake/Makefile
@@ -69,8 +69,8 @@ NT_DOC:=NTDox
NT_ERRORS:= #ActiveSurfaceErrors NotoActiveSurfaceErrors
NT_INTERFACES:=NotoAntennaInterface NotoReceiversInterface NotoWeatherStationInterface NotoActiveSurfaceInterface \
NT_LIBRARIES:=
-NT_SERVERS:= NotoReceivers NotoMount NotoWeatherStation NotoActiveSurface NotoMinorServo NotoPyLocalOscillator NotoPyIfDistributor
-NT_CLIENTS:=NotoMountTextClient
+NT_SERVERS:= NotoReceivers NotoMount NotoWeatherStation NotoActiveSurfaceBoss NotoMinorServo NotoPyLocalOscillator NotoPyIfDistributor
+NT_CLIENTS:=NotoMountTextClient NotoActiveSurfaceGUIClient
NT_MISC:=NotoScripts
ifeq ($(STATION),SRT)
@@ -140,6 +140,7 @@ ifeq ($(STATION),Medicina)
BackendsImplementation_MODULES:=TotalPower NoiseGenerator XBackend
ReceiversImplementation_MODULES:=ReceiversBoss
WeatherStationImplementation_MODULES:=MedWeatherStation Metrology
+ MedicinaActiveSurfaceImplementation_MODULES:=MedicinaActiveSurfaceBoss
CDB_SVN_LOCATION="Medicina/Configuration/CDB"
SYSTEM_SVN_MODULES=Common Medicina
@@ -152,7 +153,7 @@ ifeq ($(STATION),Noto)
NotoAntennaInterface \
SlaLibrary IRALibrary TextWindowLibrary ParserLibrary PyTestingLibrary \
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\
NotoMountTextClient CustomLoggingClient Scripts
@@ -168,6 +169,7 @@ ifeq ($(STATION),Noto)
ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients
BackendsImplementation_MODULES:=TotalPower
ReceiversImplementation_MODULES:=ReceiversBoss
+ NotoActiveSurfaceImplementation_MODULES:=NotoActiveSurfaceBoss
CDB_SVN_LOCATION="Noto/Configuration/CDB"
SYSTEM_SVN_MODULES=Common Medicina Noto