Refactoring Branch#79

Draft

lucas-wilkins wants to merge 1040 commits intomasterfrom

refactor_24

This pull request is big! We're only showing the most recent 250 commits

Commits on Mar 16, 2026

Fixup lint

rprospero
authored and
krzywon
committed
Make changes suggested in PR review

rprospero
authored and
krzywon
committed
Fix simple typos from rebase

rprospero
authored and
krzywon
committed
Add equality testing for quantities

rprospero
authored and
krzywon
committed
More tests for quantities

rprospero
authored and
krzywon
committed
Fix meshmerge calculation

rprospero
authored and
krzywon
committed
Ruff format.

jamescrake-merani
authored and
krzywon
committed
This comment was repetitive.

jamescrake-merani
authored and
krzywon
committed
Ruff format.

jamescrake-merani
authored and
krzywon
committed
Function to guess the dataset type.

jamescrake-merani
authored and
krzywon
committed
Function for loading a file with default params.

jamescrake-merani
authored and
krzywon
committed
Ruff format.

jamescrake-merani
authored and
krzywon
committed
Remove imports ruff is complaining aren't used.

jamescrake-merani
authored and
krzywon
committed
Added a test to make sure 2d data gets read right.

jamescrake-merani
authored and
krzywon
committed
Makes sure the dataset type gets guessed.

jamescrake-merani
authored and
krzywon
committed
Use basename for sasdata ascii name.

jamescrake-merani
authored and
krzywon
committed
Be consistent with how basename is called.

jamescrake-merani
authored and
krzywon
committed
Move comment to avoid odd Ruff format.

jamescrake-merani
authored and
krzywon
committed
Move comment again.

jamescrake-merani
authored and
krzywon
committed
Fixed test.

jamescrake-merani
authored and
krzywon
committed
Created an import metadata function.

jamescrake-merani
authored and
krzywon
committed
Remove the old function.

jamescrake-merani
authored and
krzywon
committed
Use the new import function.

jamescrake-merani
authored and
krzywon
committed
Remove these imports.

jamescrake-merani
authored and
krzywon
committed
Need to use keywords for this dataclass.

jamescrake-merani
authored and
krzywon
committed
Import the mumag data for testing.

jamescrake-merani
authored and
krzywon
committed
Added a case for mumag data.

jamescrake-merani
authored and
krzywon
committed
Added test for loading ascii data with metadata.

jamescrake-merani
authored and
krzywon
committed
Use params filenames not just filenames.

jamescrake-merani
authored and
krzywon
committed
Fixed column parameters.

jamescrake-merani
authored and
krzywon
committed
Doh. Missing commas on filename list.

jamescrake-merani
authored and
krzywon
committed
Roll the raw metadata into the metadata object.

jamescrake-merani
authored and
krzywon
committed
Need to fill in all the parameters.

jamescrake-merani
authored and
krzywon
committed
Forgot process :P

jamescrake-merani
authored and
krzywon
committed
Consider both of these.

jamescrake-merani
authored and
krzywon
committed
Combine both metadata so we go through all of them

jamescrake-merani
authored and
krzywon
committed
Raw metadata is in lists.

jamescrake-merani
authored and
krzywon
committed
I don't know what these decimals were.

jamescrake-merani
authored and
krzywon
committed
Start implementing ModellingRequirements

rprospero
authored and
krzywon
committed
Start testing modelling requirements

rprospero
authored and
krzywon
committed
Start adding better tests for ModellingRequirements

rprospero
authored and
krzywon
committed
Flip order of parameters on compose

rprospero
authored and
krzywon
committed
Don't assume that Sesans includes smear

rprospero
authored and
krzywon
committed
Enable left composition by null model

rprospero
authored and
krzywon
committed
support right addition of NullModel

rprospero
authored and
krzywon
committed
Allow preprocess and postprocess steps

rprospero
authored and
krzywon
committed
Start performing Hankel transform for SESANS

rprospero
authored and
krzywon
committed
Ignore slit smearing before SESANS

rprospero
authored and
krzywon
committed
Pull sesans metadata from file

rprospero
authored and
krzywon
committed
Add unit test for Hankel transform

rprospero
authored and
krzywon
committed
Fix units with error calculation

rprospero
authored and
krzywon
committed
χ² squared based test

rprospero
authored and
krzywon
committed
Code Review Suggestions

rprospero
authored and
krzywon
committed
Fix up rename in compose

rprospero
authored and
krzywon
committed
Fix uncertainty in SESANS parser

rprospero
authored and
krzywon
committed
Update SESANS units in unit_kinds

rprospero
authored and
krzywon
committed
Applies auto fixes for ruff rule F401

DrPaulSharp
authored and
krzywon
committed
Applies auto fixes for ruff rule E714

