convert pre aux power to watts in aa module

git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C2041

VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb

@@ -104,7 +104,7 @@ Namespace DownstreamModules
         Private ReadOnly Property Sum9 As Single
             Get
 
-                Return signals.EngineDrivelineTorque + signals.PreExistingAuxPower
+                Return signals.EngineDrivelineTorque + ((signals.PreExistingAuxPower * 1000) / Sum0(signals.EngineSpeed))
 
             End Get
         End Property

VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb

@@ -147,13 +147,10 @@ Namespace DownstreamModules
         Public ReadOnly Property Sum2 As Single
             Get
 
-
-                Dim returnValue As Single = _signals.PreExistingAuxPower + _m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts + SW1 + _m3.GetAveragePowerDemandAtCrankFromPneumatics
+                Dim returnValue As Single = (_signals.PreExistingAuxPower * 1000) + _m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts + SW1 + _m3.GetAveragePowerDemandAtCrankFromPneumatics
 
                 Return returnValue
 
-
-
             End Get
         End Property
         Public ReadOnly Property Sum3 As Single

VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb

@@ -166,7 +166,7 @@ Namespace DownstreamModules
         Private ReadOnly Property S14 As Single
             Get
 
-                Return Signals.EngineDrivelineTorque + Signals.PreExistingAuxPower
+                Return Signals.EngineDrivelineTorque + ((Signals.PreExistingAuxPower * 1000) / S0(Signals.EngineSpeed))
 
             End Get
         End Property