Updated databases

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.

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():

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.

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 [

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():

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 [

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.

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.