FIX: genesis4 scaling factor

ChristopherMayes · Dec 17, 2024 · 657b384 · 657b384
1 parent 26b418b
commit 657b384
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/docs/examples/wavefront.ipynb b/docs/examples/wavefront.ipynb
@@ -399,7 +399,9 @@
   {
    "cell_type": "markdown",
    "id": "d3fc2a90-d104-46c3-86fc-c3f33d3be642",
-   "metadata": {},
+   "metadata": {
+    "jp-MarkdownHeadingCollapsed": true
+   },
    "source": [
     "```\n",
     "Wwigner = Wavefront.gaussian_pulse(\n",

diff --git a/pmd_beamphysics/wavefront.py b/pmd_beamphysics/wavefront.py
@@ -1894,8 +1894,9 @@ def to_genesis4_fieldfile(self) -> Genesis4FieldFile:
         else:
             refposition = 0.0
 
+        v_over_m_to_genesis = gridsize / np.sqrt(2.0 * Z0)
         return FieldFile(
-            dfl=self.rmesh,
+            dfl=self.rmesh * v_over_m_to_genesis,
             param=FieldFileParams(
                 #  number of gridpoints in one transverse dimension equal to nx and ny above
                 gridpoints=nx,

diff --git a/tests/test_wavefront.py b/tests/test_wavefront.py
@@ -198,10 +198,10 @@ def test_write_and_read_genesis4(
     # E           ?            ^       ^       ^            ^       ^       ^...
     # Should probably switch to `allclose` in `__eq__` but I think Chris has a
     # preference for true equality
-    # assert np.allclose(wavefront.rmesh.real, loaded.rmesh.real)
-    # assert np.allclose(wavefront.rmesh.imag, loaded.rmesh.imag)
-    # loaded._rmesh = wavefront.rmesh
-    # assert wavefront == loaded
+    assert np.allclose(wavefront.rmesh.real, loaded.rmesh.real)
+    assert np.allclose(wavefront.rmesh.imag, loaded.rmesh.imag)
+    loaded._rmesh = wavefront.rmesh
+    assert wavefront == loaded
 
 
 def test_write_and_read_openpmd(