schema: Factor out common PET and MRS entities

Author: effigies

src/schema/meta/templates.yaml

@@ -41,6 +41,22 @@ raw:
       direction: optional
       part: optional
 
+  pet:
+    entities:
+      $ref: meta.templates.raw.base.entities
+      task: optional
+      tracer: optional
+      reconstruction: optional
+      run: optional
+
+  mrs:
+    entities:
+      $ref: meta.templates.raw.recording.entities
+      task: optional
+      nucleus: optional
+      volume: optional
+      reconstruction: optional
+
 # Entities that apply to most derivative files
 # Include thus:
 #

src/schema/rules/files/raw/events.yaml

@@ -39,18 +39,11 @@ events__pet:
   datatypes:
     - pet
   entities:
-    $ref: meta.templates.raw.task.entities
-    tracer: optional
-    reconstruction: optional
-    # Most events allow acquisition, PET doesn't
-    acquisition: null
+    $ref: meta.templates.raw.pet.entities
 
 events__mrs:
   $ref: rules.files.raw.events.events
   datatypes:
     - mrs
   entities:
-    $ref: rules.files.raw.events.events.entities
-    reconstruction: optional
-    nucleus: optional
-    volume: optional
+    $ref: meta.templates.raw.mrs.entities

src/schema/rules/files/raw/mrs.yaml

@@ -12,10 +12,6 @@ mrs:
   datatypes:
     - mrs
   entities:
-    $ref: meta.templates.raw.recording.entities
-    task: optional
-    reconstruction: optional
+    $ref: meta.templates.raw.mrs.entities
     echo: optional
     inversion: optional
-    nucleus: optional
-    volume: optional

src/schema/rules/files/raw/pet.yaml

@@ -9,11 +9,7 @@ pet:
   datatypes:
     - pet
   entities:
-    $ref: meta.templates.raw.base.entities
-    task: optional
-    tracer: optional
-    reconstruction: optional
-    run: optional
+    $ref: meta.templates.raw.pet.entities
 
 blood:
   suffixes:
@@ -24,9 +20,5 @@ blood:
   datatypes:
     - pet
   entities:
-    $ref: meta.templates.raw.base.entities
-    task: optional
-    tracer: optional
-    reconstruction: optional
-    run: optional
+    $ref: meta.templates.raw.pet.entities
     recording: required