Work on the SasData object definition#156

Draft

lucas-wilkins wants to merge 528 commits into

refactor_24from

148-refactor_24-sasdata-derived-objects

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

Commits on Aug 11, 2025

Remove python interpreter header.

jamescrake-merani
authored and
DrPaulSharp
committed
Remove this comment as I don't think its true.

jamescrake-merani
authored and
DrPaulSharp
committed
Skeleton implementation for ordinate and abscissae

jamescrake-merani
authored and
DrPaulSharp
committed
These are the wrong way round.

jamescrake-merani
authored and
DrPaulSharp
committed
Match statements are causing problems; use if.

jamescrake-merani
authored and
DrPaulSharp
committed
Implement abscissae for 2D data.

jamescrake-merani
authored and
DrPaulSharp
committed
Wrote a test for 1d data.

jamescrake-merani
authored and
DrPaulSharp
committed
Use the value property.

jamescrake-merani
authored and
DrPaulSharp
committed
2D test.

jamescrake-merani
authored and
DrPaulSharp
committed
Bring guess into sasdata.

James Crake-Merani
authored and
DrPaulSharp
committed
Bring default logic from SasView here.

James Crake-Merani
authored and
DrPaulSharp
committed
Make the default value a param.

James Crake-Merani
authored and
DrPaulSharp
committed
Function for making the guesses.

James Crake-Merani
authored and
DrPaulSharp
committed
Forgot return statement.

James Crake-Merani
authored and
DrPaulSharp
committed
Column unit can be none.

James Crake-Merani
authored and
DrPaulSharp
committed
If there are extra columns than expected, ignore.

James Crake-Merani
authored and
DrPaulSharp
committed
Wrote a test for the ASCII reader.

James Crake-Merani
authored and
DrPaulSharp
committed
Need to get the full filename.

James Crake-Merani
authored and
DrPaulSharp
committed
Don't use filename to get filename :P

James Crake-Merani
authored and
DrPaulSharp
committed
Property that doesn't include ignore columns.

James Crake-Merani
authored and
DrPaulSharp
committed
It seems I'm a bit sleepy today.

James Crake-Merani
authored and
DrPaulSharp
committed
Use the new property.

James Crake-Merani
authored and
DrPaulSharp
committed
Find can accept more locations in the future.

James Crake-Merani
authored and
DrPaulSharp
committed
Missing import.

James Crake-Merani
authored and
DrPaulSharp
committed
Second test.

James Crake-Merani
authored and
DrPaulSharp
committed
Uncertainties should have the same units.

James Crake-Merani
authored and
DrPaulSharp
committed
Add slow cubic interpolation

rprospero
authored and
DrPaulSharp
committed
Fix first for loop

rprospero
authored and
DrPaulSharp
committed
Remove second for loop from conversion_matrix calculation

rprospero
authored and
DrPaulSharp
committed
Parameterize tests over interpolation orders

rprospero
authored and
DrPaulSharp
committed
Create test option for displaying diagnostic plots

rprospero
authored and
DrPaulSharp
committed
More interpolation test into main test directory

rprospero
authored and
DrPaulSharp
committed
Temporarily add a magnetic category.

jamescrake-merani
authored and
DrPaulSharp
committed
Fixed typo.

jamescrake-merani
authored and
DrPaulSharp
committed
Don't compare against the quantity.

jamescrake-merani
authored and
DrPaulSharp
committed
Need to convert to list before array.

jamescrake-merani
authored and
DrPaulSharp
committed
Apply all twice.

jamescrake-merani
authored and
DrPaulSharp
committed
Use brackets properly.

jamescrake-merani
authored and
DrPaulSharp
committed
Add tests for dataset

rprospero
authored and
DrPaulSharp
committed
Handle collimations directly

rprospero
authored and
DrPaulSharp
committed
Start properly descending node tree

rprospero
authored and
DrPaulSharp
committed
Make aperture part of collimation

rprospero
authored and
DrPaulSharp
committed
Move to dataclasses

rprospero
authored and
DrPaulSharp
committed
Parse source

