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

Replace lingering generateray() calls #183

Merged
merged 3 commits into from
May 13, 2021
Merged

Replace lingering generateray() calls #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f415fc2
generateray(sources, k) -> sources[k]
alfredclwong May 12, 2021
8455a2c
v0.5.0-DEV -> v0.5.0 (release ready)
alfredclwong May 12, 2021
5e5479f
Merge branch 'main' into fix/generateray
BrianGun May 13, 2021
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 Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name = "OpticSim"
uuid = "24114763-4efb-45e7-af0e-cde916beb153"
authors = ["Brian Guenter", "Charlie Hewitt", "Ran Gal", "Alfred Wong"]
repository = "https://github.com/microsoft/OpticSim.jl"
version = "0.5.0-DEV"
version = "0.5.0"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Expand Down
8 changes: 4 additions & 4 deletions src/Optical/OpticalSystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,14 +597,14 @@ function traceMT(
print("\rTraced: ~ $t / $(length(sources)) Elapsed: $(dif)s Left: $(left)s ")
end
end
trace(system, generateray(sources, k), test = test)
trace(system, sources[k]; test)
end
else
for k in f:l
if k % update_timesteps == 0
Threads.atomic_add!(total_traced, update_timesteps)
end
trace(system, generateray(sources, k), test = test)
trace(system, sources[k]; test)
end
end
end
Expand Down Expand Up @@ -713,7 +713,7 @@ function tracehitsMT(
print("\rTraced: ~ $t / $(length(sources)) Elapsed: $(dif)s Left: $(left)s ")
end
end
lt = trace(system, generateray(sources, k), test = test)
lt = trace(system, sources[k]; test)
if lt !== nothing
push!(results[i], lt)
end
Expand All @@ -723,7 +723,7 @@ function tracehitsMT(
if k % update_timesteps == 0
Threads.atomic_add!(total_traced, update_timesteps)
end
lt = trace(system, generateray(sources, k), test = test)
lt = trace(system, sources[k]; test)
if lt !== nothing
push!(results[i], lt)
end
Expand Down