-
Notifications
You must be signed in to change notification settings - Fork 3
Upgrade to V1 #437
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
Merged
Merged
Upgrade to V1 #437
Changes from 250 commits
Commits
Show all changes
383 commits
Select commit
Hold shift + click to select a range
39d83ae
enable energy offset in benchmark
rettigl ac1aa18
typing fixes
rettigl ec92432
apply bias offset for energy calibration in energy calibrator, and om…
rettigl 7d60c92
fix test
rettigl ff134a5
fix spelling in all files using Code Spell Checker
rettigl 57d6cd7
some additional spell fixes
rettigl 06a2715
Merge pull request #449 from OpenCOMPES/spelling_fixes
rettigl ebd2b32
Merge remote-tracking branch 'origin/v1_feature_branch' into refactor…
rettigl d131fe4
remove nans from all electron channels
zain-sohail 194c874
use pd import, load h5 file inside df creator
zain-sohail af33740
update comments to explain the code
zain-sohail 50f7ee1
make review changes
zain-sohail 65d909d
fix tests with review comments
zain-sohail b7537a8
fix dropna
zain-sohail b0b090d
fix minor stuff and add test to see if exception handling works in pa…
zain-sohail f5b9148
Merge pull request #329 from OpenCOMPES/refactor-flashloader
zain-sohail 118084e
fix timestamp issue in flashloader
zain-sohail 2a76734
Update benchmark targets
zain-sohail 2c82686
Merge remote-tracking branch 'origin/v1_feature_branch' into energy_c…
rettigl b9afad7
Merge pull request #455 from OpenCOMPES/update_benchmark_targets
rettigl bf9d624
Merge remote-tracking branch 'origin/v1_feature_branch' into energy_c…
rettigl 0fdff42
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 7f9422c
additional spell fixes
rettigl b90b7f3
change behavior of tof_binning and adc_binning to reflect actual binn…
rettigl 84421ea
add additional ignore entries
rettigl 0da2561
move num_cores to "core" and use it globally
rettigl 6c642b4
Merge branch 'v1_feature_branch' into energy_calibration_bias_shift
rettigl 232c6cc
fix spelling
rettigl 78b5fbf
bump version to 0.1.10a6
cc8145e
Update dependencies
rettigl 7687fd1
fix flash tests to also rune fine with defined system config
rettigl 6e04835
add typing to tests, and fix issues
rettigl 6b5ff8a
detect illegal keyword arguments
rettigl 05b9a20
Merge remote-tracking branch 'origin/flash_test_fixes' into catch_ill…
rettigl 77692d8
add tests for illegal keyword errors
rettigl 11d4d74
Merge pull request #465 from OpenCOMPES/flash_test_fixes
zain-sohail f6c33e6
fix group_name error
zain-sohail 30e7447
bring back old behavior
zain-sohail 49d93e9
minor changes
zain-sohail d830e8c
use concat for faster join
zain-sohail c48a6ec
try saving both
zain-sohail 4d11d7a
change fill section
zain-sohail 88f0e9c
parallel processing
zain-sohail f6a45e5
change paths config to hold raw and processed keys
zain-sohail a8632ab
change filehandling of buffer files as it's more complicated now, and…
zain-sohail 53ea8fd
add dtype handler, make more changes to filepath handler
zain-sohail e436397
update methods and tests
zain-sohail 1b2e788
sxp test fixes
zain-sohail 7ed0962
processor test fixes
zain-sohail 7d1262b
sxp test fixes
zain-sohail 0a677df
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 989f438
Merge branch 'v1_feature_branch' into energy_calibration_bias_shift
rettigl 8774b8f
Merge branch 'v1_feature_branch' into tof_binning-as-actual-binning-v…
rettigl 245762a
Merge branch 'energy_calibration_bias_shift' into catch_illegal_kwds
rettigl 638ed68
add further tests
rettigl 84f99ef
fix typing
rettigl 5b6f940
remove 0 vals from all pulse channels
zain-sohail ecd517d
Merge pull request #451 from OpenCOMPES/tof_binning-as-actual-binning…
rettigl 748cb11
Merge branch 'v1_feature_branch' into energy_calibration_bias_shift
rettigl 1ef47b1
update energy calibration description
rettigl a017fe4
fix Energy(TOF) view for binding energy scale
rettigl c0d61ea
add some more tests for mpes loader
rettigl 4b682a5
Merge branch 'v1_feature_branch' into fix-459
rettigl b325ba6
update paths
rettigl 852ce8e
revert the benchmarking
zain-sohail 2de5243
update aux channel handling
zain-sohail ae4a2c0
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 3eb5dea
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl c717114
Merge branch 'v1_feature_branch' into energy_calibration_bias_shift
rettigl cb7c97a
Merge pull request #411 from OpenCOMPES/energy_calibration_bias_shift
rettigl 1e2ea1b
Merge pull request #466 from OpenCOMPES/catch_illegal_kwds
rettigl cce0ba7
limit matplotlib to fix typing issue
rettigl 770af0d
index sorting
zain-sohail 7944043
roll back the buffer_handler with small changes
zain-sohail adfd335
fix some test issues
zain-sohail fbd5cbf
fix energy calibration and delay range
rettigl dc74566
Merge remote-tracking branch 'origin/v1_feature_branch' into fix-459
rettigl 4d35e54
some metadata changes
zain-sohail b9bef4f
Merge branch 'fix-459' into flash-minor-changes
zain-sohail 0aab5c4
use correct lock
zain-sohail 1966ac4
roll back to iterations
zain-sohail d09e715
add aux alias and subchannels argument
zain-sohail b0471f2
change name and return of the run method
zain-sohail 85c1315
Merge pull request #479 from OpenCOMPES/flash-minor-changes
zain-sohail 89ba09e
Merge pull request #469 from OpenCOMPES/fix-459
zain-sohail ddfb16c
Update benchmark targets
zain-sohail 019bf40
remove invalid channels
zain-sohail 80da01d
create exception and use it to find invalid files
zain-sohail e8b8a4d
Merge pull request #483 from OpenCOMPES/update_benchmark_targets
rettigl 337e6f8
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 4d1ce1e
add exception when no valid files are available and fix testing
zain-sohail f8aab53
implement suggested changes
zain-sohail d305f19
let code run even if no train channels exist
zain-sohail 69521c9
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 779b594
limit pynxtools
rettigl 36acf44
Merge branch 'v1_feature_branch' into remove-invalid-channels
rettigl 2b6f96e
filter out all negative pulse values as they are invalid
zain-sohail a890d5d
filter out in final df
zain-sohail 60e43e7
Merge pull request #484 from OpenCOMPES/remove-invalid-channels
zain-sohail 83fe946
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl bda9e10
replace prints by logging
rettigl f824bad
fixes for new matplotlib
rettigl fbb0af2
use base sed logger
rettigl 469236d
add logging to mpes loader
rettigl 37feca1
add verbosity to loader interface
rettigl 2fbae5d
add logging to delay calibrator
rettigl 3292658
use logging in momentum calibrator
rettigl e3af246
use logging in energy calibrator, and further fixes
rettigl 2a69836
some further fixes
rettigl 79a181d
add function to set verbosity, and use in each class
rettigl 8716dc0
Make verbose a private property, and add getter and setters for it, t…
rettigl c90e839
Merge pull request #490 from OpenCOMPES/logging
rettigl 64848b9
adding this flag due to https://github.com/astral-sh/ruff/issues/5434
zain-sohail eb5ee3f
first pydantic model for config
zain-sohail 600ef55
without typeddict
zain-sohail 24998df
remove defaults
zain-sohail bea6079
update lock file with pydantic
zain-sohail c7aac14
nest the models
zain-sohail c179d9a
add copytool in configmodel and other attrs
zain-sohail d7cab5f
update config files to conform to model
zain-sohail 75f1200
use configmodel in processor class
zain-sohail 8ef5807
update modules to new config
zain-sohail 02aea0a
fix some config problems
zain-sohail d84f6e4
update lockfile
rettigl 715c42a
update poetry, limit numpy
rettigl a70529a
update lockfile
rettigl daf5c2d
limit dask version to <2024.8 due to bug where computation takes forw…
rettigl 1aa4a83
disable dask query-planning as workaround for bugs in dask-expr
rettigl 41f05ef
remove limits on python versions for tests
rettigl d56d6d9
Merge pull request #448 from OpenCOMPES/update_dask_version
rettigl 5c0f75e
Merge remote-tracking branch 'origin/v1_feature_branch' into pydantic…
rettigl 1146b4f
fix tests for calibrators
rettigl a1a9b27
make model fail on extra parameters
rettigl e3577bb
fix flash loader
rettigl 8054bfa
fix calibrator tests again
rettigl 35dcd11
fix processor tests
rettigl 738cd85
fix sxp loader
rettigl bc6f457
update notebooks
rettigl bc40fea
fix remaining tests
rettigl b6db85f
add config model for copy tool
rettigl bdc5bac
Add further type refinements to config model
rettigl 022dc69
add tests for config model
zain-sohail 52a11dc
fix remaining tutorials
rettigl 9edbea2
fix config model tests
rettigl ad8705d
add review suggestions
rettigl 7aa7231
fix reporting of energy/delay offsets
rettigl ec20e03
fix handling of nexus input files and tests
rettigl 4e535cf
fix error reporting
rettigl 7a7441c
fix sxp notebook
rettigl fb04ce6
changes from review
rettigl fea015a
Move static (#511)
zain-sohail 68b2eaf
Merge pull request #487 from OpenCOMPES/pydantic-model
rettigl 6d5c55c
fix benchmarks
rettigl 1de860a
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 47458dd
update merged changes
rettigl d26654b
update build scripts to new config model
rettigl d18934c
move code to src folder
rettigl 4375692
fix tests
rettigl f2931ef
update workflows
rettigl 35e4966
update tutorials
rettigl 07cbc89
add config to build specs
rettigl 757e19e
fix flash build script again
rettigl 1499550
update path to Nexus config file
rettigl a101031
fix tests
rettigl 0d1b805
fix benchmarks
rettigl 1b7b926
Merge pull request #508 from OpenCOMPES/src_layout
rettigl df8d89b
move Flash Nxmpes config
rettigl 49b4b02
update build script
rettigl f3da086
update jupyter to >v4
rettigl 1cbfd36
adopt figure sizes
rettigl dd91313
change color map to default plt cycle
rettigl 6f5f033
use matplotlib also for momentum correction
rettigl 366de39
fix type error
rettigl 6365b93
fix figure sizes and font sizes
rettigl fb0b025
remove redundant toctree entry
rettigl 7ff8fc2
fix config docs
rettigl 8ecde26
Merge pull request #509 from OpenCOMPES/style_fixes
rettigl 8f4b6bf
Merge pull request #516 from OpenCOMPES/update_jupyter
rettigl 1a28294
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl f4350d8
fix config paths
rettigl 02d8a71
fix new notebooks and merging bugs
rettigl 787447d
fix changed variable name
rettigl 9be909b
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 2d0b2fd
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 637504d
fix merge errors
rettigl 0f39523
move config into sed
rettigl d76deab
fix config references
rettigl 5f2f179
fix build scripts
rettigl a21a4cb
Merge remote-tracking branch 'origin/main' into fix_src_layout
rettigl 2b162ad
Merge pull request #537 from OpenCOMPES/fix_src_layout
rettigl afd4984
update pyproject and workflows
rettigl 1118d54
use dynamic versioning
rettigl e07c99e
fix spelling
rettigl a50e9b8
add v1 branch
rettigl 4049c1e
update tests
rettigl 208beee
limit photutils
rettigl 422a7f3
remove 3.8 again
rettigl fd63650
fix coverage report
rettigl d55e176
add build step
rettigl 3c241c8
try fix release
rettigl dee2501
fix benchmark
rettigl bfca5bd
fix url
rettigl d868238
add pypi-test url and credentials
rettigl 469b7b7
fix scripts
rettigl 1ca5acf
remove password
rettigl ead1256
add verbose output
rettigl 6452e2b
fix docs config
rettigl e30c65c
publish to main pypi, and remove trigger
rettigl f831898
update docs
rettigl 64b07c1
further docs fixes
rettigl 178c6ea
Merge pull request #540 from OpenCOMPES/move_to_uv
rettigl 8d9bcd5
remove empty pulses from timed dataframe, and bring back old behavior
rettigl 39c2e52
add further exceptions for completely empty files, and exceptions
b4ddac4
allow both timed dataframe formats
zain-sohail 73269e5
add back docstring
zain-sohail 87fa1fa
reformat
zain-sohail b3e79c3
Merge pull request #546 from OpenCOMPES/flash_normalization_fixes-zain
zain-sohail 299d04b
fix metadata issues, and add more debug logs
zain-sohail e2dfcc5
fix lint errors
zain-sohail 24df1f0
remove repitition
zain-sohail 5eba2e3
remove warnings
zain-sohail ccd5a8c
add documentation about feature
zain-sohail 2dca036
Merge pull request #541 from OpenCOMPES/flash_normalization_fixes
zain-sohail 620f4c4
Merge branch 'v1_feature_branch' into flash-metadata-fixes
zain-sohail d66d34d
update token handling with env variables
zain-sohail 9a7a8b0
update test
zain-sohail 9d22be7
add the dotenv package
zain-sohail a99b945
Merge pull request #542 from OpenCOMPES/more-broken-file-fixes
rettigl 80ef9c1
read write env variables without extra package, tests added
zain-sohail a251f61
Merge branch 'v1_feature_branch' into flash-metadata-fixes
zain-sohail 0adb961
config error
zain-sohail b60a891
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 5084bb7
use value error
zain-sohail 9b13c99
search for .env in cwd and os env variables
zain-sohail 977223d
Merge branch 'flash-metadata-fixes' of github.com:OpenCOMPES/sed into…
zain-sohail 25a935b
bring back comments
zain-sohail 82fc11f
Merge pull request #547 from OpenCOMPES/flash-metadata-fixes
zain-sohail 2c2a9ae
Merge branch 'v1_feature_branch' into pydantic-error-handling
zain-sohail cd27f4a
Merge branch 'v1_feature_branch' of github.com:OpenCOMPES/sed into v1…
rettigl c333747
Merge remote-tracking branch 'origin/main' into v1_feature_branch
rettigl 1752d34
Merge pull request #549 from OpenCOMPES/pydantic-error-handling
rettigl b3ad646
update tests
zain-sohail 27234e0
Fix release and update documentation
rettigl 321f2fe
use user platformdir also for user config
rettigl ab5adac
Merge pull request #553 from OpenCOMPES/fix-552
zain-sohail fb71ec3
Merge remote-tracking branch 'origin/v1_feature_branch' into config_r…
rettigl d283e93
add tests for system config dir
rettigl 975a506
Merge pull request #554 from OpenCOMPES/fix-release-and-docs
rettigl 8ff0040
Merge pull request #555 from OpenCOMPES/config_renaming
rettigl cf9f594
update workflows
rettigl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.