rprospero
authored and
DrPaulSharp
committed
Parse source in instrument

rprospero
authored and
DrPaulSharp
committed
Start fixing Detector setup

rprospero
authored and
DrPaulSharp
committed
Get Detector name and wavelength properly

rprospero
authored and
DrPaulSharp
committed
Better unit parsing

rprospero
authored and
DrPaulSharp
committed
All the detector parts

rprospero
authored and
DrPaulSharp
committed
Fix up aperture

rprospero
authored and
DrPaulSharp
committed
Instrument is a data class

rprospero
authored and
DrPaulSharp
committed
Keyword only dataclasses

rprospero
authored and
DrPaulSharp
committed
Make the Instrument metadata optional

rprospero
authored and
DrPaulSharp
committed
Parse sample data

rprospero
authored and
DrPaulSharp
committed
Refactor our conditional parsing code

rprospero
authored and
DrPaulSharp
committed
Process Metadata as a dataclass

rprospero
authored and
DrPaulSharp
committed
Simplify radiation handling

rprospero
authored and
DrPaulSharp
committed
Include high leve metadata in metadata

rprospero
authored and
DrPaulSharp
committed
Metadata is a dataclass

rprospero
authored and
DrPaulSharp
committed
Remove unused values

rprospero
authored and
DrPaulSharp
committed
Properly load and test multiple entries

rprospero
authored and
DrPaulSharp
committed
Minor cleanup

rprospero
authored and
DrPaulSharp
committed
Flag node types for parses

rprospero
authored and
DrPaulSharp
committed
Fixup after rebase

rprospero
authored and
DrPaulSharp
committed
Clean up import lint

rprospero
authored and
DrPaulSharp
committed
More lint

rprospero
authored and
DrPaulSharp
committed
More handling of the change to dict

rprospero
authored and
DrPaulSharp
committed
All metadata needs to be optional to accomodate other file formats

rprospero
authored and
DrPaulSharp
committed
Fix up types

rprospero
authored and
DrPaulSharp
committed
Collimation is optional

rprospero
authored and
DrPaulSharp
committed
Fix imports

rprospero
authored and
DrPaulSharp
committed
Replace optional with proper sum type

rprospero
authored and
DrPaulSharp
committed
Remove unused imports

rprospero
authored and
DrPaulSharp
committed
Fix parsing of unit full names

rprospero
authored and
DrPaulSharp
committed
Remove testing bit

rprospero
authored and
DrPaulSharp
committed
Don't edit the file with a giant "Don't edit this file" header

rprospero
authored and
DrPaulSharp
committed
Handle null title and sample in summary

rprospero
authored and
DrPaulSharp
committed
Start parsing XML

rprospero
authored and
DrPaulSharp
committed
Create _load_text helper

rprospero
authored and
DrPaulSharp
committed
Parse process

rprospero
authored and
DrPaulSharp
committed
Refactor with helper functions

rprospero
authored and
DrPaulSharp
committed
Fully parse xml metadata

rprospero
authored and
DrPaulSharp
committed
Parse IData in XML

rprospero
authored and
DrPaulSharp
committed
Remove extraneous line in hdf reader

rprospero
authored and
DrPaulSharp
committed
Trial multiple files

rprospero
authored and
DrPaulSharp
committed
Fix aperture load

rprospero
authored and
DrPaulSharp
committed
Support multiple cansas versions

rprospero
authored and
DrPaulSharp
committed
More IData column types

rprospero
authored and
DrPaulSharp
committed
Start adding official tests for xml file loading

rprospero
authored and
DrPaulSharp
committed
Add singular alias to degrees unit

rprospero
authored and
DrPaulSharp
committed
Better work at handling comments

rprospero
authored and
DrPaulSharp
committed
Refactor text parsing to better handle comments

rprospero
authored and
DrPaulSharp
committed
More tests of xml

rprospero
authored and
DrPaulSharp
committed
Mark weird units, but continue parsing

rprospero
authored and
DrPaulSharp
committed
Add last xml test

rprospero
authored and
DrPaulSharp
committed
Fix parsing of BeamSize

