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

Support CSX Jan 2020 zone plate experiment #75

Merged
merged 17 commits into from
Feb 11, 2020

Conversation

leofang
Copy link
Contributor

@leofang leofang commented Jan 29, 2020

@leofang leofang added this to the v1.4.0 milestone Jan 29, 2020
1. initialize to 0.0
2. change allowed range to [-180, 180]
TODO: this may not be the best practice. Should do this elsewhere, like
when loading data?
Now the the behavior is
- if the window is closed, one can reopen it with everything intact as
  long as there is no need to reload (due to change of scan number, etc)
- if reload is needed, the window will be forced close so that a fresh
  window can be opened.

TODO: need a reset button for the roi window
@leofang
Copy link
Contributor Author

leofang commented Jan 30, 2020

Zero-out does not seem to behave correctly. Investigating...

EDIT: fixed in d10e7ee

@leofang
Copy link
Contributor Author

leofang commented Feb 1, 2020

For the flat field support, note the commit message in 03871d6. This is a short-term solution as the usage is not very intuitive, but this is what I can do in one hour without going through the painful process of designing GUI elements. Will have to revisit this later.

To correct flat field, type in 7, instead of 3, scan ids in the Associate
Scans window, in this order: (dark8, dark2, dark1, flat_scan_num, flat_dark8,
flat_dark2, flat_dark1).

Two notes:
1. To use this feature, must apply the patch in NSLS-II-CSX/csxtools#68 (comment)
   to csxtools, otherwise the error from NSLS-II-CSX/csxtools#68 would happen.

2. I observed a vertical black stripe in the corrected image, not sure if
   this is expected.
@leofang
Copy link
Contributor Author

leofang commented Feb 1, 2020

Will fix a few more GUI bugs before merging this. EDIT: Done.

This bug exists in both HXN and CSX databroker accesses.
This is a non-compatible change in that in addition to restore the zoom-in
status, all values and internal states, including ROIs, bad pixels, log
scale, etc, are also reset.

Close NSLS2#81.
@leofang leofang changed the title [WIP] Support CSX Jan 2020 zone plate experiment Support CSX Jan 2020 zone plate experiment Feb 3, 2020
@leofang leofang marked this pull request as ready for review February 3, 2020 18:04
@leofang
Copy link
Contributor Author

leofang commented Feb 4, 2020

@mrakitin If you are interested in (or have time for 😆) reviewing this PR, I'll be more than happy. If you don't have time, please go ahead and merge for me. I'll then proceed to do some lightweight refactoring to prepare for #74 (perhaps after I add a few new solvers to the backend). We'll have one more shot to review all the changes before I release v1.4.0 (#70). Thanks!

@mrakitin
Copy link

mrakitin commented Feb 4, 2020

Hi Leo, I will review it tonight.

@leofang leofang requested a review from mrakitin February 4, 2020 15:02
@leofang
Copy link
Contributor Author

leofang commented Feb 11, 2020

@mrakitin I am going to merge this for now, as @xiaojinghuang from HXN needs 476fce3. Going to deploy a hotfix for them. Please feel free to revisit anytime.

@leofang leofang merged commit 05e83f9 into NSLS2:master Feb 11, 2020
@leofang leofang deleted the csx_zone_plate branch February 11, 2020 17:18
@mrakitin
Copy link

Sounds good. It has fallen off my priority list somehow. Will reiterate later.

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