Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tjmonopix2/scans/tune_global_threshold.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def _configure(self, start_column=0, stop_column=512, start_row=0, stop_row=512,

self.chip.registers["SEL_PULSE_EXT_CONF"].write(0)

self.data.hist_occ = oa.OccupancyHistogramming(rx_id=self.chip.chip_id)
self.data.hist_occ = oa.OccupancyHistogramming(rx_id=int(self.chip.receiver[2]))

def _scan(self, n_injections=100, gdac_value_bits=range(6, -1, -1), **_):
'''
Expand Down
2 changes: 1 addition & 1 deletion tjmonopix2/scans/tune_local_threshold.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def _configure(self, start_column=0, stop_column=512, start_row=0, stop_row=512,

self.chip.registers["SEL_PULSE_EXT_CONF"].write(0)

self.data.hist_occ = oa.OccupancyHistogramming(rx_id=self.chip.chip_id)
self.data.hist_occ = oa.OccupancyHistogramming(rx_id=int(self.chip.receiver[2]))

def _scan(self, start_column=0, stop_column=512, start_row=0, stop_row=512, n_injections=100, **_):
'''
Expand Down
2 changes: 1 addition & 1 deletion tjmonopix2/system/scan_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ def write_dict_to_table(dictionary, node):
row['attribute'] = attr
try:
row['value'] = val
except TypeError: # value cannot be implicitly converted to string
except (TypeError, ValueError): # value cannot be implicitly converted to string
row['value'] = str(val)
row.append()
node.flush()
Expand Down
Loading