Modified MatchToGen to run without RunHTT_top when doPF=True