Remove P7Cav and add SRFCavs in Monitor interface
Remove P7Cav and add SRFCavs in Monitor interface