search

pcdshub / lightpath

LCLS Lightpath Module
https://pcdshub.github.io/lightpath
Other
4 stars 9 forks source link

REV: revert split of xpp line #178

Closed tangkong closed 1 year ago

tangkong commented 1 year ago

Description

reverts the config split of XPP into two lines for hutch-python compatibility

Motivation and Context

Hutch-python expects very specific hutch names, so we should not change the ones that are available by default.

This split can simply be done via custom config files in the future

Can't just revert the whole PR since there were other fixes in it

How Has This Been Tested?

reverting and running the test suite

Where Has This Been Documented?

This PR

ZLLentz commented 1 year ago

Another option is to teach hutch-python about the two XPP lines, I'm not sure which is better

tangkong commented 1 year ago

My rationale was that hutch-python relies on the provided hutch name in many places, and teaching hutch-python about two new XPP lines would require either coding in edge cases in all those places. hutch-python also uses that hutch name to search happi, and changing the line names would cause a mismatch there.

On the other hand, if XPP starts lightpath with a custom config, hutch-python should work as it has.

ZLLentz commented 1 year ago

You're definitely right that this would end up as a special case in hutch-python and possibly have knock-on impacts

klauer commented 1 year ago

Got it - this clearly seems the correct approach then 👍