| @@ -10,7 +10,6 import traceback | |||||
| 10 | import math |
|
10 | import math | |
| 11 | import time |
|
11 | import time | |
| 12 | from multiprocessing import Process, Queue, cpu_count |
|
12 | from multiprocessing import Process, Queue, cpu_count | |
| 13 | from profilehooks import profile, coverage |
|
|||
| 14 |
|
13 | |||
| 15 | import schainpy |
|
14 | import schainpy | |
| 16 | import schainpy.admin |
|
15 | import schainpy.admin | |
| @@ -694,7 +693,6 class ProcUnitConf(): | |||||
| 694 |
|
693 | |||
| 695 | return procUnitObj |
|
694 | return procUnitObj | |
| 696 |
|
695 | |||
| 697 | ## @profile |
|
|||
| 698 | def run(self): |
|
696 | def run(self): | |
| 699 |
|
697 | |||
| 700 | is_ok = False |
|
698 | is_ok = False | |
| @@ -713,8 +711,7 class ProcUnitConf(): | |||||
| 713 | #print "\tRunning the '%s' operation with %s" %(opConfObj.name, opConfObj.id) |
|
711 | #print "\tRunning the '%s' operation with %s" %(opConfObj.name, opConfObj.id) | |
| 714 | sts = self.procUnitObj.call(opType = opConfObj.type, |
|
712 | sts = self.procUnitObj.call(opType = opConfObj.type, | |
| 715 | opName = opConfObj.name, |
|
713 | opName = opConfObj.name, | |
| 716 |
opId = opConfObj.id |
|
714 | opId = opConfObj.id) | |
| 717 | **kwargs) |
|
|||
| 718 |
|
715 | |||
| 719 | # total_time = time.time() - ini |
|
716 | # total_time = time.time() - ini | |
| 720 | # |
|
717 | # | |
| @@ -766,7 +763,6 class ReadUnitConf(ProcUnitConf): | |||||
| 766 |
|
763 | |||
| 767 | def setup(self, id, name, datatype, path='', startDate="", endDate="", startTime="", |
|
764 | def setup(self, id, name, datatype, path='', startDate="", endDate="", startTime="", | |
| 768 | endTime="", parentId=None, queue=None, server=None, **kwargs): |
|
765 | endTime="", parentId=None, queue=None, server=None, **kwargs): | |
| 769 |
|
||||
| 770 | #Compatible with old signal chain version |
|
766 | #Compatible with old signal chain version | |
| 771 | if datatype==None and name==None: |
|
767 | if datatype==None and name==None: | |
| 772 | raise ValueError, "datatype or name should be defined" |
|
768 | raise ValueError, "datatype or name should be defined" | |
| @@ -987,7 +983,6 class Project(): | |||||
| 987 | self.description = description |
|
983 | self.description = description | |
| 988 |
|
984 | |||
| 989 | def addReadUnit(self, id=None, datatype=None, name=None, **kwargs): |
|
985 | def addReadUnit(self, id=None, datatype=None, name=None, **kwargs): | |
| 990 |
|
||||
| 991 | if id is None: |
|
986 | if id is None: | |
| 992 | idReadUnit = self.__getNewId() |
|
987 | idReadUnit = self.__getNewId() | |
| 993 | else: |
|
988 | else: | |
| 1 | NO CONTENT: modified file |
|
NO CONTENT: modified file |
| 1 | NO CONTENT: modified file |
|
NO CONTENT: modified file |
| @@ -200,7 +200,6 class ProcessingUnit(object): | |||||
| 200 | return True |
|
200 | return True | |
| 201 |
|
201 | |||
| 202 | def call(self, opType, opName=None, opId=None): |
|
202 | def call(self, opType, opName=None, opId=None): | |
| 203 |
|
||||
| 204 | """ |
|
203 | """ | |
| 205 | Return True si ejecuta la operacion interna nombrada "opName" o la operacion externa |
|
204 | Return True si ejecuta la operacion interna nombrada "opName" o la operacion externa | |
| 206 | identificada con el id "opId"; con los argumentos "**kwargs". |
|
205 | identificada con el id "opId"; con los argumentos "**kwargs". | |
| @@ -7,7 +7,7 Created on Jul 16, 2014 | |||||
| 7 |
|
7 | |||
| 8 | import numpy |
|
8 | import numpy | |
| 9 | from setuptools import setup, Extension |
|
9 | from setuptools import setup, Extension | |
| 10 | import numpy |
|
10 | from schainpy import __version__ | |
| 11 |
|
11 | |||
| 12 | setup(name="schainpy", |
|
12 | setup(name="schainpy", | |
| 13 | version=__version__, |
|
13 | version=__version__, | |
| 1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now