Skip to content

Commit 9f26b3f

Browse files
committed
Missed a few ATS -> AT3 conversions.
1 parent 9154bba commit 9f26b3f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

aspFunctions.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
aspFunctionsLogger = logging.getLogger('__main__')
2020

2121

22-
modeDict = {1: 'AT1', 2: 'AT2', 3: 'ATS'}
22+
modeDict = {1: 'AT1', 2: 'AT2', 3: 'AT3'}
2323

2424

2525
commandExitCodes = {0x00: 'Process accepted without error',
@@ -117,7 +117,7 @@ def __init__(self, config):
117117
self.currentState['filter'] = ASPSettingsList([0 for i in range(max_nstand)])
118118
self.currentState['at1'] = ASPSettingsList([30 for i in range(max_nstand)])
119119
self.currentState['at2'] = ASPSettingsList([30 for i in range(max_nstand)])
120-
self.currentState['ats'] = ASPSettingsList([30 for i in range(max_nstand)])
120+
self.currentState['at3'] = ASPSettingsList([15.5 for i in range(max_nstand)])
121121

122122
## Monitoring and background threads
123123
self.currentState['spiThread'] = None
@@ -261,7 +261,7 @@ def __iniProcess(self, nBoards):
261261
self.currentState['filter'][i] = 0
262262
self.currentState['at1'][i] = 30
263263
self.currentState['at2'][i] = 30
264-
self.currentState['ats'][i] = 30
264+
self.currentState['at3'][i] = 15.5
265265

266266
# Start the SPI command processor
267267
self.currentState['spiThread'].start()
@@ -498,7 +498,7 @@ def setAttenuator(self, mode, stand, attenSetting):
498498

499499
def __atnProcess(self, mode, stand, attenSetting):
500500
"""
501-
Background process for AT1/AT2/ATS commands so that other commands can keep on running.
501+
Background process for AT1/AT2/AT3 commands so that other commands can keep on running.
502502
"""
503503

504504
# Do SPI bus stuff
@@ -800,7 +800,7 @@ def getFilter(self, stand):
800800

801801
def getAttenuators(self, stand):
802802
"""
803-
Return the attenuator settings (AT1, AT2, ATS) for a given stand as a two-element
803+
Return the attenuator settings (AT1, AT2, AT3) for a given stand as a two-element
804804
tuple (success, values) where success is a boolean related to if the attenuator
805805
values were found. See the currentState['lastLog'] entry for the reason for
806806
failure if the returned success value is False.
@@ -809,8 +809,8 @@ def getAttenuators(self, stand):
809809
if stand > 0 and stand <= self.num_stands:
810810
at1 = self.currentState['at1'][stand]
811811
at2 = self.currentState['at2'][stand]
812-
ats = self.currentState['ats'][stand]
813-
return True, (at1, at2, ats)
812+
at3 = self.currentState['at3'][stand]
813+
return True, (at1, at2, at3)
814814

815815
else:
816816
self.currentState['lastLog'] = 'Invalid stand ID (%i)' % stand

0 commit comments

Comments
 (0)