Skip to content
This repository has been archived by the owner on Oct 23, 2022. It is now read-only.

Commit

Permalink
BrianGun/issue378 (#379)
Browse files Browse the repository at this point in the history
* Fix problems with SCHOTT glasses in doc examples
Fixes #376
replaced all references to SCHOTT with hardcoded glasses in both docs and src. Some notebooks are still not working correctly, for other reasons.

* fixed bug in planoplano function. it was passing numbers instead of strings to initialize the SurfaceType column.

* deleted Fields.jl. This contained old functions to generate hexapolar and rectangular grid ray patterns that have been replaced by the new Emitters code.

Added RayListSource as a first step in making some examples in other_examples.jl work.

* removed spotdiag functions in Visualization that used the old HexapolarField and GridField functions.

* Documenting the deletion of HexapolarField in the remaining files which use the function and will require considerable work to update.

* fixing bugs in iterator for RayListSource

* removed generate function for  RayListSource since it was messing up the other emitters

* fixed off by one error in RayListSource iterator

* fixed tfix to the off by one error for iterator for RayListSource

* tests pass for new RayListSource. Some examples in other_examples now work correctly but others still need work.

deleted two examples that used the old spot diagram vis code that referenced HexapolarField.

* fixing visualization code to support new RayListSource types. Eliminated direct reference to fields of source in draw! routines and made the argument type an AbstractSource instead of a concrete Source.

* Fix problems with SCHOTT glasses in doc examples
Fixes #376

fixed vistest in Diagnostics.jl so it passes correct argument to RayListSource constructor

* Incorrect eyebox assignment for RGB clusters
Fixes #378

added RGBCluster type to ClusterWithProperties so lenslet eyebox assignment code can determine if eyeboxes need to be assigned across RGB

* fixed bug in definition of hex12RGB. The cluster basis was [2 -3;2 2] and it should have been [2 -4;2 2].

Added extensive documentation to eyebox_numbers

added a test for new eyebox numbering that correctly accounts for RGB lenslets.

* was computing incorrect matchingindex in eyebox_number. Fixed now.

rewrote eyebox number assignment test as a function.

* fixed visualization test that was using Examples.hex3RGB(). This function was moved to Repeat.Multilens.
  • Loading branch information
BrianGun authored Mar 8, 2022
1 parent b5c2bf1 commit 768ddf2
Show file tree
Hide file tree
Showing 24 changed files with 4,722 additions and 294 deletions.
1 change: 0 additions & 1 deletion deps/precompile.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
using OpticSim # this will only work after the main build steps are completed
@info "Running representative workload"
# add stuff here #
Examples.autodrawrays()
Examples.hexapolarspotdiagramexample()
@info "Finished running representative workload"
2 changes: 1 addition & 1 deletion docs/src/optimization.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ using Optim
function objective(a::AbstractVector{T}, b::AxisymmetricOpticalSystem{T}, samples::Int = 3) where {T}
# RMSE spot size
system = Optimization.updateoptimizationvariables(b, a)
# distribute rays evenly across entrance pupil using HexapolarField
# distribute rays evenly across entrance pupil using HexapolarField. The latest version of OpticSim no longer supports HexapolarField.
field = HexapolarField(system, collimated = true, samples = samples)
error = zero(T)
hits = 0
Expand Down
Loading

0 comments on commit 768ddf2

Please sign in to comment.