From f8fb1296f4dac3e8355f80c92e199e79ec9bbda5 2014-05-06 21:00:36
From: Daniel Valdez <daniel.suarez@jro.igp.gob.pe>
Date: 2014-05-06 21:00:36
Subject: [PATCH] Se modifico las condiciones de Decoder, en cada iteracion se actualiza el codigo. Se corrigieron bugs en la lectura de codigo. Se detecto que no se guarda el codigo actualizado en el header de pdata, esta pendiente su revision.

---

diff --git a/schainpy/model/jrodataIO.py b/schainpy/model/jrodataIO.py
index 807bbb5..84fa6e6 100644
--- a/schainpy/model/jrodataIO.py
+++ b/schainpy/model/jrodataIO.py
@@ -2249,13 +2249,13 @@ class SpectraReader(JRODataReader):
     
         self.dataOut.flagDeflipData = True #asumo q la data no esta sin flip
         
-        if self.processingHeaderObj.code != None:
+        if self.radarControllerHeaderObj.code != None:
             
-            self.dataOut.nCode = self.processingHeaderObj.nCode
+            self.dataOut.nCode = self.radarControllerHeaderObj.nCode
             
-            self.dataOut.nBaud = self.processingHeaderObj.nBaud
+            self.dataOut.nBaud = self.radarControllerHeaderObj.nBaud
             
-            self.dataOut.code = self.processingHeaderObj.code
+            self.dataOut.code = self.radarControllerHeaderObj.code
             
             self.dataOut.flagDecodeData = True
         
diff --git a/schainpy/model/jroheaderIO.py b/schainpy/model/jroheaderIO.py
index bf88aa4..4945cd1 100644
--- a/schainpy/model/jroheaderIO.py
+++ b/schainpy/model/jroheaderIO.py
@@ -369,9 +369,9 @@ class ProcessingHeader(Header):
         self.deltaHeight = 0
         self.samplesWin = 0
         self.spectraComb = 0
-        self.nCode = None
-        self.code = None
-        self.nBaud = None
+#         self.nCode = None
+#         self.code = None
+#         self.nBaud = None
         self.shif_fft = False
         self.flag_dc = False
         self.flag_cspc = False
diff --git a/schainpy/model/jroprocessing.py b/schainpy/model/jroprocessing.py
index dd5cebf..2371486 100644
--- a/schainpy/model/jroprocessing.py
+++ b/schainpy/model/jroprocessing.py
@@ -654,18 +654,19 @@ class Decoder(Operation):
     
     def run(self, dataOut, code=None, nCode=None, nBaud=None, mode = 0):
         
-        if not self.__isConfig:
+        if code == None:
+            code = dataOut.code
+        else:
+            code = numpy.array(code).reshape(nCode,nBaud)
+            dataOut.code = code
+            dataOut.nCode = nCode
+            dataOut.nBaud = nBaud
+            dataOut.radarControllerHeaderObj.code = code
+            dataOut.radarControllerHeaderObj.nCode = nCode
+            dataOut.radarControllerHeaderObj.nBaud = nBaud
             
-            if code == None:
-                code = dataOut.code
-            else:
-                code = numpy.array(code).reshape(nCode,nBaud)
-                dataOut.code = code
-                dataOut.nCode = nCode
-                dataOut.nBaud = nBaud
-                
-            if code == None:
-                return 1
+        
+        if not self.__isConfig:
             
             self.setup(code, dataOut.data.shape)
             self.__isConfig = True