Fixed device_uri tags

mxcube · Jul 11, 2024 · e9e98c3 · e9e98c3
1 parent 994ffc6
commit e9e98c3
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 20 deletions.
diff --git a/deprecated/HardwareObjects/TacoDevice_MTSafe.py b/deprecated/HardwareObjects/TacoDevice_MTSafe.py
@@ -276,7 +276,7 @@ def dev_tcpudp(mdevname, mode):
         if Dev_deb[0] == 1:
             print(loc_c_pt)
         if (mode != "tcp") and (mode != "udp"):
-            print("usage: dev_tcpudp(<object_name>,udp|tcp)")
+            print("usage: dev_tcpudp(<device_name>,udp|tcp)")
             return 0
         try:
             ret = esrf_tcpudp(loc_c_pt, mode)

diff --git a/mxcubecore/configuration/alba_xaloc13/mxcollect.xml b/mxcubecore/configuration/alba_xaloc13/mxcollect.xml
@@ -38,7 +38,7 @@
   <undulators>
     <undulator>
      <type>ivu21</type>
-     <object_uri></object_uri>
+     <device_uri></device_uri>
      <gap_index>0</gap_index>
     </undulator>
   </undulators>

diff --git a/mxcubecore/configuration/alba_xaloc13/pilatus.xml b/mxcubecore/configuration/alba_xaloc13/pilatus.xml
@@ -3,7 +3,7 @@
   <object href="/detector-distance" role="detector_distance"/>
 
   <tangoname>bl13/eh/pilatuslima</tangoname>
-  <object_specific>bl13/eh/pilatusspecific</object_specific>
+  <device_specific>bl13/eh/pilatusspecific</device_specific>
 
   <manufacturer>DECTRIS</manufacturer>
   <model>6M_F</model>

diff --git a/mxcubecore/configuration/desy_p11/mxlocal.xml b/mxcubecore/configuration/desy_p11/mxlocal.xml
@@ -3,12 +3,12 @@
   <BCM_PARS>
     <undulator>
       <type>u29</type>
-      <object_uri></object_uri>
+      <device_uri></device_uri>
       <gap_index>0</gap_index>
     </undulator>
     <undulator>
       <type></type>
-      <object_uri></object_uri>
+      <device_uri></device_uri>
       <gap_index>0</gap_index>
     </undulator>
     <detector_radius>211.8</detector_radius>

diff --git a/mxcubecore/configuration/embl_hh_p13/beamline-test.xml b/mxcubecore/configuration/embl_hh_p13/beamline-test.xml
@@ -1,5 +1,5 @@
 <object class="EMBLBeamlineTest">
-    <object_list>/opt/embl-hh/etc/p13/app/mxcube/HardwareObjects.xml/p13devicesList.csv</object_list>
+    <device_list>/opt/embl-hh/etc/p13/app/mxcube/HardwareObjects.xml/p13devicesList.csv</device_list>
     <object hwrid="/oh1/motor-pitch-hfm" role="horizontal_motor"/>
     <object hwrid="/oh1/motor-pitch-vfm" role="vertical_motor"/>
 

diff --git a/mxcubecore/configuration/embl_hh_p13/mxcollect.xml b/mxcubecore/configuration/embl_hh_p13/mxcollect.xml
@@ -44,7 +44,7 @@
   <undulators>
    <undulator>
      <type>u29</type>
-     <object_uri></object_uri>
+     <device_uri></device_uri>
      <gap_index>0</gap_index>
     </undulator>
    </undulators>

diff --git a/mxcubecore/configuration/embl_hh_p14/mxcollect.xml b/mxcubecore/configuration/embl_hh_p14/mxcollect.xml
@@ -44,7 +44,7 @@
   <undulators>
    <undulator>
      <type>u29</type>
-     <object_uri></object_uri>
+     <device_uri></device_uri>
      <gap_index>0</gap_index>
     </undulator>
    </undulators>

diff --git a/mxcubecore/configuration/embl_hh_pe2/mxcollect.xml b/mxcubecore/configuration/embl_hh_pe2/mxcollect.xml
@@ -56,7 +56,7 @@
   <undulators>
    <undulator>
      <type>u29</type>
