diff --git a/Common/Servers/ExternalClients/src/ExternalClientsSocketServer.cpp b/Common/Servers/ExternalClients/src/ExternalClientsSocketServer.cpp index 23411b2a06c4946fa44dd9790addd5d42d5c1457..2fe3df0f44a2bfca451b3d0a54b7f2da0a230260 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 b32f0abfaa1776a62150013cb1c6b69b0719f288..c516b9e81886f3364212a83daf4e9b61aac21119 100644 --- a/Common/Servers/PyCalmux/src/Calmux/PyCalmuxImpl.py +++ b/Common/Servers/PyCalmux/src/Calmux/PyCalmuxImpl.py @@ -146,6 +146,8 @@ class PyCalmuxImpl(CalMux, cc, services, lcycle): s.sendall(command) +# time.sleep(0.1) + response = s.recv(1024) s.close() response = response.strip().split() diff --git a/Medicina/Servers/MedicinaMinorServo/src/MedMinorServoGeometry.cpp b/Medicina/Servers/MedicinaMinorServo/src/MedMinorServoGeometry.cpp index db364b60549c0fdfb45cdf0ffcea6730b8e5d54e..3928ac373ceabdb3a76083b1196a1998bcdf40d0 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< @@ -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 @@ -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 @@ -62,8 +68,10 @@ 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 @@ -76,9 +84,11 @@ 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 @@ -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 @@ -106,9 +118,11 @@ asOff device=0 calmux=TotalPower - calOff - ifdist=1,2,22 - ifdist=2,2,22 + calOff + ifdist=1,2,-1 + ifdist=2,2,-1 + ifdist=1,-1,44 + ifdist=2,-1,44 @@ -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 @@ -136,9 +152,11 @@ 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 diff --git a/Noto/Configuration/CDB/alma/DataBlock/MMC/NormalModeSetup/NormalModeSetup.xml b/Noto/Configuration/CDB/alma/DataBlock/MMC/NormalModeSetup/NormalModeSetup.xml index 234122febc550ece553b3b836b3bde6be3d8d627..c4b0eece4184934766370b21fea6ea365225a743 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 e7186f9e4f6e22da470ef85f0ca75ad868c74aca..ca6aa325be777324b6b81fd101deedcaed99cef0 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"> -6956.016 +6936.016 - \ No newline at end of file + diff --git a/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/Noto/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index a5440f574ab53f018aac51747a77658ae0614a09..95447e60d286546a9360acc346c666dc91707b48 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,16 + ifdist=2,-1,32 @@ -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 @@ -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 @@ -62,8 +68,10 @@ 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 @@ -76,9 +84,11 @@ 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 @@ -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 @@ -106,9 +118,11 @@ asOff device=0 calmux=TotalPower - calOff - ifdist=1,2,22 - ifdist=2,2,22 + calOff + ifdist=1,2,-1 + ifdist=2,2,-1 + ifdist=1,-1,44 + ifdist=2,-1,44 @@ -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 @@ -136,9 +152,11 @@ 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 diff --git a/Noto/Configuration/CDB/alma/RECEIVERS/NotoReceivers/NotoReceivers.xml b/Noto/Configuration/CDB/alma/RECEIVERS/NotoReceivers/NotoReceivers.xml index eaeaf8d2a9651a6bda433ce0c4585c5205be4016..fa6d7da85d87781b19243250890a8c465a89ae51 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" >