Moved metadata to sampleset

bob/db/morph/database.py

@@ -102,7 +102,7 @@ class Database:
     @property
     def allow_scoring_with_all_biometric_references(self):
         # This allows some optimization during the scoring stage
-        return self.protocol.allow_scoring_with_all_references
+        return self.protocol.allow_scoring_with_all_biometric_references
 
     def background_model_samples(self):
         """Returns :py:class:`Sample`'s to train a background model (group
@@ -414,6 +414,11 @@ class Database:
                     key=self._subject_to_key(subject),
                     path=path,
                     subject=subject,
+                    date_of_birth=row.dob,
+                    photo_date=row.doa,
+                    age_phd=row.age,
+                    sex=row.gender,
+                    rac=row.race,
                 )
                 # SampleSet needs a 'references' field, if in probes.
                 if references_ids != None:
@@ -437,11 +442,6 @@ class Database:
                     key=path,
                     subject=subject,
                     annotations=self._eyes_annotations(file.split('.')[0]),
-                    date_of_birth=row.dob,
-                    photo_date=row.doa,
-                    age_phd=row.age,
-                    sex=row.gender,
-                    rac=row.race,
                 )
             )
             if covariate != None:

bob/db/morph/protocol.py

@@ -83,7 +83,7 @@ class Protocol:
         if self.name == "verification_fold3":
             self.shuffle_seed = 3
         # Scoring with all references is True for all protocols (yet).
-        self.allow_scoring_with_all_references = True
+        self.allow_scoring_with_all_biometric_references = True
 
     def genders(self):
         """Returns the gender(s) concerned by this protocol