Format Python codes by Black

.github/workflows/tests.yaml

@@ -0,0 +1,30 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - main
+      - deshima2.0
+  pull_request:
+    branches:
+      - main
+      - deshima2.0
+
+jobs:
+  job:
+    name: Test (Python ${{ matrix.python }})
+    runs-on: ubuntu-latest
+    env:
+      POETRY_VIRTUALENVS_CREATE: false
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ["3.9", "3.10", "3.11"]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+      - run: pip install poetry && poetry install
+      - run: black --check ./
+      - run: cd test && ./mktd.sh && python test_merge_to_dems.py

calc_resonance_params.py

@@ -15,6 +15,7 @@
 import pickle
 import dmerge
 
+
 def calc_resonance_params(kid, nfwhm=5, minq=100, maxratio=1.0):
     """1つのKIDに対するresonanceパラメータを求める
     引数
@@ -23,48 +24,54 @@ def calc_resonance_params(kid, nfwhm=5, minq=100, maxratio=1.0):
     float FWHMを単位としたフィット範囲[オプション]
     float qの最小値(フィットの良し悪しを判定する基準として利用する:dmerge.find_peaks()関数で利用)[オプション]
     float フィットの良し悪しを判定する基準((bg-d)/bgの最大値:dmerge.find_peaks()関数で利用)[オプション]
-    
+
     戻り値
     ------
     dict フィットの結果を引数で与えられたkidに追加した辞書
     """
-    fc = kid['tod'].frequency
-    peaks = dmerge.find_peaks(kid['localsweep'].x, kid['localsweep'].amplitude, fc, minq=minq, maxratio=maxratio)
-    result, fitrange = dmerge.fit_onepeak(kid['localsweep'], peaks, nfwhm=nfwhm)
+    fc = kid["tod"].frequency
+    peaks = dmerge.find_peaks(
+        kid["localsweep"].x,
+        kid["localsweep"].amplitude,
+        fc,
+        minq=minq,
+        maxratio=maxratio,
+    )
+    result, fitrange = dmerge.fit_onepeak(kid["localsweep"], peaks, nfwhm=nfwhm)
 
-    fr = result.params['fr'].value # GHz
-    dfr = result.params['fr'].stderr # GHz
-    Qr = result.params['Qr'].value
-    dQr = result.params['Qr'].stderr
-    Qc = result.params['Qc'].value
-    dQc = result.params['Qc'].stderr
-    Qi = result.params['Qi'].value
-    dQi = result.params['Qi'].stderr
-    if dfr/fr<0. or dQr/Qr<0. or dQc/Qc<0. or dQi/Qi<0.:
-        kid['enabled'] = False
-    elif fr!=fr or dfr!=dfr or Qr!=Qr or dQr!=dQr: # reject Nan
-        kid['enabled'] = False
-    elif abs(Qr)==float('inf') or abs(dQr)==float('inf'): # reject +/-inf
-        kid['enabled'] = False
-    if kid['enabled']:
-        kid['resonance_params'] = result.params
-        kid['fitrange'] = fitrange
+    fr = result.params["fr"].value  # GHz
+    dfr = result.params["fr"].stderr  # GHz
+    Qr = result.params["Qr"].value
+    dQr = result.params["Qr"].stderr
+    Qc = result.params["Qc"].value
+    dQc = result.params["Qc"].stderr
+    Qi = result.params["Qi"].value
+    dQi = result.params["Qi"].stderr
+    if dfr / fr < 0.0 or dQr / Qr < 0.0 or dQc / Qc < 0.0 or dQi / Qi < 0.0:
+        kid["enabled"] = False
+    elif fr != fr or dfr != dfr or Qr != Qr or dQr != dQr:  # reject Nan
+        kid["enabled"] = False
+    elif abs(Qr) == float("inf") or abs(dQr) == float("inf"):  # reject +/-inf
+        kid["enabled"] = False
+    if kid["enabled"]:
+        kid["resonance_params"] = result.params
+        kid["fitrange"] = fitrange
     else:
-        kid['resonance_params'] = None
-        kid['fitrange'] = None
+        kid["resonance_params"] = None
+        kid["fitrange"] = None
     return kid
 
-if __name__=='__main__':
+
+if __name__ == "__main__":
     """
     コマンドライン引数
     ------------------
     args[1] string divide_data()関数で生成したpklファイルへのパス
     """
     args = sys.argv
     filename = args[1]
-    with open(filename, 'rb') as f:
+    with open(filename, "rb") as f:
         kid = pickle.load(f)
     kid = calc_resonance_params(kid)
-    with open(filename, 'wb') as f:
+    with open(filename, "wb") as f:
         pickle.dump(kid, f)
-