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

Enh/plotped lcls2 #113

Merged
merged 3 commits into from
Mar 3, 2022
Merged

Enh/plotped lcls2 #113

merged 3 commits into from
Mar 3, 2022

Conversation

silkenelson
Copy link
Collaborator

changes for UED to enable restartdaq, stopdaq & makepeds

Description

Check for LCLS2 hutches in a better way & add UED as an LCLS2 hutch
expand makepeds_psana to also work for LSL2 (epixquad only tested detector for now)

Motivation and Context

UED should have the same tools used elsewhere

How Has This Been Tested?

ran makepeds_psana locally

Where Has This Been Documented?

nowhere as usual.

@silkenelson silkenelson requested review from ZryletTC and vespos March 3, 2022 06:42
Copy link
Contributor

@ZryletTC ZryletTC left a comment

Choose a reason for hiding this comment

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

Looks pretty good to me. I'd like Vincent's eyes on it as well since the epix10k section is pretty dense. Did you also test with the makepeds run non-locally?

Co-authored-by: Tyler Pennebaker <[email protected]>
@silkenelson
Copy link
Collaborator Author

In my experience, testing the full makepeds is messy as I usually have to hack makepeds to call the changed makepeds_psana instead of the default and then remember to fix that before committing. As I have not actually changed makepeds I've deemed this an unnecessary step in this instance.

@ZryletTC ZryletTC merged commit abd0adf into master Mar 3, 2022
@ZryletTC ZryletTC deleted the ENH/plotped_lcls2 branch March 3, 2022 21:16
@ZryletTC
Copy link
Contributor

ZryletTC commented Mar 3, 2022

I'm surprised you'd need to hack makepeds. It looks like it runs the makepeds_psana script in the current directory: $DIR/makepeds_psana. But your reasoning makes sense. When you said you ran it locally, I was thinking you meant with the -l option so was hoping for a batched test as well.

@silkenelson
Copy link
Collaborator Author

It's possible that I worked around my earlier problems with makepeds - my memory is somewhat hazy.
TBH, for UED I only tested the batch option - mostly because that processes in parallel while I have not implemented using subprocesses on a local machine and I'm impatient. I guess add Mikhail parallel_proc script for local processing. Because this script needs more options to support.... Thank you!

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