From b644ef63a619168e380a5e18ba4fa8c2dfcf9e24 Mon Sep 17 00:00:00 2001
From: fvitello <fabio.vitello@inaf.it>
Date: Mon, 28 Mar 2022 08:04:11 +0000
Subject: [PATCH] Reopen branch to track modified files on Noto server
---
.../src/ExternalClientsSocketServer.cpp | 15 +++-
.../PyCalmux/src/Calmux/PyCalmuxImpl.py | 2 +-
.../src/MedMinorServoGeometry.cpp | 10 ++-
.../StationProcedures/StationProcedures.xml | 24 +++---
.../MMC/NormalModeSetup/NormalModeSetup.xml | 2 +-
.../DataBlock/MMC/Synthesizer/Synthesizer.xml | 4 +-
.../StationProcedures/StationProcedures.xml | 84 +++++++++++--------
.../RECEIVERS/NotoReceivers/NotoReceivers.xml | 2 +-
8 files changed, 87 insertions(+), 56 deletions(-)
diff --git a/Common/Servers/ExternalClients/src/ExternalClientsSocketServer.cpp b/Common/Servers/ExternalClients/src/ExternalClientsSocketServer.cpp
index 23411b2a0..2fe3df0f4 100644
--- a/Common/Servers/ExternalClients/src/ExternalClientsSocketServer.cpp
+++ b/Common/Servers/ExternalClients/src/ExternalClientsSocketServer.cpp
@@ -560,17 +560,24 @@ CExternalClientsSocketServer::cmdToScheduler ()
printf("dentro ans==false\n");
}*/
}
+ out.ReplaceAll('\n','-');
+ /*out.Replace('\n','-');
out.Replace('\n','-');
+ out.Replace('\n','-');
+ out.Replace('\n','-');*/
Len = out.GetLength ();
int i;
- for (i = 0; i < Len; i++)
- {
- outBuffer[i] = out.CharAt (i);
- }
+ for (i = 0; i < Len; i++) {
+ //if (out.CharAt(i)=='\n')
+ // break;
+ outBuffer[i] = out.CharAt (i);
+ }
out.Empty();
outBuffer[Len] = '\n';
+ //outBuffer[i] = '\n';
//printf ("Command returned = %s", outBuffer);
Res = sendBuffer (outBuffer, Len + 1);
+ //Res = sendBuffer (outBuffer, i + 1);
if (Res == WOULDBLOCK || Res == FAIL)
{
_EXCPT (SocketErrorExImpl, impl,
diff --git a/Common/Servers/PyCalmux/src/Calmux/PyCalmuxImpl.py b/Common/Servers/PyCalmux/src/Calmux/PyCalmuxImpl.py
index 34a74ef73..c516b9e81 100644
--- a/Common/Servers/PyCalmux/src/Calmux/PyCalmuxImpl.py
+++ b/Common/Servers/PyCalmux/src/Calmux/PyCalmuxImpl.py
@@ -146,7 +146,7 @@ class PyCalmuxImpl(CalMux, cc, services, lcycle):
s.sendall(command)
- time.sleep(0.1)
+# time.sleep(0.1)
response = s.recv(1024)
s.close()
diff --git a/Medicina/Servers/MedicinaMinorServo/src/MedMinorServoGeometry.cpp b/Medicina/Servers/MedicinaMinorServo/src/MedMinorServoGeometry.cpp
index db364b605..3928ac373 100755
--- a/Medicina/Servers/MedicinaMinorServo/src/MedMinorServoGeometry.cpp
+++ b/Medicina/Servers/MedicinaMinorServo/src/MedMinorServoGeometry.cpp
@@ -325,12 +325,16 @@ double
MedMinorServoGeometry::_check_axis_limit(const double position,
const MedMinorServoAxis axis)
{
- if(position < axis.position_min){
+ int iposition = (int)position;
+
+
+ if(iposition < axis.position_min){
throw MinorServoAxisLimitError("axis too low");
//return axis.position_min;
}
- if(position > axis.position_max){
- throw MinorServoAxisLimitError("axis too high");
+ if(iposition > axis.position_max){
+ std::cout<<axis.name<<" "<<iposition<<" " <<axis.position_max<< std::endl;
+ throw MinorServoAxisLimitError("axis too high ");
//return axis.position_max;
}
return position;
diff --git a/Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
index 6ae47cf6f..c1b02ca67 100644
--- a/Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+++ b/Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
@@ -26,7 +26,7 @@
initialize=MMC
receiversSetup=MMC
servoSetup=SEC
- asOn
+ asOn
device=0
calmux=TotalPower
calOff
@@ -47,8 +47,8 @@
device=0
calmux=TotalPower
calOff
- ifdist=1,1,44
- ifdist=2,1,32
+ ifdist=1,1,36
+ ifdist=2,1,34
</body>
</Procedure>
@@ -56,9 +56,9 @@
<body>
antennaSetup=SEC
initialize=QQC
- receiversSetup=QQC
+ receiversSetup=QQC
servoSetup=SEC
- asOn
+ asOn
device=0
calmux=TotalPower
calOff
@@ -86,9 +86,9 @@
<body>
antennaSetup=PRIM
initialize=XXP
- receiversSetup=XXP
+ receiversSetup=XXP
servoSetup=SXP
- asOff
+ asOff
device=0
calmux=TotalPower
calOff
@@ -101,14 +101,16 @@
<body>
antennaSetup=LL
initialize=LLP
- receiversSetup=LLP
+ receiversSetup=LLP
servoSetup=LLP
- asOff
+ asOff
device=0
calmux=TotalPower
calOff
- ifdist=1,2,44
- ifdist=2,2,32
+ ifdist=1,2,-1
+ ifdist=2,2,-1
+ ifdist=1,-1,44
+ ifdist=2,-1,44
</body>
</Procedure>
diff --git a/Noto/Configuration/CDB/alma/DataBlock/MMC/NormalModeSetup/NormalModeSetup.xml b/Noto/Configuration/CDB/alma/DataBlock/MMC/NormalModeSetup/NormalModeSetup.xml
index 234122feb..c4b0eece4 100644
--- a/Noto/Configuration/CDB/alma/DataBlock/MMC/NormalModeSetup/NormalModeSetup.xml
+++ b/Noto/Configuration/CDB/alma/DataBlock/MMC/NormalModeSetup/NormalModeSetup.xml
@@ -18,7 +18,7 @@
Feeds="1"
IFs="2"
Polarization="L R"
- DefaultLO="6956.0 6956.0"
+ DefaultLO="6936.0 6936.0"
LOMultiplier="1 1"
FixedLO2="0.0 0.0"
LOMin="5000.0 5000.0"
diff --git a/Noto/Configuration/CDB/alma/DataBlock/MMC/Synthesizer/Synthesizer.xml b/Noto/Configuration/CDB/alma/DataBlock/MMC/Synthesizer/Synthesizer.xml
index e7186f9e4..ca6aa325b 100644
--- a/Noto/Configuration/CDB/alma/DataBlock/MMC/Synthesizer/Synthesizer.xml
+++ b/Noto/Configuration/CDB/alma/DataBlock/MMC/Synthesizer/Synthesizer.xml
@@ -5,6 +5,6 @@
xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<SynthesizerEntry><Frequency>6956.0</Frequency><OutputPower>16</OutputPower></SynthesizerEntry>
+<SynthesizerEntry><Frequency>6936.0</Frequency><OutputPower>16</OutputPower></SynthesizerEntry>
-</LocalOscillatorLookUpTable>
\ No newline at end of file
+</LocalOscillatorLookUpTable>
diff --git a/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
index 6ae47cf6f..b9f1f6e23 100644
--- a/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+++ b/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
@@ -15,8 +15,10 @@
calOff
setAttenuation=0,15
setAttenuation=1,5
- ifdist=1,1,44
- ifdist=2,1,32
+ ifdist=1,1,-1
+ ifdist=2,1,-1
+ ifdist=1,-1,44
+ ifdist=2,-1,32
</body>
</Procedure>
@@ -26,14 +28,16 @@
initialize=MMC
receiversSetup=MMC
servoSetup=SEC
- asOn
+ asOn
device=0
calmux=TotalPower
calOff
setAttenuation=0,0
setAttenuation=1,4
- ifdist=1,1,44
- ifdist=2,1,32
+ ifdist=1,1,-1
+ ifdist=2,1,-1
+ ifdist=1,-1,44
+ ifdist=2,-1,32
</body>
</Procedure>
@@ -43,12 +47,14 @@
initialize=KKC
receiversSetup=KKC
servoSetup=SEC
- asOn
+ asOn
device=0
calmux=TotalPower
calOff
- ifdist=1,1,44
- ifdist=2,1,32
+ ifdist=1,1,-1
+ ifdist=2,1,-1
+ ifdist=2,-1,34
+ ifdist=1,-1,36
</body>
</Procedure>
@@ -56,14 +62,16 @@
<body>
antennaSetup=SEC
initialize=QQC
- receiversSetup=QQC
+ receiversSetup=QQC
servoSetup=SEC
- asOn
+ asOn
device=0
calmux=TotalPower
calOff
- ifdist=1,1,44
- ifdist=2,1,32
+ ifdist=1,1,-1
+ ifdist=2,1,-1
+ ifdist=1,-1,44
+ ifdist=2,-1,32
</body>
</Procedure>
@@ -71,14 +79,16 @@
<body>
antennaSetup=PRIM
initialize=XXP
- receiversSetup=XXP
+ receiversSetup=XXP
servoSetup=SXP
- asOn
+ asOn
device=0
calmux=TotalPower
- calOff
- ifdist=1,3,44
- ifdist=2,3,32
+ calOff
+ ifdist=1,3,-1
+ ifdist=2,3,-1
+ ifdist=1,-1,10
+ ifdist=2,-1,10
</body>
</Procedure>
@@ -91,9 +101,11 @@
asOff
device=0
calmux=TotalPower
- calOff
- ifdist=1,4,44
- ifdist=2,3,32
+ calOff
+ ifdist=1,5,-1
+ ifdist=2,3,-1
+ ifdist=1,-1,8
+ ifdist=2,-1,10
</body>
</Procedure>
@@ -101,14 +113,16 @@
<body>
antennaSetup=LL
initialize=LLP
- receiversSetup=LLP
+ receiversSetup=LLP
servoSetup=LLP
- asOff
+ asOff
device=0
calmux=TotalPower
- calOff
- ifdist=1,2,44
- ifdist=2,2,32
+ calOff
+ ifdist=1,2,-1
+ ifdist=2,2,-1
+ ifdist=1,-1,44
+ ifdist=2,-1,44
</body>
</Procedure>
@@ -121,9 +135,11 @@
servoSetup=SXP
device=0
calmux=TotalPower
- calOff
- ifdist=1,4,44
- ifdist=2,4,32
+ calOff
+ ifdist=1,4,-1
+ ifdist=2,4,-1
+ ifdist=1,-1,8
+ ifdist=2,-1,8
</body>
</Procedure>
@@ -131,14 +147,16 @@
<body>
antennaSetup=PRIM
initialize=SSP
- receiversSetup=SSP
+ receiversSetup=SSP
servoSetup=SXP
- asOff
+ asOff
device=0
calmux=TotalPower
- calOff
- ifdist=1,3,44
- ifdist=2,5,32
+ calOff
+ ifdist=1,5,-1
+ ifdist=2,3,-1
+ ifdist=1,-1,8
+ ifdist=2,-1,10
</body>
</Procedure>
diff --git a/Noto/Configuration/CDB/alma/RECEIVERS/NotoReceivers/NotoReceivers.xml b/Noto/Configuration/CDB/alma/RECEIVERS/NotoReceivers/NotoReceivers.xml
index eaeaf8d2a..fa6d7da85 100644
--- a/Noto/Configuration/CDB/alma/RECEIVERS/NotoReceivers/NotoReceivers.xml
+++ b/Noto/Configuration/CDB/alma/RECEIVERS/NotoReceivers/NotoReceivers.xml
@@ -10,7 +10,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
HPIBIPAddress="192.167.187.201"
HPIBPort="1234"
- LocalOscillatorInstance="RECEIVERS/LocalOscillator"
+ LocalOscillatorInstance=""
LocalOscillatorEnabledReceivers="KKC QQC CCC MMC"
FocusSelectorInterface="IDL:alma/Backends/TotalPower:1.0"
>
--
GitLab