ABS/abscontrol Commit - r101:102 · Jicamarca Repository

Trying frame without semicolon.

imanay -

r101:102

parent child

Context file:

r101:102

Collapse all files

trunk/absroot/source/abspy/abscontrol/client3.py +4 -2

             import library3
   No newline at end of file
             class ABSClient:
                 def __init__(self,ipSource="192.168.1.117", iDSource="Clnt_01", ipDestino="192.168.1.117", iDDestino = "CeCnMod", portDestino=7000):
  No newline at end of file
-                def __init__(self,ipSource="localhost", ipDestino="192.168.1.117", portDestino=7000):
  No newline at end of file
   No newline at end of file
                     self.ipSource = ipSource
+                    self.iDSource = iDSource 
  No newline at end of file
                     self.ipDestino = ipDestino
+                    self.iDDestino = iDDestino 
  No newline at end of file
                     self.portDestino = portDestino
   No newline at end of file
                     self.createObjects()
   No newline at end of file
                 def createObjects(self):
                     self.commObj = library3.TCPComm(self.ipSource, self.iDSource, self.ipDestino, self.iDDestino, self.portDestino)
  No newline at end of file
-                    self.commObj = library3.TCPComm(self.ipSource, self.ipDestino, self.portDestino)
  No newline at end of file
                     self.wFiles = library3.FilesStuff()
   No newline at end of file
                 def __ConnectionWithCentralControl(self, cmd, data):
   No newline at end of file
                     self.commObj.open_socket()
                     self.commObj.sendData(cmd = cmd, data = data, ipDestino = self.ipDestino)
                     ipSource, ipDestino, cmd, output = self.commObj.waitData()
                     self.commObj.close_socket()
   No newline at end of file
                     return output
   No newline at end of file
                 def abs2ControlModuleFormatFile(self, filename):
   No newline at end of file
                     #From matriz to control module format
                     self.wFiles.toCentralControlFormat(filename)
                     FileName = "CentralControlFormat.txt"
                     F_Obj = open(FileName,"r")
                     FileList = F_Obj.readlines()
                     F_Obj.close()
                     FileStr = "".join(FileList)
   No newline at end of file
                     return FileStr
   No newline at end of file
                 def sendFile(self, filename):
   No newline at end of file
                     data = self.abs2ControlModuleFormatFile(filename)
   No newline at end of file
                     self.__ConnectionWithCentralControl(cmd = "SNDF", data = data)
   No newline at end of file
                 def changeBeam(self, newBeam):
   No newline at end of file
                     self.__ConnectionWithCentralControl(cmd = "CHGB", data = newBeam)
   No newline at end of file
                 def __writeFile(self, filename, data):
   No newline at end of file
                     fobj = open(filename,"w")
                     fobj.writelines(data)
                     fobj.close()
   No newline at end of file
                 def getControlModuleStatus(self, data):
   No newline at end of file
                     data = self.__ConnectionWithCentralControl(cmd = "ANST", data = data)
                     self.__writeFile("report.txt", data)
   No newline at end of file
                 def getConnectionStatus(self):
   No newline at end of file
                     data = self.__ConnectionWithCentralControl(cmd = "NTST", data = "none")
                     self.__writeFile("connection_status.txt", data)
   No newline at end of file
             if __name__ == '__main__':
   No newline at end of file
                 filename = "experimento1.abs"
   No newline at end of file
                 absObj = ABSClient()
                 absObj.sendFile(filename)

trunk/absroot/source/abspy/abscontrol/library3.py +92 -12

             # Needed for the FilesStuff class
             import os
             import numpy as np
             # Needed for the TCPComm class
             import socket
   No newline at end of file
             class TCPComm:
   No newline at end of file
                 __HEADER = "JRO"
                 __TYPE = "ABS"
                 def __init__(self, ipSource, iDSource, ipDestino, iDDestino, portDestino, asServer=False):
  No newline at end of file
-                def __init__(self, ipSource, ipDestino, portDestino, asServer=False):
  No newline at end of file
   No newline at end of file
                     self.ipSource = ipSource
+                    self.iDSource = iDSource 
  No newline at end of file
                     self.ipDestino = ipDestino
