X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FConfig.fs;h=9df9dc49dc635e2c80ac3d24a6ee66eaad71ac01;hp=b12f9a7d0ef98ebb7124244e601fbcb1bb8dc303;hb=db49e167a602ef1df02a8b5f7de334355a4917dd;hpb=c4a76a01f62568c6353396ff85551a3151fc5236

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index b12f9a7..9df9dc4 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -13,6 +13,9 @@ type Parameters = {
     rbcDiameter: float<μm>
     resolution: float<ppi>
 
+    colorContribution_BG_RBC: float * float * float // (R, G, B).
+    colorContribution_RBC_parasite: float * float * float // (R, G, B).
+
     ratioAreaPaleCenter: float32 // The area of the second opening is 'ratioSecondAreaOpen' * mean RBC area. It's applied only if greater than 'initialAreaOpen'.
 
     granulometryRange: float32 // The radius will be seeked from radius - granulometryRange * radius to radius + granulometryRange * radius.
@@ -20,7 +23,9 @@ type Parameters = {
     minRbcRadius: float32 // Factor of the mean RBC radius.
     maxRbcRadius: float32 // Factor of the mean RBC radius.
 
-    LPFStandardDeviation: float<μm> // Sigma parameter of the gaussian to remove the high frequency noise.
+    LPFStandardDeviationParasite: float<μm> // Sigma parameter of the gaussian to remove the high frequency noise.
+    LPFStandardDeviationStain: float<μm>
+    LPFStandardDeviationRBC: float<μm>
 
     // Ellipse.
     factorNbPick: float // The number of computed ellipse per edge pixel.
@@ -44,25 +49,30 @@ let defaultParameters = {
     rbcDiameter = 8.<μm>
     resolution = 220.e3<ppi> // 220.e3<ppi> Correspond to 50X.
 
-    ratioAreaPaleCenter = 1.f / 3.f // The ratio between an RBC area and the area of the its pale center.
+    colorContribution_BG_RBC = 0.16, 0.44, 0.4
+    colorContribution_RBC_parasite = 0.54, 0.41, 0.05
+
+    ratioAreaPaleCenter = 2.f / 5.f // The ratio between an RBC area and the area of the its pale center.
 
     granulometryRange = 0.5f
 
     minRbcRadius = -0.3f
     maxRbcRadius = 0.3f
 
-    LPFStandardDeviation = 0.2<μm> // 8.5e-6<inch>.
+    LPFStandardDeviationParasite = 0.15<μm>
+    LPFStandardDeviationStain = 0.15<μm> // 0.12
+    LPFStandardDeviationRBC = 0.2<μm> // 8.5e-6<inch>. // 0.2<μm>
 
     factorNbPick = 1.0
 
     darkStainLevel = 0.25 // 0.3
     maxDarkStainRatio = 0.1 // 10 %
 
-    infectionArea = 0.012f // 1.2 %
-    infectionSensitivity = 0.9
+    infectionArea = 0.01f // 0.8 % // 0.012f
+    infectionSensitivity = 0.9 // 1) 0.93, 2) 0.94
 
-    stainArea = 0.08f // 8 %
-    stainSensitivity = 0.9
+    stainArea = 0.08f // 6 % // 0.08f
+    stainSensitivity = 0.96 //  1) 0.91, 2) 0.92
     maxStainRatio = 0.12 // 12 %
 
     standardDeviationMaxRatio = 0.5 // 0.5
@@ -106,8 +116,16 @@ type Config (param: Parameters) =
 
     member val Debug = DebugOff with get, set
 
-    member this.LPFStandardDeviation =
-        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviation) * parameters.resolution
+    member this.LPFStandardDeviationParasite =
+        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationParasite) * parameters.resolution
+        float stdDeviation
+
+    member this.LPFStandardDeviationStain =
+        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationStain) * parameters.resolution
+        float stdDeviation
+
+    member this.LPFStandardDeviationRBC =
+        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationRBC) * parameters.resolution
         float stdDeviation
 
     member this.RBCRadiusByResolution = rbcRadiusByResolution