From 78c29438e19774ee4ad606dc73d6df1c46b32baf 2022-03-04 20:33:26 From: joabAM Date: 2022-03-04 20:33:26 Subject: [PATCH] corregido reorganización de apuntes en kamisr --- diff --git a/schainpy/model/io/jroIO_kamisr.py b/schainpy/model/io/jroIO_kamisr.py index bd3a28b..0aea743 100644 --- a/schainpy/model/io/jroIO_kamisr.py +++ b/schainpy/model/io/jroIO_kamisr.py @@ -58,7 +58,7 @@ class AMISRReader(ProcessingUnit): self.azimuthList = [] self.elevationList = [] self.dataShape = None - + self.flag_old_beams = False self.profileIndex = 0 @@ -93,14 +93,15 @@ class AMISRReader(ProcessingUnit): code = None, nCode = 0, nBaud = 0, - online=False): + online=False + old_beams=False): self.timezone = timezone self.all = all self.online = online - + self.flag_old_beams = old_beams self.code = code self.nCode = int(nCode) self.nBaud = int(nBaud) @@ -144,7 +145,7 @@ class AMISRReader(ProcessingUnit): header = 'Raw11/Data/RadacHeader' self.beamCodeByPulse = fp.get(header+'/BeamCode') # LIST OF BEAMS PER PROFILE, TO BE USED ON REARRANGE - if (self.startDate> datetime.date(2021, 7, 15)): #Se cambió la forma de extracción de Apuntes el 17 + 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 self.beamcodeFile = fp['Setup/Beamcodefile'][()].decode() self.trueBeams = self.beamcodeFile.split("\n") self.trueBeams.pop()#remove last diff --git a/schainpy/model/utils/jroutils_ftp.py b/schainpy/model/utils/jroutils_ftp.py index 61865f6..10cab6b 100644 --- a/schainpy/model/utils/jroutils_ftp.py +++ b/schainpy/model/utils/jroutils_ftp.py @@ -602,7 +602,7 @@ class SendToServerProc(ProcessingUnit): self.dataOut.flagNoData=True def setup(self, server=None, username="", password="", remotefolder="", localfolder="", - ext='.png', period=60, protocol='ftp', sendByTrigger=False, key_filename=None): + ext='.png', period=60, protocol='ftp', sendByTrigger=False, key_filename=None): self.server = server self.username = username self.password = password @@ -626,7 +626,6 @@ class SendToServerProc(ProcessingUnit): if not self.clientObj: raise ValueError("%s has been chosen as remote access protocol but it is not valid" %protocol) - #self.clientObj.start() print("Send to Server setup complete")