only apply mass correction in case a primary vehicle or completed generic...

only apply mass correction in case a primary vehicle or completed generic (with mission parameters from primary mission) is simulated

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/VehicleDataAdapter.cs

@@ -218,7 +218,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 			var retVal = base.DoCreateVehicleData(data, segment, mission, loading, passengerCount, allowVocational);
 
 			retVal.CurbMass = mission.CurbMass;
-			if (!mission.BusParameter.CurbMassTPMLMFactor.IsNaN() &&
+			if (mission.BusParameter.BusGroup.IsPrimaryBus() && !mission.BusParameter.CurbMassTPMLMFactor.IsNaN() &&
 				data.GrossVehicleMassRating * mission.BusParameter.CurbMassTPMLMFactor < mission.CurbMass) {
 				retVal.CurbMass = data.GrossVehicleMassRating * mission.BusParameter.CurbMassTPMLMFactor;
 			}

VectoCore/VectoCoreTest/InputData/DeclarationDataAdapterTest/DeclarationDataAdapterTest.cs

@@ -459,21 +459,14 @@ namespace TUGraz.VectoCore.Tests.InputData.DeclarationDataAdapterTest
 			var curbMassCompleted = 12345;
 
 			var mission = primarySegment.Missions[runIdx];
-			//var primaryMission = primarySegment.Missions.Where(
-			//	m => {
-			//		return m.BusParameter.DoubleDecker ==
-			//				vehicleCode.IsDoubleDeckerBus() &&
-			//				m.MissionType == mission.MissionType &&
-			//				m.BusParameter.FloorType == vehicleCode.GetFloorType();
-			//	}).First();
 			var completedMission = completedSegment.Missions.FirstOrDefault(m => m.MissionType == mission.MissionType);
 			var loading = mission.Loadings.First();
             var vehicleInputData = GetMockVehicleData(TPMLM, axleConfiguration, addElectricComponents);
 			var completedInput = GetMockCompletedInputData(curbMassCompleted);
-			var vehicleDataGeneric =
-				dataAdapterGeneric.CreateVehicleData(vehicleInputData, primarySegment, mission, new KeyValuePair<LoadingType, Tuple<Kilogram, double?>>(loading.Key,
-					mission.Loadings[loading.Key]), false);
 
+
+			var vehicleDataGeneric =
+				dataAdapterGeneric.CreateVehicleData(vehicleInputData, primarySegment, mission, loading, false);
 			var vehicleDataSpecific =
 				dataAdapterSpecific.CreateVehicleData(vehicleInputData, completedInput, completedSegment, completedMission, loading);