cancel the if condition for longitudinal profile

lasy/profiles/gaussian_profile.py

@@ -158,9 +158,9 @@ def __init__(
                 beta=beta,
                 phi2=phi2,
                 zeta=zeta,
-                stc_theta=0,
+                stc_theta=stc_theta,
                 w0=w0,
-                z_foc=z_foc,
+                z_foc=z_foc
             ),
             GaussianTransverseProfile(w0, z_foc, wavelength),
         )

lasy/profiles/longitudinal/gaussian_profile.py

@@ -73,7 +73,7 @@ def __init__(
         phi2=0,
         zeta=0,
         stc_theta=0,
-        w0=None,
+        w0=0,
         z_foc=0,
     ):
         super().__init__(wavelength)
@@ -85,11 +85,6 @@ def __init__(
         self.zeta = zeta
         self.w0 = w0
         self.stc_theta = stc_theta
-        self.k0 = 2.0 * scc.pi / wavelength
-        if beta:
-            assert (
-                w0 is not None and z_foc is not None
-            ), "Both w0 and z_foc should be specified if angular dispersion beta is not 0"
         if z_foc == 0:
             self.z_foc_over_zr = 0
         else:
@@ -98,7 +93,7 @@ def __init__(
             ), "You need to pass the wavelength, when `z_foc` is non-zero."
             self.z_foc_over_zr = z_foc * wavelength / (np.pi * w0**2)
 
-    def evaluate(self, t, x=None, y=None):
+    def evaluate(self, t, x, y):
         """
         Return the longitudinal envelope.
 
@@ -116,30 +111,29 @@ def evaluate(self, t, x=None, y=None):
             Contains the value of the longitudinal envelope at the
             specified points. This array has the same shape as the array t.
         """
-        stretch_factor = 1.0
         inv_tau2 = self.tau ** (-2)
-        if self.phi2 or self.zeta or self.beta:
-            assert (
+        assert (
                 x is not None and y is not None
             ), "transverse points should be specified if spatio-temperal coupling exits"
-            inv_complex_waist_2 = (
+        inv_complex_waist_2 = (
                 1.0
                 / (
                     self.w0**2
                     * (1.0 + 2.0j * self.z_foc_over_zr / (self.k0 * self.w0**2))
                 )
                 if self.beta
                 else 0
-            )
-            stretch_factor += (
+        )
+        stretch_factor = (
+                1 +
                 4.0
                 * (self.zeta + self.beta * self.z_foc_over_zr * inv_tau2)
                 * (self.zeta + self.beta * self.z_foc_over_zr * inv_complex_waist_2)
                 + 2.0j
                 * (self.phi2 - self.beta**2 * self.k0 * self.z_foc_over_zr)
                 * inv_tau2
-            )
-            stc_exponent = (
+        )
+        stc_exponent = (
                 1.0
                 / stretch_factor
                 * inv_tau2
@@ -155,12 +149,6 @@ def evaluate(self, t, x=None, y=None):
                     * inv_complex_waist_2
                 )
                 ** 2
-            )
-            envelope = np.exp(-stc_exponent)
-        else:
-            envelope = np.exp(
-                -((t - self.t_peak) ** 2) / self.tau**2
-                + 1.0j * (self.cep_phase + self.omega0 * self.t_peak)
-            )
-
+        )
+        envelope = np.exp(-stc_exponent + 1.0j * (self.cep_phase + self.omega0 * self.t_peak))
         return envelope

lasy/profiles/longitudinal/longitudinal_profile.py

@@ -13,7 +13,7 @@ class LongitudinalProfile(object):
     def __init__(self, wavelength):
         self.lambda0 = wavelength
         self.omega0 = 2 * pi * c / self.lambda0
-
+        self.k0 = 2.0 * scc.pi / wavelength
     def evaluate(self, t):
         """
         Return the longitudinal envelope.