Skip to content
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

Jump to bottom

Calculated first row in heatmap #21

Merged
merged 2 commits into from
Aug 3, 2023
Merged

Calculated first row in heatmap #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acfaf78
Calculated first row in heatmap
Aug 3, 2023
2826b74
Rows numbers now correct on heatmap
Aug 3, 2023
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
5 changes: 5 additions & 0 deletions control/src/mercury/carrier/Carrier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,7 @@ def create_reshaped_array():

self._segment_data = self._segment_data + reshaped

blank_segment = [[0] * 80]*4

try:

Expand All @@ -1093,7 +1094,11 @@ def create_reshaped_array():
for segment in range(20):
create_reshaped_array()
else:
for i in range(0, segment):
self._segment_data = self._segment_data + blank_segment
create_reshaped_array()
for i in range (segment+1, 20):
self._segment_data = self._segment_data + blank_segment


self._segment_ready = True
Expand Down
4 changes: 4 additions & 0 deletions control/test/static/js/carrier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,6 +1258,7 @@ function update_loki_asic_segment_data() {

function readout_output(segment_data) {

var first_row = segment_current*4;

var data = [
{
Expand Down Expand Up @@ -1306,6 +1307,9 @@ function readout_output(segment_data) {
if (all_segments_displayed) {
layout["title"] = 'All Segments';
layout.coloraxis["colorbar"] = "v";
} else {
layout.yaxis.autorange=false;
layout.yaxis.range=[first_row+3.5,first_row-0.5];
};

Plotly.newPlot('graph_output', data, layout, config);
Expand Down