DrPaulSharp
authored and
krzywon
committed
Applies auto fixes for ruff rule F541

DrPaulSharp
authored and
krzywon
committed
Test should fail when there's no data.

James Crake-Merani
authored and
krzywon
committed
Added a get default unit function.

James Crake-Merani
authored and
krzywon
committed
Use the new get default unit function.

James Crake-Merani
authored and
krzywon
committed
Pass in the unit group as well.

James Crake-Merani
authored and
krzywon
committed
Return value if it isn't None.

James Crake-Merani
authored and
krzywon
committed
Set the dataset type properly.

James Crake-Merani
authored and
krzywon
committed
Expect 2D test to fail.

James Crake-Merani
authored and
krzywon
committed
Use Quantity in models

rprospero
authored and
krzywon
committed
Don't use a quantity for model post processing

rprospero
authored and
krzywon
committed
Basic Pinhole model

rprospero
authored and
krzywon
committed
Refactor pinhole tests

rprospero
authored and
krzywon
committed
Fix radius bug in smearing

rprospero
authored and
krzywon
committed
More realisting δq

rprospero
authored and
krzywon
committed
Combine Smearing and Sesans tests

rprospero
authored and
krzywon
committed
Define model metadata in constructor

rprospero
authored and
krzywon
committed
Better testing range for pinhole

rprospero
authored and
krzywon
committed
Add slit smearing

rprospero
authored and
krzywon
committed
Remove old commented code

rprospero
authored and
krzywon
committed
Vectorise slit calculation

rprospero
authored and
krzywon
committed
Check combination of slit models

rprospero
authored and
krzywon
committed
Decrease logical depth of linear_extrapolation

rprospero
authored and
krzywon
committed
Decrease logical depth of slit_resolution

rprospero
authored and
krzywon
committed
Decrease logical depth of geometric_extrapolation

rprospero
authored and
krzywon
committed
Apply PR changes

