Merge pull request #78 from Azazel-h/feature/fabry-perot-update

Feature/fabry perot update
Azazel-h · Dec 20, 2023 · 683126c · 683126c
2 parents fd49b2b + f3f5735
commit 683126c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/fabry_perot/forms.py b/fabry_perot/forms.py
@@ -12,7 +12,12 @@ class GraphForm(forms.Form):
         initial=630,
         widget=RangeInput(min_value=380, max_value=780, step=0.1)
     )
-    wave_length_diff = forms.FloatField(label='Разница длин волн \\(\\Delta\\lambda\\) [нм]', min_value=0, step_size=0.001, initial=0)
+    wave_length_diff = forms.FloatField(
+        label='Разница длин волн \\(\\Delta\\lambda\\) [нм]',
+        min_value=0,
+        step_size=0.000001,
+        initial=0
+    )
     glasses_distance = forms.FloatField(
         label='Расстояние между зеркалами \\(d\\) [мм]',
         min_value=0,

diff --git a/fabry_perot/views.py b/fabry_perot/views.py
@@ -54,19 +54,20 @@ def get_graph(form_dict: dict) -> Optional[dict[str, Union[str, tuple[str, ...]]
         second_wavenumber = 2 * math.pi / (wave_length + wave_length_diff)
         fineness = 4.0 * reflection_coefficient / math.pow((1.0 - reflection_coefficient), 2)
 
-        step = picture_size / resolution / sll.mm
+        step = picture_size / resolution
         matrix_center = (resolution + 1) // 2
 
-        theta_array = []
-        first_beam = []
+        distance_array = []
+        # first_beam = []
         second_beam = []
+
         for i in range(0, matrix_center):
             x_ray = (i + 0.5) * step
             for j in range(i, matrix_center):
                 y_ray = (j + 0.5) * step
 
-                x = x_ray * sll.mm - picture_size / 2
-                y = y_ray * sll.mm - picture_size / 2
+                x = x_ray - picture_size / 2
+                y = y_ray - picture_size / 2
                 radius = math.sqrt(x * x + y * y)
 
                 theta = math.atan2(radius, focal_distance)
@@ -81,20 +82,20 @@ def get_graph(form_dict: dict) -> Optional[dict[str, Union[str, tuple[str, ...]]
                 intensity[i][j] = intensity[j][i] = second_light_intensity
 
                 if i == j:
-                    first_beam.append(first_light_intensity)
+                    # first_beam.append(first_light_intensity)
                     second_beam.append(second_light_intensity)
-                    theta_array.append(theta)
-
-        # TODO: Вывести все это в интерфейс
-        dispersion_region = math.pow(wave_length + wave_length_diff, 2) / (2 * glasses_distance)
+                    distance_array.append(radius / sll.mm)
 
-        # print(theta_array, first_beam, second_beam)
+        dispersion_region = math.pow(wave_length, 2) / (2 * glasses_distance) / sll.nm
 
         intensity[resolution - matrix_center:resolution, 0:matrix_center] = np.rot90(
             intensity[0:matrix_center, 0:matrix_center])
         intensity[0:resolution, resolution - matrix_center:resolution] = np.rot90(
             intensity[0:resolution, 0:matrix_center], 2)
+
         intensity = (intensity - np.min(intensity)) / (np.max(intensity) - np.min(intensity))
+        second_beam = [(beam_intensity - min(second_beam)) / (max(second_beam) - min(second_beam)) for beam_intensity in
+                       second_beam]
 
         laser_color = sll.color.rgb_to_hex(sll.wave.wave_length_to_rgb(wave_length / sll.nm))
 
@@ -103,13 +104,13 @@ def get_graph(form_dict: dict) -> Optional[dict[str, Union[str, tuple[str, ...]]
 
         df = pd.DataFrame(
             dict(
-                x=theta_array,
+                x=distance_array,
                 y=second_beam,
                 color=laser_color
             )
         )
 
-        fig_2 = px.line(df, x="x", y="y", labels={'y': 'Интенсивность', 'x': 'Угол падения'})
+        fig_2 = px.line(df, x="x", y="y", labels={'x': 'Расстояние [мм]', 'y': 'Интенсивность'})
         fig_2.update_traces(line_color=laser_color)
         fig_2.update_layout(
             plot_bgcolor='white'
@@ -136,7 +137,10 @@ def get_graph(form_dict: dict) -> Optional[dict[str, Union[str, tuple[str, ...]]
                 fig_1.to_html(config=config, include_plotlyjs=False, full_html=False),
                 fig_2.to_html(config=config, include_plotlyjs=False, full_html=False),
             ),
-            'additional': f'<span>Область дисперсии: {dispersion_region}</span>'
+            'additional':
+                '<div class="mt-4 card card-body">'
+                f'    Область дисперсии: ' + '{:.6f}'.format(dispersion_region) + ' нм'
+                '</div>'
         }
 
 

diff --git a/templates/components/interferometer-interface.html b/templates/components/interferometer-interface.html
@@ -29,7 +29,7 @@
                         {% endif %}
                     </div>
                 </form>
-                <div class="mt-4 card card-body" id="additional"></div>
+                <div id="additional"></div>
             </div>
         </div>
     </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ @@
                             {% endif %}
                         </div>
                     </form>
-                    <div class="mt-4 card card-body" id="additional"></div>
+                    <div id="additional"></div>
                 </div>
             </div>
         </div>
@@ Expand Down @@