Index: trunk/absroot/source/abspy/bin/server3.py =================================================================== diff --git a/trunk/absroot/source/abspy/bin/server3.py b/trunk/absroot/source/abspy/bin/server3.py --- a/trunk/absroot/source/abspy/bin/server3.py (revision 269) +++ b/trunk/absroot/source/abspy/bin/server3.py (revision 270) @@ -320,27 +320,23 @@ def __TwoComparation(self, in_lst): - file = [] relay = [] status = [] - mode = '0' - - if mode == '0': - - for i in in_lst: - if len(i) == 7: - file.append("xxxxxx") - relay.append("xxxxxx") - else: - file.append(i[16:22]) - relay.append(i[23:29]) - #Loop to generate a status - for i in range(64): - cnt = 0 - if file[i] == "xxxxxx": - status.append("xx") - continue + + for i in in_lst: + if len(i) == 7: + file.append("xxxxxx") + relay.append("xxxxxx") + else: + file.append(i[16:22]) + relay.append(i[23:29]) + #Loop to generate a status + for i in range(64): + cnt = 0 + if file[i] == "xxxxxx": + status.append("xx") + continue if cmp(file[i],relay[i]) == 0: cnt = cnt + 1 @@ -350,9 +346,7 @@ if cmp(file[i][3:6],relay[i][3:6]) == 0: cnt = cnt + 2 - - - + if cnt == 4: status.append("00") elif cnt == 0: @@ -361,52 +355,6 @@ status.append("01") else: status.append("10") - - else: - - cm_up =[] - cm_dw =[] - relay_up =[] - relay_dw =[] - - for i in in_lst: - if len(i) == 8: - relay_up.append("-") - relay_dw.append("-") - cm_up.append("-") - cm_dw.append("-") - continue - relay_up.append(i[14:17]) - relay_dw.append(i[17:20]) - cm_up.append(i[21:24]) - cm_dw.append(i[24:27]) - - comp_up = [] - comp_dw = [] - - for i in range(64): - if len(relay_up == 1): - comp_up.append('x') - else: - if cmp(relay_up[i], cm_up[i]) == 0: - comp_up.append('0') - else: - comp_up.append('1') - - for i in range(64): - if len(relay_dw == 1): - comp_dw.append('x') - else: - if cmp(relay_dw[i], cm_dw[i]) == 0: - comp_dw.append('0') - else: - comp_dw.append('1') - - # Example: - # comp_up = [1,0,x,1,1,1 ..,1,0,1,x] - # - print comp_up - print comp_dw #Doing final format return self.__FinalFormat(data1 = file, data2 = relay, data3 = status)