Fixed error in merge of PartialSolarCollector
Fixed errors in scaling with nPanels