Merge remote-tracking branch 'origin/feature/8100_remove_hyspeca'

mantidproject · Oct 21, 2013 · 5a538d0 · 5a538d0
2 parents 084c85a + 4dbf9c7
commit 5a538d0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 546 deletions.
diff --git a/Code/Mantid/instrument/Facilities.xml b/Code/Mantid/instrument/Facilities.xml
@@ -346,13 +346,6 @@
     <livedata address="hyspec-sms1.sns.gov:31415" />
   </instrument> 
 
-  <!-- This is a virtual temp instrument for testing ADARA -->
-  <instrument name="HYSPECA" shortname="HYSA" beamline="14BS"> 
-    <technique>Neutron Spectroscopy</technique>
-    <technique>TOF Direct Geometry Spectroscopy</technique>
-    <livedata address="hyspec-sms1.sns.gov:31415" />
-  </instrument> 
-
   <instrument name="VISION" shortname="VIS" beamline="16B">
     <technique>Neutron Spectroscopy</technique>
     <technique>TOF Indirect Geometry Spectroscopy</technique>