diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs index 53a12ceda685ebab142c22abd39f49cc6ff05b1e..e152ab3587ae374c1698dd58fdbbdc852c244c79 100644 --- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs +++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs @@ -853,6 +853,9 @@ namespace TUGraz.VectoCommon.InputData public PowertrainPosition Position { get; set; } private double? _ratioADC = null; + + private TableData _lossMapADC = null; + /// <summary> /// If not overridden RatioADC == ADC?.Ratio ?? 1; /// Can only be overridden when ADC == null; @@ -874,7 +877,21 @@ namespace TUGraz.VectoCommon.InputData public double MechanicalTransmissionEfficiency { get; set; } - public TableData MechanicalTransmissionLossMap { get; set; } + public TableData MechanicalTransmissionLossMap + { + get + { + if (_lossMapADC != null && ADC == null) { + return _lossMapADC; + } else { + return ADC?.LossMap; + } + } + set + { + _lossMapADC = value; + } + } public IADCDeclarationInputData ADC {get; set; } }