Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenariosCalculation.cs
===================================================================
diff -u -r949 -r962
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenariosCalculation.cs	(.../RWScenariosCalculation.cs)	(revision 949)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenariosCalculation.cs	(.../RWScenariosCalculation.cs)	(revision 962)
@@ -22,20 +22,17 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Deltares.DamEngine.Calculators.SchematizationFactor;
+using Deltares.DamEngine.Calculators.Dikes_Assessment_Regional;
 using Deltares.DamEngine.Data.General;
-using Deltares.DamEngine.Data.General.Results;
-using Deltares.DamEngine.Data.General.SchematizationFactor;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.RWScenarios;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Language;
 using Deltares.DamEngine.Data.Standard.Logging;
 
-namespace Deltares.DamEngine.Calculators.Dikes_Assessment_Regional
+namespace Deltares.DamEngine.Calculators.DikesAssessmentRegional
 {
     /// <summary>
     /// Exception for RWScenariosCalculation class
@@ -57,8 +54,7 @@
 
         private Dictionary<ICalculation, RWResult> runningJobs = new Dictionary<ICalculation, RWResult>();
         private bool isSkipStabilityCalculation = false;
-        private SchematizationFactorData schematizationFactorData;
-
+        
         public PipingModelType PipingModelType { get; set; }
         public MStabParameters MStabParameters { get; set; }
 
@@ -180,12 +176,6 @@
             set { maxCalculationCores = value; }
         }
 
-        public SchematizationFactorData SchematizationFactorData
-        {
-            get { return schematizationFactorData; }
-            set { schematizationFactorData = value; }
-        }
-
         private List<RWScenarioProfileResult> FillQueue()
         {
             List<RWScenarioProfileResult> tasks = new List<RWScenarioProfileResult>();
@@ -338,7 +328,7 @@
 //                }
 //                //job.SoilGeometryProbability.SoilProfile1D.EnsureUniqueLayerIds();
 //                var calculationName = GetCalculationNameForPipingCalculator(job);
-//                calculator.FilenameCalculation = Path.Combine(Path.Combine(DamProjectData.OldProjectWorkingPath, job.FailureMechanismType.ToString()), calculationName);
+//                calculator.FilenameCalculation = Path.Combine(Path.Combine(DamProjectData.ProjectWorkingPath, job.FailureMechanismType.ToString()), calculationName);
 //                calculator.IsHydraulicShortcut = (job.HydraulicShortcutType == HydraulicShortcutType.HydraulicShortcut);
 //                double? pipingFactor = calculator.CalculatePipingFactor(job.Location, job.Location.LocalXZSurfaceLine2, job.SoilGeometryProbability.SoilProfile1D, waterLevel);
 //                job.BaseFileName = calculator.FilenameCalculation;
@@ -438,7 +428,7 @@
             //            calculator.SaveToFile(damCalculation.FailureMechanismParametersMStab);
             //            string inputFile = damCalculation.FailureMechanismParametersMStab.MStabParameters.ProjectFileName;
             //
-            //            job.BaseFileName = inputFile.Replace(DamProject.OldProjectWorkingPath, @"").Replace(".sti", "");
+            //            job.BaseFileName = inputFile.Replace(DamProject.ProjectWorkingPath, @"").Replace(".sti", "");
 
 //            calculator.Load(inputFile);
 //            job.CalculationResult = calculator.Run();
@@ -545,11 +535,6 @@
                         scenariosResult.SafetyFactor = double.NaN;
                     }
 
-                    if (schematizationFactorData != null)
-                    {
-                        var results = AddSchematizationFactors(location, scenariosResult);
-                        evaluationJob.SchematizationFactorResults.Add(results);
-                    }
                     // scenariosResult are the results of all scenarios for one location.
                     this.evaluationJob.Results.Add(scenariosResult);
 
@@ -567,17 +552,6 @@
 
         }
 
-        private RWSchematizationFactorsResult AddSchematizationFactors(Location location, RWScenariosResult scenariosResult)
-        {
-            var schematizationFactorCalculation = new SchematizationFactorCalculation();
-            schematizationFactorCalculation.ScenariosResult = scenariosResult;
-            schematizationFactorCalculation.Location = location;
-            schematizationFactorCalculation.SchematizationFactorData = SchematizationFactorData;
-            schematizationFactorCalculation.DetrimentFactor = location.DetrimentFactor;
-            var results = schematizationFactorCalculation.CalculateSchematizationFactorResults();
-            return results;
-        }
-
         private void CombineProfiles(RWScenarioResult scenarioResult)
         {
             // combine results of profiles