changes related to hardware sorting methods for egammas
remove firmware workaround