Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history 
for more information, see https://pre-commit.ci
  • Loading branch information
@pre-commit-ci
pre-commit-ci[bot] committed Nov 8, 2023
1 parent 0e804ce commit 9404218
Show file tree
Hide file tree
Showing 13 changed files with 252 additions and 322 deletions.
44 changes: 20 additions & 24 deletions docs/adr/001/sympy.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,10 @@
"for i in range(1, N_COMPONENTS + 1):\n",
" mu = sp.Symbol(Rf\"\\mu_{i}\")\n",
" sigma = sp.Symbol(Rf\"\\sigma_{i}\")\n",
" model.initial_values.update(\n",
" {\n",
" mu: float(i),\n",
" sigma: 1 / (2 * i),\n",
" }\n",
" )\n",
" model.initial_values.update({\n",
" mu: float(i),\n",
" sigma: 1 / (2 * i),\n",
" })\n",
" gauss = sp.exp(-((x - mu) ** 2) / (sigma**2)) / (sigma * sp.sqrt(2 * sp.pi))\n",
" dyn_symbol = sp.Symbol(Rf\"\\mathrm{{dyn}}_{i}\")\n",
" model.dynamics[dyn_symbol] = gauss\n",
Expand Down Expand Up @@ -1115,25 +1113,23 @@
"real0 = tf.constant(0, dtype=tf.float64)\n",
"real1 = tf.constant(1, dtype=tf.float64)\n",
"intensity_result = tf_intensity(\n",
" np.array(\n",
" np.array([\n",
" [\n",
" tf.complex(real1, real0),\n",
" tf.complex(real0, real0),\n",
" -tf.complex(real0, real1),\n",
" ],\n",
" [\n",
" tf.complex(real0, real0),\n",
" tf.complex(real1, real0),\n",
" tf.complex(real0, real0),\n",
" ],\n",
" [\n",
" [\n",
" tf.complex(real1, real0),\n",
" tf.complex(real0, real0),\n",
" -tf.complex(real0, real1),\n",
" ],\n",
" [\n",
" tf.complex(real0, real0),\n",
" tf.complex(real1, real0),\n",
" tf.complex(real0, real0),\n",
" ],\n",
" [\n",
" tf.complex(real0, real1),\n",
" tf.complex(real0, real0),\n",
" tf.complex(real1, real0),\n",
" ],\n",
" ]\n",
" ),\n",
" tf.complex(real0, real1),\n",
" tf.complex(real0, real0),\n",
" tf.complex(real1, real0),\n",
" ],\n",
" ]),\n",
")\n",
"intensity_result"
]
Expand Down
10 changes: 4 additions & 6 deletions docs/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,10 @@ def fetch_logo(url: str, output_path: str) -> None:
"members": True,
"undoc-members": True,
"show-inheritance": True,
"special-members": ", ".join(
[
"__call__",
"__eq__",
]
),
"special-members": ", ".join([
"__call__",
"__eq__",
]),
}
codeautolink_concat_default = True
codeautolink_global_preface = """
Expand Down
10 changes: 4 additions & 6 deletions docs/report/004.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,10 @@
},
"outputs": [],
"source": [
"rho.subs(\n",
" {\n",
" m1: 1,\n",
" m2: 1,\n",
" }\n",
")"
"rho.subs({\n",
" m1: 1,\n",
" m2: 1,\n",
"})"
]
},
{
Expand Down
56 changes: 24 additions & 32 deletions docs/report/005.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,9 @@
],
"source": [
"K_symbol = sp.IndexedBase(\"K\", shape=(n_channels, n_channels))\n",
"K = sp.Matrix(\n",
" [[K_symbol[i, j] for j in range(n_channels)] for i in range(n_channels)]\n",
")\n",
"K = sp.Matrix([\n",
" [K_symbol[i, j] for j in range(n_channels)] for i in range(n_channels)\n",
"])\n",
"display(K_symbol[i, j], K)"
]
},
Expand Down Expand Up @@ -525,13 +525,11 @@
}
],
"source": [
"T_subs = T.subs(\n",
" {\n",
" K[i, j]: Kij(m, M, Gamma, gamma, i, j, n_resonances)\n",
" for i in range(n_channels)\n",
" for j in range(n_channels)\n",
" }\n",
")\n",
"T_subs = T.subs({\n",
" K[i, j]: Kij(m, M, Gamma, gamma, i, j, n_resonances)\n",
" for i in range(n_channels)\n",
" for j in range(n_channels)\n",
"})\n",
"T_subs"
]
},
Expand Down Expand Up @@ -620,13 +618,11 @@
" K = create_symbol_matrix(\"K\", n_channels)\n",
" T = K * (sp.eye(n_channels) - sp.I * K).inv()\n",
" # Substitute elements\n",
" return T.subs(\n",
" {\n",
" K[i, j]: Kij(m, M, Gamma, gamma, i, j, n_resonances)\n",
" for i in range(n_channels)\n",
" for j in range(n_channels)\n",
" }\n",
" )"
" return T.subs({\n",
" K[i, j]: Kij(m, M, Gamma, gamma, i, j, n_resonances)\n",
" for i in range(n_channels)\n",
" for j in range(n_channels)\n",
" })"
]
},
{
Expand Down Expand Up @@ -835,21 +831,17 @@
" m0_values = m0_values[1:-1]\n",
" for R in range(n_resonances):\n",
" for i in range(n_channels):\n",
" sliders.set_ranges(\n",
" {\n",
" \"i\": (0, n_channels - 1),\n",
" f\"m{R}\": (0, 3, 100),\n",
" f\"Gamma{R}\": (-1, 1, 100),\n",
" Rf\"\\gamma_{{{R},{i}}}\": (0, 2, 100),\n",
" }\n",
" )\n",
" sliders.set_values(\n",
" {\n",
" f\"m{R}\": m0_values[R],\n",
" f\"Gamma{R}\": (R + 1) * 0.1,\n",
" Rf\"\\gamma_{{{R},{i}}}\": 1 - 0.1 * R + 0.1 * i,\n",
" }\n",
" )\n",
" sliders.set_ranges({\n",
" \"i\": (0, n_channels - 1),\n",
" f\"m{R}\": (0, 3, 100),\n",
" f\"Gamma{R}\": (-1, 1, 100),\n",
" Rf\"\\gamma_{{{R},{i}}}\": (0, 2, 100),\n",
" })\n",
" sliders.set_values({\n",
" f\"m{R}\": m0_values[R],\n",
" f\"Gamma{R}\": (R + 1) * 0.1,\n",
" Rf\"\\gamma_{{{R},{i}}}\": 1 - 0.1 * R + 0.1 * i,\n",
" })\n",
"\n",
" # Create interactive plots\n",
" controls = Controls(**sliders)\n",
Expand Down
10 changes: 3 additions & 7 deletions docs/report/008.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,9 @@
"outputs": [],
"source": [
"def replace_indexed_symbols(expression: sp.Expr) -> sp.Expr:\n",
" return expression.subs(\n",
" {\n",
" s: to_symbol(s)\n",
" for s in expression.free_symbols\n",
" if isinstance(s, sp.Indexed)\n",
" }\n",
" )"
" return expression.subs({\n",
" s: to_symbol(s) for s in expression.free_symbols if isinstance(s, sp.Indexed)\n",
" })"
]
},
{
Expand Down
66 changes: 30 additions & 36 deletions docs/report/009.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,22 +490,20 @@
" T_hat = K * (sp.eye(n_channels) - sp.I * rho * K).inv()\n",
" T = sqrt_rho_dagger * T_hat * sqrt_rho\n",
" # Substitute elements\n",
" return T.subs(\n",
" {\n",
" K[i, j]: Kij_relativistic(\n",
" m=m,\n",
" M=M,\n",
" Gamma=Gamma,\n",
" gamma=gamma,\n",
" i=i,\n",
" j=j,\n",
" n_resonances=n_resonances,\n",
" angular_momentum=angular_momentum,\n",
" )\n",
" for i in range(n_channels)\n",
" for j in range(n_channels)\n",
" }\n",
" )\n",
" return T.subs({\n",
" K[i, j]: Kij_relativistic(\n",
" m=m,\n",
" M=M,\n",
" Gamma=Gamma,\n",
" gamma=gamma,\n",
" i=i,\n",
" j=j,\n",
" n_resonances=n_resonances,\n",
" angular_momentum=angular_momentum,\n",
" )\n",
" for i in range(n_channels)\n",
" for j in range(n_channels)\n",
" })\n",
"\n",
"\n",
"def create_symbol_matrix(name: str, n: int) -> sp.Matrix:\n",
Expand Down Expand Up @@ -733,26 +731,22 @@
" sliders.set_ranges(L=(0, 8))\n",
" for R in range(n_resonances):\n",
" for i in range(n_channels):\n",
" sliders.set_ranges(\n",
" {\n",
" \"i\": (0, n_channels - 1),\n",
" \"epsilon\": (y_min * 0.2, y_max * 0.2, 0.01),\n",
" f\"m{R}\": (0, 3, 100),\n",
" Rf\"\\Gamma_{{{R},{i}}}\": (-2, +2, 100),\n",
" Rf\"\\gamma_{{{R},{i}}}\": (0, 10, 100),\n",
" f\"m_a{i}\": (0, 1, 0.01),\n",
" f\"m_b{i}\": (0, 1, 0.01),\n",
" }\n",
" )\n",
" sliders.set_values(\n",
" {\n",
" f\"m{R}\": m0_values[R],\n",
" Rf\"\\Gamma_{{{R},{i}}}\": 2.0 * (0.4 + R * 0.2 - i * 0.3),\n",
" Rf\"\\gamma_{{{R},{i}}}\": 0.25 * (10 - R + i),\n",
" f\"m_a{i}\": (i + 1) * 0.25,\n",
" f\"m_b{i}\": (i + 1) * 0.25,\n",
" }\n",
" )\n",
" sliders.set_ranges({\n",
" \"i\": (0, n_channels - 1),\n",
" \"epsilon\": (y_min * 0.2, y_max * 0.2, 0.01),\n",
" f\"m{R}\": (0, 3, 100),\n",
" Rf\"\\Gamma_{{{R},{i}}}\": (-2, +2, 100),\n",
" Rf\"\\gamma_{{{R},{i}}}\": (0, 10, 100),\n",
" f\"m_a{i}\": (0, 1, 0.01),\n",
" f\"m_b{i}\": (0, 1, 0.01),\n",
" })\n",
" sliders.set_values({\n",
" f\"m{R}\": m0_values[R],\n",
" Rf\"\\Gamma_{{{R},{i}}}\": 2.0 * (0.4 + R * 0.2 - i * 0.3),\n",
" Rf\"\\gamma_{{{R},{i}}}\": 0.25 * (10 - R + i),\n",
" f\"m_a{i}\": (i + 1) * 0.25,\n",
" f\"m_b{i}\": (i + 1) * 0.25,\n",
" })\n",
"\n",
" # Create interactive plots\n",
" controls = Controls(**sliders)\n",
Expand Down
104 changes: 48 additions & 56 deletions docs/report/010.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,42 +366,38 @@
" K = create_symbol_matrix(\"K\", n_channels, n_channels)\n",
" F = (sp.eye(n_channels) - sp.I * K * rho).inv() * P\n",
" # Substitute elements\n",
" return F.subs(\n",
" {\n",
" K[i, j]: Kij_relativistic(\n",
" m=m,\n",
" M=M,\n",
" Gamma=Gamma,\n",
" gamma=gamma,\n",
" m_a=m_a,\n",
" m_b=m_b,\n",
" i=i,\n",
" j=j,\n",
" R=R,\n",
" n_resonances=n_resonances,\n",
" angular_momentum=angular_momentum,\n",
" )\n",
" for i in range(n_channels)\n",
" for j in range(n_channels)\n",
" }\n",
" ).subs(\n",
" {\n",
" P[i]: Pi_relativistic(\n",
" m=m,\n",
" M=M,\n",
" Gamma=Gamma,\n",
" gamma=gamma,\n",
" beta=beta,\n",
" i=i,\n",
" m_a=m_a,\n",
" m_b=m_b,\n",
" R=R,\n",
" n_resonances=n_resonances,\n",
" angular_momentum=angular_momentum,\n",
" )\n",
" for i in range(n_channels)\n",
" }\n",
" )\n",
" return F.subs({\n",
" K[i, j]: Kij_relativistic(\n",
" m=m,\n",
" M=M,\n",
" Gamma=Gamma,\n",
" gamma=gamma,\n",
" m_a=m_a,\n",
" m_b=m_b,\n",
" i=i,\n",
" j=j,\n",
" R=R,\n",
" n_resonances=n_resonances,\n",
" angular_momentum=angular_momentum,\n",
" )\n",
" for i in range(n_channels)\n",
" for j in range(n_channels)\n",
" }).subs({\n",
" P[i]: Pi_relativistic(\n",
" m=m,\n",
" M=M,\n",
" Gamma=Gamma,\n",
" gamma=gamma,\n",
" beta=beta,\n",
" i=i,\n",
" m_a=m_a,\n",
" m_b=m_b,\n",
" R=R,\n",
" n_resonances=n_resonances,\n",
" angular_momentum=angular_momentum,\n",
" )\n",
" for i in range(n_channels)\n",
" })\n",
"\n",
"\n",
"def create_symbol_matrix(name: str, m: int, n: int) -> sp.Matrix:\n",
Expand Down Expand Up @@ -509,26 +505,22 @@
" )\n",
" for R in range(n_resonances):\n",
" for i in range(n_channels):\n",
" sliders.set_ranges(\n",
" {\n",
" f\"m{R}\": (0, 3, 100),\n",
" f\"beta{R}\": (0, 5, 0.1),\n",
" Rf\"\\Gamma_{{{R},{i}}}\": (-5, +5, 100),\n",
" Rf\"\\gamma_{{{R},{i}}}\": (0, 20, 100),\n",
" f\"m_a{i}\": (0, 1, 0.01),\n",
" f\"m_b{i}\": (0, 1, 0.01),\n",
" }\n",
" )\n",
" sliders.set_values(\n",
" {\n",
" f\"m{R}\": m0_values[R],\n",
" f\"beta{R}\": 1,\n",
" Rf\"\\Gamma_{{{R},{i}}}\": 3 * (0.4 + R * 0.2 - i * 0.3),\n",
" Rf\"\\gamma_{{{R},{i}}}\": 0.2 * (10 - R + i),\n",
" f\"m_a{i}\": (i + 1) * 0.25,\n",
" f\"m_b{i}\": (i + 1) * 0.25,\n",
" }\n",
" )\n",
" sliders.set_ranges({\n",
" f\"m{R}\": (0, 3, 100),\n",
" f\"beta{R}\": (0, 5, 0.1),\n",
" Rf\"\\Gamma_{{{R},{i}}}\": (-5, +5, 100),\n",
" Rf\"\\gamma_{{{R},{i}}}\": (0, 20, 100),\n",
" f\"m_a{i}\": (0, 1, 0.01),\n",
" f\"m_b{i}\": (0, 1, 0.01),\n",
" })\n",
" sliders.set_values({\n",
" f\"m{R}\": m0_values[R],\n",
" f\"beta{R}\": 1,\n",
" Rf\"\\Gamma_{{{R},{i}}}\": 3 * (0.4 + R * 0.2 - i * 0.3),\n",
" Rf\"\\gamma_{{{R},{i}}}\": 0.2 * (10 - R + i),\n",
" f\"m_a{i}\": (i + 1) * 0.25,\n",
" f\"m_b{i}\": (i + 1) * 0.25,\n",
" })\n",
"\n",
" set_default_values()\n",
"\n",
Expand Down
Loading

0 comments on commit 9404218

Please sign in to comment.