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

raw data directory changes in 2020-09 #45

Open
2 tasks
prjemian opened this issue Sep 9, 2020 · 7 comments
Open
2 tasks

raw data directory changes in 2020-09 #45

prjemian opened this issue Sep 9, 2020 · 7 comments
Assignees
Labels

Comments

@prjemian
Copy link
Contributor

prjemian commented Sep 9, 2020

In APS-USAXS/usaxs-bluesky-ended-2023#379, the raw data directory will change according to the table described here: APS-USAXS/usaxs-bluesky-ended-2023#361 (comment)

update:

  • livedata
  • specplots
@prjemian
Copy link
Contributor Author

FlyScan is not plotted when collected by SPEC. This is because the number of SPEC comments has changed and the livedata was expecting the HDF5 file name to be provided at a fixed number of comments from the scan start.

        comment = scan.comments[2]
        key_string = 'FlyScan file name = '

but the data file now has

#C splB_8
#C Wed Sep 16 16:37:58 2020.  Need to fix FIlename Format when other ADs are running.
#C Wed Sep 16 16:37:58 2020.  Collected FLY2 jpg data.
#C Wed Sep 16 16:37:58 2020.  FlyScan #260 started.
#C Wed Sep 16 16:37:58 2020.  FlyScan file name = ./09_16_Krzysko/09_16_Krzysko_usaxs/splB_8_0059.h5.
#C Wed Sep 16 16:37:58 2020.  Please wait approximately 135s to complete FlyScan..
#C Wed Sep 16 16:40:09 2020.  Flyscan done after 129s..
#C Wed Sep 16 16:40:09 2020.  FlyScan finished.
#C Wed Sep 16 16:40:09 2020.  Moving AR motor back to 8.74763 degrees (beam center).
#C Wed Sep 16 16:40:09 2020.  splB_8.
#C Wed Sep 16 16:40:28 2020.  Ready for SAXS mode.
#C Wed Sep 16 16:40:28 2020.  Need to fix FIlename Format when other ADs are running.
#C Wed Sep 16 16:40:28 2020.  Collected FLY2 jpg data.
#C Wed Sep 16 16:40:28 2020.  *************   Started SAXS Exposure   **********************.
#C Wed Sep 16 16:40:28 2020.  First Sample Name ./09_16_Krzysko/09_16_Krzysko_saxs/splB_8_0059.hdf.

The livedata code needs to search the comments for a match rather than assume the match is one specific comment.

prjemian pushed a commit that referenced this issue Sep 16, 2020
@prjemian
Copy link
Contributor Author

The specplots page is not getting the new directories when SPEC runs.

prjemian pushed a commit that referenced this issue Sep 17, 2020
@prjemian
Copy link
Contributor Author

specplot was failing on a reported SPEC file name that was actually the directory that contains a SPEC data file. For now, let's just log that the reported file name is actually a directory, then proceed to the next file name in the current list.

@prjemian
Copy link
Contributor Author

Directories are now created but the FlyScan data files are not found for display. Upstream fix for the SPEC code will be added later today and it is expected all data will then be visible.

@prjemian
Copy link
Contributor Author

Same for FlyScan plots on main livedata page. Not shown until upstream fix for SPEC code is added.

@jilavsky
Copy link
Contributor

IT'S working!

@prjemian
Copy link
Contributor Author

Right, FlyScan plot is now shown on livedata page. NOT shown on specplots page. File path to .h5 file looks right, in subdirectory from SPEC data file. Need to check the specplot code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants