Skip to content

fix: dont load wavelength #72

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

Merged
merged 3 commits into from
Jul 1, 2024
Merged

fix: dont load wavelength #72

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
e4cb379
fix: dont load wavelength
jokasimr Jun 26, 2024
b5854fc
test: remove tests checking for the wavelength coordinate
jokasimr Jun 26, 2024
297dd31
fix: remove reference to wavelength
jokasimr Jun 26, 2024
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
6 changes: 3 additions & 3 deletions docs/user-guide/dream/dream-instrument-view.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
},
"outputs": [],
"source": [
"mantle_view = dream.instrument_view(dg[\"mantle\"].hist(wavelength=50), dim=\"wavelength\")\n",
"mantle_view = dream.instrument_view(dg[\"mantle\"].hist(tof=50), dim=\"tof\")\n",
"mantle_view"
]
},
Expand All @@ -201,7 +201,7 @@
},
"outputs": [],
"source": [
"mantle_view[1].controls[\"wavelength\"][\"slider\"].value = 43"
"mantle_view[1].controls[\"tof\"][\"slider\"].value = 43"
]
},
{
Expand Down Expand Up @@ -242,7 +242,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.13"
"version": "3.10.14"
}
},
"nbformat": 4,
Expand Down
3 changes: 1 addition & 2 deletions src/ess/dream/io/geant4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,14 @@ def _load_raw_events(file_path: str) -> sc.DataArray:
file_path, sep="\t", header_parser="bracket", data_columns=[]
)
table = table.rename_dims(row="event")
table.coords.pop("lambda")
return sc.DataArray(
sc.ones(sizes=table.sizes, with_variances=True, unit="counts"),
coords=table.coords,
)


def _adjust_coords(da: sc.DataArray) -> None:
da.coords["wavelength"] = da.coords.pop("lambda")
da.coords["wavelength"].unit = "angstrom"
da.coords["position"] = sc.spatial.as_vectors(
da.coords.pop("x_pos"), da.coords.pop("y_pos"), da.coords.pop("z_pos")
)
Expand Down
5 changes: 0 additions & 5 deletions tests/dream/io/geant4_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ def test_load_geant4_csv_mantle_has_expected_coords(file):

assert "sector" not in mantle.bins.coords
assert "tof" in mantle.bins.coords
assert "wavelength" in mantle.bins.coords
Copy link
Member

@SimonHeybrock SimonHeybrock Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will now cause merge conflicts with #71

Copy link
Contributor Author

@jokasimr jokasimr Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll wait for #71 to be merged before rebasing this

assert "position" in mantle.coords


Expand All @@ -128,7 +127,6 @@ def test_load_geant4_csv_endcap_backward_has_expected_coords(file):

assert "sector" not in endcap.bins.coords
assert "tof" in endcap.bins.coords
assert "wavelength" in endcap.bins.coords
assert "position" in endcap.coords


Expand All @@ -143,7 +141,6 @@ def test_load_geant4_csv_endcap_forward_has_expected_coords(file):

assert "sector" not in endcap.bins.coords
assert "tof" in endcap.bins.coords
assert "wavelength" in endcap.bins.coords
assert "position" in endcap.coords


Expand All @@ -157,7 +154,6 @@ def test_load_geant4_csv_high_resolution_has_expected_coords(file):
assert_index_coord(hr.coords["sector"], values=set(range(1, 5)))

assert "tof" in hr.bins.coords
assert "wavelength" in hr.bins.coords
assert "position" in hr.coords


Expand All @@ -174,7 +170,6 @@ def test_load_geant4_csv_sans_has_expected_coords(file):
assert_index_coord(sans.coords["sector"], values=set(range(1, 5)))

assert "tof" in sans.bins.coords
assert "wavelength" in sans.bins.coords
assert "position" in sans.coords


Expand Down