Added support for ambient super-samples (-as) in new calculation (-DNEWAMB)
Minor optimization