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

Rayonix fixes and some mrxv functions #71

Merged
merged 14 commits into from
May 1, 2022
Merged

Rayonix fixes and some mrxv functions #71

merged 14 commits into from
May 1, 2022

Conversation

apeck12
Copy link
Collaborator

@apeck12 apeck12 commented May 1, 2022

Most of the changes make the code compatible with the Rayonix.

In addition, retrieve_from_mrxv function and associated fetch_mask task were implemented. The opt_distance task now detects the appropriate mask file using a fetch_latest function added to shortcuts.

@apeck12 apeck12 added this to the SFX demo milestone May 1, 2022
@apeck12 apeck12 marked this pull request as draft May 1, 2022 05:47
@apeck12 apeck12 marked this pull request as ready for review May 1, 2022 05:47
@apeck12
Copy link
Collaborator Author

apeck12 commented May 1, 2022

Tasks have been updated in terms of output nomenclature and using fetch_latest (rather than an entry in the yaml) to retrieve the appropriate mask or geom file as needed. Current mfxlv4920.yaml and code have been tested for the following tasks: fetch_mask, fetch_geom, run_analysis, opt_distance, find_peaks, index, stream_analysis.

Copy link
Collaborator

@fredericpoitevin fredericpoitevin left a comment

Choose a reason for hiding this comment

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

Now that starts to look like something! Thanks so much @apeck12 , I'll make good use of all this today :D

Just a thought: do we want to rename misc/metrology.py as interfaces/metrology_interface.py?

@@ -29,3 +31,27 @@ def __getattr__(self, item):
return self.__getitem__(item)
except KeyError:
raise AttributeError(item)

def fetch_latest(fnames, run):
Copy link
Collaborator

Choose a reason for hiding this comment

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

Note for later: this could potentially go with another function tasked with defining paths to mrxv, etc. based on the location (SLAC, NERSC, ...). Maybe in some path_interface tool, or something

@fredericpoitevin
Copy link
Collaborator

I will merge now, hope it's OK!

@fredericpoitevin fredericpoitevin merged commit f848fa7 into main May 1, 2022
@apeck12
Copy link
Collaborator Author

apeck12 commented May 1, 2022

@fredericpoitevin, thanks for merging! I'll put metrology.py into interfaces and rename the contents of interfaces as we discussed earlier (e.g. stream_interface.py -> istream.py) in a separate PR.

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.

None yet

2 participants