+                    self.iDDestino = iDDestino
  No newline at end of file
                     self.portDestino = portDestino
                     self.addr = (ipDestino,portDestino)
   No newline at end of file
                     self.sc = "none"
                     self.answer = "none"     #test
                     self.asServer = False
                     self.len = "000000"
-                    self.len = 0
+             No newline at end of file
                     self.crc = "0"
  No newline at end of file
-                    self.crc = 0
  No newline at end of file
   No newline at end of file
                     self.openSocket(asServer)
   No newline at end of file
                 def openSocket(self, asServer):
   No newline at end of file
                     #self.socket_c = socket.socket(AF_INET,SOCK_DGRAM)
             #        self.socket_c = socket.socket()
             #        self.socket_c.connect((self.ipDestino, self.portDestino))
   No newline at end of file
                     if asServer:
                         self.socket_c = socket.socket()
             #            self.configAsServer()
                         self.socket_c.bind(self.addr)
                         self.asServer = True
                     else:
             #            self.configAsClient()
                         self.asServer = False        #Socket is opened at the sendData function
   No newline at end of file
             #    def configAsClient(self):
                     #Buscar broadcast TCP
             #        self.socket_c.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
             #         self.socket_c.connect(self.addr)
             #         pass
   No newline at end of file
             #    def configAsServer(self):
             #
             #        self.socket_c.bind(self.addr)
   No newline at end of file
                 def waitData(self):
                     if self.asServer == True:
                         trama_rx, l = self.waitAsServer()
  No newline at end of file
-                        trama_rx = self.waitAsServer()
  No newline at end of file
                     else:
                         trama_rx, l = self.waitAsClient()
-                        trama_rx = self.waitAsClient()
+             No newline at end of file
              No newline at end of file
              No newline at end of file
                     ipSource, ipDestino, cmd, data = self.__getTrama(trama_rx, l)
  No newline at end of file
-                    ipSource, ipDestino, cmd, data = self.__getTrama(trama_rx)
  No newline at end of file
   No newline at end of file
                     return ipSource, ipDestino, cmd, data
                 def waitAsClient2(self, nbytes = 1024):
-                def waitAsServer(self, nbytes = 1024):
  No newline at end of file
+             No newline at end of file
+                    print "\nWaiting the server."
              No newline at end of file
+                        # Short data through ethernet
              No newline at end of file
+                    trama_rx = self.socket_c.recv(nbytes)
              No newline at end of file
+                    print "\nThis socket has received this data: " + str(trama_rx)
              No newline at end of file
              No newline at end of file
+                    return trama_rx
              No newline at end of file
              No newline at end of file
+                def waitAsServer2(self, nbytes = 1024):
  No newline at end of file
                     print "\nWaiting some client."
                     self.socket_c.listen(1)
                     sc, addr = self.socket_c.accept()
                     self.sc = sc
                     self.answer = addr
                     # Big data through ethernet
                     trama_rx = ""
                     while True:
                         tmp = self.sc.recv(nbytes)
                         trama_rx = trama_rx + tmp
                         if trama_rx[-4:] == "quit":
                             break
   No newline at end of file
                     print "\nThis socket has received some data from: " + str(self.answer)
   No newline at end of file
                     return trama_rx
   No newline at end of file
+                def waitAsServer(self, nbytes = 1024):
              No newline at end of file
+                    print "\nWaiting some client."
              No newline at end of file
+                    self.socket_c.listen(1)
              No newline at end of file
+                    sc, addr = self.socket_c.accept()
              No newline at end of file
+                    self.sc = sc
              No newline at end of file
+                    self.answer = addr
              No newline at end of file
+                    # Big data through ethernet
              No newline at end of file
+                    cnt = 0;
              No newline at end of file
+                    first = 0;
              No newline at end of file
+                    trama_rx = ""
              No newline at end of file
+                    while True:
              No newline at end of file
+                        tmp = self.sc.recv(nbytes)
              No newline at end of file
+                        trama_rx = trama_rx + tmp
              No newline at end of file
+                        cnt = len(trama_rx)
              No newline at end of file
+                        if first == 0:
              No newline at end of file
