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.

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

Nyx merge fixes #400

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Nyx merge fixes #400

wants to merge 3 commits into from

Conversation

vshekar
Copy link
Collaborator

@vshekar vshekar commented Oct 12, 2024

No description provided.

)
correctedC2C_y = self.getBeamCenterY() + (
y_click - (self.centerMarker.y() - self.centerMarkerCharOffsetY) - 40
if daq_utils.beamline == "nyx":
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mskinner5278 This is where the carve out for nyx is for the click to center code. Please make changes to whatever you have at NYX

Copy link
Collaborator

@JunAishima JunAishima left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are some AMX/FMX code blocks still in nyx_parameter_layout(). this set of changes should remove that code

gui/control_main.py Outdated Show resolved Hide resolved
gui/control_main.py Outdated Show resolved Hide resolved
gui/control_main.py Outdated Show resolved Hide resolved
@JunAishima
Copy link
Collaborator

is there a good reference commit from which the amx_fmx_parameter_layout() is derived?

Removed unnecessary amx/fmx layouts from nyx layout code

Co-authored-by: Jun Aishima <jaishima@bnl.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants