From 070ffa305e13866bf2f83a2938da753ed84c38bb Mon Sep 17 00:00:00 2001 From: Christian Hespe Date: Wed, 19 Jun 2024 09:04:02 +0200 Subject: [PATCH 1/4] Ensure dipoles get a unique name --- cheetah/accelerator/dipole.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cheetah/accelerator/dipole.py b/cheetah/accelerator/dipole.py index ab3cd83a..83cb7373 100644 --- a/cheetah/accelerator/dipole.py +++ b/cheetah/accelerator/dipole.py @@ -74,7 +74,6 @@ def __init__( if tilt is not None else torch.zeros_like(self.length) ) - self.name = name self.fringe_integral = ( torch.as_tensor(fringe_integral, **factory_kwargs) if fringe_integral is not None From 7ef2e1d2c0e0df787c5c029eafa6fcdf6f522090 Mon Sep 17 00:00:00 2001 From: Christian Hespe Date: Wed, 19 Jun 2024 09:34:55 +0200 Subject: [PATCH 2/4] Add test for dipole name --- tests/test_dipole.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_dipole.py b/tests/test_dipole.py index c5f0e149..c6eeae46 100644 --- a/tests/test_dipole.py +++ b/tests/test_dipole.py @@ -18,6 +18,7 @@ def test_dipole_off(): dipole.angle = torch.tensor([1.0], device=dipole.angle.device) outbeam_dipole_on = dipole(incoming_beam) + assert dipole.name is not None assert torch.allclose(outbeam_dipole_off.sigma_x, outbeam_drift.sigma_x) assert not torch.allclose(outbeam_dipole_on.sigma_x, outbeam_drift.sigma_x) From 7790c0278ba2b4142cc722d8b66f24ed634ef8ac Mon Sep 17 00:00:00 2001 From: Christian Hespe Date: Wed, 19 Jun 2024 09:46:27 +0200 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1169b44..d73f8dfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Now all `Element` have a default length of `torch.zeros((1))`, fixing occasional issues with using elements without length, such as `Marker`, `BPM`, `Screen`, and `Aperture`. (see #143) (@cr-xu) - Fix bug in `Cavity` `_track_beam` (see [#150](https://github.com/desy-ml/cheetah/issues/150)) (@jp-ga) +- Remove unnecessary overwrite in dipole naming (see #186) (@hespe) ### 🐆 Other From 28e96f1a4d1492d0b638bb673749b91825f475ce Mon Sep 17 00:00:00 2001 From: Jan Kaiser Date: Wed, 19 Jun 2024 10:06:29 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d73f8dfc..c1667197 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ - Now all `Element` have a default length of `torch.zeros((1))`, fixing occasional issues with using elements without length, such as `Marker`, `BPM`, `Screen`, and `Aperture`. (see #143) (@cr-xu) - Fix bug in `Cavity` `_track_beam` (see [#150](https://github.com/desy-ml/cheetah/issues/150)) (@jp-ga) -- Remove unnecessary overwrite in dipole naming (see #186) (@hespe) +- Fix issue where dipoles would not get a unique name by default (see #186) (@hespe) ### 🐆 Other