Updated DB interface

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.

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

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.

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 [

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

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 [

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.

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.