Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -r73f4a080b3673e335d993525a17cf31df00f56d1 -rdfce818445fc8caa5830d14adc585926a32bfb40
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 73f4a080b3673e335d993525a17cf31df00f56d1)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision dfce818445fc8caa5830d14adc585926a32bfb40)
@@ -24,7 +24,6 @@
 using Core.Common.Base.Service;
 using Core.Common.Utils;
 using log4net;
-using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.HydraRing.Calculation.Activities;
 using Ringtoets.HydraRing.Calculation.Data.Output;
 using Ringtoets.HydraRing.Data;
@@ -38,29 +37,30 @@
     public class WaveHeightCalculationActivity : HydraRingActivity<ReliabilityIndexCalculationOutput>
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(WaveHeightCalculationActivity));
-
-        private readonly IAssessmentSection assessmentSection;
         private readonly HydraulicBoundaryLocation hydraulicBoundaryLocation;
+        private readonly int norm;
+        private readonly string hydraulicBoundaryDatabaseFilePath;
+        private readonly string ringId;
 
         /// <summary>
         /// Creates a new instance of <see cref="WaveHeightCalculationActivity"/>.
         /// </summary>
-        /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> data which is used for the calculation.</param>
-        /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryDatabase"/> to perform the calculation for.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
-        public WaveHeightCalculationActivity(IAssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation)
+        /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> to perform the calculation for.</param>
+        /// <param name="hydraulicBoundaryDatabaseFilePath">The HLCD file that should be used for performing the calculation.</param>
+        /// <param name="ringId">The id of the ring to perform the calculation for.</param>
+        /// <param name="norm">The norm to use during the calculation.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
+        public WaveHeightCalculationActivity(HydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath, string ringId, int norm)
         {
-            if (assessmentSection == null)
-            {
-                throw new ArgumentNullException("assessmentSection");
-            }
             if (hydraulicBoundaryLocation == null)
             {
                 throw new ArgumentNullException("hydraulicBoundaryLocation");
             }
 
-            this.assessmentSection = assessmentSection;
             this.hydraulicBoundaryLocation = hydraulicBoundaryLocation;
+            this.hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath;
+            this.ringId = ringId;
+            this.norm = norm;
 
             Name = string.Format(Resources.WaveHeightCalculationService_Name_Calculate_wave_height_for_location_0_,
                                  hydraulicBoundaryLocation.Name);
@@ -74,12 +74,10 @@
                 return;
             }
 
-            PerformRun(() => WaveHeightCalculationService.Validate(assessmentSection.HydraulicBoundaryDatabase, hydraulicBoundaryLocation),
+            PerformRun(() => WaveHeightCalculationService.Validate(hydraulicBoundaryLocation, hydraulicBoundaryDatabaseFilePath),
                        () => hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) double.NaN,
-                       () => WaveHeightCalculationService.Calculate(assessmentSection,
-                                                                    assessmentSection.HydraulicBoundaryDatabase,
-                                                                    hydraulicBoundaryLocation,
-                                                                    assessmentSection.Id));
+                       () => WaveHeightCalculationService.Calculate(hydraulicBoundaryLocation, hydraulicBoundaryDatabaseFilePath,
+                                                                    ringId, norm));
         }
 
         protected override void OnFinish()
@@ -88,7 +86,7 @@
             {
                 hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) Output.Result;
                 bool waveHeightCalculationConvergence =
-                    Math.Abs(Output.CalculatedReliabilityIndex - StatisticsConverter.NormToBeta(assessmentSection.FailureMechanismContribution.Norm)) <= 1.0e-3;
+                    Math.Abs(Output.CalculatedReliabilityIndex - StatisticsConverter.NormToBeta(norm)) <= 1.0e-3;
                 if (!waveHeightCalculationConvergence)
                 {
                     log.WarnFormat(Resources.WaveHeightCalculationActivity_WaveHeight_calculation_for_location_0_not_converged, hydraulicBoundaryLocation.Name);
@@ -97,7 +95,6 @@
                                                                                  ? CalculationConvergence.CalculatedConverged
                                                                                  : CalculationConvergence.CalculatedNotConverged;
             });
-            hydraulicBoundaryLocation.NotifyObservers();
         }
     }
 }
\ No newline at end of file