+                            first = 1
              No newline at end of file
+                            lng = int(trama_rx[20:26])
              No newline at end of file
+                        if cnt == lng:
              No newline at end of file
+                            break
              No newline at end of file
              No newline at end of file
+                    print "\nThis socket has received some data from: " + str(self.answer)
              No newline at end of file
              No newline at end of file
+                    return trama_rx, lng
              No newline at end of file
+  No newline at end of file
                 def waitAsClient(self, nbytes = 1024):
                     print "\nWaiting the server."
                         # Short data through ethernet
                     trama_rx = self.socket_c.recv(nbytes)
+                    lng = int(trama_rx[20:26])
  No newline at end of file
                     print "\nThis socket has received this data: " + str(trama_rx)
                     return trama_rx, lng
-                    return trama_rx
+             No newline at end of file
              No newline at end of file
              No newline at end of file
                 def sendData2(self, cmd, data, ipDestino):
  No newline at end of file
-                def sendData(self, cmd, data, ipDestino):
  No newline at end of file
   No newline at end of file
                     trama_tx = self.__HEADER + ":" + self.__TYPE + ":" + str(self.ipSource) + ":" + str(ipDestino) + \
                     ":" + str(self.len) + ":" + str(cmd) + ":" + str(data) + ":" + str(self.crc) + ":" + "quit"
   No newline at end of file
                     if self.asServer == True:
                         self.SendAsServer(trama_tx)
                     else:
                         self.SendAsClient(ipDestino, trama_tx)
   No newline at end of file
+                def sendData(self, cmd, data, ipDestino):
              No newline at end of file
              No newline at end of file
+                    trama_tx = self.__HEADER + self.__TYPE + self.iDSource + \
              No newline at end of file
+                    self.iDDestino + self.len + str(cmd) + str(data) + self.crc
              No newline at end of file
              No newline at end of file
+                    self.len = self.int2str(len(trama_tx))
              No newline at end of file
              No newline at end of file
+                    trama_tx = self.__HEADER + self.__TYPE + self.iDSource + \
              No newline at end of file
+                    self.iDDestino + self.len + str(cmd) + str(data) + self.crc
              No newline at end of file
              No newline at end of file
+                    if self.asServer == True:
              No newline at end of file
+                        self.SendAsServer(trama_tx)
              No newline at end of file
+                    else:
              No newline at end of file
+                        self.SendAsClient(ipDestino, trama_tx)
              No newline at end of file
+  No newline at end of file
                 def SendAsServer(self, trama_tx):
   No newline at end of file
                     self.sc.send(trama_tx)
                     print "Sending message:[" + trama_tx + "] to: " + str(self.answer)
   No newline at end of file
   No newline at end of file
                 def SendAsClient(self, ipDestino, trama_tx):
   No newline at end of file
                     self.socket_c.connect((ipDestino, self.portDestino))
                     self.socket_c.send(trama_tx)
                     print "Sending message:[" + trama_tx + "] to: " + ipDestino
                 def __getTrama2(self, trama):
  No newline at end of file
-                def __getTrama(self, trama):
  No newline at end of file
   No newline at end of file
                     FrameList = trama.split(':')
   No newline at end of file
                     header = FrameList[0]
                     TypeOfInstrument = FrameList[1]
                     ipSource = FrameList[2]
                     ipDestino = FrameList[3]
                     len = FrameList[4]
                     cmd = FrameList[5]
                     data = FrameList[6]
                     crc = FrameList[7]
                     trash = FrameList[8]
   No newline at end of file
                     return ipSource, ipDestino, cmd, data
   No newline at end of file
+                def __getTrama(self, trama, l):
              No newline at end of file
              No newline at end of file
+                    header = trama[0:3]
              No newline at end of file
+                    TypeOfInstrument = trama[3:6]
              No newline at end of file
+                    ipSource = trama[6:13]
              No newline at end of file
+                    ipDestino = trama[13:20]
              No newline at end of file
+                    len = trama[20:26]
              No newline at end of file
+                    cmd = trama[26:30]
              No newline at end of file
+                    ldata = l-31
              No newline at end of file
+                    data = trama[30:30+ldata]
              No newline at end of file