rprospero
authored and
DrPaulSharp
committed
Add micron unit alias

rprospero
authored and
DrPaulSharp
committed
Handle singular unit names in parsing

rprospero
authored and
DrPaulSharp
committed
Always print summary in same order

rprospero
authored and
DrPaulSharp
committed
Reinstate summary output when xml loader is used as a main module

rprospero
authored and
DrPaulSharp
committed
Factor our finding cansas version into its own file

rprospero
authored and
DrPaulSharp
committed
More docstrings

rprospero
authored and
DrPaulSharp
committed
Fix typo in comment

rprospero
authored and
DrPaulSharp
committed
Fix type hints

rprospero
authored and
DrPaulSharp
committed
Provide default name for unnamed data sets

rprospero
authored and
DrPaulSharp
committed
Better default names for SasData entries

rprospero
authored and
DrPaulSharp
committed
Process can have multiple terms, which may be quantites

rprospero
authored and
DrPaulSharp
committed
Fix hdf process term parsing

rprospero
authored and
DrPaulSharp
committed
Correctly parse process notes

rprospero
authored and
DrPaulSharp
committed
Add type hint to load_data filename

rprospero
authored and
DrPaulSharp
committed
More concise source parsing

rprospero
authored and
DrPaulSharp
committed
Whitespace fix

rprospero
authored and
DrPaulSharp
committed
Typehint on load_data

rprospero
authored and
DrPaulSharp
committed
Fix up Source parser

rprospero
authored and
DrPaulSharp
committed
Add raw data to xml metadata

rprospero
authored and
DrPaulSharp
committed
Add raw handling to reader

rprospero
authored and
DrPaulSharp
committed
Enable raw data filter

rprospero
authored and
DrPaulSharp
committed
Start testing data filter

rprospero
authored and
DrPaulSharp
committed
Run through code formatter

rprospero
authored and
DrPaulSharp
committed
Simplify metadata filtering

rprospero
authored and
DrPaulSharp
committed
Raise KeyError instead of ValueError

rprospero
authored and
DrPaulSharp
committed
Fix up ascii reader tests

rprospero
authored and
DrPaulSharp
committed
Update creation of SasData in trend

rprospero
authored and
DrPaulSharp
committed
Properly compare named units with unnamed units

rprospero
authored and
DrPaulSharp
committed
Enforce loading test reference files in UTF-8

rprospero
authored and
DrPaulSharp
committed
Skeleton framework for SESANS data

rprospero
authored and
DrPaulSharp
committed
Start parsing sesans header

rprospero
authored and
DrPaulSharp
committed
Start parsing SESANS sample metadata

rprospero
authored and
DrPaulSharp
committed
Include SESANS angle metadata

rprospero
authored and
DrPaulSharp
committed
Multiple SESANS files in reader test

rprospero
authored and
DrPaulSharp
committed
Parse actual data from SES files

rprospero
authored and
DrPaulSharp
committed
Add Raw SESANS Node Data

rprospero
authored and
DrPaulSharp
committed
Update XML test references to include apertures

rprospero
authored and
DrPaulSharp
committed
SESANS metadata as a process, not an aperture

rprospero
authored and
DrPaulSharp
committed
Fixup lint

rprospero
authored and
DrPaulSharp
committed
Make changes suggested in PR review

rprospero
authored and
DrPaulSharp
committed
Fix simple typos from rebase

rprospero
authored and
DrPaulSharp
committed
Add equality testing for quantities

rprospero
authored and
DrPaulSharp
committed
More tests for quantities

rprospero
authored and
DrPaulSharp
committed
Fix meshmerge calculation

rprospero
authored and
DrPaulSharp
committed
Ruff format.

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

jamescrake-merani
authored and
DrPaulSharp
committed
Ruff format.

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

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

jamescrake-merani
authored and
DrPaulSharp
committed
Ruff format.

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

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

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

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

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

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

jamescrake-merani
authored and
DrPaulSharp
committed
Move comment again.

jamescrake-merani
authored and
DrPaulSharp
committed
Fixed test.

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

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

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

