Using get_effective_source_models
Special case for no sources
Removed an incorrect ordering
Removed parallelize and fixed the scenario calculator