Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs =================================================================== diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -rcae5de06e8d44c086a51fe2453ff328457a5c715 --- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision c37eebd9171a53987f5929013edbe3d82e618ed0) +++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision cae5de06e8d44c086a51fe2453ff328457a5c715) @@ -81,7 +81,7 @@ double totalDetailedAssessmentProbability = 0; foreach (SemiProbabilisticPipingCalculationScenario scenario in relevantScenarios) { - DerivedSemiProbabilisticPipingOutput derivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(scenario.Output, failureMechanism, assessmentSection); + DerivedSemiProbabilisticPipingOutput derivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(scenario.Output, assessmentSection.FailureMechanismContribution.Norm); totalDetailedAssessmentProbability += derivedOutput.PipingProbability * (double) scenario.Contribution; } Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenarioRow.cs =================================================================== diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -rcae5de06e8d44c086a51fe2453ff328457a5c715 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenarioRow.cs (.../PipingScenarioRow.cs) (revision c37eebd9171a53987f5929013edbe3d82e618ed0) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenarioRow.cs (.../PipingScenarioRow.cs) (revision cae5de06e8d44c086a51fe2453ff328457a5c715) @@ -92,7 +92,7 @@ private void CreateDerivedOutput() { derivedOutput = CalculationScenario.HasOutput - ? DerivedSemiProbabilisticPipingOutputFactory.Create(CalculationScenario.Output, failureMechanism, assessmentSection) + ? DerivedSemiProbabilisticPipingOutputFactory.Create(CalculationScenario.Output, assessmentSection.FailureMechanismContribution.Norm) : null; } } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenarioRowTest.cs =================================================================== diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -rcae5de06e8d44c086a51fe2453ff328457a5c715 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision c37eebd9171a53987f5929013edbe3d82e618ed0) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision cae5de06e8d44c086a51fe2453ff328457a5c715) @@ -116,7 +116,7 @@ var row = new PipingScenarioRow(calculation, failureMechanism, assessmentSection); // Assert - DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, failureMechanism, assessmentSection); + DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); Assert.AreEqual(expectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(expectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); @@ -171,7 +171,7 @@ row.Update(); // Then - DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, failureMechanism, assessmentSection); + DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); Assert.AreEqual(expectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(expectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); @@ -197,7 +197,7 @@ var row = new PipingScenarioRow(calculation, failureMechanism, assessmentSection); // Precondition - DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, failureMechanism, assessmentSection); + DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); Assert.AreEqual(expectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(expectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); @@ -233,7 +233,7 @@ var row = new PipingScenarioRow(calculation, failureMechanism, assessmentSection); // Precondition - DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, failureMechanism, assessmentSection); + DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); Assert.AreEqual(expectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(expectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); @@ -246,7 +246,7 @@ row.Update(); // Then - DerivedSemiProbabilisticPipingOutput newExpectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, failureMechanism, assessmentSection); + DerivedSemiProbabilisticPipingOutput newExpectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); Assert.AreEqual(newExpectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(newExpectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); Assert.AreEqual(newExpectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave);