diff --git a/Chamber_Design/src/constant.py b/Chamber_Design/src/constants.py similarity index 100% rename from Chamber_Design/src/constant.py rename to Chamber_Design/src/constants.py diff --git a/Chamber_Design/src/geometry.py b/Chamber_Design/src/geometry.py index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..db4b799cbe728f62b0e8024cc2f21deeba8459f9 100644 --- a/Chamber_Design/src/geometry.py +++ b/Chamber_Design/src/geometry.py @@ -0,0 +1,11 @@ +# geometry.py + +from constant import M_PER_MM + +# Tube geometry +D_WIDE = 24.39 * M_PER_MM # [m] diameter +L_WIDE = 57.952 * M_PER_MM # [m] length +D_GLASS = 18 * M_PER_MM # [m] diameter +L_GLASS = 201 * M_PER_MM # [m] length +D_CELL = 27 * M_PER_MM # [m] diameter +L_CELL = 114 * M_PER_MM # [m] length diff --git a/Chamber_Design/src/optimization.py b/Chamber_Design/src/optimization.py index cec7ce8809ffb704687938729804d74caa06ee18..3d3c11d02e2d9285eac820f95b4d660e8245c922 100644 --- a/Chamber_Design/src/optimization.py +++ b/Chamber_Design/src/optimization.py @@ -3,6 +3,7 @@ from simulation import Simulation import numpy as np from scipy.optimize import minimize +from geometry import D_WIDE, L_WIDE, D_GLASS, L_GLASS, D_CELL, L_CELL def objective(params, N, temperature_x, temperature_y): v0x_center, v0y_center, x_tube_rescale, y_tube_rescale = params