Showing the changes to python (1 of 1 file). Show all
Unified · Split
| @@ -101,25 +101,25 @@ class onsetpick: · 100 unmodified lines | |||
| 101 | self.mode = mode | 101 | self.mode = mode |
| 102 | self.pp = peakpick(float(threshold)) | 102 | self.pp = peakpick(float(threshold)) |
| 103 | self.derivate = derivate | 103 | self.derivate = derivate |
| 104 | self.dcthreshold = dcthreshold | 104 | self.dcthreshold = dcthreshold |
| 105 | self.oldval = 0. | 105 | self.oldval = 0. |
| 106 | 106 | ||
| 107 | def do(self,myvec): | 107 | def do(self,myvec): |
| 108 | self.pv.do(myvec,self.myfft) | 108 | self.pv.do(myvec,self.myfft) |
| 109 | self.myod.do(self.myfft,self.myonset) | 109 | self.myod.do(self.myfft,self.myonset) |
| 110 | if self.mode == 'dual': | 110 | if self.mode == 'dual': |
| 111 | self.myod2.do(self.myfft,self.myonset2) | 111 | self.myod2.do(self.myfft,self.myonset2) |
| 112 | self.myonset.set(self.myonset.get(0,0)*self.myonset2.get(0,0),0,0) | 112 | self.myonset.set(self.myonset.get(0,0)*self.myonset2.get(0,0),0,0) |
| 113 | if self.derivate: | 113 | if self.derivate: |
| 114 | val = self.myonset.get(0,0) | 114 | val = self.myonset.get(0,0) |
| 115 | dval = val - self.oldval | 115 | dval = val - self.oldval |
| 116 | self.oldval = val | 116 | self.oldval = val |
| 117 | if dval > 0: self.myonset.set(dval,0,0) | 117 | if dval > 0: self.myonset.set(dval,0,0) |
| 118 | else: self.myonset.set(0.,0,0) | 118 | else: self.myonset.set(0.,0,0) |
| 119 | if self.dcthreshold: | 119 | if self.dcthreshold: |
| 120 | dval = self.myonset.get(0,0) - self.dcthreshold | 120 | dval = self.myonset.get(0,0) - self.dcthreshold |
| 121 | if dval > 0: self.myonset.set(dval,0,0) | 121 | if dval > 0: self.myonset.set(dval,0,0) |
| 122 | else: self.myonset.set(0.,0,0) | 122 | else: self.myonset.set(0.,0,0) |
| 123 | return self.pp.do(self.myonset),self.myonset.get(0,0) | 123 | return self.pp.do(self.myonset),self.myonset.get(0,0) |
| 124 | 124 | ||
| 125 | class pitchdetection: | 125 | class pitchdetection: |