Skip to content

Add method to stop sample engine from sampling #33

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
cpagravel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add method to stop sample engine from sampling #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions Monsoon/sampleEngine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def setStopTrigger(self,triggerstyle,triggerlevel):
def setTriggerChannel(self, triggerChannel):
"""Sets channel that controls the trigger.
triggerChannel: selected from sampleEngine.channels"""

self.__triggerChannel = triggerChannel

def ConsoleOutput(self, boolValue):
Expand Down Expand Up @@ -439,7 +439,7 @@ def __processZeroCal(self,meas):
self.__auxCal.addZeroCal(meas[self.__auxFineIndex], False)
return True
def __processRefCal(self, meas):
"""Adds raw measurement data to the refcal tracker
"""Adds raw measurement data to the refcal tracker
meas: RefCal measurements indexed by the global channel index scheme.
"""
self.__mainCal.addRefCal(meas[self.__mainCoarseIndex], True)
Expand All @@ -451,7 +451,7 @@ def __processRefCal(self, meas):
return True

def getSamples(self):
"""Returns samples in a Python list. Format is:
"""Returns samples in a Python list. Format is:
[timestamp, main, usb, aux,mainVolts,usbVolts]."""
result = self.__arrangeSamples(True)
return result
Expand Down Expand Up @@ -531,7 +531,7 @@ def outputCSVHeaders(self):
def __sampleLoop(self, S, Samples, ProcessRate, legacy_timestamp=False):
"""
Collects and processes samples in batches. Numpy makes processing large numbers of samples in batches
much faster than processing them as they're received. Useful in avoiding dropped samples.
much faster than processing them as they're received. Useful in avoiding dropped samples.
S: The number of samples in the current batch.
Samples: An array that will be populated with samples.
ProcessRate: Number of samples per batch. Should be a power of 2 for best results.
Expand Down Expand Up @@ -560,7 +560,7 @@ def __sampleLoop(self, S, Samples, ProcessRate, legacy_timestamp=False):
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.
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()
Expand Down Expand Up @@ -597,7 +597,7 @@ def __startSampling(self, samples=5000, granularity=1, legacy_timestamp=False, c
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.
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):
Expand Down Expand Up @@ -629,6 +629,9 @@ def startSampling(self, samples=5000, granularity = 1, legacy_timestamp=False, c
self.disableCSVOutput()
raise Exception(e.args)

def stopSampling(self):
"""Stop the sample engine from sampling if it is running."""
self.__stopTriggerSet = True

def periodicStartSampling(self,calTime=1250):
"""Causes the Power Monitor to enter sample mode, but doesn't actively collect samples.
Expand Down