-     <object_uri></object_uri>
+     <device_uri></device_uri>
      <gap_index>0</gap_index>
     </undulator>
    </undulators>

diff --git a/mxcubecore/configuration/esrf_id231/mxlocal.xml b/mxcubecore/configuration/esrf_id231/mxlocal.xml
@@ -47,12 +47,12 @@
     <autocentring_ap>20</autocentring_ap>
     <undulator>
       <type>u35</type>
-      <object_uri>//aries/id/id/23</object_uri>
+      <device_uri>//aries/id/id/23</device_uri>
       <gap_index>0</gap_index> 
     </undulator>
     <undulator>
       <type>u20</type>
-      <object_uri>//aries/id/id/23</object_uri>
+      <device_uri>//aries/id/id/23</device_uri>
       <gap_index>2</gap_index>
     </undulator>
     <detector>

diff --git a/mxcubecore/configuration/esrf_id29/mxlocal.xml b/mxcubecore/configuration/esrf_id29/mxlocal.xml
@@ -46,12 +46,12 @@
   <BCM_PARS>
     <undulator>
       <type>u35u</type>
-      <object_uri>//aries/id/id/29</object_uri>
+      <device_uri>//aries/id/id/29</device_uri>
       <gap_index>0</gap_index>
     </undulator>
     <undulator>
       <type>u21d</type>
-      <object_uri>//aries/id/id/29</object_uri>
+      <device_uri>//aries/id/id/29</device_uri>
       <gap_index>2</gap_index>
     </undulator>
     <diffractometer>

diff --git a/mxcubecore/configuration/lnls_manaca/mxlocal.xml b/mxcubecore/configuration/lnls_manaca/mxlocal.xml
@@ -40,12 +40,12 @@
     <synchrotron_name>MAXIV</synchrotron_name>
     <undulator>
            <type>u35u</type>
-           <object_uri>id/id/29</object_uri>
+           <device_uri>id/id/29</device_uri>
            <gap_index>0</gap_index>
     </undulator>
     <undulator>
            <type>u21d</type>
-           <object_uri>id/id/29</object_uri>
+           <device_uri>id/id/29</device_uri>
            <gap_index>2</gap_index>
     </undulator>
     <monochromator_type>channel cut</monochromator_type>

diff --git a/mxcubecore/configuration/lnls_sol/mxlocal.xml b/mxcubecore/configuration/lnls_sol/mxlocal.xml
@@ -40,12 +40,12 @@
     <synchrotron_name>MAXIV</synchrotron_name>
     <undulator>
            <type>u35u</type>
-           <object_uri>id/id/29</object_uri>
+           <device_uri>id/id/29</device_uri>
            <gap_index>0</gap_index>
     </undulator>
     <undulator>
            <type>u21d</type>
-           <object_uri>id/id/29</object_uri>
+           <device_uri>id/id/29</device_uri>
            <gap_index>2</gap_index>
     </undulator>
     <monochromator_type>channel cut</monochromator_type>

diff --git a/mxcubecore/configuration/mockup/web/mxlocal.xml b/mxcubecore/configuration/mockup/web/mxlocal.xml
@@ -40,12 +40,12 @@
     <synchrotron_name>MAXIV</synchrotron_name>
     <undulator>
            <type>u35u</type>
-           <object_uri>id/id/29</object_uri>
+           <device_uri>id/id/29</device_uri>
            <gap_index>0</gap_index>
     </undulator>
     <undulator>
            <type>u21d</type>
-           <object_uri>id/id/29</object_uri>
+           <device_uri>id/id/29</device_uri>
            <gap_index>2</gap_index>
     </undulator>
     <monochromator_type>channel cut</monochromator_type>

diff --git a/mxcubecore/configuration/soleil_px1/mxlocal.xml b/mxcubecore/configuration/soleil_px1/mxlocal.xml
@@ -40,7 +40,7 @@
     <synchrotron_name>SOLEIL</synchrotron_name>
     <undulator>
         <type>u20</type>
-        <object_uri>id/id/29</object_uri>
+        <device_uri>id/id/29</device_uri>
         <gap_index>0</gap_index>
     </undulator>
     <monochromator_type>channel cut</monochromator_type>