Skip to content

Consolidate startSampling into one routine/Added callback for post processing #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
g9lee wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Consolidate startSampling into one routine/Added callback for post processing #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a11c1
Added callback for post-processing used
geo9lee Apr 4, 2018
d9f2053
Consolidated startSampling into one routine
geo9lee Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 54 additions & 64 deletions Monsoon/sampleEngine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def __init__(self, Monsoon,bulkProcessRate=128, errorMode = ErrorHandlingModes.f
self.__mainVoltageScale = Monsoon.mainvoltageScale
self.__usbVoltageScale = Monsoon.usbVoltageScale
self.dropped = 0
self.bulkProcessRate = 128
self.bulkProcessRate = bulkProcessRate
self.__packetSize = 64
self.__startTime = time.time()
#Indices
Expand Down Expand Up @@ -546,77 +546,67 @@ def __sampleLoop(self, S, Samples, ProcessRate, legacy_timestamp=False):
S = 0
return S

def __startSampling(self, samples=5000, granularity=1, legacy_timestamp=False, calTime = 1250):
def startSampling(self, samples=5000, granularity = 1, legacy_timestamp=False, calTime = 1250, output_callback=None):
"""Handle setup for sample collection.
samples: Number of samples to collect, independent of the stop trigger. sampleEngine.triggers.SAMPLECOUNT_INFINITE to function solely through triggers.
granularity: Samples to store. 1 = 1:1, 10 = store 1 out of every 10 samples, etc.
legacy_timestamp: if true, use time.time() for timestamp instead of currentTime - startTime
"""
self.__Reset()
self.__granularity = granularity
self.__sampleLimit = samples
Samples = [[0 for _ in range(self.__packetSize+1)] for _ in range(self.bulkProcessRate)]
S = 0
debugcount = 0
minutes = 0
granularity_index = 0
csvOutRateLimit = True
csvOutThreshold = self.bulkProcessRate/2
self.__startTime = time.time()
if(self.__CSVOutEnable):
self.outputCSVHeaders()
self.monsoon.StartSampling(calTime,triggers.SAMPLECOUNT_INFINITE)
if not self.__startupCheck(False):
self.monsoon.stopSampling()
return False
while not self.__stopTriggerSet:
S = self.__sampleLoop(S,Samples,self.bulkProcessRate,legacy_timestamp)
if(S == 0):
csvOutRateLimit = True
if(S >= csvOutThreshold and self.__CSVOutEnable and self.__startTriggerSet):
self.__outputToCSV()
csvOutRateLimit = False
if(S == 0):
Samples = [[0 for _ in range(self.__packetSize+1)] for _ in range(self.bulkProcessRate)]
self.monsoon.stopSampling()
if(self.__CSVOutEnable):
self.__outputToCSV()
self.disableCSVOutput()

def startSampling(self, samples=5000, granularity = 1, legacy_timestamp=False, calTime = 1250):
"""Handle setup for sample collection.
samples: Number of samples to collect, independent of the stop trigger. sampleEngine.triggers.SAMPLECOUNT_INFINITE to function solely through triggers.
granularity: Samples to store. 1 = 1:1, 10 = store 1 out of every 10 samples, etc.
legacy_timestamp: if true, use time.time() for timestamp instead of currentTime - startTime
"""
if(self.__errorMode == ErrorHandlingModes.off):
self.__startSampling(samples,granularity,legacy_timestamp)
else:
try:
self.__startSampling(samples,granularity,legacy_timestamp,calTime)
except KeyboardInterrupt:
print("Caught keyboard interrupt, test ending adruptly.")
try:
self.__Reset()
self.__granularity = granularity
self.__sampleLimit = samples
Samples = [[0 for _ in range(self.__packetSize+1)] for _ in range(self.bulkProcessRate)]
S = 0
debugcount = 0
minutes = 0
granularity_index = 0
csvOutRateLimit = True
csvOutThreshold = self.bulkProcessRate/2
self.__startTime = time.time()
if(self.__CSVOutEnable):
self.outputCSVHeaders()
self.monsoon.StartSampling(calTime,triggers.SAMPLECOUNT_INFINITE)
if not self.__startupCheck(False):
print("Error: startCheck failed")
self.monsoon.stopSampling()
if(self.__CSVOutEnable):
while not self.__stopTriggerSet:
S = self.__sampleLoop(S,Samples,self.bulkProcessRate,legacy_timestamp)
if(S >= csvOutThreshold and self.__CSVOutEnable and self.__startTriggerSet):
self.__outputToCSV()
self.disableCSVOutput()
except usb.core.USBError:
print("Caught disconnection event. Test restarting with default parameters")
self.monsoon.Reconnect()
self.monsoon.stopSampling()
if(self.__CSVOutEnable):
self.__outputToCSV()
self.disableCSVOutput()
self.enableCSVOutput(self.__outputFilename)
self.startSampling(samples,granularity, legacy_timestamp,calTime)
csvOutRateLimit = False
if output_callback:
yield self.__arrangeSamples()
if(S == 0):
csvOutRateLimit = True
Samples = [[0 for _ in range(self.__packetSize+1)] for _ in range(self.bulkProcessRate)]
self.monsoon.stopSampling()
if(self.__CSVOutEnable):
self.__outputToCSV()
self.disableCSVOutput()
except KeyboardInterrupt:
print("Caught keyboard interrupt, test ending adruptly.")
self.monsoon.stopSampling()
if(self.__CSVOutEnable):
self.__outputToCSV()
self.disableCSVOutput()
except usb.core.USBError:
print("Caught disconnection event. Test restarting with default parameters")
self.monsoon.Reconnect()
self.monsoon.stopSampling()
if(self.__CSVOutEnable):
self.__outputToCSV()
self.disableCSVOutput()
self.enableCSVOutput(self.__outputFilename)
self.startSampling(samples,granularity, legacy_timestamp,calTime,output_callback)

except Exception as e:
print("Error: Unknown exception caught. Test failed.")
self.monsoon.stopSampling()
if(self.__CSVOutEnable):
self.__outputToCSV()
self.disableCSVOutput()
raise Exception(e.args)
except Exception as e:
print("Error: Unknown exception caught. Test failed.")
self.monsoon.stopSampling()
if(self.__CSVOutEnable):
self.__outputToCSV()
self.disableCSVOutput()
raise Exception(e.args)


def periodicStartSampling(self,calTime=1250):
Expand Down