##// END OF EJS Templates
corregido reorganización de apuntes en kamisr
joabAM -
r1420:78c29438e197
parent child
Show More
@@ -58,7 +58,7 class AMISRReader(ProcessingUnit):
58 self.azimuthList = []
58 self.azimuthList = []
59 self.elevationList = []
59 self.elevationList = []
60 self.dataShape = None
60 self.dataShape = None
61
61 self.flag_old_beams = False
62
62
63
63
64 self.profileIndex = 0
64 self.profileIndex = 0
@@ -93,14 +93,15 class AMISRReader(ProcessingUnit):
93 code = None,
93 code = None,
94 nCode = 0,
94 nCode = 0,
95 nBaud = 0,
95 nBaud = 0,
96 online=False):
96 online=False
97 old_beams=False):
97
98
98
99
99
100
100 self.timezone = timezone
101 self.timezone = timezone
101 self.all = all
102 self.all = all
102 self.online = online
103 self.online = online
103
104 self.flag_old_beams = old_beams
104 self.code = code
105 self.code = code
105 self.nCode = int(nCode)
106 self.nCode = int(nCode)
106 self.nBaud = int(nBaud)
107 self.nBaud = int(nBaud)
@@ -144,7 +145,7 class AMISRReader(ProcessingUnit):
144
145
145 header = 'Raw11/Data/RadacHeader'
146 header = 'Raw11/Data/RadacHeader'
146 self.beamCodeByPulse = fp.get(header+'/BeamCode') # LIST OF BEAMS PER PROFILE, TO BE USED ON REARRANGE
147 self.beamCodeByPulse = fp.get(header+'/BeamCode') # LIST OF BEAMS PER PROFILE, TO BE USED ON REARRANGE
147 if (self.startDate> datetime.date(2021, 7, 15)): #Se cambió la forma de extracción de Apuntes el 17
148 if (self.startDate> datetime.date(2021, 7, 15)) or self.flag_old_beams: #Se cambió la forma de extracción de Apuntes el 17 o forzar con flag de reorganización
148 self.beamcodeFile = fp['Setup/Beamcodefile'][()].decode()
149 self.beamcodeFile = fp['Setup/Beamcodefile'][()].decode()
149 self.trueBeams = self.beamcodeFile.split("\n")
150 self.trueBeams = self.beamcodeFile.split("\n")
150 self.trueBeams.pop()#remove last
151 self.trueBeams.pop()#remove last
@@ -602,7 +602,7 class SendToServerProc(ProcessingUnit):
602 self.dataOut.flagNoData=True
602 self.dataOut.flagNoData=True
603
603
604 def setup(self, server=None, username="", password="", remotefolder="", localfolder="",
604 def setup(self, server=None, username="", password="", remotefolder="", localfolder="",
605 ext='.png', period=60, protocol='ftp', sendByTrigger=False, key_filename=None):
605 ext='.png', period=60, protocol='ftp', sendByTrigger=False, key_filename=None):
606 self.server = server
606 self.server = server
607 self.username = username
607 self.username = username
608 self.password = password
608 self.password = password
@@ -626,7 +626,6 class SendToServerProc(ProcessingUnit):
626 if not self.clientObj:
626 if not self.clientObj:
627 raise ValueError("%s has been chosen as remote access protocol but it is not valid" %protocol)
627 raise ValueError("%s has been chosen as remote access protocol but it is not valid" %protocol)
628
628
629 #self.clientObj.start()
630 print("Send to Server setup complete")
629 print("Send to Server setup complete")
631
630
632
631
General Comments 0
You need to be logged in to leave comments. Login now