Index: trunk/absroot/source/abspy/abscontrol/client3.py =================================================================== diff --git a/trunk/absroot/source/abspy/abscontrol/client3.py b/trunk/absroot/source/abspy/abscontrol/client3.py --- a/trunk/absroot/source/abspy/abscontrol/client3.py (revision 138) +++ b/trunk/absroot/source/abspy/abscontrol/client3.py (revision 139) @@ -15,7 +15,7 @@ def createObjects(self): self.commObj = library3.TCPComm(self.ipSource, self.iDSource, self.ipDestino, self.iDDestino, self.portDestino) - self.wFiles = library3.FilesStuff() +# self.wFiles = library3.FilesStuff() def __ConnectionWithCentralControl(self, cmd, data): @@ -26,22 +26,22 @@ return output - def abs2ControlModuleFormatFile(self, filename): - - #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) - - return FileStr +# def abs2ControlModuleFormatFile(self, filename): +# +# #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) +# +# return FileStr def sendFile(self, filename): - data = self.abs2ControlModuleFormatFile(filename) - +# data = self.abs2ControlModuleFormatFile(filename) + data = self.__readFile(filename) self.__ConnectionWithCentralControl(cmd = "SNDF", data = data) def changeBeam(self, newBeam): @@ -53,6 +53,15 @@ fobj = open(filename,"w") fobj.writelines(data) fobj.close() + + def __readFile(self, filename): + + fobj = open(filename,"r") + listData = fobj.readlines() + fobj.close() + data = "".join(listData) + return data + def getControlModuleStatus(self, data): Index: trunk/absroot/source/abspy/abscontrol/server3.py =================================================================== diff --git a/trunk/absroot/source/abspy/abscontrol/server3.py b/trunk/absroot/source/abspy/abscontrol/server3.py --- a/trunk/absroot/source/abspy/abscontrol/server3.py (revision 138) +++ b/trunk/absroot/source/abspy/abscontrol/server3.py (revision 139) @@ -25,6 +25,7 @@ asServer = True self.commServerObj = library3.TCPComm("Central_Control", "CeCnMod", self.ipDestino, "CnMod01", self.portDestino, asServer) self.commClientObj = library3.TCPComm("Central_Control", "CeCnMod", self.ipDestino2, "CnMod01", self.portDestino2) + self.wFiles = library3.FilesStuff() def waitRequest(self): @@ -74,10 +75,19 @@ else: status_array.append("192.168.1." + str(address) + " [0 0]\n") - f = open("module_status.txt","w") - f.writelines(status_array) - f.close() - + filename = "module_status.txt" + self.__writeFile(filename,status_array) +# f = open("module_status.txt","w") +# f.writelines(status_array) +# f.close() + + + def __writeFile(self, filename, data): + + fobj = open(filename,"w") + fobj.writelines(data) + fobj.close() + def checkAntenna(self): """ @@ -107,7 +117,19 @@ ipSource, ipDestino, cmd, tmp = self.commClientObj.waitData() self.commClientObj.close_socket() - return tmp + return tmp + + def abs2ControlModuleFormatFile(self, filename): + + #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) + + return FileStr def __All2Blocks(self,input): @@ -121,9 +143,12 @@ def __sendFile2Modules(self,cmd): - + + filename = "tmp.txt" + self.__writeFile(filename,self.rx_buffer) + data = self.abs2ControlModuleFormatFile(filename) #Needed for the loop - header, control_modules_lst = self.__All2Blocks(self.rx_buffer) + header, control_modules_lst = self.__All2Blocks(data) correct = 0 for id in range(1,65):