split the plots into shifter and expert

Ke Lirequested to merge
keli/athena:fix23 into 23.0

This one is the same with !62165 (merged) but targeting at rel. 23.0 not master. Ping the shifters @jarguin and @honguyen .

Merge request reports