rprospero
authored and
krzywon
committed
Fixes ruff linting errors (#140)

DrPaulSharp
authored and
krzywon
committed
Adds Pyupgrade (UP) ruleset and rules SIM118 & SIM300 to ruff linter (#144)

DrPaulSharp
authored and
krzywon
committed
Applies fixes for isort (I) ruff ruleset (#146)

DrPaulSharp
authored and
krzywon
committed
Fixes whitespace errors

DrPaulSharp
authored and
krzywon
committed
Fix hours, days, and years

rprospero
authored and
krzywon
committed
Add command for explicitly formatting quantity units

rprospero
authored and
krzywon
committed
Add test harness for serialisation

rprospero
authored and
krzywon
committed
Add first real json property

rprospero
authored and
krzywon
committed
Export data type

rprospero
authored and
krzywon
committed
Add mask and model requirements

rprospero
authored and
krzywon
committed
Start exporting metadata

rprospero
authored and
krzywon
committed
Start adding sample details

rprospero
authored and
krzywon
committed
Export process metadata

rprospero
authored and
krzywon
committed
Export Instrument and Raw metadata

rprospero
authored and
krzywon
committed
Support exporting Quantities

rprospero
authored and
krzywon
committed
Remove unneeded default calls

rprospero
authored and
krzywon
committed
Start writing decoder

rprospero
authored and
krzywon
committed
Correctly export sample temperature

rprospero
authored and
krzywon
committed
Fix notes nodes type

rprospero
authored and
krzywon
committed
Decode metadata from json

rprospero
authored and
krzywon
committed
Use proper bytes for numpy serialisation

rprospero
authored and
krzywon
committed
Fix historical unit errors

rprospero
authored and
krzywon
committed
Parse MetaNode

rprospero
authored and
krzywon
committed
Use .json extension for JSON files

rprospero
authored and
krzywon
committed
Establish settings for ruff and pycodestyle

rprospero
authored and
krzywon
committed
Fix formatting

rprospero
authored and
krzywon
committed
[pre-commit.ci lite] apply automatic fixes for ruff linting errors

pre-commit-ci-lite[bot]
authored and
krzywon
committed
Adds main check to "transforms.py"

DrPaulSharp
authored and
krzywon
committed
Start descending

rprospero
authored and
krzywon
committed
Convert tail call recursion to loop

rprospero
authored and
krzywon
committed
Enumerate keys for access

rprospero
authored and
krzywon
committed
Descend into dicts

rprospero
authored and
krzywon
committed
Fix access to dict items

rprospero
authored and
krzywon
committed
Fix formatting and doctstrings

rprospero
authored and
krzywon
committed
Enable tag collection

rprospero
authored and
krzywon
committed
Fix PR Comments

rprospero
authored and
krzywon
committed
Formatting fixes

rprospero
authored and
krzywon
committed
Start encoding

rprospero
authored and
krzywon
committed
Test saving with XML files

rprospero
authored and
krzywon
committed
More tests for sample metadata

rprospero
authored and
krzywon
committed
Switch to safe asserts

rprospero
authored and
krzywon
committed
Start serialising process

rprospero
authored and
krzywon
committed
Start serialising process

rprospero
authored and
krzywon
committed
Write instrument tests

rprospero
authored and
krzywon
committed
Start testing g5 round trip

rprospero
authored and
krzywon
committed
Fix *most* of the round trip issues

rprospero
authored and
krzywon
committed
Everything passes if we ignore raw

rprospero
authored and
krzywon
committed
Start trying to serialise raw data

rprospero
authored and
krzywon
committed
Simplify test setup

rprospero
authored and
krzywon
committed
[pre-commit.ci lite] apply automatic fixes for ruff linting errors

pre-commit-ci-lite[bot]
authored and
krzywon
committed
Attach metadata to every entry

rprospero
authored and
krzywon
committed
Add comments to as_h5

rprospero
authored and
krzywon
committed
Fix up file handling of test

rprospero
authored and
krzywon
committed
[pre-commit.ci lite] apply automatic fixes for ruff linting errors

pre-commit-ci-lite[bot]
authored and
krzywon
committed
Remove debugging print

rprospero
authored and
krzywon
committed
Respond to PR suggestions

rprospero
authored and
krzywon
committed
Adds local pre-commit hook for ruff linting auto fixes

DrPaulSharp
authored and
krzywon
committed
Handle bytes type object in units parser

rprospero
authored and
krzywon
committed
Fix underline length in metadata export

rprospero
authored and
krzywon
committed
Fix import of actual sasdata

rprospero
authored and
krzywon
committed
Tweak json handling

rprospero
authored and
krzywon
committed
Fix most of HDF file loading

rprospero
authored and
krzywon
committed
Properly save multidimensional data

rprospero
authored and
krzywon
committed
Fix parsing of exception in test

rprospero
authored and
krzywon
committed
Perform serialisation test on ALL example data

rprospero
authored and
krzywon
committed
Export json

rprospero
authored and
krzywon
committed
[pre-commit.ci lite] apply automatic fixes for ruff linting errors

pre-commit-ci-lite[bot]
authored and
krzywon
committed
Fix json export of data objects

rprospero
authored and
krzywon
committed
Fixes to json export

rprospero
authored and
krzywon
committed
Respond to PR suggestions

rprospero
authored and
krzywon
committed
Use file name as file id

rprospero
authored and
krzywon
committed
157 refactor design documentation (#158)

authored and
krzywon
committed
Redesign tests (#155)

authored and
krzywon
committed
Mark dataload test for faster turnaround

rprospero
authored and
krzywon
committed
Ruff code formatting

rprospero
authored and
krzywon
committed
Fix up HDF Test case

rprospero
authored and
krzywon
committed
Start moving HDF tests into James test framework

rprospero
authored and
krzywon
committed
Start moving XML into James test framework

rprospero
authored and
krzywon
committed
Move round trip testing into main framework

rprospero
authored and
krzywon
committed
Move json testing into test framework

rprospero
authored and
krzywon
committed
Eliminate old testing detritus

rprospero
authored and
krzywon
committed
Start on Sesans testing

rprospero
authored and
krzywon
committed
[pre-commit.ci lite] apply automatic fixes for ruff linting errors

pre-commit-ci-lite[bot]
authored and
krzywon
committed
Modifies autogen code to match ruff rules

DrPaulSharp
authored and
krzywon
committed
added rpms and ran to rebuild tables

paulneves77
authored and
krzywon
committed
ran ruff fixes

paulneves77
authored and
krzywon
committed
added 3D datatype and added Qz generalizations where obvious

paulneves77
authored and
krzywon
committed
added first attempt at ND binner which can take in I(x,y,z,u,v,...) and rebin to an N dimensional regular grid

paulneves77
authored and
krzywon
committed
added rebin and sketch of inplied qz for postprocessing

paulneves77
authored and
krzywon
committed
updated rebin, added rpm to units, and working on testing readers

paulneves77
authored and
krzywon
committed
the ND xubpixel binning appears to be working, and made some updates to the temporary hdf5 reader

paulneves77
authored and
krzywon
committed
corrected errors in qz calculator, cleaned up test_hdf5_reader, improved NDrebin local testing

paulneves77
authored and
krzywon
committed
corrected errors in qz calculator, cleaned up test_hdf5_reader, improved NDrebin local testing

paulneves77
authored and
krzywon
committed
started cleaning up for pull request

paulneves77
authored and
krzywon
committed
fixed temp_hdf5_reader to be slightly more compliant with NXcanSAS standards (now looks directly at canSAS_class instead of the group name. This is because the group name is allowed to be anything,…

paulneves77
authored and
krzywon
committed
fixed apertures and run from none to empty list if missing, and fixed raw data loading if present

paulneves77
authored and
krzywon
committed
[pre-commit.ci lite] apply automatic fixes for ruff linting errors

pre-commit-ci-lite[bot]
authored and
krzywon
committed
cleaned up code based on Jeff Kryzwon's suggestions and added test case for deduce_qz

paulneves77
authored and
krzywon
committed
removed NDrebin from this branch.

paulneves77
authored and
krzywon
committed
implemented minor cleanups to code

paulneves77
authored and
krzywon
committed
fixed a few bugs and cleaned up more

paulneves77
authored and
krzywon
committed
added raw back to metadata

paulneves77
authored and
krzywon
committed
fixed some bugs with importing sasdata/test/sasdataloader/data/simpleexamplefile.h5. Also added support for when the NX_class attribute has a canSAS_class name. Also fixed bug when no instrument, s…

paulneves77
authored and
krzywon
committed
fixed the collimation cansas_class attribute in the nxcansas_1Dand2D_multisasentry_multisasdata.h5, nxcansas_1Dand2D_multisasdata.h5, and nxcansas_1Dand2D_multisasentry.h5 test data files

paulneves77
authored and
krzywon
committed
removed local path references, removed spurious units.py

paulneves77
authored and
krzywon
committed
moved duplicate code in parse_quantity to a call of parse_float, changed name of parse_float_first to parse_float

paulneves77
authored and
krzywon
committed
fixed minor error in reference output for nxcansas_1Dand2D_multisasdata and nxcansas_1Dand2D_multisasentry where the detector distance was read wrong because of the difference between node.astype(f…

paulneves77
authored and
krzywon
committed
brought over NDrebin from refactor_24_3D branch

paulneves77
authored and
krzywon
committed
updated NDrebin a bunch and also added NDrebin testing

paulneves77
authored and
krzywon
committed
[pre-commit.ci lite] apply automatic fixes for ruff linting errors

pre-commit-ci-lite[bot]
authored and
krzywon
committed
added note on using NDrebin for M dimensional integration

paulneves77
authored and
krzywon
committed
first pass at rebasing NDrebin to a class

paulneves77
authored and
krzywon
committed
second pass at cleaning up NDrebin class

paulneves77
authored and
krzywon
committed
NDrebin class ready for testing

paulneves77
authored and
krzywon
committed
added unit testing for NDrebin

paulneves77
authored and
krzywon
committed
removed temporary testing from NDrebin.py

paulneves77
authored and
krzywon
committed
cleaned up NDrebin, removed old function, added documentation

paulneves77
authored and
krzywon
committed
refactor NDRebin._build_limits to pass codescene review. vectorized and removed for loops and most conditional logic

paulneves77
authored and
krzywon
committed
fixed bug in _build_limits

paulneves77
authored and
krzywon
committed
indented code block, clarified non-vector comment, fixed typo, removed return in NDRebin __call__

paulneves77
authored and
krzywon
committed
indented code block, clarified non-vector comment, fixed typo, removed return in NDRebin __call__

paulneves77
authored and
krzywon
committed
Update date format in refactor roadmap

DrPaulSharp
authored and
krzywon
committed
Basic test harness for names

rprospero
authored and
krzywon
committed
Base 62 encode the hash for shorter names

rprospero
authored and
krzywon
committed
Name info in unique id for NamedQuantity

rprospero
authored and
krzywon
committed
Ruff formatting

rprospero
authored and
krzywon
committed
Properly attach run title and number to quantity information

rprospero
authored and
krzywon
committed
Make the name a part of all quantities

rprospero
authored and
krzywon
committed
Ensure that xml imports also include a proper name unique id

rprospero
authored and
krzywon
committed
Ensure ASCII reader generates unique_id for data quantities

rprospero
authored and
krzywon
committed
Refactor our id_header

rprospero
authored and
krzywon
committed
[pre-commit.ci lite] apply automatic fixes for ruff linting errors

pre-commit-ci-lite[bot]
authored and
krzywon
committed
Minor formatting fixes

rprospero
authored and
krzywon
committed
Remove debugging print statements

rprospero
authored and
krzywon
committed
Refactor operations (#184)

authored and
krzywon
committed
Update refactor roadmap

DrPaulSharp
authored and
krzywon
committed
Adds trig and exp operations (#186)

DrPaulSharp
authored and
krzywon
committed
Merge remote-tracking branch 'origin/refactor_24' into refactor_24
krzywon
committed