Add: opportunity to set cross-sec CPs on traj eval points or traj CPs

Add: opportunity to set cross-sec CPs on traj eval points or traj CPs #2052