Skip to content
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

Jump to bottom

new keepout method and koMap implementations #232

Merged
merged 78 commits into from
Jun 10, 2019
Merged

new keepout method and koMap implementations #232

merged 78 commits into from
Jun 10, 2019

Conversation

gjsoto
Copy link
Collaborator

@gjsoto gjsoto commented Jun 9, 2019

No description provided.

gjsoto added 30 commits May 23, 2019 12:34
@gjsoto
adding koAngle Mins and Maxs as attributes for Optical System prototype
6ef40ae
@gjsoto
small typo
9e86eff
@gjsoto
removed specific koAngles from Observatory, replaced with solar panel…
c76ec61 
… keepout angles, added koangles as an input to keepout
@gjsoto
optical system koAngles are now 1x2 arrays for each bright body
ef104a8
@gjsoto
solar panel koangles in Observatory prototype are now an array. plus …
fa7934c 
…some better descriptions
@gjsoto
new koangleArray that is s x 11 x 2 created in keepout method
89adc09
@gjsoto
fixed the logic in keepout method to check for min and max angles. al…
643616a 
…so added a row to the culprit array corresponding to solar panel keepout
@gjsoto
fixing koAngle attribute names
881c10c
@gjsoto
extracts koangles from Optical System in the SurveySimulation prototy…
915589a 
…pe init
@gjsoto
small error in keepout with array sizes and units. fixed generate_koM…
fd6cc02 
…ap to be consistent with all changes. THIS ONE RUNS
@gjsoto
created new koMaps dictionary with name of starlight suppression system
5097b92
@gjsoto
fixed calculate_observableTimes to find appropriate koMap
f1c1aae
@gjsoto
fixed typo with the array size
88d0720
@gjsoto
fixed the prototypes observatory test: added new koAngle input and ma…
72e24cd 
…de the assert tests deal with the new size of the kogood array
@gjsoto
fixed the outspec_compare method to check an array of koAngle inputs
7c2527a
@gjsoto
fixing the keepout array description and input of calculate_observabl…
14b8823 
…eTimes in run_sim
@gjsoto
changed observation_characterization: checks koMaps rather than calli…
b3c21f4 
…ng the keepout() method. fixed some more typos between koMap and koMaps.
@gjsoto
adding koAngle Mins and Maxs as attributes for Optical System prototype
baae2ee
@gjsoto
small typo
07a5121
@gjsoto
removed specific koAngles from Observatory, replaced with solar panel…
0bbcbc7 
… keepout angles, added koangles as an input to keepout
@gjsoto
optical system koAngles are now 1x2 arrays for each bright body
1ee26ec
@gjsoto
solar panel koangles in Observatory prototype are now an array. plus …
567c054 
…some better descriptions
@gjsoto
new koangleArray that is s x 11 x 2 created in keepout method
6e159ec
@gjsoto
fixed the logic in keepout method to check for min and max angles. al…
f16166b 
…so added a row to the culprit array corresponding to solar panel keepout
@gjsoto
fixing koAngle attribute names
db9edda
@gjsoto
extracts koangles from Optical System in the SurveySimulation prototy…
2618160 
…pe init
@gjsoto
small error in keepout with array sizes and units. fixed generate_koM…
3a47530 
…ap to be consistent with all changes. THIS ONE RUNS
@gjsoto
created new koMaps dictionary with name of starlight suppression system
bbebe9d
@gjsoto
fixed calculate_observableTimes to find appropriate koMap
9c6d0fd
@gjsoto
fixed typo with the array size
c9dd2c7
gjsoto added 27 commits May 29, 2019 17:41
@gjsoto
applying changes to tieredScheduler_DD
7156325
@gjsoto
applying changes to tieredScheduler_DD_SLSQP
aaa2d15
@gjsoto
applying changes to tieredScheduler_DD_sotoSS
db5dacd
@gjsoto
applying changes to tieredScheduler_SLSQP
419a296
@gjsoto
applying changes to tieredScheduler_sotoSS
922be06
@gjsoto
commenting out keepout section of calcfZmax
28e8879
@gjsoto
typo in tieredScheduler
b48323e
@gjsoto
uses only one of the det_modes to find koMap in tieredScheduler_DD. t…
c260ab7 
…emporary fix
@gjsoto
making it 2.7 friendly, removing list.copy()
1760b26
@gjsoto
typo in the koAngles array size. also solarPanel culprit was not bein…
af85840 
…g saved correctly
@gjsoto
updating attribute names for koAngles in OpticalSystem
e6d1a5a
@gjsoto
removing assertion that nStars must equal nTimes. now loops through n…
599be8b 
…Times. will return an n x m x 3 array unless either nStars or nTimes = 1 (then it's n x 3)
@gjsoto
rewriting the description of starprop to include new details about ou…
aa337e3 
…tput r_targ
@gjsoto
keepout method now runs three loops over s Systems, n Stars and m times
bd98f22
@gjsoto
rewriting description of keepout method
1ef6f42
@gjsoto
generate_koMap uses keepout method correctly now
324c455
@gjsoto
starprop_static returns the proper dimension r_targ. if nTimes > 1, i…
7b66722 
…t tiles the vectors for all stars appropriately
@gjsoto
fixed star_angularSep call in occulterJScheduler
8d7c6dc
@gjsoto
if currentTimes is an mx1 array of identical values, just collapse to…
4bcf588 
… a scalar in starprop (just like in keepout)
@gjsoto
if nTimes == nStars, backwards compatible
a4226db
@gjsoto
checks for multiple endTimes in observation_characterization like it …
062c0af 
…used to in Prototype and LJS
@gjsoto
fixing linearJScheduler endTimes to be consistent with SurveySimulation
486b207
@gjsoto
checks for multiple endTimes in observation_characterization like it …
61743ec 
…used in all other schedulers
@gjsoto
koMap is now a local variable defined at the beginning of next_target…
7d03990 
…() and observation_characterization(), to make it easier to merge
@gjsoto
fixed the backwards compatibility if statement in starprop_static
43a83d3
@gjsoto
adding test_starprop method in the TargetList unittest
203fab5
@gjsoto
merging with master after fixing issue230
a998243
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.7%) to 56.962% when pulling a998243 on newKeepoutMethod into 14e5581 on master.

@dsavransky dsavransky merged commit 8339bf1 into master Jun 10, 2019
@dsavransky dsavransky deleted the newKeepoutMethod branch November 3, 2022 00:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@gjsoto @coveralls @dsavransky