laserfields 0.4.1__tar.gz → 0.4.2__tar.gz

{laserfields-0.4.1 → laserfields-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: laserfields
-Version: 0.4.1
+Version: 0.4.2
 Summary: Python library for describing time-dependent laserfields by Johannes Feist.
 Author-email: Johannes Feist <johannes.feist@gmail.com>
 Requires-Python: >=3.7

{laserfields-0.4.1 → laserfields-0.4.2}/laserfields/__init__.py

@@ -1,6 +1,6 @@
 """Python library for describing time-dependent laserfields by Johannes Feist."""
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 
 __all__ = [
     "intensity_Wcm2_to_Eau",

{laserfields-0.4.1 → laserfields-0.4.2}/laserfields/laserfields.py

@@ -148,10 +148,15 @@ class GaussianLaserField(LaserField):
 
 def expiatbt2_intT(a, b, T):
     # returns the result of the integral Int(exp(i*(a*t+b*t**2)),{t,-T/2,T/2}) / sqrt(2*pi)
-    if abs(b) * T**2 < 1e-8:
-        # use first-order expansion for small b to avoid numerical divergence
-        x1 = 2j * b / a**2
-        x2 = x1 * cos(a * T / 2) + (1 - x1 + 0.25j * b * T**2) * sinc(a * T / (2 * π))
+    bTsq = b * T**2
+    if abs(bTsq) <= 1e-5:
+        aT = a * T
+        # use first-order expansion for small b to avoid numerical errors
+        # + 1e-250 to avoid division by zero
+        x1 = 2j * b / (a**2 + 1e-250)
+        x2 = x1 * cos(aT / 2) + (1 - x1 + 0.25j * bTsq) * sinc(aT / (2 * π))
+        # avoid numerical errors for small aT
+        x2 = np.where(abs(aT) < 1e-8, 1 + 1j/12 * bTsq - bTsq**2/160, x2)
         return x2 * T / sqrt(2 * π)
     zz1 = (1 + 1j) / 4
     z34 = (-1.0 + 1j) / sqrt(2)  # == (-1)**(3/4)

{laserfields-0.4.1 → laserfields-0.4.2}/tests/test_all.py

@@ -109,13 +109,13 @@ def test_Teff():
 def test_fourier():
     # Test the Fourier transform of the laser fields
     # Compare the analytical Fourier transform with the numerical one (computed using FFT)
-    for chirp in -1e-3, -1e-20, 0, 1e-20, 1e-3:
+    for chirp in -0.0011, -0.0009, -1e-3, -1e-20, 0, 1e-20, 1e-3, 0.0009, 0.0011:
         general_args = dict(is_vecpot=True, E0=1.5, ω0=0.12, t0=500.0, chirp=chirp, ϕ0=0.8 * np.pi)
         for lf in [
             GaussianLaserField(**general_args, σ=100.0),
-            SinExpLaserField(**general_args, T=800.0, exponent=2),
-            SinExpLaserField(**general_args, T=800.0, exponent=4),
-            SinExpLaserField(**general_args, T=800.0, exponent=7),
+            SinExpLaserField(**general_args, T=100.0, exponent=2),
+            SinExpLaserField(**general_args, T=100.0, exponent=4),
+            SinExpLaserField(**general_args, T=100.0, exponent=7),
             LinearFlatTopLaserField(**general_args, Tflat=400.0, Tramp=150),
             Linear2FlatTopLaserField(**general_args, Tflat=400.0, Tramp=150),
         ]:
@@ -134,5 +134,5 @@ def test_fourier():
             # FFT acts as if ts[0] was t=0, shift to the correct value
             Eω2 *= np.exp(-1j * ts[0] * ωs)
 
-            atol = 0.02 if isinstance(lf, LinearFlatTopLaserField) else 1e-4
+            atol = 0.02 if isinstance(lf, LinearFlatTopLaserField) else 1e-3
             assert np.allclose(Eω, Eω2, atol=atol), f"Failed for {lf.__class__.__name__} with chirp {chirp}"