From 174d828903645c03581df998af28ea92e741f139 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Wed, 9 Jun 2021 10:20:07 +0200
Subject: [PATCH] Updated databases
---
bob/bio/face/database/casia_africa.py | 6 +++---
bob/bio/face/database/cbsr_nir_vis_2.py | 4 ++--
bob/bio/face/database/frgc.py | 6 +++---
bob/bio/face/database/meds.py | 6 +++---
bob/bio/face/database/mobio.py | 5 ++---
bob/bio/face/database/morph.py | 6 +++---
bob/bio/face/database/multipie.py | 6 +++---
bob/bio/face/database/pola_thermal.py | 6 +++---
8 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/bob/bio/face/database/casia_africa.py b/bob/bio/face/database/casia_africa.py
index e6025110..bfedd075 100644
--- a/bob/bio/face/database/casia_africa.py
+++ b/bob/bio/face/database/casia_africa.py
@@ -107,9 +107,6 @@ class CasiaAfricaDatabase(CSVDataset):
file_hash="324bd69b581477d30606417be8e30d2a",
)
- self.annotation_type = "eyes-center"
- self.fixed_positions = None
-
directory = (
rc["bob.db.casia-africa.directory"]
if rc["bob.db.casia-africa.directory "]
@@ -131,6 +128,9 @@ class CasiaAfricaDatabase(CSVDataset):
),
)
+ self.annotation_type = "eyes-center"
+ self.fixed_positions = None
+
@staticmethod
def protocols():
# TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
diff --git a/bob/bio/face/database/cbsr_nir_vis_2.py b/bob/bio/face/database/cbsr_nir_vis_2.py
index 73f3507d..c6ec79f1 100644
--- a/bob/bio/face/database/cbsr_nir_vis_2.py
+++ b/bob/bio/face/database/cbsr_nir_vis_2.py
@@ -61,8 +61,6 @@ class CBSRNirVis2Database(CSVDataset):
filename = get_file(
"cbsr_nir_vis_2.tar.gz", urls, file_hash="116da4537c1099915cdc0f08feb651bd",
)
- self.annotation_type = "eyes-center"
- self.fixed_positions = None
directory = (
rc["bob.db.cbsr-nir-vis-2.directory"]
@@ -93,6 +91,8 @@ class CBSRNirVis2Database(CSVDataset):
EyesAnnotations(),
),
)
+ self.annotation_type = "eyes-center"
+ self.fixed_positions = None
@staticmethod
def protocols():
diff --git a/bob/bio/face/database/frgc.py b/bob/bio/face/database/frgc.py
index 0f52f5bb..38de5875 100644
--- a/bob/bio/face/database/frgc.py
+++ b/bob/bio/face/database/frgc.py
@@ -28,9 +28,6 @@ class FRGCDatabase(CSVDataset):
"frgc.tar.gz", urls, file_hash="328d2c71ae19a41679defa9585b3140f"
)
- self.annotation_type = "eyes-center"
- self.fixed_positions = None
-
super().__init__(
name="frgc",
dataset_protocol_path=filename,
@@ -47,6 +44,9 @@ class FRGCDatabase(CSVDataset):
),
)
+ self.annotation_type = "eyes-center"
+ self.fixed_positions = None
+
@staticmethod
def protocols():
# TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
diff --git a/bob/bio/face/database/meds.py b/bob/bio/face/database/meds.py
index eefec79d..18101472 100644
--- a/bob/bio/face/database/meds.py
+++ b/bob/bio/face/database/meds.py
@@ -101,9 +101,6 @@ class MEDSDatabase(CSVDatasetZTNorm):
"meds.tar.gz", urls, file_hash="3b01354d4c170672ac14120b80dace75"
)
- self.annotation_type = "eyes-center"
- self.fixed_positions = None
-
super().__init__(
name="meds",
dataset_protocol_path=filename,
@@ -120,6 +117,9 @@ class MEDSDatabase(CSVDatasetZTNorm):
),
)
+ self.annotation_type = "eyes-center"
+ self.fixed_positions = None
+
@staticmethod
def urls():
return [
diff --git a/bob/bio/face/database/mobio.py b/bob/bio/face/database/mobio.py
index 2f8a209c..02af60a2 100644
--- a/bob/bio/face/database/mobio.py
+++ b/bob/bio/face/database/mobio.py
@@ -56,9 +56,6 @@ class MobioDatabase(CSVDatasetZTNorm):
"mobio.tar.gz", urls, file_hash="42cee778c17a34762d5fc5dd13ce3ee6"
)
- self.annotation_type = "eyes-center"
- self.fixed_positions = None
-
super().__init__(
name="mobio",
dataset_protocol_path=filename,
@@ -74,6 +71,8 @@ class MobioDatabase(CSVDatasetZTNorm):
EyesAnnotations(),
),
)
+ self.annotation_type = "eyes-center"
+ self.fixed_positions = None
@staticmethod
def protocols():
diff --git a/bob/bio/face/database/morph.py b/bob/bio/face/database/morph.py
index a0ed8825..be557b02 100644
--- a/bob/bio/face/database/morph.py
+++ b/bob/bio/face/database/morph.py
@@ -65,9 +65,6 @@ class MorphDatabase(CSVDatasetZTNorm):
"morph.tar.gz", urls, file_hash="9efa1ff13ef6984ebfcf86f1b1f58873"
)
- self.annotation_type = "eyes-center"
- self.fixed_positions = None
-
super().__init__(
name="morph",
dataset_protocol_path=filename,
@@ -84,6 +81,9 @@ class MorphDatabase(CSVDatasetZTNorm):
),
)
+ self.annotation_type = "eyes-center"
+ self.fixed_positions = None
+
@staticmethod
def urls():
return [
diff --git a/bob/bio/face/database/multipie.py b/bob/bio/face/database/multipie.py
index 10dd5222..572ca1e9 100644
--- a/bob/bio/face/database/multipie.py
+++ b/bob/bio/face/database/multipie.py
@@ -94,9 +94,6 @@ class MultipieDatabase(CSVDataset):
"multipie.tar.gz", urls, file_hash="6c27c9616c2d0373c5f052b061d80178"
)
- self.annotation_type = ["eyes-center", "left-profile", "right-profile"]
- self.fixed_positions = None
-
super().__init__(
name="multipie",
dataset_protocol_path=filename,
@@ -113,6 +110,9 @@ class MultipieDatabase(CSVDataset):
),
)
+ self.annotation_type = ["eyes-center", "left-profile", "right-profile"]
+ self.fixed_positions = None
+
@staticmethod
def protocols():
# TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
diff --git a/bob/bio/face/database/pola_thermal.py b/bob/bio/face/database/pola_thermal.py
index 2052f0e4..1a976de9 100644
--- a/bob/bio/face/database/pola_thermal.py
+++ b/bob/bio/face/database/pola_thermal.py
@@ -87,9 +87,6 @@ class PolaThermalDatabase(CSVDataset):
"pola_thermal.tar.gz", urls, file_hash="cfbd7362773c6d49292fe1998e3c3825",
)
- self.annotation_type = "eyes-center"
- self.fixed_positions = None
-
directory = (
rc["bob.db.pola-thermal.directory"]
if rc["bob.db.pola-thermal.directory"]
@@ -116,6 +113,9 @@ class PolaThermalDatabase(CSVDataset):
),
)
+ self.annotation_type = "eyes-center"
+ self.fixed_positions = None
+
@staticmethod
def protocols():
# TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
--
GitLab