Skip to content

Commit

Permalink
Fix references to changed paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@bengineerd
bengineerd committed Oct 25, 2023
1 parent be01e26 commit 1c2b91e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
14 changes: 7 additions & 7 deletions firmware/python/warm_tdm/_ColumnModule.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,25 +264,25 @@ def __init__(self,
def _saOutGet(*, read=True, index=-1, check=True):
#print(f'ColumnModule._saOutGet({read=}, {index=}, {check=})')
with self.root.updateGroup():
adc = self.SaOutAdc.get(read=read, index=index, check=check)
offset = self.SaBiasOffset.OffsetVoltageArray.get(read=read, index=index, check=check)
adcs = self.SaOutAdc.get(read=read, index=index, check=check)
offsets = self.SaBiasOffset.OffsetVoltageArray.get(read=read, index=index, check=check)
if index == -1:
ret = np.array([self.Amp[i].ampVin(adc, offset) * 1e3 for i in range(8)])
ret = np.array([self.Amp[i].ampVin(adcs[i], offsets[i]) * 1e3 for i in range(8)])
return ret
else:
ret = self.Amp[index].ampVin(adc, offset) * 1e3
ret = self.Amp[index].ampVin(adcs, offsets) * 1e3
return ret

def _saOutNormGet(*, read=True, index=-1, check=True):
#print(f'ColumnModule._saOutNormGet({read=}, {index=}, {check=})')
with self.root.updateGroup():
adc = self.SaOutAdc.get(read=read, index=index, check=check)
adcs = self.SaOutAdc.get(read=read, index=index, check=check)
offset = 0.0
if index == -1:
ret = np.array([self.Amp[i].ampVin(adc, offset) * 1e3 for i in range(8)])
ret = np.array([self.Amp[i].ampVin(adcs[i], offset) * 1e3 for i in range(8)])
return ret
else:
ret = self.Amp[index].ampVin(adc, offset) * 1e3
ret = self.Amp[index].ampVin(adcs, offset) * 1e3
return ret


Expand Down
4 changes: 2 additions & 2 deletions firmware/python/warm_tdm/_FastDacDriver.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def getCurrent(self, index, read):
currents = [self.amp.dacToOutCurrent(dac) for dac in dacs]
currents = np.array(currents, dtype=np.float64)
else:
currents = self.amp.outCurrentToDac(dac)
currents = self.amp.outCurrentToDac(dacs)

return currents

Expand Down Expand Up @@ -159,7 +159,7 @@ def _overVoltageSet(value, index, write, x=col):
for col in range(8):

self.add(FastDacMem(
name = f'ColumnRaw[{col}]',
name = f'Column[{col}]',
offset = col << 12,
amp = self.Amp[col],
size = rows))
Expand Down
14 changes: 7 additions & 7 deletions software/python/warm_tdm_api/_Group.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def __init__(self, groupConfig, groupId, dataWriter, simulation=False, emulate=F
host=groupConfig.host,
colBoards=groupConfig.columnBoards,
rowBoards=groupConfig.rowBoards,
# rows=len(groupConfig.rowMap),
rows=1,
plots=plots,
groups=['Hardware'],
expand=True))
Expand Down Expand Up @@ -519,7 +519,7 @@ def __init__(self, groupConfig, groupId, dataWriter, simulation=False, emulate=F
config = self.config,
hidden = True,
# units = 'mA',
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SAFb.ColumnCurrents[m.channel]
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SAFb.Column[m.channel].Current
for m in self.config.columnMap]))

self.add(GroupLinkVariable(
Expand All @@ -541,7 +541,7 @@ def __init__(self, groupConfig, groupId, dataWriter, simulation=False, emulate=F
config = self.config,
hidden = True,
# units = 'V',
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SAFb.ColumnVoltages[m.channel]
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SAFb.Column[m.channel].Voltage
for m in self.config.columnMap]))

self.add(GroupLinkVariable(
Expand All @@ -562,7 +562,7 @@ def __init__(self, groupConfig, groupId, dataWriter, simulation=False, emulate=F
'Values can be accessed as a full 2D array or pass a (col, row) tuple for the index key to access each value.',
config = self.config,
hidden = True,
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SQ1Bias.ColumnCurrents[m.channel]
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SQ1Bias.Column[m.channel].Current
for m in self.config.columnMap]))

self.add(GroupLinkVariable(
Expand All @@ -582,7 +582,7 @@ def __init__(self, groupConfig, groupId, dataWriter, simulation=False, emulate=F
'Values can be accessed as a full 2D array or pass a (col, row) tuple for the index key to access each value.',
config = self.config,
hidden = True,
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SQ1Bias.ColumnVoltages[m.channel]
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SQ1Bias.Column[m.channel].Voltage
for m in self.config.columnMap]))


Expand All @@ -604,7 +604,7 @@ def __init__(self, groupConfig, groupId, dataWriter, simulation=False, emulate=F
'Values can be accessed as a full 2D array or pass a (col, row) tuple for the index key to access each value.',
config = self.config,
hidden = True,
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SQ1Fb.ColumnCurrents[m.channel]
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SQ1Fb.Column[m.channel].Current
for m in self.config.columnMap]))

self.add(GroupLinkVariable(
Expand All @@ -624,7 +624,7 @@ def __init__(self, groupConfig, groupId, dataWriter, simulation=False, emulate=F
'Values can be accessed as a full 2D array or pass a (col, row) tuple for the index key to access each value.',
config = self.config,
hidden = True,
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SQ1Fb.ColumnVoltages[m.channel]
dependencies = [self.HardwareGroup.ColumnBoard[m.board].SQ1Fb.Column[m.channel].Voltage
for m in self.config.columnMap]))


Expand Down

0 comments on commit 1c2b91e

Please sign in to comment.