Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into create-pull-request/p…
Browse files Browse the repository at this point in the history
…atch
rettigl committed Jul 16, 2024
2 parents 72a6d72 + 726b43c commit 5fe0996
Showing 5 changed files with 102 additions and 62 deletions.
93 changes: 47 additions & 46 deletions .cspell/custom-dictionary.txt
Original file line number Diff line number Diff line change
@@ -12,8 +12,11 @@ arraysum
ascale
astype
atleast
autoclass
automodule
autoreload
autoselect
autosummary
axhline
axind
AXISNAME
@@ -30,16 +33,20 @@ binsize
binwidth
blas
bvec
bysource
caldir
calib
calibdict
caplog
cdeform
cdeformfield
cdisp
centroidnn
chessy
clim
cmap
cobertura
codemirror
coeffs
coldist
colgrid
@@ -50,6 +57,7 @@ COMPES
coordmat
coordtype
countrate
coverallsapp
cryo
cstart
cstep
@@ -60,6 +68,8 @@ cvdist
dask
datacheck
dataconverter
datafile
datafolder
dataformat
dataframe
dataframes
@@ -74,10 +84,12 @@ dfpart
dfpid
dictionarized
dictmerge
dpkg
dropna
dset
dsets
dtype
easimon
ecalibdict
electronanalyser
endstation
@@ -87,12 +99,15 @@ ENERGYDISPERSION
ENOSPC
equiscale
Eref
errorbar
evpoly
exfel
expanduser
Extr
faddr
Faradayweg
fastdtw
fdir
featranges
ffill
figsize
@@ -102,17 +117,20 @@ fixedvertex
flatidx
fluence
fontsize
fprocessing
ftype
fwhm
genindex
getgid
getmtime
gpfs
griddata
gridplot
groupnames
halfbinsize
HEXTOF
histdd
histdict
histkwds
histogramdd
histtype
@@ -134,11 +152,14 @@ ipympl
ipynb
ipython
ipywidgets
isdir
isel
isinstance
itemsize
joblib
jpars
jupyterlab
kernelspec
kmodem
KTOF
kwds
@@ -149,6 +170,7 @@ linalg
linekwds
linesegkwds
linewidth
linspace
literalinclude
lmfit
lmkcenter
@@ -159,6 +181,7 @@ macrobunches
Maklar
mapkwds
markersize
matplotlib
maxdepth
maxs
maxsplit
@@ -185,14 +208,19 @@ mycopy
myfantasymethod
myfantasyscale
mymakedirs
mypy
nanos
nans
narray
natsort
natsorted
nbagg
nbconvert
nbformat
nbin
nbins
nbsphinx
nbstripout
ncol
ncols
ndarray
@@ -228,8 +256,11 @@ OPCPA
openmp
OPTICALDELAY
otherax
packetcoders
Pandoc
parallelly
pathcorr
pathlib
pbar
pcent
pcolormesh
@@ -251,12 +282,18 @@ prefs
printfuncs
psutil
ptargs
pullrequest
pval
pyarrow
pyenv
pygments
pynxtools
pypa
pypi
pyplot
pyproject
pytest
pyupgrade
quantile
randn
rcond
@@ -271,6 +308,7 @@ rowgrid
rstart
rstep
rtol
rtype
rvbin
rvbins
rvname
@@ -286,8 +324,11 @@ SDIAG
sdir
segs
sfile
shutil
Sixten
sohail
specnorm
sphinxext
splinewarp
stackax
stackaxis
@@ -302,7 +343,9 @@ textshift
textsize
threadpool
threadpoolctl
tibdex
tifffile
timeit
TIMINGINFO
Tmain
Tmat
@@ -314,13 +357,15 @@ traceseg
trseg
Tsec
txtsize
typehints
TZCYXS
tzoffset
ubid
UDLD
unbinned
uncategorised
undoc
utime
varnames
venv
verts
@@ -355,51 +400,7 @@ ypos
yratio
yscale
ytrans
zain
Zenodo
zraw
typehints
sphinxext
nbsphinx
autoclass
bysource
rtype
nbformat
pygments
nbconvert
codemirror
kernelspec
isinstance
pyplot
matplotlib
pathlib
autoreload
getmtime
utime
zfill
expanduser
datafile
autosummary
errorbar
fdir
fprocessing
datafolder
parallelly
histdict
shutil
isdir
linspace
mypy
pyupgrade
nbstripout
timeit
pullrequest
tibdex
packetcoders
easimon
dpkg
zain
sohail
pypi
pypa
cobertura
coverallsapp
zraw
2 changes: 1 addition & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "sed-processor"
packages = [
{include = "sed"}
]
version = "0.1.10a7"
version = "0.1.10a8"
description = "Single Event Data Frame Processor: Backend to handle photoelectron resolved datastreams"
authors = ["OpenCOMPES team <[email protected]>"]
readme = "README.md"
@@ -27,8 +27,8 @@ numba = ">=0.55.1"
numpy = ">=1.18"
pandas = ">=1.4.1"
psutil = ">=5.9.0"
pynxtools-mpes = ">=0.0.3"
pynxtools = ">=0.3.1"
pynxtools-mpes = ">=0.1.1"
pynxtools = ">=0.5.0"
pyyaml = ">=6.0.0"
scipy = ">=1.8.0"
symmetrize = ">=0.5.5"
21 changes: 10 additions & 11 deletions sed/config/NXmpes_config.json
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
"/@default": "entry",
"/ENTRY[entry]/@default": "data",
"/ENTRY[entry]/definition": "NXmpes",
"/ENTRY[entry]/definition/@version": "None",
"/ENTRY[entry]/title": "@attrs:metadata/entry_title",
"/ENTRY[entry]/start_time": "@attrs:metadata/timing/acquisition_start",
"/ENTRY[entry]/experiment_institution": "Fritz Haber Institute - Max Planck Society",
@@ -15,9 +14,9 @@
"/ENTRY[entry]/collection_time": "@attrs:metadata/timing/collection_time",
"/ENTRY[entry]/collection_time/@units": "s",
"/ENTRY[entry]/USER[user]": {
"name": "@attrs:metadata/user0/name",
"name": "!@attrs:metadata/user0/name",
"role": "@attrs:metadata/user0/role",
"affiliation": "@attrs:metadata/user0/affiliation",
"affiliation": "!@attrs:metadata/user0/affiliation",
"address": "@attrs:metadata/user0/address",
"email": "@attrs:metadata/user0/email"
},
@@ -45,7 +44,7 @@
"pressure_gauge": {
"name": "sample_chamber_pressure",
"measurement": "pressure",
"value": "@attrs:metadata/file/trARPES:XGS600:PressureAC:P_RD",
"value": "!@attrs:metadata/file/trARPES:XGS600:PressureAC:P_RD",
"value/@units": "mbar"
}
},
@@ -63,19 +62,19 @@
],
"slow_axes": "@attrs:metadata/instrument/analyzer/slow_axes",
"energy_resolution": {
"resolution": "@attrs:metadata/instrument/analyzer/energy_resolution",
"resolution": "!@attrs:metadata/instrument/analyzer/energy_resolution",
"resolution/@units": "meV",
"physical_quantity": "energy",
"type": "estimated"
},
"momentum_resolution": {
"resolution": "@attrs:metadata/instrument/analyzer/momentum_resolution",
"resolution": "!@attrs:metadata/instrument/analyzer/momentum_resolution",
"resolution/@units": "1/angstrom",
"physical_quantity": "momentum",
"type": "estimated"
},
"spatial_resolution": {
"resolution": "@attrs:metadata/instrument/analyzer/spatial_resolution",
"resolution": "!@attrs:metadata/instrument/analyzer/spatial_resolution",
"resolution/@units": "µm",
"physical_quantity": "length",
"type": "estimated"
@@ -173,7 +172,7 @@
"/ENTRY[entry]/INSTRUMENT[instrument]/beamTYPE[beam_probe]": {
"distance": 0.0,
"distance/@units": "mm",
"incident_energy": "@attrs:metadata/instrument/beam/probe/incident_energy",
"incident_energy": "!@attrs:metadata/instrument/beam/probe/incident_energy",
"incident_energy/@units": "eV",
"incident_energy_spread": "@attrs:metadata/instrument/beam/probe/incident_energy_spread",
"incident_energy_spread/@units": "eV",
@@ -197,7 +196,7 @@
"/ENTRY[entry]/INSTRUMENT[instrument]/beamTYPE[beam_pump]": {
"distance": 0.0,
"distance/@units": "mm",
"incident_energy": "@attrs:metadata/instrument/beam/pump/incident_energy",
"incident_energy": "!@attrs:metadata/instrument/beam/pump/incident_energy",
"incident_energy/@units": "eV",
"incident_energy_spread": "@attrs:metadata/instrument/beam/pump/incident_energy_spread",
"incident_energy_spread/@units": "eV",
@@ -221,13 +220,13 @@
"temperature_sensor": {
"name": "sample_temperature",
"measurement": "temperature",
"value": "@attrs:metadata/file/trARPES:Carving:TEMP_RBV",
"value": "!@attrs:metadata/file/trARPES:Carving:TEMP_RBV",
"value/@units": "K"
},
"sample_bias_voltmeter": {
"name": "sample_bias",
"measurement": "voltage",
"value": "@attrs:metadata/file/KTOF:Lens:Sample:V",
"value": "!@attrs:metadata/file/KTOF:Lens:Sample:V",
"value/@units": "V"
},
"depends_on": "/entry/instrument/manipulator/transformations/trans_z",
Loading

0 comments on commit 5fe0996

Please sign in to comment.