Nyx merge fixes #400
Nyx merge fixes #400
Conversation
| ) | ||
| correctedC2C_y = self.getBeamCenterY() + ( | ||
| y_click - (self.centerMarker.y() - self.centerMarkerCharOffsetY) - 40 | ||
| if daq_utils.beamline == "nyx": |
There was a problem hiding this comment.
@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
|
is there a good reference commit from which the |
Removed unnecessary amx/fmx layouts from nyx layout code Co-authored-by: Jun Aishima <[email protected]>
|
looking good |
| @@ -701,6 +701,9 @@ def createSampleTab(self): | |||
| hBoxColParams6.addWidget(self.protoComboBox) | |||
| hBoxColParams7.addWidget(centeringLabel) | |||
| hBoxColParams7.addWidget(self.centeringComboBox) | |||
| hBoxColParams7.addWidget(self.colResoLabel) | |||
There was a problem hiding this comment.
@mskinner5278 @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
There was a problem hiding this comment.
This is intended for for AMX/FMX. Should be fine for NYX, in nyx_parameter_layout it gets reassigned to a different spot.
There was a problem hiding this comment.
doesn't that mean this widget is going to be shown in multiple places for nyx, not just shown in paramSubspace?
There was a problem hiding this comment.
No a widget shows up only once, it'll go to the last layout it was added to
No description provided.