correct simulation
This commit is contained in:
@ -23,4 +23,5 @@ jobs:
|
|||||||
make install
|
make install
|
||||||
- name: test
|
- name: test
|
||||||
run: |
|
run: |
|
||||||
python3 test/test.py
|
cd test
|
||||||
|
python3 test.py
|
||||||
|
@ -13,9 +13,10 @@ initialise {
|
|||||||
in;
|
in;
|
||||||
out "ECHO 2"; # Ask for reponses
|
out "ECHO 2"; # Ask for reponses
|
||||||
in "%(\$1MsgTxt)s"; # Clear MsgTxt on Init
|
in "%(\$1MsgTxt)s"; # Clear MsgTxt on Init
|
||||||
@mismatch{
|
# Probably should cause the ioc to just exit
|
||||||
exec 'echo "Failed to configure DAQ" && exit(1)';
|
# @mismatch{
|
||||||
}
|
# exec 'echo "Failed to configure DAQ" && exit(1)';
|
||||||
|
# }
|
||||||
}
|
}
|
||||||
|
|
||||||
fullReset {
|
fullReset {
|
||||||
|
@ -35,7 +35,7 @@ class DAQ:
|
|||||||
self.monitor = 0
|
self.monitor = 0
|
||||||
|
|
||||||
self.minratechannel = 0
|
self.minratechannel = 0
|
||||||
self.minrates = [2] * self.total_channels
|
self.minrates = [2] * (self.total_channels + 1)
|
||||||
|
|
||||||
self.gate_config = [
|
self.gate_config = [
|
||||||
#(enabled, count high/low),
|
#(enabled, count high/low),
|
||||||
@ -92,7 +92,7 @@ class DAQ:
|
|||||||
if self.countmode == 'time':
|
if self.countmode == 'time':
|
||||||
if elapsed < self.presettime:
|
if elapsed < self.presettime:
|
||||||
|
|
||||||
if self.minratechannel >= 0 and self.rates[self.minratechannel] < self.minrates[self.minratechannel]:
|
if self.minratechannel > 0 and self.rates[self.minratechannel - 1] < self.minrates[self.minratechannel]:
|
||||||
# adjust the starttime, so that it is as if this polling period didn't happen
|
# adjust the starttime, so that it is as if this polling period didn't happen
|
||||||
self.starttime += elapsed - self.elapsed
|
self.starttime += elapsed - self.elapsed
|
||||||
self.status = 5
|
self.status = 5
|
||||||
@ -115,7 +115,7 @@ class DAQ:
|
|||||||
elif self.countmode == 'count':
|
elif self.countmode == 'count':
|
||||||
if self.getMonitorCount() < self.presetcount:
|
if self.getMonitorCount() < self.presetcount:
|
||||||
|
|
||||||
if self.minratechannel >= 0 and self.rates[self.minratechannel] < self.minrates[self.minratechannel]:
|
if self.minratechannel > 0 and self.rates[self.minratechannel - 1] < self.minrates[self.minratechannel]:
|
||||||
# adjust the starttime, so that it is as if this polling period didn't happen
|
# adjust the starttime, so that it is as if this polling period didn't happen
|
||||||
self.starttime += elapsed - self.elapsed
|
self.starttime += elapsed - self.elapsed
|
||||||
self.status = 5
|
self.status = 5
|
||||||
@ -171,16 +171,16 @@ class DAQ:
|
|||||||
return float(self.rates[channel - 1])
|
return float(self.rates[channel - 1])
|
||||||
|
|
||||||
def getMinRateChannel(self):
|
def getMinRateChannel(self):
|
||||||
return self.minratechannel + 1
|
return self.minratechannel
|
||||||
|
|
||||||
def setMinRateChannel(self, channel):
|
def setMinRateChannel(self, channel):
|
||||||
self.minratechannel = channel - 1
|
self.minratechannel = channel
|
||||||
|
|
||||||
def getMinRate(self, channel):
|
def getMinRate(self, channel):
|
||||||
return self.minrates[channel - 1]
|
return self.minrates[channel]
|
||||||
|
|
||||||
def setMinRate(self, channel, rate):
|
def setMinRate(self, channel, rate):
|
||||||
self.minrates[channel - 1] = rate
|
self.minrates[channel] = rate
|
||||||
|
|
||||||
def getGateStatus(self, channel):
|
def getGateStatus(self, channel):
|
||||||
return self.gate_config[channel - 1]
|
return self.gate_config[channel - 1]
|
||||||
|
Reference in New Issue
Block a user