From 36935db8a2f5967a32a8615ca5a6e7844090141d 2014-05-10 15:28:02
From: Daniel Valdez <daniel.suarez@jro.igp.gob.pe>
Date: 2014-05-10 15:28:02
Subject: [PATCH] Escritura de codigo en el jro header, se verifico escribiendo y leyendo pdata. El factor de normalizacion se calcula correctamente con los valores actualizados del codigo.

---

diff --git a/schainpy/model/jrodataIO.py b/schainpy/model/jrodataIO.py
index 84fa6e6..193fa24 100644
--- a/schainpy/model/jrodataIO.py
+++ b/schainpy/model/jrodataIO.py
@@ -2615,6 +2615,9 @@ class SpectraWriter(JRODataWriter):
         self.systemHeaderObj = self.dataOut.systemHeaderObj.copy()
         self.systemHeaderObj.nChannels = self.dataOut.nChannels
         self.radarControllerHeaderObj = self.dataOut.radarControllerHeaderObj.copy()
+        old_code_size = self.dataOut.radarControllerHeaderObj.code_size
+        new_code_size = int(numpy.ceil(self.dataOut.nBaud/32.))*self.dataOut.nCode*4
+        self.radarControllerHeaderObj.size = self.radarControllerHeaderObj.size - old_code_size + new_code_size
         
         self.setBasicHeader()
         
diff --git a/schainpy/model/jroheaderIO.py b/schainpy/model/jroheaderIO.py
index 4945cd1..e51de80 100644
--- a/schainpy/model/jroheaderIO.py
+++ b/schainpy/model/jroheaderIO.py
@@ -276,6 +276,7 @@ class RadarControllerHeader(Header):
                         self.code[ic,ib] = temp[ib/32]%2
                         temp[ib/32] = temp[ib/32]/2
                 self.code = 2.0*self.code - 1.0
+                self.code_size = int(numpy.ceil(self.nBaud/32.))*self.nCode*4
             
             if self.line5Function == RCfunction.FLIP:
                 self.flip1 = numpy.fromfile(fp,'<u4',1)
@@ -316,8 +317,41 @@ class RadarControllerHeader(Header):
         header = numpy.array(headerTuple,self.struct)
         header.tofile(fp)
         
-        dynamic = self.dynamic
-        dynamic.tofile(fp)
+        #dynamic = self.dynamic
+        #dynamic.tofile(fp)
+        
+        samplingWindow = self.samplingWindow
+        samplingWindow.tofile(fp)
+        
+        if self.numTaus > 0:
+            self.Taus.tofile(fp)
+        
+        nCode = numpy.array(self.nCode, '<u4')
+        nCode.tofile(fp)
+        nBaud = numpy.array(self.nBaud, '<u4')
+        nBaud.tofile(fp)
+        code1 = (self.code + 1.0)/2.
+        
+        for ic in range(self.nCode):
+            tempx = numpy.zeros(numpy.ceil(self.nBaud/32.))
+            start = 0
+            end = 32
+            for i in range(len(tempx)):
+                code_selected = code1[ic,start:end]
+                for j in range(len(code_selected)-1,-1,-1):
+                    if code_selected[j] == 1:
+                        tempx[i] = tempx[i] + 2**(len(code_selected)-1-j)
+                start = start + 32
+                end = end + 32
+            
+            tempx = tempx.astype('u4')
+            tempx.tofile(fp)
+            
+        if self.line5Function == RCfunction.FLIP:
+            self.flip1.tofile(fp)
+
+        if self.line6Function == RCfunction.FLIP:
+            self.flip2.tofile(fp)
         
         return 1