Merge pull request #13 from neutrons/add_ref_m_runs

Add REF_M and REF_L runs

.gitignore

@@ -25,6 +25,7 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
+src/webmonchow/_version.py
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

docs/developer/index.rst

@@ -97,7 +97,7 @@ To manually build the documentation:
 
    $> conda activate webmonchow
    (webmonchow)$> cd /path/to/webmonchow/docs
-   (webmonchow)$> make docs
+   (webmonchow)$> make html
 
 After this, point your browser to
 `file:///path/to/webmonchow/docs/build/html/index.html`

docs/releases.rst

@@ -12,6 +12,7 @@ Notes for the next major or minor release of `webmonchow`.
 **Of interest to the User**:
 
 - PR #XYZ one-liner description
+- PR #13 Add REF_M and REF_L messages for translation, pvsd and dasmon
 
 **Of interest to the Developer:**
 

docs/user/index.rst

@@ -263,3 +263,18 @@ If you want additional instrument to show, you need to add content to these file
 Also, if you want to signal that some runs for the instrument are ready for post-processing,
 you need to add them in
 `translation.json <https://github.com/neutrons/webmonchow/blob/next/src/webmonchow/amq/services/translation.json>`_
+
+Adding as Active Instrument in the database
++++++++++++++++++++++++++++++++++++++++++++
+
+Note that for the new instrument to report the status of PVSD and DASMON correctly, i.e. show green
+status boxes for all systems on the page http://localhost/dasmon/arcs, the instrument needs to be
+added as an Active Instrument in the database at: http://localhost/database/dasmon/activeinstrument/.
+The ``"src_name"`` in
+`amq dasmon.json <https://github.com/neutrons/webmonchow/blob/next/src/webmonchow/amq/services/dasmon.json>`_.
+must match the selection in "Has pvsd" or "Has pvstreamer" on the Active Instrument object.
+
+.. image:: ../media/instrument_system_status.png
+    :width: 999px
+    :align: center
+    :alt: instrument system status

src/webmonchow/amq/services/dasmon.json

@@ -14,6 +14,11 @@
       "message": {"src_name": "dasmon",
         "status": "0"}}
   ],
+  "/topic/SNS.REF_L.STATUS.DASMON": [
+    {"frequency": 10,
+      "message": {"src_name": "dasmon",
+        "status": "0"}}
+  ],
   "/topic/SNS.HYSA.APP.DASMON": [
     {"frequency": 10,
       "message":
@@ -61,5 +66,24 @@
         "total_time": 2993.14
       }
     }
+  ],
+  "/topic/SNS.REF_L.APP.DASMON": [
+    {"frequency": 10,
+      "message":
+      {"monitors": {"1": 0, "2": 0, "8":  0},
+        "count_rate": 0,
+        "has_states_count": 0,
+        "paused": false,
+        "recording": false,
+        "scan_index": 0,
+        "scanning": false,
+        "system_dasmon": 0,
+        "system_postprocessing": "Created REF_L reduction script",
+        "system_pvsd": 0,
+        "total_charge": 3.03988e+10,
+        "total_counts": 111735,
+        "total_time": 2993.14
+      }
+    }
   ]
 }

src/webmonchow/amq/services/pvsd.json

@@ -13,5 +13,10 @@
     {"frequency": 10,
       "message": {"src_name": "pvsd",
         "status": "0"}}
+  ],
+  "/topic/SNS.REF_L.STATUS.PVSD": [
+    {"frequency": 10,
+      "message": {"src_name": "pvsd",
+        "status": "0"}}
   ]
 }

src/webmonchow/amq/services/translation.json

@@ -35,6 +35,30 @@
         "ipts": "IPTS-27800",
         "run_number": "214583",
         "facility": "SNS",
-        "data_file": "/SNS/ARCS/IPTS-27800/nexus/ARCS_214583.nxs.h5"}}
+        "data_file": "/SNS/ARCS/IPTS-27800/nexus/ARCS_214583.nxs.h5"}},
+    {"frequency": 0,
+      "message": {"instrument": "REF_M",
+        "ipts": "IPTS-30794",
+        "run_number": "42112",
+        "facility": "SNS",
+        "data_file": "/SNS/REF_M/IPTS-30794/nexus/REF_M_42112.nxs.h5"}},
+    {"frequency": 0,
+      "message": {"instrument": "REF_M",
+        "ipts": "IPTS-30794",
+        "run_number": "42113",
+        "facility": "SNS",
+        "data_file": "/SNS/REF_M/IPTS-30794/nexus/REF_M_42113.nxs.h5"}},
+    {"frequency": 0,
+      "message": {"instrument": "REF_L",
+        "ipts": "IPTS-33077",
+        "run_number": "214746",
+        "facility": "SNS",
+        "data_file": "/SNS/REF_L/IPTS-33077/nexus/REF_L_214746.nxs.h5"}},
+    {"frequency": 0,
+      "message": {"instrument": "REF_L",
+        "ipts": "IPTS-33077",
+        "run_number": "214747",
+        "facility": "SNS",
+        "data_file": "/SNS/REF_L/IPTS-33077/nexus/REF_L_214747.nxs.h5"}}
   ]
 }