+                    crc = trama[30+ldata:]
              No newline at end of file
              No newline at end of file
+                    return ipSource, ipDestino, cmd, data
              No newline at end of file
+  No newline at end of file
                 def close_socket(self):
                     self.socket_c.close()
   No newline at end of file
                 def open_socket(self):
                     self.socket_c = socket.socket()
              No newline at end of file
+                def int2str(self, n):
              No newline at end of file
              No newline at end of file
+                    str_n = str(n)
              No newline at end of file
+                    l_n = len(str_n)
              No newline at end of file
+                    if l_n == 1:
              No newline at end of file
+                        str_n = "00000" + str_n
              No newline at end of file
+                    elif l_n == 2:
              No newline at end of file
+                        str_n = "0000" + str_n
              No newline at end of file
+                    elif l_n == 3:
              No newline at end of file
+                        str_n = "000" + str_n
              No newline at end of file
+                    elif l_n == 4:
              No newline at end of file
+                        str_n = "00" + str_n
              No newline at end of file
+                    elif l_n == 5:
              No newline at end of file
+                        str_n = "0" + str_n
              No newline at end of file
+                    return  str_n
  No newline at end of file
   No newline at end of file
             class   FilesStuff():
   No newline at end of file
                 def lst2string(self, lst):
                     string=''
                     for i in lst:
                         string=string+i
                     return string
   No newline at end of file
                 def string2lst(self, string):
                     lst = []
                     for i in string:
                         lst.append(i)
                     return lst
   No newline at end of file
   No newline at end of file
                 def file1(self, filename, type):
                     lst = self.string2lst(filename)
                     fin = -1
                     t = len(lst)
                     for i in np.arange(-1,-t,-1):
                         if lst[i]=='/':
                             fin=i
                             break
                     if type == '1':
                         nombre2 = lst[fin+1:]
                         nombre2[-1]='s'
                         nombre2 = self.lst2string(nombre2)
                         return nombre2
                     if type == '2':
                         nombre2 = lst[fin+1:]
                         nombre2[-1]='1'
                         nombre2 = self.lst2string(nombre2)
                         return nombre2
   No newline at end of file
   No newline at end of file
                 def EliminaSaltoDeLinea(self,cadena):
                     i = 0
                     for elemento in cadena:
                         if elemento =='\n' or elemento =='\r':
                             pass
                         else:
                             i=i+1
                     return cadena [:i]
   No newline at end of file
                 def NumeroDeExperimentos(self, path):
                     fichero1=open(path,'r')
                     cont=0
                     for cadena in fichero1:
                         cont=cont+1
                         if cont==3:
                             nexp=''
                             pos=0
                             for elemento in cadena:
                                 pos=pos+1
                                 if elemento=='=':
                                     nexp=int(cadena[pos:])
                                     return nexp
                     fichero1.close()
   No newline at end of file
                 def Paridad(numero):
                     if numero%2==0: return 'par'
                     elif numero%2==1: return 'impar'
   No newline at end of file
                 def EvaluaCadena(self,cadena):
                     if len(cadena)>35:
                         if cadena[-1]=='$':
                             return cadena[-35:-2]
                         elif cadena[-1]==']':
                             return cadena[-34:-1]
                     else:
                         return None
   No newline at end of file
                 def GuardaEnLista(self,path):
                     fichero=open(path,'r')
                     lista=[]
                     for cadena in fichero:
                         cadena = self.EliminaSaltoDeLinea(cadena)
                         cadena = self.EvaluaCadena(cadena)
                         if cadena != None:
                             lista.append(cadena)
                     fichero.close()
                     return lista
   No newline at end of file
                 def CreaFicherosPrevios(self, path, archivo):
                     vector = self.GuardaEnLista(archivo)
                     for i in range(1,self.NumeroDeExperimentos(archivo)+1):
                         fichero =open(path + str(i)+ '.txt','w')
                         for j in range(0,16):
                             fichero.write(vector[j+16*(i-1)]+'\n')
                         fichero.close()
   No newline at end of file
                 def CapturaValoresEnArchivo(self, path, polarizacion='up'):
                     fichero =open(path,'r')
                     cnt=0
                     lstup=[]
                     lstdw=[]
                     for cadena in fichero:
                         cnt=cnt+1
                         if cnt==1:
                             nu01=cadena[1:4]
                             nu02=cadena[5:8]
                             nu03=cadena[9:12]
                             nu04=cadena[13:16]
                             eu01=cadena[17:20]
                             eu02=cadena[21:24]
                             eu03=cadena[25:28]
                             eu04=cadena[29:32]
                         if cnt==2:
                             nu05=cadena[1:4]
                             nu06=cadena[5:8]
                             nu07=cadena[9:12]
                             nu08=cadena[13:16]
                             eu05=cadena[17:20]
                             eu06=cadena[21:24]
                             eu07=cadena[25:28]
                             eu08=cadena[29:32]
                         if cnt==3:
                             nu09=cadena[1:4]
                             nu10=cadena[5:8]
                             nu11=cadena[9:12]
                             nu12=cadena[13:16]
                             eu09=cadena[17:20]
                             eu10=cadena[21:24]
                             eu11=cadena[25:28]
                             eu12=cadena[29:32]
                         if cnt==4:
                             nu13=cadena[1:4]
                             nu14=cadena[5:8]
                             nu15=cadena[9:12]
                             nu16=cadena[13:16]
                             eu13=cadena[17:20]
                             eu14=cadena[21:24]
                             eu15=cadena[25:28]
                             eu16=cadena[29:32]
                         if cnt==5:
                             wu01=cadena[1:4]
                             wu02=cadena[5:8]
                             wu03=cadena[9:12]
                             wu04=cadena[13:16]
                             su01=cadena[17:20]
                             su02=cadena[21:24]
                             su03=cadena[25:28]
                             su04=cadena[29:32]
                         if cnt==6:
                             wu05=cadena[1:4]
                             wu06=cadena[5:8]
                             wu07=cadena[9:12]
                             wu08=cadena[13:16]
                             su05=cadena[17:20]
                             su06=cadena[21:24]
                             su07=cadena[25:28]
                             su08=cadena[29:32]
                         if cnt==7:
                             wu09=cadena[1:4]
                             wu10=cadena[5:8]
                             wu11=cadena[9:12]
                             wu12=cadena[13:16]
                             su09=cadena[17:20]
                             su10=cadena[21:24]
                             su11=cadena[25:28]
                             su12=cadena[29:32]
                         if cnt==8:
                             wu13=cadena[1:4]
                             wu14=cadena[5:8]
                             wu15=cadena[9:12]
                             wu16=cadena[13:16]
                             su13=cadena[17:20]
                             su14=cadena[21:24]
                             su15=cadena[25:28]
                             su16=cadena[29:32]
                         if cnt==9:
                             nd01=cadena[1:4]
                             nd02=cadena[5:8]
                             nd03=cadena[9:12]
                             nd04=cadena[13:16]
                             ed01=cadena[17:20]
                             ed02=cadena[21:24]
                             ed03=cadena[25:28]
                             ed04=cadena[29:32]
                         if cnt==10:
                             nd05=cadena[1:4]
                             nd06=cadena[5:8]
                             nd07=cadena[9:12]
                             nd08=cadena[13:16]
                             ed05=cadena[17:20]
                             ed06=cadena[21:24]
                             ed07=cadena[25:28]
                             ed08=cadena[29:32]
                         if cnt==11:
                             nd09=cadena[1:4]
                             nd10=cadena[5:8]
                             nd11=cadena[9:12]
                             nd12=cadena[13:16]
                             ed09=cadena[17:20]
                             ed10=cadena[21:24]
                             ed11=cadena[25:28]
                             ed12=cadena[29:32]
                         if cnt==12:
                             nd13=cadena[1:4]
                             nd14=cadena[5:8]
                             nd15=cadena[9:12]
                             nd16=cadena[13:16]
                             ed13=cadena[17:20]
                             ed14=cadena[21:24]
                             ed15=cadena[25:28]
                             ed16=cadena[29:32]
                         if cnt==13:
                             wd01=cadena[1:4]
                             wd02=cadena[5:8]
                             wd03=cadena[9:12]
                             wd04=cadena[13:16]
                             sd01=cadena[17:20]
                             sd02=cadena[21:24]
                             sd03=cadena[25:28]
                             sd04=cadena[29:32]
                         if cnt==14:
                             wd05=cadena[1:4]
                             wd06=cadena[5:8]
                             wd07=cadena[9:12]
                             wd08=cadena[13:16]
                             sd05=cadena[17:20]
                             sd06=cadena[21:24]
                             sd07=cadena[25:28]
                             sd08=cadena[29:32]
                         if cnt==15:
                             wd09=cadena[1:4]
                             wd10=cadena[5:8]
                             wd11=cadena[9:12]
                             wd12=cadena[13:16]
                             sd09=cadena[17:20]
                             sd10=cadena[21:24]
                             sd11=cadena[25:28]
                             sd12=cadena[29:32]
                         if cnt==16:
                             wd13=cadena[1:4]
                             wd14=cadena[5:8]
                             wd15=cadena[9:12]
                             wd16=cadena[13:16]
                             sd13=cadena[17:20]
                             sd14=cadena[21:24]
                             sd15=cadena[25:28]
                             sd16=cadena[29:32]
                     blck_1_up = [nu01,nu02,nu03,nu04,eu01,eu02,eu03,eu04,nu05,nu06,nu07,nu08,eu05,eu06,eu07,eu08]
                     blck_1_dw = [nd01,nd02,nd03,nd04,ed01,ed02,ed03,ed04,nd05,nd06,nd07,nd08,ed05,ed06,ed07,ed08]
                     blck_2_up = [nu09,nu10,nu11,nu12,eu09,eu10,eu11,eu12,nu13,nu14,nu15,nu16,eu13,eu14,eu15,eu16]
                     blck_2_dw = [nd09,nd10,nd11,nd12,ed09,ed10,ed11,ed12,nd13,nd14,nd15,nd16,ed13,ed14,ed15,ed16]
                     blck_3_up = [wu01,wu02,wu03,wu04,su01,su02,su03,su04,wu05,wu06,wu07,wu08,su05,su06,su07,su08]
                     blck_3_dw = [wd01,wd02,wd03,wd04,sd01,sd02,sd03,sd04,wd05,wd06,wd07,wd08,sd05,sd06,sd07,sd08]
                     blck_4_up = [wu09,wu10,wu11,wu12,su09,su10,su11,su12,wu13,wu14,wu15,wu16,su13,su14,su15,su16]
                     blck_4_dw = [wd09,wd10,wd11,wd12,sd09,sd10,sd11,sd12,wd13,wd14,wd15,wd16,sd13,sd14,sd15,sd16]
   No newline at end of file
                     lstup = blck_1_up + blck_2_up + blck_3_up + blck_4_up
                     lstdw = blck_1_dw + blck_2_dw + blck_3_dw + blck_4_dw
   No newline at end of file
                     if polarizacion=='up':
                         return lstup
                     elif polarizacion=='dw':
                         return lstdw
                     fichero.close()
   No newline at end of file
                 def CreaFormatoFinal(self, path, filename):
                     ne=self.NumeroDeExperimentos(filename)
   No newline at end of file
                     #nombre01 = file1(archivo,'1')
                     nombre02 = self.file1(filename,'2')
                     fichero=open(path + 'CentralControlFormat.txt','w')
                     fichero.write(nombre02+'\n')
                     fichero.write(str(ne)+'\n')
   No newline at end of file
                     for i in range(1,65):
   No newline at end of file
                         if i<10:
                             nmod = '0'+str(i)
                         else: nmod = str(i)
   No newline at end of file
                         fichero.write("ABS_" + nmod+'\n')
   No newline at end of file
                         for j in range(1,ne+1):
                             ruta=path+str(j)+'.txt'
                             lu=self.CapturaValoresEnArchivo(ruta,polarizacion='up')
                             ld=self.CapturaValoresEnArchivo(ruta,polarizacion='dw')
                             part1=''
                             part2=''
                             if lu[i-1]=='1.0': part1='000'
                             if lu[i-1]=='2.0': part1='001'
                             if lu[i-1]=='3.0': part1='010'
                             if lu[i-1]=='0.0': part1='011'
                             if lu[i-1]=='0.5': part1='100'
                             if lu[i-1]=='1.5': part1='101'
                             if lu[i-1]=='2.5': part1='110'
                             if lu[i-1]=='3.5': part1='111'
                             if ld[i-1]=='1.0': part2='000'
                             if ld[i-1]=='2.0': part2='001'
                             if ld[i-1]=='3.0': part2='010'
                             if ld[i-1]=='0.0': part2='011'
                             if ld[i-1]=='0.5': part2='100'
                             if ld[i-1]=='1.5': part2='101'
                             if ld[i-1]=='2.5': part2='110'
                             if ld[i-1]=='3.5': part2='111'
                             fichero.write(part1+part2+'\n')
                         fichero.write('------'+'\n')
                     fichero.close()
   No newline at end of file
                 def EliminaArchivosEnLaCarpeta(self, path, filename):
                     ne=self.NumeroDeExperimentos(filename)
                     for i in range(1,ne+1):
                         os.remove(path + str(i)+'.txt')
   No newline at end of file
   No newline at end of file
                 def toCentralControlFormat(self, filename):
                     """ Funcion que genera un archivo para el control central"""
   No newline at end of file
                     path = os.getcwd() + '/'
                     self.CreaFicherosPrevios(path, filename)
                     self.CreaFormatoFinal(path, filename)
                     self.EliminaArchivosEnLaCarpeta(path, filename)

