Merge branch 'dev'

.spyproject/config/backups/codestyle.ini.bak

@@ -0,0 +1,8 @@
+[codestyle]
+indentation = True
+edge_line = True
+edge_line_columns = 79
+
+[main]
+version = 0.2.0
+

.spyproject/config/backups/encoding.ini.bak

@@ -0,0 +1,6 @@
+[encoding]
+text_encoding = utf-8
+
+[main]
+version = 0.2.0
+

.spyproject/config/backups/vcs.ini.bak

@@ -0,0 +1,7 @@
+[vcs]
+use_version_control = False
+version_control_system = 
+
+[main]
+version = 0.2.0
+

.spyproject/config/backups/workspace.ini.bak

@@ -0,0 +1,12 @@
+[workspace]
+restore_data_on_startup = True
+save_data_on_exit = True
+save_history = True
+save_non_project_files = False
+project_type = 'empty-project-type'
+recent_files = ['../.config/spyder-py3/temp.py', '.travis.yml', 'docs/Makefile', 'docs/make.bat', 'requirements-dev.txt', '.pre-commit-config.yaml', 'phenom/io.py', 'requirements.txt', 'github_deploy_key_twguest_phenom.enc', 'setup.py', 'setup.cfg']
+
+[main]
+version = 0.2.0
+recent_files = []
+

.spyproject/config/workspace.ini

@@ -4,7 +4,11 @@ save_data_on_exit = True
 save_history = True
 save_non_project_files = False
 project_type = 'empty-project-type'
+<<<<<<< HEAD
 recent_files = ['../.spyder-py3/temp.py', 'phenom/source.py', 'phenom/io.py', 'phenom/spectra.py', 'phenom/spectrum.py', 'docs/source/examples.rst', 'README.md', '.travis.yml', 'github_deploy_key_twguest_phenom.enc', '.pre-commit-config.yaml']
+=======
+recent_files = ['../.config/spyder-py3/temp.py', '.travis.yml', 'docs/Makefile', 'docs/make.bat', 'requirements-dev.txt', '.pre-commit-config.yaml', 'phenom/io.py', 'requirements.txt', 'github_deploy_key_twguest_phenom.enc', 'setup.py', 'setup.cfg']
+>>>>>>> dev
 
 [main]
 version = 0.2.0

docs/build/doctrees/nbsphinx/notebooks/sase_model_pt1.ipynb

@@ -2,7 +2,10 @@
  "cells": [
   {
    "cell_type": "markdown",
+<<<<<<< HEAD
    "id": "5ee3938b",
+=======
+>>>>>>> dev
    "metadata": {},
    "source": [
     "# Generating Pulses\n",
@@ -32,7 +35,10 @@
   {
    "cell_type": "code",
    "execution_count": 1,
+<<<<<<< HEAD
    "id": "1d1f79e8",
+=======
+>>>>>>> dev
    "metadata": {},
    "outputs": [],
    "source": [
@@ -41,7 +47,10 @@
   },
   {
    "cell_type": "markdown",
+<<<<<<< HEAD
    "id": "4c0c4011",
+=======
+>>>>>>> dev
    "metadata": {},
    "source": [
     "from which we can define a pulse of arbitrary characteristics"
@@ -50,7 +59,10 @@
   {
    "cell_type": "code",
    "execution_count": 2,
+<<<<<<< HEAD
    "id": "04a17e35",
+=======
+>>>>>>> dev
    "metadata": {},
    "outputs": [],
    "source": [
@@ -80,7 +92,10 @@
   },
   {
    "cell_type": "markdown",
+<<<<<<< HEAD
    "id": "b276ddcc",
+=======
+>>>>>>> dev
    "metadata": {},
    "source": [
     "We can visualise the spatial and temporal intensity properties of this field:"
@@ -89,7 +104,10 @@
   {
    "cell_type": "code",
    "execution_count": 3,
+<<<<<<< HEAD
    "id": "2060dc23",
+=======
+>>>>>>> dev
    "metadata": {},
    "outputs": [
     {
@@ -155,7 +173,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.3"
+   "version": "3.8.2"
   }
  },
  "nbformat": 4,