jamescrake-merani
authored and
DrPaulSharp
committed
Remove these imports.

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

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

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

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

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

jamescrake-merani
authored and
DrPaulSharp
committed
Fixed column parameters.

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

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

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

jamescrake-merani
authored and
DrPaulSharp
committed
Forgot process :P

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

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

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

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

jamescrake-merani
authored and
DrPaulSharp
committed
Start implementing ModellingRequirements

rprospero
authored and
DrPaulSharp
committed
Start testing modelling requirements

rprospero
authored and
DrPaulSharp
committed
Start adding better tests for ModellingRequirements

rprospero
authored and
DrPaulSharp
committed
Flip order of parameters on compose

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

rprospero
authored and
DrPaulSharp
committed
Enable left composition by null model

rprospero
authored and
DrPaulSharp
committed
support right addition of NullModel

rprospero
authored and
DrPaulSharp
committed
Allow preprocess and postprocess steps

rprospero
authored and
DrPaulSharp
committed
Start performing Hankel transform for SESANS

rprospero
authored and
DrPaulSharp
committed
Ignore slit smearing before SESANS

rprospero
authored and
DrPaulSharp
committed
Pull sesans metadata from file

rprospero
authored and
DrPaulSharp
committed
Add unit test for Hankel transform

rprospero
authored and
DrPaulSharp
committed
Fix units with error calculation

rprospero
authored and
DrPaulSharp
committed
χ² squared based test

rprospero
authored and
DrPaulSharp
committed
Code Review Suggestions

rprospero
authored and
DrPaulSharp
committed
Fix up rename in compose

rprospero
authored and
DrPaulSharp
committed
Fix uncertainty in SESANS parser

rprospero
authored and
DrPaulSharp
committed
Update SESANS units in unit_kinds

rprospero
authored and
DrPaulSharp
committed
Applies auto fixes for ruff rule F401
DrPaulSharp
committed
Applies auto fixes for ruff rule E714
DrPaulSharp
committed
Applies auto fixes for ruff rule F541
DrPaulSharp
committed
Bumps minimum python version to 3.12
DrPaulSharp
committed
Test should fail when there's no data.

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

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

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

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

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

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

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

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

rprospero
authored and
DrPaulSharp
committed
Basic Pinhole model

rprospero
authored and
DrPaulSharp
committed
Refactor pinhole tests

rprospero
authored and
DrPaulSharp
committed
Fix radius bug in smearing

rprospero
authored and
DrPaulSharp
committed
More realisting δq

rprospero
authored and
DrPaulSharp
committed
Combine Smearing and Sesans tests

rprospero
authored and
DrPaulSharp
committed
Define model metadata in constructor

rprospero
authored and
DrPaulSharp
committed
Better testing range for pinhole

rprospero
authored and
DrPaulSharp
committed
Add slit smearing

rprospero
authored and
DrPaulSharp
committed
Remove old commented code

rprospero
authored and
DrPaulSharp
committed
Vectorise slit calculation

rprospero
authored and
DrPaulSharp
committed
Check combination of slit models

rprospero
authored and
DrPaulSharp
committed
Decrease logical depth of linear_extrapolation

rprospero
authored and
DrPaulSharp
committed
Decrease logical depth of slit_resolution

rprospero
authored and
DrPaulSharp
committed
Decrease logical depth of geometric_extrapolation

rprospero
authored and
DrPaulSharp
committed
Apply PR changes

rprospero
authored and
DrPaulSharp
committed
Fixes ruff linting errors (#140)
DrPaulSharp
committed
Adds Pyupgrade (UP) ruleset and rules SIM118 & SIM300 to ruff linter (#144)
DrPaulSharp
committed
Applies fixes for isort (I) ruff ruleset (#146)
DrPaulSharp
committed
Fixes whitespace errors
DrPaulSharp
committed
Fix hours, days, and years

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

rprospero
authored and
DrPaulSharp
committed

Commits on Aug 12, 2025

Commits on Aug 13, 2025

Merge pull request #152 from SasView/serialise-sasdata
rprospero
authored