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

Commits on May 23, 2019

  1. adding koAngle Mins and Maxs as attributes for Optical System prototype

    @gjsoto
    gjsoto committed May 23, 2019
    Configuration menu
    Copy the full SHA
    6ef40ae View commit details
    Browse the repository at this point in the history

  2. small typo

    @gjsoto
    gjsoto committed May 23, 2019
    Configuration menu
    Copy the full SHA
    9e86eff View commit details
    Browse the repository at this point in the history

  3. removed specific koAngles from Observatory, replaced with solar panel… 

    … keepout angles, added koangles as an input to keepout
    @gjsoto
    gjsoto committed May 23, 2019
    Configuration menu
    Copy the full SHA
    c76ec61 View commit details
    Browse the repository at this point in the history

  4. optical system koAngles are now 1x2 arrays for each bright body

    @gjsoto
    gjsoto committed May 23, 2019
    Configuration menu
    Copy the full SHA
    ef104a8 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2019

  1. solar panel koangles in Observatory prototype are now an array. plus … 

    …some better descriptions
    @gjsoto
    gjsoto committed May 24, 2019
    Configuration menu
    Copy the full SHA
    fa7934c View commit details
    Browse the repository at this point in the history

  2. new koangleArray that is s x 11 x 2 created in keepout method

    @gjsoto
    gjsoto committed May 24, 2019
    Configuration menu
    Copy the full SHA
    89adc09 View commit details
    Browse the repository at this point in the history

  3. fixed the logic in keepout method to check for min and max angles. al… 

    …so added a row to the culprit array corresponding to solar panel keepout
    @gjsoto
    gjsoto committed May 24, 2019
    Configuration menu
    Copy the full SHA
    643616a View commit details
    Browse the repository at this point in the history

  4. fixing koAngle attribute names

    @gjsoto
    gjsoto committed May 24, 2019
    Configuration menu
    Copy the full SHA
    881c10c View commit details
    Browse the repository at this point in the history

  5. extracts koangles from Optical System in the SurveySimulation prototy… 

    …pe init
    @gjsoto
    gjsoto committed May 24, 2019
    Configuration menu
    Copy the full SHA
    915589a View commit details
    Browse the repository at this point in the history

  6. small error in keepout with array sizes and units. fixed generate_koM… 

    …ap to be consistent with all changes. THIS ONE RUNS
    @gjsoto
    gjsoto committed May 24, 2019
    Configuration menu
    Copy the full SHA
    fd6cc02 View commit details
    Browse the repository at this point in the history

  7. created new koMaps dictionary with name of starlight suppression system

    @gjsoto
    gjsoto committed May 24, 2019
    Configuration menu
    Copy the full SHA
    5097b92 View commit details
    Browse the repository at this point in the history

  8. fixed calculate_observableTimes to find appropriate koMap

    @gjsoto
    gjsoto committed May 24, 2019
    Configuration menu
    Copy the full SHA
    f1c1aae View commit details
    Browse the repository at this point in the history

