Skip to content
Snippets Groups Projects
Commit ba944efd authored by Fabio Vitello's avatar Fabio Vitello
Browse files

Merge branch 'fix-issue-588' into fix-issue-655

parents 02b10255 a42f6a83
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 110 additions and 61 deletions
Common/Servers/ExternalClients/src/ExternalClientsSocketServer.cpp
+ 11
− 4
View file @ ba944efd
...@@ -560,17 +560,24 @@ CExternalClientsSocketServer::cmdToScheduler () ...@@ -560,17 +560,24 @@ CExternalClientsSocketServer::cmdToScheduler ()
printf("dentro ans==false\n"); printf("dentro ans==false\n");
}*/ }*/
} }
out.ReplaceAll('\n','-');
/*out.Replace('\n','-');
out.Replace('\n','-'); out.Replace('\n','-');
out.Replace('\n','-');
out.Replace('\n','-');*/
Len = out.GetLength (); Len = out.GetLength ();
int i; int i;
for (i = 0; i < Len; i++) for (i = 0; i < Len; i++) {
{ //if (out.CharAt(i)=='\n')
// break;
outBuffer[i] = out.CharAt (i); outBuffer[i] = out.CharAt (i);
} }
out.Empty(); out.Empty();
outBuffer[Len] = '\n'; outBuffer[Len] = '\n';
//outBuffer[i] = '\n';
//printf ("Command returned = %s", outBuffer); //printf ("Command returned = %s", outBuffer);
Res = sendBuffer (outBuffer, Len + 1); Res = sendBuffer (outBuffer, Len + 1);
//Res = sendBuffer (outBuffer, i + 1);
if (Res == WOULDBLOCK || Res == FAIL) if (Res == WOULDBLOCK || Res == FAIL)
{ {
_EXCPT (SocketErrorExImpl, impl, _EXCPT (SocketErrorExImpl, impl,
......
Common/Servers/PyCalmux/src/Calmux/PyCalmuxImpl.py
+ 2
− 0
View file @ ba944efd
...@@ -146,6 +146,8 @@ class PyCalmuxImpl(CalMux, cc, services, lcycle): ...@@ -146,6 +146,8 @@ class PyCalmuxImpl(CalMux, cc, services, lcycle):
s.sendall(command) s.sendall(command)
# time.sleep(0.1)
response = s.recv(1024) response = s.recv(1024)
s.close() s.close()
response = response.strip().split() response = response.strip().split()
......
Medicina/Servers/MedicinaMinorServo/src/MedMinorServoGeometry.cpp
+ 7
− 3
View file @ ba944efd
...@@ -325,11 +325,15 @@ double ...@@ -325,11 +325,15 @@ double
MedMinorServoGeometry::_check_axis_limit(const double position, MedMinorServoGeometry::_check_axis_limit(const double position,
const MedMinorServoAxis axis) const MedMinorServoAxis axis)
{ {
if(position < axis.position_min){ int iposition = (int)position;
if(iposition < axis.position_min){
throw MinorServoAxisLimitError("axis too low"); throw MinorServoAxisLimitError("axis too low");
//return axis.position_min; //return axis.position_min;
} }
if(position > axis.position_max){ if(iposition > axis.position_max){
std::cout<<axis.name<<" "<<iposition<<" " <<axis.position_max<< std::endl;
throw MinorServoAxisLimitError("axis too high "); throw MinorServoAxisLimitError("axis too high ");
//return axis.position_max; //return axis.position_max;
} }
......
Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+ 43
− 25
View file @ ba944efd
...@@ -15,8 +15,10 @@ ...@@ -15,8 +15,10 @@
calOff calOff
setAttenuation=0,15 setAttenuation=0,15
setAttenuation=1,5 setAttenuation=1,5
ifdist=1,1,44 ifdist=1,1,-1
ifdist=2,1,32 ifdist=2,1,-1
ifdist=1,-1,16
ifdist=2,-1,32
</body> </body>
</Procedure> </Procedure>
...@@ -32,8 +34,10 @@ ...@@ -32,8 +34,10 @@
calOff calOff
setAttenuation=0,0 setAttenuation=0,0
setAttenuation=1,4 setAttenuation=1,4
ifdist=1,1,44 ifdist=1,1,-1
ifdist=2,1,32 ifdist=2,1,-1
ifdist=1,-1,44
ifdist=2,-1,32
</body> </body>
</Procedure> </Procedure>
...@@ -47,8 +51,10 @@ ...@@ -47,8 +51,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,1,44 ifdist=1,1,-1
ifdist=2,1,32 ifdist=2,1,-1
ifdist=2,-1,34
ifdist=1,-1,36
</body> </body>
</Procedure> </Procedure>
...@@ -62,8 +68,10 @@ ...@@ -62,8 +68,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,1,44 ifdist=1,1,-1
ifdist=2,1,32 ifdist=2,1,-1
ifdist=1,-1,44
ifdist=2,-1,32
</body> </body>
</Procedure> </Procedure>
...@@ -77,8 +85,10 @@ ...@@ -77,8 +85,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,3,44 ifdist=1,3,-1
ifdist=2,3,32 ifdist=2,3,-1
ifdist=1,-1,10
ifdist=2,-1,10
</body> </body>
</Procedure> </Procedure>
...@@ -92,8 +102,10 @@ ...@@ -92,8 +102,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,4,44 ifdist=1,5,-1
ifdist=2,3,32 ifdist=2,3,-1
ifdist=1,-1,8
ifdist=2,-1,10
</body> </body>
</Procedure> </Procedure>
...@@ -107,8 +119,10 @@ ...@@ -107,8 +119,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,2,22 ifdist=1,2,-1
ifdist=2,2,22 ifdist=2,2,-1
ifdist=1,-1,44
ifdist=2,-1,44
</body> </body>
</Procedure> </Procedure>
...@@ -122,8 +136,10 @@ ...@@ -122,8 +136,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,4,44 ifdist=1,4,-1
ifdist=2,4,32 ifdist=2,4,-1
ifdist=1,-1,8
ifdist=2,-1,8
</body> </body>
</Procedure> </Procedure>
...@@ -137,8 +153,10 @@ ...@@ -137,8 +153,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,3,44 ifdist=1,5,-1
ifdist=2,5,32 ifdist=2,3,-1
ifdist=1,-1,8
ifdist=2,-1,10
</body> </body>
</Procedure> </Procedure>
......
Noto/Configuration/CDB/alma/DataBlock/MMC/NormalModeSetup/NormalModeSetup.xml
+ 1
− 1
View file @ ba944efd
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
Feeds="1" Feeds="1"
IFs="2" IFs="2"
Polarization="L R" Polarization="L R"
DefaultLO="6956.0 6956.0" DefaultLO="6936.0 6936.0"
LOMultiplier="1 1" LOMultiplier="1 1"
FixedLO2="0.0 0.0" FixedLO2="0.0 0.0"
LOMin="5000.0 5000.0" LOMin="5000.0 5000.0"
......
Noto/Configuration/CDB/alma/DataBlock/MMC/Synthesizer/Synthesizer.xml
+ 2
− 2
View file @ ba944efd
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 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> </LocalOscillatorLookUpTable>
Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml
+ 43
− 25
View file @ ba944efd
...@@ -15,8 +15,10 @@ ...@@ -15,8 +15,10 @@
calOff calOff
setAttenuation=0,15 setAttenuation=0,15
setAttenuation=1,5 setAttenuation=1,5
ifdist=1,1,44 ifdist=1,1,-1
ifdist=2,1,32 ifdist=2,1,-1
ifdist=1,-1,16
ifdist=2,-1,32
</body> </body>
</Procedure> </Procedure>
...@@ -32,8 +34,10 @@ ...@@ -32,8 +34,10 @@
calOff calOff
setAttenuation=0,0 setAttenuation=0,0
setAttenuation=1,4 setAttenuation=1,4
ifdist=1,1,44 ifdist=1,1,-1
ifdist=2,1,32 ifdist=2,1,-1
ifdist=1,-1,44
ifdist=2,-1,32
</body> </body>
</Procedure> </Procedure>
...@@ -47,8 +51,10 @@ ...@@ -47,8 +51,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,1,44 ifdist=1,1,-1
ifdist=2,1,32 ifdist=2,1,-1
ifdist=2,-1,34
ifdist=1,-1,36
</body> </body>
</Procedure> </Procedure>
...@@ -62,8 +68,10 @@ ...@@ -62,8 +68,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,1,44 ifdist=1,1,-1
ifdist=2,1,32 ifdist=2,1,-1
ifdist=1,-1,44
ifdist=2,-1,32
</body> </body>
</Procedure> </Procedure>
...@@ -77,8 +85,10 @@ ...@@ -77,8 +85,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,3,44 ifdist=1,3,-1
ifdist=2,3,32 ifdist=2,3,-1
ifdist=1,-1,10
ifdist=2,-1,10
</body> </body>
</Procedure> </Procedure>
...@@ -92,8 +102,10 @@ ...@@ -92,8 +102,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,4,44 ifdist=1,5,-1
ifdist=2,3,32 ifdist=2,3,-1
ifdist=1,-1,8
ifdist=2,-1,10
</body> </body>
</Procedure> </Procedure>
...@@ -107,8 +119,10 @@ ...@@ -107,8 +119,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,2,22 ifdist=1,2,-1
ifdist=2,2,22 ifdist=2,2,-1
ifdist=1,-1,44
ifdist=2,-1,44
</body> </body>
</Procedure> </Procedure>
...@@ -122,8 +136,10 @@ ...@@ -122,8 +136,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,4,44 ifdist=1,4,-1
ifdist=2,4,32 ifdist=2,4,-1
ifdist=1,-1,8
ifdist=2,-1,8
</body> </body>
</Procedure> </Procedure>
...@@ -137,8 +153,10 @@ ...@@ -137,8 +153,10 @@
device=0 device=0
calmux=TotalPower calmux=TotalPower
calOff calOff
ifdist=1,3,44 ifdist=1,5,-1
ifdist=2,5,32 ifdist=2,3,-1
ifdist=1,-1,8
ifdist=2,-1,10
</body> </body>
</Procedure> </Procedure>
......
Noto/Configuration/CDB/alma/RECEIVERS/NotoReceivers/NotoReceivers.xml
+ 1
− 1
View file @ ba944efd
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
HPIBIPAddress="192.167.187.201" HPIBIPAddress="192.167.187.201"
HPIBPort="1234" HPIBPort="1234"
LocalOscillatorInstance="RECEIVERS/LocalOscillator" LocalOscillatorInstance=""
LocalOscillatorEnabledReceivers="KKC QQC CCC MMC" LocalOscillatorEnabledReceivers="KKC QQC CCC MMC"
FocusSelectorInterface="IDL:alma/Backends/TotalPower:1.0" FocusSelectorInterface="IDL:alma/Backends/TotalPower:1.0"
> >
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment