changes needed to use branch main

scottprahl · May 8, 2024 · c9e0302 · c9e0302
1 parent c4d2073
commit c9e0302
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 38 deletions.
diff --git a/docs/02-Background.ipynb b/docs/02-Background.ipynb
@@ -26,7 +26,7 @@
     "\n",
     "import laserbeamsize as lbs\n",
     "    \n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\"\n",
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\"\n",
     "\n",
     "%config InlineBackend.figure_format = 'retina'"
    ]
@@ -589,7 +589,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/03-Background.ipynb b/docs/03-Background.ipynb
@@ -24,7 +24,7 @@
     "import matplotlib.pyplot as plt\n",
     "import laserbeamsize as lbs\n",
     "    \n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\"\n",
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\"\n",
     "\n",
     "%config InlineBackend.figure_format = 'retina'"
    ]
@@ -387,7 +387,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/04-Test-Beam.ipynb b/docs/04-Test-Beam.ipynb
@@ -27,7 +27,7 @@
     "import matplotlib.pyplot as plt\n",
     "import laserbeamsize as lbs\n",
     "\n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\"\n",
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\"\n",
     "\n",
     "def side_by_side_plot(h,v,xc,yc,dx,dy,phi,noise=0,offset=0):\n",
     "    \"\"\"Creates plot of original and of fitted beam.\"\"\"\n",
