Reopen branch to track modified files on Noto server

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++)
-	{
+      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,

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()

Medicina/Servers/MedicinaMinorServo/src/MedMinorServoGeometry.cpp

@@ -325,11 +325,15 @@ 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){
+    if(iposition > axis.position_max){
+	     std::cout<<axis.name<<" "<<iposition<<" " <<axis.position_max<< std::endl;
         throw MinorServoAxisLimitError("axis too high ");
         //return axis.position_max;
     }

Noto/CDB/alma/Procedures/StationProcedures/StationProcedures.xml

@@ -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>
 
@@ -107,8 +107,10 @@
 	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>
 

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"

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>

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>
 
@@ -32,8 +34,10 @@
 	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>
 
@@ -47,8 +51,10 @@
 	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>
 
@@ -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
 </body>
 </Procedure>
 
@@ -77,8 +85,10 @@
 	device=0
 	calmux=TotalPower
    calOff
-	ifdist=1,3,44
-	ifdist=2,3,32
+   ifdist=1,3,-1
+   ifdist=2,3,-1
+	ifdist=1,-1,10
+	ifdist=2,-1,10
 </body>
 </Procedure>
 
@@ -92,8 +102,10 @@
 	device=0
 	calmux=TotalPower
     calOff
-	ifdist=1,4,44
-	ifdist=2,3,32
+    ifdist=1,5,-1
+    ifdist=2,3,-1
+	ifdist=1,-1,8
+	ifdist=2,-1,10
 </body>
 </Procedure>
 
@@ -107,8 +119,10 @@
 	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>
 
@@ -122,8 +136,10 @@
 	device=0
 	calmux=TotalPower
     calOff
-	ifdist=1,4,44
-	ifdist=2,4,32
+    ifdist=1,4,-1
+    ifdist=2,4,-1
+	ifdist=1,-1,8
+	ifdist=2,-1,8
 </body>
 </Procedure>
 
@@ -137,8 +153,10 @@
 	device=0
 	calmux=TotalPower
    calOff
-	ifdist=1,3,44
-	ifdist=2,5,32
+   ifdist=1,5,-1
+   ifdist=2,3,-1
+	ifdist=1,-1,8
+	ifdist=2,-1,10
 </body>
 </Procedure>
 

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"
 >