Merge pull request #76 from deshima-dev/astropenguin/issue74

Release v0.4.0
deshima-dev · Feb 4, 2022 · 557fdc2 · 557fdc2
2 parents 6a954de + 381abab
commit 557fdc2
Show file tree

Hide file tree

Showing 19 changed files with 114 additions and 89 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -15,6 +15,10 @@
             "affiliation": "Delft University of Technology",
             "orcid": "0000-0001-7507-6948"
         },
+        {
+            "name": "Joris Tiebosch",
+            "affiliation": "Delft University of Technology"
+        },
         {
             "name": "Yohei Togami",
             "affiliation": "Nagoya University"

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Click the budge below to open it in [Google colaboratory](http://colab.research.
 
 ### Stable version (recommended)
 
-[![open stable version in colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/deshima-dev/deshima-sensitivity/blob/v0.3.0/sensitivity.ipynb)
+[![open stable version in colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/deshima-dev/deshima-sensitivity/blob/v0.4.0/sensitivity.ipynb)
 
 ### Latest version
 

diff --git a/deshima_sensitivity/__init__.py b/deshima_sensitivity/__init__.py
@@ -13,7 +13,7 @@
 
 """
 # flake8: noqa
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 
 # modules

diff --git a/deshima_sensitivity/atmosphere.py b/deshima_sensitivity/atmosphere.py
@@ -44,8 +44,8 @@ def eta_atm_func(
         Atmospheric tranmsmission. Units: None.
 
     """
-    if np.average(F) > 10.0 ** 9:
-        F = F / 10.0 ** 9
+    if np.average(F) > 10.0**9:
+        F = F / 10.0**9
 
     # give F a length if it is an integer.
     if not hasattr(F, "__len__"):

diff --git a/deshima_sensitivity/filter.py b/deshima_sensitivity/filter.py
@@ -80,9 +80,9 @@ def eta_filter_lorentzian(
         Units: None.
     """
 
-    if np.average(F) < 10.0 ** 9:
-        F = F * 10.0 ** 9
-        FWHM = FWHM * 10.0 ** 9
+    if np.average(F) < 10.0**9:
+        F = F * 10.0**9
+        FWHM = FWHM * 10.0**9
 
     # give F a length if it is an integer.
     if not hasattr(F, "__len__"):
@@ -165,8 +165,8 @@ def eta_filter_csv(
 
     F_int = eta_filter_df.columns.values.astype(float)
 
-    if np.average(F_int) < 10.0 ** 9:
-        F_int = F_int * 10.0 ** 9
+    if np.average(F_int) < 10.0**9:
+        F_int = F_int * 10.0**9
         eta_filter_df.columns = F_int
 
     # Fit to lorentzian model
@@ -265,9 +265,9 @@ def expand_F(
 
     """
 
-    if np.average(F) < 10.0 ** 9:
-        F = F * 10.0 ** 9
-        FHWM = FHWM * 10 ** 9
+    if np.average(F) < 10.0**9:
+        F = F * 10.0**9
+        FHWM = FHWM * 10**9
 
     N = len(F)
     if N > 1:

diff --git a/deshima_sensitivity/galaxy.py b/deshima_sensitivity/galaxy.py
@@ -114,4 +114,4 @@ def co_luminosity(z, d_l, f_obs, int):
     c2 = 1.04e-03
 
     # Lp  = c1 * int * d_l**2 / (f_obs**2 * (1 + z)**3 )
-    return c2 * int * d_l ** 2 * f_obs
+    return c2 * int * d_l**2 * f_obs
diff --git a/deshima_sensitivity/instruments.py b/deshima_sensitivity/instruments.py
@@ -12,7 +12,7 @@
 
 
 # constants
-Delta_Al = 188.0 * 10 ** -6 * e  # gap energy of Al
+Delta_Al = 188.0 * 10**-6 * e  # gap energy of Al
 eta_pb = 0.4  # Pair breaking efficiency
 eta_Al_ohmic_850 = 0.9975  # Ohmic loss of an Al surface at 850 GHz.
 # Shitov+, ISSTT2008. https://www.nrao.edu/meetings/isstt/papers/2008/2008263266.pdf

diff --git a/deshima_sensitivity/physics.py b/deshima_sensitivity/physics.py
@@ -11,9 +11,9 @@
 
 
 # constants
-h = 6.62607004 * 10 ** -34  # Planck constant
-k = 1.38064852 * 10 ** -23  # Boltzmann constant
-e = 1.60217662 * 10 ** -19  # electron charge
+h = 6.62607004 * 10**-34  # Planck constant
+k = 1.38064852 * 10**-23  # Boltzmann constant
+e = 1.60217662 * 10**-19  # electron charge
 c = 299792458.0  # velocity of light
 
 

diff --git a/deshima_sensitivity/plotting.py b/deshima_sensitivity/plotting.py
@@ -104,7 +104,7 @@ def MDLF_simple(
     ax.set_ylabel(r"Minimum Detectable Line Flux ($\mathrm{W\, m^{-2}}$)")
     ax.set_yscale("log")
     ax.set_xlim(200, 460)
-    ax.set_ylim([10 ** -20, 10 ** -17])
+    ax.set_ylim([10**-20, 10**-17])
     ax.tick_params(direction="in", which="both")
     ax.grid(True)
     ax.set_title(
@@ -197,7 +197,7 @@ def MS_simple(F: ArrayLike, pwv: float = 0.5, EL: float = 60.0) -> HTML:
     ax.set_ylabel(r"Mapping Speed ($\mathrm{arcmin^2\, mJy^{-2}\, h^{-1}}$)")
     ax.set_yscale("log")
     ax.set_xlim(200, 460)
-    ax.set_ylim([10 ** -5, 10 ** -2])
+    ax.set_ylim([10**-5, 10**-2])
     ax.tick_params(direction="in", which="both")
     ax.grid(True)
     ax.set_title(

diff --git a/deshima_sensitivity/simulator.py b/deshima_sensitivity/simulator.py
@@ -340,7 +340,7 @@ def spectrometer_sensitivity(
 
     # Collect efficiencies at the same temperature
     eta_M1 = eta_M1_ohmic * eta_M1_spill
-    eta_wo = eta_Al_ohmic ** n_wo_mirrors * eta_wo_spill
+    eta_wo = eta_Al_ohmic**n_wo_mirrors * eta_wo_spill
 
     # Forward efficiency: does/should not include window loss
     # because it is defined as how much power out of

diff --git a/docs/conf.py b/docs/conf.py
@@ -2,7 +2,7 @@
 project = "deshima-sensitivity"
 copyright = "2020 DESHIMA software team"
 author = "Akira Endo"
-release = "0.3.0"
+release = "0.4.0"
 
 
 # General configuration

diff --git a/lines/Dl_at_z2.py → misc/Dl_at_z2.py b/lines/Dl_at_z2.py → misc/Dl_at_z2.py
diff --git a/lines/lineflux.py → misc/lineflux.py b/lines/lineflux.py → misc/lineflux.py
diff --git a/data/plot_data_recal.csv → misc/plot_data_recal.csv b/data/plot_data_recal.csv → misc/plot_data_recal.csv
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "deshima-sensitivity"
-version = "0.3.0"
+version = "0.4.0"
 description = "Sensitivity calculator for DESHIMA-type spectrometers"
 authors = ["Akira Endo <a.endo@tudelft.nl>"]
 maintainers = [
@@ -9,6 +9,7 @@ maintainers = [
     "Keiichi Matsuda <matsuda@a.phys.nagoya-u.ac.jp>",
     "Masato Hagimoto <hagimoto@a.phys.nagoya-u.ac.jp>",
     "Stefanie Brackenhoff <s.a.brackenhoff@student.tudelft.nl>",
+    "Joris Tiebosch <j.p.tiebosch@student.tudelft.nl>",
 ]
 license = "MIT"
 readme = "README.md"
@@ -25,8 +26,8 @@ pandas = "^1.1"
 scipy = "^1.4"
 
 [tool.poetry.dev-dependencies]
-black = "^21.12b"
-ipykernel = "^6.7"
+black = "^22.1"
+ipykernel = "^6.8"
 ipython = "^7.31"
 myst-parser = "^0.16"
 pydata-sphinx-theme = "^0.8"

diff --git a/sensitivity.ipynb b/sensitivity.ipynb
@@ -23,7 +23,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install -q \"deshima-sensitivity==0.3.0\""
+    "!pip install -q \"deshima-sensitivity==0.4.0\""
    ]
   },
   {

diff --git a/tests/test_package.py b/tests/test_package.py
@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == "0.3.0"
+    assert __version__ == "0.4.0"
diff --git a/tests/test_physics.py b/tests/test_physics.py
@@ -3,7 +3,7 @@
 
 
 def test_johnson_nyquist_psd():
-    expected = 1.34778 * 10 ** -21
+    expected = 1.34778 * 10**-21
     output = physics.johnson_nyquist_psd(1e11, 100)
     assert isclose(output, expected, rel_tol=0.01)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		def test_version():
		assert __version__ == "0.3.0"
		assert __version__ == "0.4.0"