@@ -655,7 +655,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/05-Experiment.ipynb b/docs/05-Experiment.ipynb
@@ -48,7 +48,7 @@
     "\n",
     "\n",
     "pixel_size_µm = 3.75               # microns\n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\"\n"
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\"\n"
    ]
   },
   {
@@ -397,7 +397,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/06-Fixed-Rotation.ipynb b/docs/06-Fixed-Rotation.ipynb
@@ -33,7 +33,7 @@
     "import laserbeamsize as lbs\n",
     "    \n",
     "pixel_size_µm = 3.75          # pixel size in microns for the camera\n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\""
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\""
    ]
   },
   {
@@ -248,7 +248,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/07-Easy-Images.ipynb b/docs/07-Easy-Images.ipynb
@@ -25,7 +25,7 @@
     "import laserbeamsize as lbs\n",
     "    \n",
     "pixel_size_µm = 3.75          # pixel size in microns for the camera\n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\""
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\""
    ]
   },
   {
@@ -210,7 +210,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/08-Harder-Images.ipynb b/docs/08-Harder-Images.ipynb
@@ -27,7 +27,7 @@
     "import laserbeamsize as lbs\n",
     "    \n",
     "pixel_size_µm = 3.75               # microns\n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\""
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\""
    ]
   },
   {
@@ -327,7 +327,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/09-Razor-Blade.ipynb b/docs/09-Razor-Blade.ipynb
@@ -17,15 +17,6 @@
     "In this notebook, we compare the results from `lbs.beam_size()` with that from a fit to a simulated razor blade experiment done on the same image.\n"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#!pip install --user laserbeamsize"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": 1,
@@ -39,7 +30,7 @@
     "import laserbeamsize as lbs\n",
     "    \n",
     "pixel_size_mm = 3.75/1000           # pixel size in mm for the camera\n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\""
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\""
    ]
   },
   {
@@ -415,7 +406,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/10-Beam-Waist.ipynb b/docs/10-Beam-Waist.ipynb
@@ -25,7 +25,7 @@
     "import laserbeamsize as lbs\n",
     "\n",
     "pixel_size_µm = 3.75\n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\""
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\""
    ]
   },
   {
@@ -329,7 +329,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/15-M2-Problems.ipynb b/docs/15-M2-Problems.ipynb
@@ -28,7 +28,7 @@
     "pixel_size_mm = pixel_size * 1e3\n",
     "pixel_size_µm = pixel_size * 1e6\n",
     "\n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\""
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\""
    ]
   },
   {
@@ -406,7 +406,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/astigmatic-report.png b/docs/astigmatic-report.png
diff --git a/docs/hene-report.png b/docs/hene-report.png
diff --git a/docs/m2fit.png b/docs/m2fit.png
diff --git a/docs/readme_images.ipynb b/docs/readme_images.ipynb
@@ -27,7 +27,7 @@
     "import laserbeamsize as lbs\n",
     "%config InlineBackend.figure_format='retina'\n",
     "\n",
-    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/master/docs/\""
+    "repo = \"https://github.com/scottprahl/laserbeamsize/raw/main/docs/\""
    ]
   },
   {
@@ -54,7 +54,7 @@
     }
    ],
    "source": [
-    "# file at https://github.com/scottprahl/laserbeamsize/blob/master/docs/t-hene.pgm\n",
+    "# file at https://github.com/scottprahl/laserbeamsize/blob/main/docs/t-hene.pgm\n",
     "    \n",
     "beam = iio.imread(\"t-hene.pgm\")\n",
     "x, y, dx, dy, phi = lbs.beam_size(beam)\n",
@@ -352,7 +352,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

diff --git a/docs/sbfit.png b/docs/sbfit.png
diff --git a/docs/sbmontage.png b/docs/sbmontage.png
diff --git a/docs/tem02.png b/docs/tem02.png
diff --git a/laserbeamsize/analysis.py b/laserbeamsize/analysis.py
@@ -12,7 +12,7 @@
     >>> import imageio.v3 as iio
     >>> import laserbeamsize as lbs
     >>>
-    >>> file = "https://github.com/scottprahl/laserbeamsize/raw/master/docs/t-hene.pgm"
+    >>> file = "https://github.com/scottprahl/laserbeamsize/raw/main/docs/t-hene.pgm"
     >>> image = iio.imread(file)
     >>>
     >>> x, y, dx, dy, phi = lbs.beam_size(image)

diff --git a/laserbeamsize/background.py b/laserbeamsize/background.py
@@ -10,7 +10,7 @@
     >>> import imageio.v3 as iio
     >>> import laserbeamsize as lbs
     >>>
-    >>> file = "https://github.com/scottprahl/laserbeamsize/raw/master/docs/t-hene.pgm"
+    >>> file = "https://github.com/scottprahl/laserbeamsize/raw/main/docs/t-hene.pgm"
     >>> image = iio.imread(file)
     >>>
     >>> mean, stdev = lbs.corner_background(image)
@@ -25,7 +25,7 @@
     >>> import imageio.v3 as iio
     >>> import laserbeamsize as lbs
     >>>
-    >>> file = "https://github.com/scottprahl/laserbeamsize/raw/master/docs/t-hene.pgm"
+    >>> file = "https://github.com/scottprahl/laserbeamsize/raw/main/docs/t-hene.pgm"
     >>> image = iio.imread(file)
     >>>
     >>> clean_image = subtract_iso_background(image)

diff --git a/laserbeamsize/display.py b/laserbeamsize/display.py
@@ -9,7 +9,7 @@
     >>> import matplotlib.pyplot as plt
     >>> import laserbeamsize as lbs
     >>>
-    >>> repo = "https://github.com/scottprahl/laserbeamsize/raw/master/docs/"
+    >>> repo = "https://github.com/scottprahl/laserbeamsize/raw/main/docs/"
     >>> image = iio.imread(repo + 't-hene.pgm')
     >>>
     >>> lbs.plot_image_analysis(image)
@@ -22,7 +22,7 @@
     >>> import numpy as np
     >>> import laserbeamsize as lbs
     >>>
-    >>> repo = "https://github.com/scottprahl/laserbeamsize/raw/master/docs/"
+    >>> repo = "https://github.com/scottprahl/laserbeamsize/raw/main/docs/"
     >>> z1 = np.array([168,210,280,348,414,480], dtype=float)
     >>> fn1 = [repo + "t-%dmm.pgm" % number for number in z1]
     >>> images = [iio.imread(fn) for fn in fn1]

diff --git a/tests/test_all_notebooks.py b/tests/test_all_notebooks.py
@@ -18,7 +18,7 @@
 
 The original can be located at::
 
-    https://github.com/alchemyst/Dynamics-and-Control/blob/master/test_all_notebooks.py
+    https://github.com/alchemyst/Dynamics-and-Control/blob/main/test_all_notebooks.py
 """
 import os.path
 import pathlib