comparison dsp/onsets/PeakPicking.cpp @ 331:6dd7c8bb5e3a

Restore the accidentally-removed line in which all the work happens! Fixes onset detector
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 05 Sep 2013 12:33:35 +0100
parents 31f22daeba64
children 2ae4ceb76ac3
comparison
equal deleted inserted replaced
330:3f7b4b282df1 331:6dd7c8bb5e3a
104 104
105 vector <double> m_maxFit; 105 vector <double> m_maxFit;
106 vector <double> m_poly; 106 vector <double> m_poly;
107 vector <double> m_err; 107 vector <double> m_err;
108 108
109 // double p;
110
111 m_poly.push_back(0); 109 m_poly.push_back(0);
112 m_poly.push_back(0); 110 m_poly.push_back(0);
113 m_poly.push_back(0); 111 m_poly.push_back(0);
114 112
115 for( int t = -2; t < 3; t++) 113 for( int t = -2; t < 3; t++)
135 { 133 {
136 selMax = src[ m_maxIndex[j] + k ] ; 134 selMax = src[ m_maxIndex[j] + k ] ;
137 m_maxFit.push_back(selMax); 135 m_maxFit.push_back(selMax);
138 } 136 }
139 137
140 // p = TPolyFit::PolyFit2( m_err, m_maxFit, m_poly); 138 TPolyFit::PolyFit2(m_err, m_maxFit, m_poly);
141 139
142 double f = m_poly[0]; 140 double f = m_poly[0];
143 // double g = m_poly[1];
144 double h = m_poly[2]; 141 double h = m_poly[2];
145
146 // int kk = m_poly.size();
147 142
148 if (h < -Qfilta || f > Qfiltc) 143 if (h < -Qfilta || f > Qfiltc)
149 { 144 {
150 idx.push_back(m_maxIndex[j]); 145 idx.push_back(m_maxIndex[j]);
151 } 146 }