-
Notifications
You must be signed in to change notification settings - Fork 98
Multiple energy window code v2 #1597
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
base: master
Are you sure you want to change the base?
Conversation
…_UP_TO_DATE_OCT
merge version 5.0.0 onto multi_energy branch: - resolve conflicts - minor fixes
I've currently merged This compiles and ctests work. I didn't check Unfortunately, merging
They aren't too bad, but need some attention. I guess this means that more than likely we'll have more of this coming up for later versions. |
This is a copy of #722, where we will gradually merge updates to more recent versions of STIR.
I anticipate that when this is done, we will squash history, and generate a new PR.
Expect squashes and rebases therefore.
Pinging @rmapree @ludovicabrusaferri