merge

1 files changed, 1 insertions, 16 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
index 879f31619..cceabb571 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
@@ -29,11 +29,6 @@ namespace Tango.BL.Dispensing
             }
         }
 
-        public virtual double CalculateNanoliterPerCentimeter(double volume, double maxNanoliterPerCentimeter)
-        {
-            return (volume / 100d) * maxNanoliterPerCentimeter;
-        }
-
         /// <summary>
         /// Calculates the required nanoliter per second.
         /// </summary>
@@ -58,17 +53,7 @@ namespace Tango.BL.Dispensing
         /// <returns></returns>
         public virtual double CalculatePulsePerSecond(LiquidVolume liquidVolume)
         {
-            return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep / (double)liquidVolume.DispenserStepDivision;
-        }
-
-        /// <summary>
-        /// Calculates the required full pulses per second.
-        /// </summary>
-        /// <param name="liquidVolume">The liquid volume.</param>
-        /// <returns></returns>
-        public double CalculatePulsePerSecondFull(LiquidVolume liquidVolume)
-        {
-            return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep;
+            return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep * 8d;
         }
 
         /// <summary>