Skip to content

Fix demos incompatibility with the latest versions of Raysect and Matplotlib #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CnlPepper merged 1 commit into from
Feb 18, 2023
Merged

Fix demos incompatibility with the latest versions of Raysect and Matplotlib #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demos/materials/modifiers/transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def emission_function(self, point, direction, spectrum, world, ray, primitive, t
wvl_range = spectrum.min_wavelength - spectrum.max_wavelength
shift = 2 * (spectrum.wavelengths - wvl_centre) / wvl_range
radius = sqrt(point.x**2 + point.y**2)
spectrum.samples += cos((shift + 5) * radius)**4
spectrum.samples[:] += cos((shift + 5) * radius)**4
return spectrum


Expand Down
2 changes: 1 addition & 1 deletion demos/materials/volume.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def emission_function(self, point, direction, spectrum, world, ray, primitive, t
wvl_range = spectrum.min_wavelength - spectrum.max_wavelength
shift = 2 * (spectrum.wavelengths - wvl_centre) / wvl_range
radius = sqrt(point.x**2 + point.y**2)
spectrum.samples += cos((shift + 5) * radius)**4
spectrum.samples[:] += cos((shift + 5) * radius)**4
return spectrum


Expand Down
3 changes: 3 additions & 0 deletions demos/observers/metal_with_lens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,6 @@
# ccd.pipelines[0].save("demo_metal_lens_{}.png".format(p))
print()
p += 1

ioff()
show()
11 changes: 4 additions & 7 deletions demos/optics/etendue_of_pinhole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,10 @@ def raytraced_etendue(distance, detector_radius=0.001, ray_count=100000, batches
raytraced_values = np.array(raytraced_values)
raytraced_errors = np.array(raytraced_errors)

plt.ion()

plt.figure()
ax = plt.gca()
ax.set_xscale("log", nonposx='clip')
ax.set_yscale("log", nonposy='clip')
ax.set_xscale("log", nonpositive='clip')
ax.set_yscale("log", nonpositive='clip')
plt.axhline(y=detector_etendue, linestyle='--', color='k', label='detector etendue')
plt.plot(distance_samples, analytic_values, label='analytic etendue')
plt.errorbar(distance_samples, raytraced_values, raytraced_errors, label='ray-traced etendue')
Expand All @@ -126,12 +124,11 @@ def raytraced_etendue(distance, detector_radius=0.001, ray_count=100000, batches

# plt.figure()
# ax = plt.gca()
# ax.set_xscale("log", nonposx='clip')
# ax.set_xscale("log", nonpositive='clip')
# plt.errorbar(distance_samples, np.abs(raytraced_values-analytic_values)/raytraced_values, raytraced_errors/raytraced_values)
# plt.xlim(0.001, 0.1)
# plt.ylim(0, 0.5)
# plt.xlabel('Distance between slit and detector (m)')
# plt.ylabel('Fractional error')
# plt.show()


plt.show()
6 changes: 3 additions & 3 deletions demos/optics/logging_trajectories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@

# for each sample direction trace a logging ray and plot the ray trajectory
plt.ion()
fig = plt.figure()
ax = fig.gca(projection='3d')
ax = plt.axes(projection='3d')

for u in np.linspace(-0.006, 0.006, 5):
for v in np.linspace(-0.012, 0.012, 11):
Expand All @@ -39,7 +38,8 @@
log_ray.trace(world)

p = [(start.x, start.y, start.z)]
for point in log_ray.log:
for intersection in log_ray.log:
point = intersection.hit_point
p.append((point.x, point.y, point.z))
p = np.array(p)

Expand Down