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 160) +++ b/trunk/absroot/source/abspy/abscontrol/server3.py (revision 161) @@ -46,7 +46,10 @@ if cmd == "SNDF": datarpta = self.__sendFile2Modules(cmd = cmd, rx_buffer = rx_buffer) - + + if cmd == "GETF": + datarpta = self.__getFileFromModules(cmd = cmd, rx_buffer = rx_buffer) + if cmd == "CHGB": datarpta = self.__changeBeam(cmd = cmd, rx_buffer = rx_buffer) @@ -150,7 +153,7 @@ F_Obj.close() FileStr = "".join(FileList) - return FileStr + return FileStr def __All2Blocks(self,input): @@ -190,6 +193,16 @@ rpta = "Failure" return rpta + + def __getFileFromModules(self, cmd, rx_buffer): + + for id in range(1,65): + if id not in self.enaModules: + continue + + file = self.__ConnectionWithControlModules(rx_buffer,cmd,id) + del self.rxFile[id-1] + self.rxFile.insert(id-1, file) def __changeBeam(self, cmd, rx_buffer): @@ -339,6 +352,12 @@ def __AutomaticControlModules(self): + cmd = "GETF" + rx_buffer = "experimento1.ab1" + "\n" + self.__getFileFromModules(cmd = cmd, rx_buffer = rx_buffer) + + print self.rxFile + cmd = "ANST" rx_buffer = "1" self.__getControlModuleStatus(cmd = cmd, rx_buffer = rx_buffer) @@ -348,12 +367,13 @@ self.__getControlModuleLowPhase(cmd = cmd, rx_buffer = rx_buffer) print "Saving file..." + print self.bits print self.phase self.__WritingMonitoringFile() - threading.Timer(30, self.__AutomaticControlModules).start() + threading.Timer(60, self.__AutomaticControlModules).start() def __WritingMonitoringFile(self): filename = "Monitoring.txt"