Skip to content

Nyx merge fixes#400

Open
Shekar V (vshekar) wants to merge 3 commits intoNSLS2:masterfrom
vshekar:nyx_merge_fixes
Open

Nyx merge fixes#400
Shekar V (vshekar) wants to merge 3 commits intoNSLS2:masterfrom
vshekar:nyx_merge_fixes

Conversation

@vshekar
Copy link
Copy Markdown
Collaborator

No description provided.

Comment thread gui/control_main.py
)
correctedC2C_y = self.getBeamCenterY() + (
y_click - (self.centerMarker.y() - self.centerMarkerCharOffsetY) - 40
if daq_utils.beamline == "nyx":
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

MSkinner (@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
Copy Markdown
Collaborator

@JunAishima Jun Aishima (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

Comment thread gui/control_main.py Outdated
Comment thread gui/control_main.py Outdated
Comment thread gui/control_main.py Outdated
@JunAishima
Copy link
Copy Markdown
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>
@JunAishima
Copy link
Copy Markdown
Collaborator

looking good

Comment thread gui/control_main.py
hBoxColParams6.addWidget(self.protoComboBox)
hBoxColParams7.addWidget(centeringLabel)
hBoxColParams7.addWidget(self.centeringComboBox)
hBoxColParams7.addWidget(self.colResoLabel)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

MSkinner (@mskinner5278) Shekar V (@vshekar) are all beamlines happy that the resolution is shown here and editable? this is the only code block that would be shared between the beamlines, so want to make sure it is ok

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

This is intended for for AMX/FMX. Should be fine for NYX, in nyx_parameter_layout it gets reassigned to a different spot.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

doesn't that mean this widget is going to be shown in multiple places for nyx, not just shown in paramSubspace?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

No a widget shows up only once, it'll go to the last layout it was added to

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