Fix DE trajectory and carveout
Merge branch 'develop' of github.com:RDCEP/RPSCalc into develop
Replace RPS_STATES dicts with objects