schain-jc Commit - r1039:a86c6846b78a

merge con online_data_hour

José Chávez -

r1039:a86c6846b78a

parent child

Context file:

r1039:a86c6846b78a

schainpy/model/io/jroIO_base.py +1 -14

                     self.__printInfo = False
                 def run(self,
                         path=None,
                         startDate=None,
                         verbose=True, **kwargs):
                     if not(self.isConfig):
-            <<<<<<< HEAD
             #            self.dataOut = dataOut
                         self.setup( path=path,
                                     startDate=startDate,
                                     cursor=cursor,
                                     warnings=warnings,
                                     server=server,
-                                    verbose=verbose)
+                                    verbose=verbose, **kwargs)
-            =======
-                        #            self.dataOut = dataOut
-                        self.setup(**kwargs)
-            >>>>>>> online_data_hour
                         self.isConfig = True
                     if server is None:
                         self.getData()
                     Return:
                         None
                     """
-            <<<<<<< HEAD
-            #        CALCULAR PARAMETROS
-            =======
                     #        CALCULAR PARAMETROS
-            >>>>>>> online_data_hour
                     sizeLongHeader = self.systemHeaderObj.size + self.radarControllerHeaderObj.size + self.processingHeaderObj.size
                     self.basicHeaderObj.size = self.basicHeaderSize + sizeLongHeader

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages