diff --git a/bob/bio/face/database/casia_africa.py b/bob/bio/face/database/casia_africa.py index 34dc60f89d86f7ca27e6a5bdc25bcffdc720821c..23a696fd2d128dbb3fd51f145995f62f255f6356 100644 --- a/bob/bio/face/database/casia_africa.py +++ b/bob/bio/face/database/casia_africa.py @@ -126,11 +126,10 @@ class CasiaAfricaDatabase(CSVDataset): ), EyesAnnotations(), ), + annotation_type=annotation_type, + fixed_positions=fixed_positions, ) - self.annotation_type = annotation_type - self.fixed_positions = fixed_positions - @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 bab3a4f72a47395707a97e526ce10a578c68732a..581ca39a89d8bc08345699385c749fd703e50519 100644 --- a/bob/bio/face/database/cbsr_nir_vis_2.py +++ b/bob/bio/face/database/cbsr_nir_vis_2.py @@ -90,9 +90,9 @@ class CBSRNirVis2Database(CSVDataset): ), EyesAnnotations(), ), + annotation_type=annotation_type, + fixed_positions=fixed_positions, ) - self.annotation_type = annotation_type - self.fixed_positions = fixed_positions @staticmethod def protocols(): diff --git a/bob/bio/face/database/frgc.py b/bob/bio/face/database/frgc.py index a2831f6e78cd7fd95daa5b7ec5ebe5588c4ef50c..8403ac9190400225ecc90ad3680aab311bcc00c5 100644 --- a/bob/bio/face/database/frgc.py +++ b/bob/bio/face/database/frgc.py @@ -42,11 +42,10 @@ class FRGCDatabase(CSVDataset): ), EyesAnnotations(), ), + annotation_type=annotation_type, + fixed_positions=fixed_positions, ) - self.annotation_type = annotation_type - self.fixed_positions = fixed_positions - @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 397cc69e742980c7228c05210932d402f2a1908e..5286de567ed5053843b68935801fcf6d911af12f 100644 --- a/bob/bio/face/database/meds.py +++ b/bob/bio/face/database/meds.py @@ -115,11 +115,10 @@ class MEDSDatabase(CSVDatasetZTNorm): ), EyesAnnotations(), ), + annotation_type=annotation_type, + fixed_positions=fixed_positions, ) - self.annotation_type = annotation_type - self.fixed_positions = fixed_positions - @staticmethod def urls(): return [ diff --git a/bob/bio/face/database/mobio.py b/bob/bio/face/database/mobio.py index 729e9a8862bad196db6b9f053fcaad2ea9d629db..94dbe5d7b5d805a84da5e668207c77a0502d2f5c 100644 --- a/bob/bio/face/database/mobio.py +++ b/bob/bio/face/database/mobio.py @@ -70,9 +70,9 @@ class MobioDatabase(CSVDatasetZTNorm): ), EyesAnnotations(), ), + annotation_type=annotation_type, + fixed_positions=fixed_positions, ) - self.annotation_type = annotation_type - self.fixed_positions = fixed_positions @staticmethod def protocols(): diff --git a/bob/bio/face/database/morph.py b/bob/bio/face/database/morph.py index 391292ddd4ca15d84f359c937d8362a86e4a1e3e..b922f49b4fde078fb58fa140d863486297ddad91 100644 --- a/bob/bio/face/database/morph.py +++ b/bob/bio/face/database/morph.py @@ -79,11 +79,10 @@ class MorphDatabase(CSVDatasetZTNorm): ), EyesAnnotations(), ), + annotation_type=annotation_type, + fixed_positions=fixed_positions, ) - self.annotation_type = annotation_type - self.fixed_positions = fixed_positions - @staticmethod def urls(): return [ diff --git a/bob/bio/face/database/multipie.py b/bob/bio/face/database/multipie.py index 6bfed594ff9552840adb88f4e1b9365d9f9fcfed..888e1d7de79a16e2a36790172dc675e54b7b9302 100644 --- a/bob/bio/face/database/multipie.py +++ b/bob/bio/face/database/multipie.py @@ -108,11 +108,10 @@ class MultipieDatabase(CSVDataset): ), MultiposeAnnotations(), ), + annotation_type=["eyes-center", "left-profile", "right-profile"], + fixed_positions=None, ) - 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 cb1808a0050526b7af688e399782d0f136af5982..5b4063e7ab33b032d72f9662adce995c3ca23e27 100644 --- a/bob/bio/face/database/pola_thermal.py +++ b/bob/bio/face/database/pola_thermal.py @@ -111,11 +111,10 @@ class PolaThermalDatabase(CSVDataset): ), EyesAnnotations(), ), + annotation_type=annotation_type, + fixed_positions=fixed_positions, ) - self.annotation_type = annotation_type - self.fixed_positions = fixed_positions - @staticmethod def protocols(): # TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.