X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FConfig.fs;h=67b9ce3df31bcbd23bbc1d0e1ac3546c524ccc82;hp=4b38483c8d7a798513b5089c8dc349c7b4d250b7;hb=9a025e7d947ffbe097eb844f3214fbc95e134f7c;hpb=e3842630f4d36c5ea8c8a0c3d4762684e1c510f4

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 4b38483..67b9ce3 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -24,7 +24,9 @@ type Parameters = {
     LPFStandardDeviationRBC: float<μm>
 
     // Ellipse.
-    factorNbPick: float // The number of computed ellipse per edge pixel.
+    nbPickElementsMin: int
+    factorNbValidPick: float // The number of computed ellipse per edge pixel.
+    factorNbMaxPick: float
 
     // Parasites detection.
     darkStainLevel: float // Lower -> more sensitive. Careful about illumination on the borders.
@@ -42,20 +44,22 @@ type Parameters = {
     minimumCellAreaFactor: float32 } // Factor of the mean RBC area. A cell with an area below this will be rejected.
 
 let defaultParameters = {
-    rbcDiameter = 8.<μm>
-    resolution = 220.e3<ppi> // 220.e3<ppi> Correspond to 50X.
+    rbcDiameter = 7.5<μm>
+    resolution = 230.e3<ppi> // 230.e3<ppi> Correspond to 50X.
 
     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
+    minRbcRadius = -0.23f
+    maxRbcRadius = 0.23f
 
     LPFStandardDeviationParasite = 0.15<μm>
-    LPFStandardDeviationRBC = 0.2<μm>
+    LPFStandardDeviationRBC = 0.22<μm>
 
-    factorNbPick = 1.0
+    nbPickElementsMin = 10
+    factorNbValidPick = 0.06 //1.0
+    factorNbMaxPick = 2.
 
     darkStainLevel = 0.25
     maxDarkStainRatio = 0.1 // 10 %
@@ -66,9 +70,9 @@ let defaultParameters = {
     cytoplasmSensitivity = 0.96
 
     nucleusAreaRatio = 0.01f // 1.0 %
-    infectionSensitivity = 0.9
+    infectionSensitivity = 0.92
 
-    standardDeviationMaxRatio = 0.5
+    standardDeviationMaxRatio = 0.6
     minimumCellAreaFactor = 0.4f }
 
 type RBCRadius (radius: float32, parameters: Parameters) =