Commits on May 27, 2019

  1. fixed typo with the array size

    @gjsoto
    gjsoto committed May 27, 2019
    Configuration menu
    Copy the full SHA
    88d0720 View commit details
    Browse the repository at this point in the history

  2. fixed the prototypes observatory test: added new koAngle input and ma… 

    …de the assert tests deal with the new size of the kogood array
    @gjsoto
    gjsoto committed May 27, 2019
    Configuration menu
    Copy the full SHA
    72e24cd View commit details
    Browse the repository at this point in the history

  3. fixed the outspec_compare method to check an array of koAngle inputs

    @gjsoto
    gjsoto committed May 27, 2019
    Configuration menu
    Copy the full SHA
    7c2527a View commit details
    Browse the repository at this point in the history

  4. fixing the keepout array description and input of calculate_observabl… 

    …eTimes in run_sim
    @gjsoto
    gjsoto committed May 27, 2019
    Configuration menu
    Copy the full SHA
    14b8823 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2019

  1. changed observation_characterization: checks koMaps rather than calli… 

    …ng the keepout() method. fixed some more typos between koMap and koMaps.
    @gjsoto
    gjsoto committed May 28, 2019
    Configuration menu
    Copy the full SHA
    b3c21f4 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2019

  1. adding koAngle Mins and Maxs as attributes for Optical System prototype

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    baae2ee View commit details
    Browse the repository at this point in the history

  2. small typo

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    07a5121 View commit details
    Browse the repository at this point in the history

  3. removed specific koAngles from Observatory, replaced with solar panel… 

    … keepout angles, added koangles as an input to keepout
    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    0bbcbc7 View commit details
    Browse the repository at this point in the history

  4. optical system koAngles are now 1x2 arrays for each bright body

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    1ee26ec View commit details
    Browse the repository at this point in the history

  5. solar panel koangles in Observatory prototype are now an array. plus … 

    …some better descriptions
    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    567c054 View commit details
    Browse the repository at this point in the history

  6. new koangleArray that is s x 11 x 2 created in keepout method

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    6e159ec View commit details
    Browse the repository at this point in the history

  7. fixed the logic in keepout method to check for min and max angles. al… 

    …so added a row to the culprit array corresponding to solar panel keepout
    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    f16166b View commit details
    Browse the repository at this point in the history

  8. fixing koAngle attribute names

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    db9edda View commit details
    Browse the repository at this point in the history

  9. extracts koangles from Optical System in the SurveySimulation prototy… 

    …pe init
    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    2618160 View commit details
    Browse the repository at this point in the history

  10. small error in keepout with array sizes and units. fixed generate_koM… 

    …ap to be consistent with all changes. THIS ONE RUNS
    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    3a47530 View commit details
    Browse the repository at this point in the history

  11. created new koMaps dictionary with name of starlight suppression system

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    bbebe9d View commit details
    Browse the repository at this point in the history

  12. fixed calculate_observableTimes to find appropriate koMap

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    9c6d0fd View commit details
    Browse the repository at this point in the history

  13. fixed typo with the array size

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    c9dd2c7 View commit details
    Browse the repository at this point in the history

  14. fixed the prototypes observatory test: added new koAngle input and ma… 

    …de the assert tests deal with the new size of the kogood array
    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    5302d55 View commit details
    Browse the repository at this point in the history

  15. fixed the outspec_compare method to check an array of koAngle inputs

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    f65368f View commit details
    Browse the repository at this point in the history

  16. fixing the keepout array description and input of calculate_observabl… 

    …eTimes in run_sim
    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    50421ee View commit details
    Browse the repository at this point in the history

  17. changed observation_characterization: checks koMaps rather than calli… 

    …ng the keepout() method. fixed some more typos between koMap and koMaps.
    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    0573d2f View commit details
    Browse the repository at this point in the history

  18. fixing the attribute list in test_observatory

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    d8329c0 View commit details
    Browse the repository at this point in the history

  19. fixing koAngles_SolarPanel description in Observatory prototype

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    17465c1 View commit details
    Browse the repository at this point in the history

  20. typo in an if statement

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    540a054 View commit details
    Browse the repository at this point in the history

  21. another typo from merging

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    827a7bd View commit details
    Browse the repository at this point in the history

  22. ugh. another typo

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    93ba42c View commit details
    Browse the repository at this point in the history

  23. cosmetic changes

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    be68046 View commit details
    Browse the repository at this point in the history

  24. applying changes to ExoC_Scheduler

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    9ee6717 View commit details
    Browse the repository at this point in the history

  25. applying changes to linearJScheduler

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    622c4b3 View commit details
    Browse the repository at this point in the history

  26. applying changes to linearJScheduler_3DDPC

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    43c0900 View commit details
    Browse the repository at this point in the history

  27. applying changes to linearJScheduler_3DDPC_sotoSS

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    10517e8 View commit details
    Browse the repository at this point in the history

  28. applying changes to linearJScheduler_DDPC

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    a280348 View commit details
    Browse the repository at this point in the history

  29. applying changes to linearJScheduler_DDPC_sotoSS

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    9de7778 View commit details
    Browse the repository at this point in the history

  30. applying changes to linearJScheduler_det_only

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    300695a View commit details
    Browse the repository at this point in the history

  31. applying changes to linearJScheduler_det_only_sotoSS

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    2b4408e View commit details
    Browse the repository at this point in the history

  32. applying changes to SS_char_only

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    2ac406e View commit details
    Browse the repository at this point in the history

  33. applying changes to SS_char_only2

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    0a5c535 View commit details
    Browse the repository at this point in the history

  34. applying changes to tieredScheduler

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    ca46614 View commit details
    Browse the repository at this point in the history

  35. applying changes to tieredScheduler_DD

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    7156325 View commit details
    Browse the repository at this point in the history

  36. applying changes to tieredScheduler_DD_SLSQP

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    aaa2d15 View commit details
    Browse the repository at this point in the history

  37. applying changes to tieredScheduler_DD_sotoSS

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    db5dacd View commit details
    Browse the repository at this point in the history

  38. applying changes to tieredScheduler_SLSQP

    @gjsoto
    gjsoto committed May 29, 2019
    Configuration menu
    Copy the full SHA
    419a296 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. applying changes to tieredScheduler_sotoSS

    @gjsoto
    gjsoto committed May 30, 2019
    Configuration menu
    Copy the full SHA
    922be06 View commit details
    Browse the repository at this point in the history

  2. commenting out keepout section of calcfZmax

    @gjsoto
    gjsoto committed May 30, 2019
    Configuration menu
    Copy the full SHA
    28e8879 View commit details
    Browse the repository at this point in the history

  3. typo in tieredScheduler

    @gjsoto
    gjsoto committed May 30, 2019
    Configuration menu
    Copy the full SHA
    b48323e View commit details
    Browse the repository at this point in the history

  4. uses only one of the det_modes to find koMap in tieredScheduler_DD. t… 

    …emporary fix
    @gjsoto
    gjsoto committed May 30, 2019
    Configuration menu
    Copy the full SHA
    c260ab7 View commit details
    Browse the repository at this point in the history

  5. making it 2.7 friendly, removing list.copy()

    @gjsoto
    gjsoto committed May 30, 2019
    Configuration menu
    Copy the full SHA
    1760b26 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. typo in the koAngles array size. also solarPanel culprit was not bein… 

    …g saved correctly
    @gjsoto
    gjsoto committed May 31, 2019
    Configuration menu
    Copy the full SHA
    af85840 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. updating attribute names for koAngles in OpticalSystem

    @gjsoto
    gjsoto committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    e6d1a5a View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. removing assertion that nStars must equal nTimes. now loops through n… 

    …Times. will return an n x m x 3 array unless either nStars or nTimes = 1 (then it's n x 3)
    @gjsoto
    gjsoto committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    599be8b View commit details
    Browse the repository at this point in the history

  2. rewriting the description of starprop to include new details about ou… 

    …tput r_targ
    @gjsoto
    gjsoto committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    aa337e3 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. keepout method now runs three loops over s Systems, n Stars and m times

    @gjsoto
    gjsoto committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    bd98f22 View commit details
    Browse the repository at this point in the history

  2. rewriting description of keepout method

    @gjsoto
    gjsoto committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    1ef6f42 View commit details
    Browse the repository at this point in the history

  3. generate_koMap uses keepout method correctly now

    @gjsoto
    gjsoto committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    324c455 View commit details
    Browse the repository at this point in the history

  4. starprop_static returns the proper dimension r_targ. if nTimes > 1, i… 

    …t tiles the vectors for all stars appropriately
    @gjsoto
    gjsoto committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    7b66722 View commit details
    Browse the repository at this point in the history

  5. fixed star_angularSep call in occulterJScheduler

    @gjsoto
    gjsoto committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    8d7c6dc View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2019

  1. if currentTimes is an mx1 array of identical values, just collapse to… 

    … a scalar in starprop (just like in keepout)
    @gjsoto
    gjsoto committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    4bcf588 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2019

  1. if nTimes == nStars, backwards compatible

    @gjsoto
    gjsoto committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    a4226db View commit details
    Browse the repository at this point in the history

  2. checks for multiple endTimes in observation_characterization like it … 

    …used to in Prototype and LJS
    @gjsoto
    gjsoto committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    062c0af View commit details
    Browse the repository at this point in the history

  3. fixing linearJScheduler endTimes to be consistent with SurveySimulation

    @gjsoto
    gjsoto committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    486b207 View commit details
    Browse the repository at this point in the history

  4. checks for multiple endTimes in observation_characterization like it … 

    …used in all other schedulers
    @gjsoto
    gjsoto committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    61743ec View commit details
    Browse the repository at this point in the history

  5. koMap is now a local variable defined at the beginning of next_target… 

    …() and observation_characterization(), to make it easier to merge
    @gjsoto
    gjsoto committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    7d03990 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2019

  1. fixed the backwards compatibility if statement in starprop_static

    @gjsoto
    gjsoto committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    43a83d3 View commit details
    Browse the repository at this point in the history

  2. adding test_starprop method in the TargetList unittest

    @gjsoto
    gjsoto committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    203fab5 View commit details
    Browse the repository at this point in the history

  3. merging with master after fixing issue230

    @gjsoto
    gjsoto committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    a998243 View commit details
    Browse the repository at this point in the history