Separated Rigid and DIR stages by making two separate calls to plastimatch for Rigid and DIR stages. This allows specification of image masks for DIR.