fixed bug v0.0.1.2

Changing the number of guide will correcly change the beams position relative to the new guides

Author: Python-simulation

README.rst

@@ -18,7 +18,7 @@ under the directive of Pr. Nicolas Fressengeas.
 The bpm codes are mainly based on a compilation of MatLab codes initialy
 developed by Régis Grasser during his PhD thesis [#thesis]_,
 and later modified at the FEMTO-ST institute of the Université de
-Bourgogne-Franche-Comté and at the LMOPS laboratory [#lmops]_ of the
+Franche-Comté and at the LMOPS laboratory [#lmops]_ of the
 Université de Lorraine.
 
 References

beampy/__init__.py

@@ -1,4 +1,4 @@
-"""Beampy is a module based on Beam Propagation Method, a numerical method
+"""Beampy is a module based on Beam Propagation Method, a numerical method
 used to compute light propagation into a refractive index.
 The light propagation is done by the :mod:`beampy.bpm` module, shown and
 piloted by the :mod:`beampy.user_interface` module.
@@ -29,7 +29,7 @@
 # module
 from beampy import examples
 
-__version__ = "0.0.1.1"
+__version__ = "0.0.1.2"
 
 
 def help():

beampy/user_interface.py

@@ -279,6 +279,7 @@ def calculate_guide(self, topology='array'):
             self.doubleSpinBox_offset_light.setEnabled(True)
             self.checkBox_offset_light.setChecked(False)
             self.checkBox_offset_light.setDisabled(True)
+            self.offset_check *= 0
             self.checkBox_lost.setDisabled(True)
             self.checkBox_lost.setChecked(False)
             self.frame_lost.setDisabled(True)
@@ -291,11 +292,13 @@ def calculate_guide(self, topology='array'):
             self.checkBox_check_power.setEnabled(True)
 
 #        Define new min/max for light and looses, based on selected guides
-        self.doubleSpinBox_offset_light.setMinimum(min(self.x))
-        self.doubleSpinBox_offset_light.setMaximum(max(self.x))
         self.doubleSpinBox_offset_light.setSingleStep(1.0)
         self.doubleSpinBox_width_lost.setMaximum(self.length_x-self.dist_x)
         self.doubleSpinBox_lobe_size.setMaximum(self.length_x-self.dist_x)
+        # If want to use min/max for offset: multiple beams will have issue if
+        # the windows size change (min/max will only be for the displayed beam)
+#        self.doubleSpinBox_offset_light.setMinimum(self.x[0])
+#        self.doubleSpinBox_offset_light.setMaximum(self.x[-1])
 
         self.calculate_guide_done = True
         t_guide_end = time.process_time()
@@ -325,16 +328,17 @@ def calculate_light(self):
 
         for i in range(nbr_light):
 
-            # Check if offset in µm or in guide number
+            # Check if offset relative to guide number or else in µm
             if self.offset_check[i] and self.peaks.shape[0] != 0:
 
                 # Reduce light # if > guides #
-                if (self.topology == 'array'
-                        and self.offset_light_peak[i] > self.nbr_p):
-                    self.offset_light_peak[i] = self.nbr_p - 1
-                elif (self.topology == 'curved'
-                        and self.offset_light_peak[i] > 3):
-                    self.offset_light_peak[i] = 3 - 1
+                peaks_i = self.offset_light_peak[i]
+                peaks_max = self.spinBox_offset_light_peak.maximum()
+
+                if peaks_i > peaks_max:
+                    print("beam", i+1, "has a non-existing guide position")
+                    print("Change position from", peaks_i, "to", peaks_max)
+                    self.offset_light_peak[i] = peaks_max
 
                 offset_light = self.peaks[self.offset_light_peak[i], 0]
 

docs/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: a5a90952a14e9d65e4eace05767b9430
+config: 8116325f5fcdc414db89fc5ae6481eaf
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/html/.doctrees/beampy.doctree

@@ -8,7 +8,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>MIT License &mdash; beampy 0.0.1.1 documentation</title>
+  <title>MIT License &mdash; beampy 0.0.1.2 documentation</title>
 
 
 

docs/html/.doctrees/codes.doctree

@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.0.1.1',
+    VERSION: '0.0.1.2',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     FILE_SUFFIX: '.html',