Showing the changes to python (2 of 2 files). Show all
Unified · Split
| @@ -17,6 +17,7 @@ class taskbeat(taskonset): · 16 unmodified lines | |||
| 17 | 17 | ||
| 18 | def __call__(self): | 18 | def __call__(self): |
| 19 | taskonset.__call__(self) | 19 | taskonset.__call__(self) |
| 20 | #results = taskonset.__call__(self) | ||
| 20 | # write to current file | 21 | # write to current file |
| 21 | if self.pos2 == self.btstep - 1 : | 22 | if self.pos2 == self.btstep - 1 : |
| 22 | self.bt.do(self.dfframe,self.btoutput) | 23 | self.bt.do(self.dfframe,self.btoutput) |
| @@ -27,6 +28,8 @@ class taskbeat(taskonset): · 4 unmodified lines | |||
| 27 | self.pos2 = -1; | 28 | self.pos2 = -1; |
| 28 | self.pos2 += 1 | 29 | self.pos2 += 1 |
| 29 | val = self.opick.pp.getval() | 30 | val = self.opick.pp.getval() |
| 31 | #if not results: val = 0 | ||
| 32 | #else: val = results[1] | ||
| 30 | self.dfframe.set(val,self.btwinlen - self.btstep + self.pos2,0) | 33 | self.dfframe.set(val,self.btwinlen - self.btstep + self.pos2,0) |
| 31 | i=0 | 34 | i=0 |
| 32 | for i in range(1,int( self.btoutput.get(0,0) ) ): | 35 | for i in range(1,int( self.btoutput.get(0,0) ) ): |
| @@ -52,4 +52,3 @@ class task(taskparams): · 51 unmodified lines | |||
| 52 | #print "CPU time is now %f seconds," % time.clock(), | 52 | #print "CPU time is now %f seconds," % time.clock(), |
| 53 | #print "task execution took %f seconds" % (time.time() - self.tic) | 53 | #print "task execution took %f seconds" % (time.time() - self.tic) |
| 54 | return time.time() - self.tic | 54 | return time.time() - self.tic |
| 55 | |||