rename one of the ObservingConfigurations to help distinguish it

ivoa · Oct 21, 2024 · 74184ee · 74184ee
1 parent 01c247f
commit 74184ee
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "org.javastro.ivoa.dm"
-version = "0.6.0-SNAPSHOT"
+version = "0.6.1-SNAPSHOT"
 
 
 vodml {

diff --git a/src/main/vo-dml/proposalManagement.vo-dml.xml b/src/main/vo-dml/proposalManagement.vo-dml.xml
@@ -4,12 +4,12 @@
               xsi:schemaLocation="http://www.ivoa.net/xml/VODML/v1 https://www.ivoa.net/xml/VODML/vo-dml-v1.xsd" 
               vodmlVersion="1.1">	<!-- file generated from VODSL - needs validatation against v1.1 of schema  --> 
       <name>proposalManagement</name>
-      <description>The data model for managing the proposal review process. Intended to work for phase 1</description> 
+      <description>The data model for managing the proposal review process. This is the observatories' view of the proposal process, intended to work for phase 1 only</description> 
       <uri/>
       <title>Proposal Management</title>
       <author>Paul Harrison</author>
       <version>0.6</version>
-      <lastModified>2024-10-19T15:23:56Z</lastModified>
+      <lastModified>2024-10-21T12:03:07Z</lastModified>
       <import>
         <name>null</name><!--should not be needed in modern vo-dml -->
         <url>IVOA-v1.0.vo-dml.xml</url>

diff --git a/src/main/vo-dml/proposaldm.vo-dml.xml b/src/main/vo-dml/proposaldm.vo-dml.xml
@@ -12,7 +12,7 @@
       <title>Proposal</title>
       <author>Paul Harrison</author>
       <version>0.6</version>
-      <lastModified>2024-10-19T19:17:38Z</lastModified>
+      <lastModified>2024-10-21T12:09:40Z</lastModified>
       <import>
         <name>null</name><!--should not be needed in modern vo-dml -->
         <url>IVOA-v1.0.vo-dml.xml</url>
@@ -829,11 +829,11 @@
                </attribute>
             </objectType>
             <objectType>
-               <vodml-id>ObservingConfiguration</vodml-id>
-               <name>ObservingConfiguration</name>
+               <vodml-id>ObservingModeConfiguration</vodml-id>
+               <name>ObservingModeConfiguration</name>
                <description>A particular observation combination that is possible</description>	    
                <reference>
-                 <vodml-id>ObservingConfiguration.telescope</vodml-id>
+                 <vodml-id>ObservingModeConfiguration.telescope</vodml-id>
                  <name>telescope</name>
                  <description></description>	    
                  <datatype>
@@ -845,7 +845,7 @@
                  </multiplicity>
                </reference>
                <reference>
-                 <vodml-id>ObservingConfiguration.instrument</vodml-id>
+                 <vodml-id>ObservingModeConfiguration.instrument</vodml-id>
                  <name>instrument</name>
                  <description></description>	    
                  <datatype>
@@ -857,7 +857,7 @@
                  </multiplicity>
                </reference>
                <composition>
-                 <vodml-id>ObservingConfiguration.filter</vodml-id>
+                 <vodml-id>ObservingModeConfiguration.filter</vodml-id>
                  <name>filter</name>
                  <description>The filter or frequency response that </description>	    
                  <datatype>
@@ -869,7 +869,7 @@
                  </multiplicity>
                </composition>
                <reference>
-                 <vodml-id>ObservingConfiguration.backend</vodml-id>
+                 <vodml-id>ObservingModeConfiguration.backend</vodml-id>
                  <name>backend</name>
                  <description></description>	    
                  <datatype>
@@ -914,7 +914,7 @@
                  <name>configuration</name>
                  <description></description>	    
                  <datatype>
-                   <vodml-ref>proposal:ObservingConfiguration</vodml-ref>
+                   <vodml-ref>proposal:ObservingModeConfiguration</vodml-ref>
                  </datatype>
                  <multiplicity>
                    <minOccurs>1</minOccurs>

diff --git a/src/main/vodsl/proposalManagement.vodsl b/src/main/vodsl/proposalManagement.vodsl
@@ -2,7 +2,7 @@
  *  created on 20 Oct 2021 // The review side of the proposal.
  */
 
- model proposalManagement (0.6)  "The data model for managing the proposal review process. Intended to work for phase 1"
+ model proposalManagement (0.6)  "The data model for managing the proposal review process. This is the observatories' view of the proposal process, intended to work for phase 1 only"
  author "Paul Harrison" 
  title "Proposal Management"
 

diff --git a/src/main/vodsl/proposaldm.vodsl b/src/main/vodsl/proposaldm.vodsl
@@ -76,6 +76,7 @@ observations, although the intention is that information about targets etc. coul
 
  }
 
+ //IMPL - this and related objects should probably be in the "Management" model.
  otype Observatory -> Organization "An organisation that can perform astronomical observations" {
 
  	telescopes : Telescope @+ as composition "the telescopes that the observatory controls";
@@ -135,7 +136,7 @@ observations, although the intention is that information about targets etc. coul
 
  /*  Note that when presenting these configurations in the GUI they probably need to be decomposed into combo boxes that display each set of possibilities of each member one after another 
   limited by the remaining possible choices having selected those above */
- otype ObservingConfiguration "A particular observation combination that is possible" {
+ otype ObservingModeConfiguration "A particular observation combination that is possible" {
  	telescope references ObservingPlatform "";
  	instrument references Instrument "";
  	filter:Filter as composition "The filter or frequency response that ";
@@ -145,7 +146,7 @@ observations, although the intention is that information about targets etc. coul
  otype ObservingMode "a configuration that has been chosen to observe with." {
   name: ivoa:string "human readable name for the mode";
   description: ivoa:string "human readable description";
- 	configuration references ObservingConfiguration  ""; 
+ 	configuration references ObservingModeConfiguration  ""; 
   // IMPL could add an arbitrary "options" here.
  }
 

diff --git a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java
@@ -86,11 +86,11 @@ public  EmerlinExample () {
 
         obsModes = new ObservingMode[] {
               new ObservingMode("L-Band", "full e-MERLIN at L-Band",
-                     new ObservingConfiguration(eMERLIN, instruments[0],simpleFilter("L-Band",1.2, 1.7), backend))
+                     new ObservingModeConfiguration(eMERLIN, instruments[0],simpleFilter("L-Band",1.2, 1.7), backend))
               ,new ObservingMode("C-Band", "full e-MERLIN at C-Band", 
-                     new ObservingConfiguration(eMERLIN, instruments[1],simpleFilter("C-Band",4.0, 7.0), backend))
+                     new ObservingModeConfiguration(eMERLIN, instruments[1],simpleFilter("C-Band",4.0, 7.0), backend))
               ,new ObservingMode("K-Band", "reduced e-EMERLIN at K-Band",
-                      new ObservingConfiguration(eMERLINReduced, instruments[2],simpleFilter("K-Band",20.0, 24.0), backend))
+                      new ObservingModeConfiguration(eMERLINReduced, instruments[2],simpleFilter("K-Band",20.0, 24.0), backend))
         };
 
         grades = new AllocationGrade[] {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ plugins { @@
     }
     group = "org.javastro.ivoa.dm"
-    version = "0.6.0-SNAPSHOT"
+    version = "0.6.1-SNAPSHOT"
     vodml {
@@ Expand Down @@