renamed varialbes, made makeoptmizationntuple flag build for non-MC