trunk/absroot/source/abspy/abscontrol/server3.py +2 -2

             import os
             import library3
             import time
   No newline at end of file
             class ABSServer:
   No newline at end of file
                 def __init__(self,ipSource="localhost", ipDestino="192.168.1.117", portDestino=7000, ipDestino2="192.168.1.11", portDestino2=5500):
   No newline at end of file
                     self.ipSource = ipSource
                     self.ipDestino = ipDestino
                     self.portDestino = portDestino
   No newline at end of file
                     self.ipDestino2 = ipDestino2
                     self.portDestino2 = portDestino2
   No newline at end of file
                     self.tx_buffer = "default"
                     self.rx_buffer = "default"
                     self.enaModules = []
   No newline at end of file
                     self.createObjects()
   No newline at end of file
                 def createObjects(self):
   No newline at end of file
                     asServer = True
                     self.commServerObj = library3.TCPComm("Central_Control", "CeCnMod", self.ipDestino, "CnMod01", self.portDestino, asServer)
-                    self.commServerObj = library3.TCPComm("Central_Control", self.ipDestino, self.portDestino, asServer)
+             No newline at end of file
                     self.commClientObj = library3.TCPComm("Central_Control", "CeCnMod", self.ipDestino2, "CnMod01", self.portDestino2)
  No newline at end of file
