X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FConfig.fs;h=308995393fc6474cf3d220f4fc442c840047d4af;hp=1110096ea4d826ec40277263f4a5cd59fcec8d52;hb=828e126c88524d3dc123abc966a132532aed118b;hpb=3b645f8ff5259f88a33ffbd9a63b10a8640c439f

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 1110096..3089953 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -13,8 +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).
+    averageColor_BG: float32 * float32 * float32 // R * G * B.
+    averageColor_RBC: float32 * float32 * float32 // R * G * B.
+    averageColor_Parasite: float32 * float32 * float32 // R * G * B.
 
     ratioAreaPaleCenter: float32 // The area of the second opening is 'ratioSecondAreaOpen' * mean RBC area. It's applied only if greater than 'initialAreaOpen'.
 
@@ -24,7 +25,6 @@ type Parameters = {
     maxRbcRadius: float32 // Factor of the mean RBC radius.
 
     LPFStandardDeviationParasite: float<μm> // Sigma parameter of the gaussian to remove the high frequency noise.
-    LPFStandardDeviationStain: float<μm>
     LPFStandardDeviationRBC: float<μm>
 
     // Ellipse.
@@ -35,8 +35,8 @@ type Parameters = {
     maxDarkStainRatio: float // When a cell must own less than this ratio to be a RBC.
 
     parasiteRadiusRatio: float32 // The ratio of the parasite radius of the RBC radius.
-
     minimumParasiteAreaRatio: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
+
     cytoplasmSensitivity: float // between 0 (the least sensitive) and 1 (the most sensitive).
 
     nucleusAreaRatio: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
@@ -50,8 +50,13 @@ let defaultParameters = {
     rbcDiameter = 8.<μm>
     resolution = 220.e3<ppi> // 220.e3<ppi> Correspond to 50X.
 
-    colorContribution_BG_RBC = (* 0., 1., 0. *) 0.16, 0.44, 0.4
-    colorContribution_RBC_parasite = (* 1., 0., 0. *) 0.54, 0.41, 0.05
+    averageColor_BG = 113.3f, 135.3f, 150.3f
+    averageColor_RBC = 94.7f, 80.7f, 99.3f
+    averageColor_Parasite = 76.f, 58.f, 94.f
+
+    (*averageColor_BG = 179.f, 148.f, 121.f
+    averageColor_RBC = 141.f, 96.f, 83.f
+    averageColor_Parasite = 123.f, 89.f, 83.f*)
 
     ratioAreaPaleCenter = 2.f / 5.f // The ratio between an RBC area and the area of the its pale center.
 
@@ -61,12 +66,11 @@ let defaultParameters = {
     maxRbcRadius = 0.3f
 
     LPFStandardDeviationParasite = 0.15<μm>
-    LPFStandardDeviationStain = 0.15<μm> // 0.12
-    LPFStandardDeviationRBC = 0.2<μm> // 8.5e-6<inch>. // 0.2<μm>
+    LPFStandardDeviationRBC = 0.2<μm>
 
     factorNbPick = 1.0
 
-    darkStainLevel = 0.25 // 0.3
+    darkStainLevel = 0.25
     maxDarkStainRatio = 0.1 // 10 %
 
     parasiteRadiusRatio = 0.5f // 40 %
@@ -124,10 +128,6 @@ type Config (param: Parameters) =
         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