Skip to content

Add xas and xrfmaps export subdirectories #36

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.

Sign up for GitHub

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

Open
AbbyGi wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add xas and xrfmaps export subdirectories #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fa10b3
Add xas and xrfmaps subdirs for export
AbbyGi Apr 1, 2026
5e8deaf
Linter fix
AbbyGi Apr 1, 2026
cc8aeb8
Another linter fix
AbbyGi Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions xanes_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import numpy as np
import xraylib as xrl
import pandas as pd
from pathlib import Path


def create_subdir(path):
Path(path).mkdir(parents=True, exist_ok=True)


def xanes_textout(
Expand All @@ -30,13 +35,9 @@ def xanes_textout(
"""

h = get_run(scanid, api_key=api_key)
if (
"Beamline Commissioning (beamline staff only)".lower()
in h.start["proposal"]["type"].lower()
):
filepath = f"/nsls2/data/srx/proposals/commissioning/{h.start['data_session']}/scan_{h.start['scan_id']}_xanes.txt"
else:
filepath = f"/nsls2/data/srx/proposals/{h.start['cycle']}/{h.start['data_session']}/scan_{h.start['scan_id']}_xanes.txt" # noqa: E501
filepath = f"/nsls2/data/srx/proposals/{h.start['cycle']}/{h.start['data_session']}/xas/scan_{h.start['scan_id']}_xanes.txt" # noqa: E501

create_subdir(Path(filepath).parent)

with open(filepath, "w") as f:
dataset_client = h["primary"]["data"]
Expand Down Expand Up @@ -233,9 +234,10 @@ def xas_fly_exporter(uid, api_key=None, dry_run=False):
start_doc = hdr.start

# Get proposal directory location
is_commissioning = "beamline commissioning" in start_doc["proposal"]["type"].lower()
cycle = "commissioning" if is_commissioning else start_doc["cycle"]
root = f"/nsls2/data/srx/proposals/{cycle}/{start_doc['data_session']}/"
cycle = start_doc["cycle"]
root = f"/nsls2/data/srx/proposals/{cycle}/{start_doc['data_session']}/xas/"

create_subdir(root)

# Identify scan streams
scan_streams = [s for s in hdr if s != "baseline" and "monitor" not in s]
Expand Down
12 changes: 4 additions & 8 deletions xrf_hdf5_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from pyxrf.api import make_hdf

from data_validation import get_run
from xanes_exporter import create_subdir

# from pyxrf.api import make_hdf

Expand Down Expand Up @@ -43,14 +44,9 @@ def export_xrf_hdf5(scanid, api_key=None, dry_run=False):
)
return

if "SRX Beamline Commissioning".lower() in h.start["proposal"]["title"].lower():
working_dir = (
f"/nsls2/data/srx/proposals/commissioning/{h.start['data_session']}"
)
else:
working_dir = (
f"/nsls2/data/srx/proposals/{h.start['cycle']}/{h.start['data_session']}" # noqa: E501
)
working_dir = f"/nsls2/data/srx/proposals/{h.start['cycle']}/{h.start['data_session']}/xrfmaps" # noqa: E501

create_subdir(working_dir)

os.umask(0o007) # Read/write access for user and group only

Expand Down
Loading