@@ -160,38 +160,6 @@ def _parseGivenActualFrequency(ncsMemMap, ncsSects, chanNum, reqFreq, blkOnePred
160160 NcsSections object with block locations marked
161161 """
162162
163- # Old code with loops
164-
165- # ts0 = ncsMemMap["timestamp"][0]
166- # curBlock = NcsSection(0, ts0, -1, -1, -1)
167- # ncsSects.sects.append(curBlock)
168- # startBlockPredTime = blkOnePredTime
169- # blk_len = 0
170- # for recn in range(1, ncsMemMap.shape[0]):
171- # timestamp = ncsMemMap["timestamp"][recn]
172- # channel_id = ncsMemMap["channel_id"][recn]
173- # sample_rate = ncsMemMap["sample_rate"][recn]
174- # nb_valid = ncsMemMap["nb_valid"][recn]
175-
176- # if channel_id != chanNum or sample_rate != reqFreq:
177- # raise IOError("Channel number or sampling frequency changed in " + "records within file")
178- # predTime = NcsSectionsFactory.calc_sample_time(ncsSects.sampFreqUsed, startBlockPredTime, blk_len)
179- # nValidSamps = nb_valid
180- # if timestamp != predTime:
181- # curBlock.endRec = recn - 1
182- # curBlock.endTime = predTime
183- # curBlock.n_samples = blk_len
184- # curBlock = NcsSection(recn, timestamp, -1, -1, -1)
185- # ncsSects.sects.append(curBlock)
186- # startBlockPredTime = NcsSectionsFactory.calc_sample_time(ncsSects.sampFreqUsed, timestamp, nValidSamps)
187- # blk_len = 0
188- # else:
189- # blk_len += nValidSamps
190- # curBlock.endRec = ncsMemMap.shape[0] - 1
191- # endTime = NcsSectionsFactory.calc_sample_time(ncsSects.sampFreqUsed, startBlockPredTime, blk_len)
192- # curBlock.endTime = endTime
193-
194-
195163 # New code numpy vector based (speedup X50)
196164 delta = (ncsMemMap ["timestamp" ][1 :] - ncsMemMap ["timestamp" ][:- 1 ]).astype (np .int64 )
197165 delta_prediction = ((ncsMemMap ["nb_valid" ][:- 1 ] / ncsSects .sampFreqUsed ) * 1e6 ).astype (np .int64 )
0 commit comments