How to remove alternate hierarchies from XRANGE

Summary:

I'm having issues with my application, while using XRANGE

In period dimension, I have the YearTotal Rollup where i have stored periods, and then i have a dynamic calc hierarchy below to calculate YTD. What's the best way to Remove Dynamics from the formula? When the current year is not FY16, it takes in consideration the AP** periods as well resulting in a wrong SUM.

Period Dimension:

→ YearTotal

• P01
• P02
• …
• P12

→ Period_YTD:

• AP01
• AP02
• ….
• AP12

Formula:

@SUMRANGE("Revenue",@XRANGE("FY16"->"P01",@CURRMBR(Years)->"P02"));

When the current year is not FY16, it takes in consideration the AP** periods as well.