-                    self.commClientObj = library3.TCPComm("Central_Control", self.ipDestino2, self.portDestino2)
  No newline at end of file
   No newline at end of file
                 def waitRequest(self):
   No newline at end of file
                     #Using rx buffer
                     ipSource, ipDestino, cmd, self.rx_buffer = self.commServerObj.waitData()
   No newline at end of file
                     if cmd == "SNDF":
                         datarpta = self.__sendFile2Modules(cmd = cmd)
   No newline at end of file
                     if cmd == "CHGB":
                         datarpta = self.__changeBeam(cmd = cmd)
   No newline at end of file
                     if cmd == "ANST":
                         self.__getControlModuleStatus(cmd = cmd)
                         #Using tx buffer
                         datarpta = self.tx_buffer
   No newline at end of file
                     if cmd == "NTST":
                         self.enaModules =  self.__getConnectionStatus()
                         #Using tx buffer
                         datarpta = self.enaModules
   No newline at end of file
                     self.commServerObj.sendData(cmd=cmd, data=datarpta, ipDestino = ipSource)
   No newline at end of file
                 def checkModule(self, address):
   No newline at end of file
                     cmd = "ping -c 1 -w 1 192.168.1."+ str(address) + " >> /dev/null"
                     status = os.system(cmd)
   No newline at end of file
                     if status == 256:
                         return False
   No newline at end of file
                     return True
   No newline at end of file
                 def __writeReport(self, enaModules):
   No newline at end of file
                     status_array = ["Status of modules\n"]
                     status_array.append("----------------\n")
   No newline at end of file
                     for address in range(1,65):
                         if address in enaModules:
                             status_array.append("192.168.1." + str(address) + " [1 1]\n")
                         else:
                             status_array.append("192.168.1." + str(address) + " [0 0]\n")
   No newline at end of file
                     f = open("module_status.txt","w")
                     f.writelines(status_array)
                     f.close()
   No newline at end of file
                 def checkAntenna(self):
   No newline at end of file
                     """
                     Direccion de los modulos de las antenas:
   No newline at end of file
                         Norte    :    01-16
                         Este     :    17-32
                         Oeste:   :    33-48
                         Sur      :    49-64
   No newline at end of file
                     """
   No newline at end of file
                     enaModules2 = []
   No newline at end of file
                     for address in range(1,65):
                         if self.checkModule(address):
                             enaModules2.append(address)
   No newline at end of file
                     self.__writeReport(enaModules2)
                     return  enaModules2
   No newline at end of file
                 def __ConnectionWithControlModules(self,data,cmd,id):
   No newline at end of file
                     self.commClientObj.open_socket()
                     ip = "192.168.1." + str(id)
                     self.commClientObj.sendData(cmd, data, ip)
                     ipSource, ipDestino, cmd, tmp = self.commClientObj.waitData()
                     self.commClientObj.close_socket()
   No newline at end of file
                     return tmp
   No newline at end of file
                 def __All2Blocks(self,input):
   No newline at end of file
                     rx_frame_lst = input.split('\n',2)
   No newline at end of file
                     header = rx_frame_lst[0] + "\n"
                     control_modules_str = rx_frame_lst[2]
                     control_modules_lst = control_modules_str.split("------\n")
   No newline at end of file
                     return  header, control_modules_lst
   No newline at end of file
   No newline at end of file
                 def __sendFile2Modules(self,cmd):
   No newline at end of file
                     #Needed for the loop
                     header, control_modules_lst = self.__All2Blocks(self.rx_buffer)
                     correct = 0
   No newline at end of file
                     for id in range(1,65):
   No newline at end of file
                         if id not in self.enaModules:
                             continue
   No newline at end of file
                         if self.__ConnectionWithControlModules(header + control_modules_lst[id-1], cmd, id) == "OK":
                             correct = correct + 1
   No newline at end of file
                     if correct == len(self.enaModules):
                         rpta = "OK"
                     else:
                         rpta = "Failure"
   No newline at end of file
                     return rpta
   No newline at end of file
                 def __changeBeam(self, cmd):
   No newline at end of file
                     correct = 0
             #        enaModules = self.checkAntenna()
             #        enaModules = [11,12,13,14]
   No newline at end of file
                     for id in range(1,65):
                         if id not in self.enaModules:
                             continue
   No newline at end of file
                         if self.__ConnectionWithControlModules(self.rx_buffer,cmd,id) == "OK":
                             correct = correct + 1
   No newline at end of file
                     if correct == len(self.enaModules):
                         rpta = "OK"
                     else:
                         rpta = "Failure"
   No newline at end of file
                     return rpta
   No newline at end of file
                 def __getControlModuleStatus(self, cmd):
   No newline at end of file
                     all_blocks = ""
             #        enaModules = self.checkAntenna()
             #        enaModules = [11,12,13,14]
   No newline at end of file
                     for id in range(1,65):
                         if id not in self.enaModules:
                             continue
   No newline at end of file
                         one_block = self.__ConnectionWithControlModules(self.rx_buffer,cmd,id)
   No newline at end of file
                         all_blocks = all_blocks + one_block
                     #Using tx buffer
                     self.tx_buffer = all_blocks
   No newline at end of file
                 def __getConnectionStatus(self):
   No newline at end of file
                     enaModules = self.checkAntenna()
   No newline at end of file
                     return  enaModules
   No newline at end of file
             if __name__ == '__main__':
   No newline at end of file
                 absObj = ABSServer()
   No newline at end of file
                 while 1:
                     absObj.waitRequest()

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages