# SVN changeset patch # User imanay # Date 2012-11-29 22:46:45.144570 # Revision 50 Index: trunk/absroot/source/abspy/abscontrol/client.py =================================================================== diff --git a/trunk/absroot/source/abspy/abscontrol/client.py b/trunk/absroot/source/abspy/abscontrol/client.py --- a/trunk/absroot/source/abspy/abscontrol/client.py (revision 49) +++ b/trunk/absroot/source/abspy/abscontrol/client.py (revision 50) @@ -197,7 +197,177 @@ elif polarizacion=='dw': return lstdw fichero.close() - + + def CapturaValoresEnArchivo2(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] + lst_n_up=[nu01,nu02,nu03,nu04,nu05,nu06,nu07,nu08,nu09,nu10,nu11,nu12,nu13,nu14,nu15,nu16] + lst_n_dw=[nd01,nd02,nd03,nd04,nd05,nd06,nd07,nd08,nd09,nd10,nd11,nd12,nd13,nd14,nd15,nd16] + lst_s_up=[su01,su02,su03,su04,su05,su06,su07,su08,su09,su10,su11,su12,su13,su14,su15,su16] + lst_s_dw=[sd01,sd02,sd03,sd04,sd05,sd06,sd07,sd08,sd09,sd10,sd11,sd12,sd13,sd14,sd15,sd16] + lst_w_up=[wu01,wu02,wu03,wu04,wu05,wu06,wu07,wu08,wu09,wu10,wu11,wu12,wu13,wu14,wu15,wu16] + lst_w_dw=[wd01,wd02,wd03,wd04,wd05,wd06,wd07,wd08,wd09,wd10,wd11,wd12,wd13,wd14,wd15,wd16] + lst_e_up=[eu01,eu02,eu03,eu04,eu05,eu06,eu07,eu08,eu09,eu10,eu11,eu12,eu13,eu14,eu15,eu16] + lst_e_dw=[ed01,ed02,ed03,ed04,ed05,ed06,ed07,ed08,ed09,ed10,ed11,ed12,ed13,ed14,ed15,ed16] + + lstup = lst_s_up + lst_w_up + lst_n_up + lst_e_up + lstdw = lst_s_dw + lst_w_dw + lst_n_up + lst_e_up + + if polarizacion=='up': + return lstup + elif polarizacion=='dw': + return lstdw + fichero.close() + + def CreaFormatoFinal(): ne=NumeroDeExperimentos(archivo) @@ -240,13 +410,56 @@ fichero.write('------'+'\n') fichero.close() + def CreaFormatoFinal2(): + ne=NumeroDeExperimentos(archivo) + + #nombre01 = file1(archivo,'1') + nombre02 = file1(archivo,'2') + fichero=open(CarpetaDeTrabajo+'FormatoControlCentral.txt','w') + fichero.write(nombre02+'\n') + fichero.write(str(ne)+'\n') + + for i in range(1,65): + + if i<10: + nmod = '0'+str(i) + else: nmod = str(i) + + fichero.write("ABS_" + nmod+'\n') + + for j in range(1,ne+1): + ruta=CarpetaDeTrabajo+str(j)+'.txt' + lu=CapturaValoresEnArchivo2(ruta,polarizacion='up') + ld=CapturaValoresEnArchivo2(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() + def EliminaArchivosEnLaCarpeta(): ne=NumeroDeExperimentos(archivo) for i in range(1,ne+1): os.remove(CarpetaDeTrabajo+str(i)+'.txt') CreaFicherosPrevios() - CreaFormatoFinal() + CreaFormatoFinal2() EliminaArchivosEnLaCarpeta() ########## @@ -256,7 +469,7 @@ filename = "experimento1.abs" absObj = ABSClient() - absObj.sendFile(filename) +# absObj.sendFile(filename) # absObj.changeBeam("0") # absObj.changeBeam("1") # absObj.changeBeam("2") @@ -265,4 +478,4 @@ # absObj.changeBeam("5") # absObj.changeBeam("6") # absObj.changeBeam("7") -# absObj.getStatus(5) \ No newline at end of file + absObj.getStatus(5) \ No newline at end of file Index: trunk/absroot/source/abspy/abscontrol/server.py =================================================================== diff --git a/trunk/absroot/source/abspy/abscontrol/server.py b/trunk/absroot/source/abspy/abscontrol/server.py --- a/trunk/absroot/source/abspy/abscontrol/server.py (revision 49) +++ b/trunk/absroot/source/abspy/abscontrol/server.py (revision 50) @@ -73,7 +73,7 @@ self.experiment_name = experiment_name - def __sendAnswer(self, cmd): + def sendAnswer(self, cmd): data = "OK" @@ -333,4 +333,4 @@ while 1: cmd = absObj.waitRequest() - absObj.__sendAnswer(cmd) \ No newline at end of file + absObj.sendAnswer(cmd) \ No newline at end of file