Fix issue when trellis is disabled

master->pass_number_scan_opt_base needs to be set to appropriate value
when trellis is disabled