Skip to content
Snippets Groups Projects
Commit 347cf5ee authored by Martyn Gigg's avatar Martyn Gigg
Browse files

Formatting changes only.

Remove extra whitespace at the end of lines.
Refs #12844
parent 80b821c4
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<archive> <archive>
<archiveSearch plugin="ISISDataSearch" /> <archiveSearch plugin="ISISDataSearch" />
</archive> </archive>
<computeResource name="SCARF@STFC" jobmanagertype="SCARFLSFJobManager"> <computeResource name="SCARF@STFC" jobmanagertype="SCARFLSFJobManager">
<baseURL>https://portal.scarf.rl.ac.uk</baseURL> <baseURL>https://portal.scarf.rl.ac.uk</baseURL>
</computeResource> </computeResource>
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
<mac replacement="/archive"></mac> <mac replacement="/archive"></mac>
</filelocation> </filelocation>
</catalog> </catalog>
<instrument name="ALF"> <instrument name="ALF">
<technique>Single Crystal Diffraction</technique> <technique>Single Crystal Diffraction</technique>
<livedata address="NDXALF:6789" /> <livedata address="NDXALF:6789" />
</instrument> </instrument>
<instrument name="CRISP" shortname="CSP"> <instrument name="CRISP" shortname="CSP">
<technique>Reflectometry</technique> <technique>Reflectometry</technique>
<livedata address="NDXCRISP:6789" /> <livedata address="NDXCRISP:6789" />
</instrument> </instrument>
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
<technique>TOF Direct Geometry Spectroscopy</technique> <technique>TOF Direct Geometry Spectroscopy</technique>
<livedata address="NDXHET:6789" /> <livedata address="NDXHET:6789" />
</instrument> </instrument>
<instrument name="HRPD" shortname="HRP"> <instrument name="HRPD" shortname="HRP">
<technique>Powder Diffraction</technique> <technique>Powder Diffraction</technique>
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
<livedata address="NDXHRPD:6789" /> <livedata address="NDXHRPD:6789" />
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
<livedata address="NDXINES:6789" /> <livedata address="NDXINES:6789" />
</instrument> </instrument>
<instrument name="INTER"> <instrument name="INTER">
<technique>Reflectometry</technique> <technique>Reflectometry</technique>
<zeropadding size="8"/> <zeropadding size="8"/>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
</instrument> </instrument>
<instrument name="PEARL" shortname="PRL"> <instrument name="PEARL" shortname="PRL">
<zeropadding size="5" startRunNumber="1" prefix="PRL"/> <zeropadding size="5" startRunNumber="1" prefix="PRL"/>
<zeropadding size="8" startRunNumber="71010" prefix="PEARL"/> <zeropadding size="8" startRunNumber="71010" prefix="PEARL"/>
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
<livedata address="NDXPEARL:6789" /> <livedata address="NDXPEARL:6789" />
...@@ -138,9 +138,9 @@ ...@@ -138,9 +138,9 @@
<technique>Neutron Diffraction with isotopic substitution</technique> <technique>Neutron Diffraction with isotopic substitution</technique>
<livedata address="NDXSANDALS:6789" /> <livedata address="NDXSANDALS:6789" />
</instrument> </instrument>
<instrument name="SURF" shortname="SRF"> <instrument name="SURF" shortname="SRF">
<zeropadding size="5" startRunNumber="1" prefix="SRF"/> <zeropadding size="5" startRunNumber="1" prefix="SRF"/>
<zeropadding size="6" startRunNumber="100000" prefix="SRF"/> <zeropadding size="6" startRunNumber="100000" prefix="SRF"/>
<zeropadding size="8" startRunNumber="104604" prefix="SURF"/> <zeropadding size="8" startRunNumber="104604" prefix="SURF"/>
<technique>Reflectometry</technique> <technique>Reflectometry</technique>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<technique>TOF Indirect Geometry Diffraction</technique> <technique>TOF Indirect Geometry Diffraction</technique>
<livedata address="NDXVESUVIO:6789" /> <livedata address="NDXVESUVIO:6789" />
</instrument> </instrument>
<instrument name="LET"> <instrument name="LET">
<zeropadding size="8"/> <zeropadding size="8"/>
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
<livedata address="NDXSANS2D:6789" /> <livedata address="NDXSANS2D:6789" />
</instrument> </instrument>
<instrument name="SANS2D_EVENT" shortname="SANS2D"> <instrument name="SANS2D_EVENT" shortname="SANS2D">
<zeropadding size="8"/> <zeropadding size="8"/>
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
<technique>Single Crystal Diffraction</technique> <technique>Single Crystal Diffraction</technique>
<livedata address="NDXWISH:6789" /> <livedata address="NDXWISH:6789" />
</instrument> </instrument>
<instrument name="HIFI"> <instrument name="HIFI">
<zeropadding size="8"/> <zeropadding size="8"/>
<technique>Muon level crossing resonance</technique> <technique>Muon level crossing resonance</technique>
...@@ -236,94 +236,94 @@ ...@@ -236,94 +236,94 @@
<technique>Radio frequency muSR</technique> <technique>Radio frequency muSR</technique>
<livedata address="NDXHIFI:6789" /> <livedata address="NDXHIFI:6789" />
</instrument> </instrument>
<instrument name="MUSR"> <instrument name="MUSR">
<zeropadding size="8"/> <zeropadding size="8"/>
<technique>Muon spectroscopy</technique> <technique>Muon spectroscopy</technique>
<technique>Radio frequency muSR</technique> <technique>Radio frequency muSR</technique>
<livedata address="NDXMUSR:6789" /> <livedata address="NDXMUSR:6789" />
</instrument> </instrument>
<instrument name="MUT"> <instrument name="MUT">
<zeropadding size="8"/> <zeropadding size="8"/>
<technique>Muon spectroscopy</technique> <technique>Muon spectroscopy</technique>
<technique>Radio frequency muSR</technique> <technique>Radio frequency muSR</technique>
</instrument> </instrument>
<instrument name="EMU"> <instrument name="EMU">
<zeropadding size="8"/> <zeropadding size="8"/>
<technique>Muon spectroscopy</technique> <technique>Muon spectroscopy</technique>
<technique>Radio frequency muSR</technique> <technique>Radio frequency muSR</technique>
<livedata address="NDXEMU:6789" /> <livedata address="NDXEMU:6789" />
</instrument> </instrument>
<instrument name="ARGUS"> <instrument name="ARGUS">
<zeropadding size="7" startRunNumber="1"/> <zeropadding size="7" startRunNumber="1"/>
<zeropadding size="8" startRunNumber="57942"/> <zeropadding size="8" startRunNumber="57942"/>
<technique>Muon spectroscopy</technique> <technique>Muon spectroscopy</technique>
<technique>Radio frequency muSR</technique> <technique>Radio frequency muSR</technique>
<livedata address="NDXARGUS:6789" /> <livedata address="NDXARGUS:6789" />
</instrument> </instrument>
<instrument name="CHRONUS"> <instrument name="CHRONUS">
<zeropadding size="7"/> <zeropadding size="7"/>
<technique>Muon spectroscopy</technique> <technique>Muon spectroscopy</technique>
<technique>Radio frequency muSR</technique> <technique>Radio frequency muSR</technique>
<livedata address="NDXCHRONUS:6789" /> <livedata address="NDXCHRONUS:6789" />
</instrument> </instrument>
<livedata listener="ISISHistoDataListener"/> <livedata listener="ISISHistoDataListener"/>
</facility> </facility>
<facility name="HFIR" FileExtensions=".nxs,.dat,.xml"> <facility name="HFIR" FileExtensions=".nxs,.dat,.xml">
<instrument name="HB1"> <instrument name="HB1">
<technique>Triple Axis Spectroscopy</technique> <technique>Triple Axis Spectroscopy</technique>
</instrument> </instrument>
<instrument name="HB1A"> <instrument name="HB1A">
<technique>Triple Axis Spectroscopy</technique> <technique>Triple Axis Spectroscopy</technique>
</instrument> </instrument>
<instrument name="HB2A"> <instrument name="HB2A">
<technique>technique</technique> <technique>technique</technique>
</instrument> </instrument>
<instrument name="HB2B"> <instrument name="HB2B">
<technique>technique</technique> <technique>technique</technique>
</instrument> </instrument>
<instrument name="WAND"> <instrument name="WAND">
<technique>technique</technique> <technique>technique</technique>
</instrument> </instrument>
<instrument name="HB2D"> <instrument name="HB2D">
<technique>technique</technique> <technique>technique</technique>
</instrument> </instrument>
<instrument name="HB3"> <instrument name="HB3">
<technique>Triple Axis Spectroscopy</technique> <technique>Triple Axis Spectroscopy</technique>
</instrument> </instrument>
<instrument name="HB3A"> <instrument name="HB3A">
<technique>technique</technique> <technique>technique</technique>
</instrument> </instrument>
<instrument name="GPSANS"> <instrument name="GPSANS">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
</instrument> </instrument>
<instrument name="HIRESSANS"> <instrument name="HIRESSANS">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
</instrument> </instrument>
<instrument name="BIOSANS"> <instrument name="BIOSANS">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
</instrument> </instrument>
</facility> </facility>
<facility name="SNS" delimiter="_" FileExtensions=".nxs.h5,_event.nxs,.nxs,.dat,_runinfo.xml,_histo.nxs"> <facility name="SNS" delimiter="_" FileExtensions=".nxs.h5,_event.nxs,.nxs,.dat,_runinfo.xml,_histo.nxs">
...@@ -345,86 +345,86 @@ ...@@ -345,86 +345,86 @@
<mac replacement=""></mac> <mac replacement=""></mac>
</filelocation> </filelocation>
</catalog> </catalog>
<instrument name="DAS"> <instrument name="DAS">
<technique>technique</technique> <technique>technique</technique>
</instrument> </instrument>
<instrument name="TOF-USANS" beamline="1A"> <instrument name="TOF-USANS" beamline="1A">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
</instrument> </instrument>
<instrument name="NOMAD" shortname="NOM" beamline="1B"> <instrument name="NOMAD" shortname="NOM" beamline="1B">
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
<technique>Neutron Amorphous</technique> <technique>Neutron Amorphous</technique>
</instrument> </instrument>
<instrument name="BASIS" shortname="BSS" beamline="2"> <instrument name="BASIS" shortname="BSS" beamline="2">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>TOF Indirect Geometry Spectroscopy</technique> <technique>TOF Indirect Geometry Spectroscopy</technique>
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
</instrument> </instrument>
<instrument name="SNAP" beamline="3"> <instrument name="SNAP" beamline="3">
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
</instrument> </instrument>
<instrument name="REF_M" beamline="4A"> <instrument name="REF_M" beamline="4A">
<technique>Reflectometry</technique> <technique>Reflectometry</technique>
</instrument> </instrument>
<instrument name="REF_L" beamline="4B"> <instrument name="REF_L" beamline="4B">
<technique>Reflectometry</technique> <technique>Reflectometry</technique>
</instrument> </instrument>
<instrument name="CNCS" beamline="5"> <instrument name="CNCS" beamline="5">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>TOF Direct Geometry Spectroscopy</technique> <technique>TOF Direct Geometry Spectroscopy</technique>
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
</instrument> </instrument>
<instrument name="EQ-SANS" shortname="EQSANS" beamline="6"> <instrument name="EQ-SANS" shortname="EQSANS" beamline="6">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
</instrument> </instrument>
<instrument name="USANS" shortname="USANS" beamline="1A"> <instrument name="USANS" shortname="USANS" beamline="1A">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
<livedata address="usans-daq1.sns.gov:31415" /> <livedata address="usans-daq1.sns.gov:31415" />
</instrument> </instrument>
<instrument name="VULCAN" beamline="7"> <instrument name="VULCAN" beamline="7">
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
</instrument> </instrument>
<instrument name="CORELLI" beamline="9"> <instrument name="CORELLI" beamline="9">
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
<technique>Diffuse Scattering</technique> <technique>Diffuse Scattering</technique>
<livedata address="corelli-daq1.sns.gov:31415" /> <livedata address="corelli-daq1.sns.gov:31415" />
</instrument> </instrument>
<instrument name="POWGEN" shortname="PG3" beamline="11A"> <instrument name="POWGEN" shortname="PG3" beamline="11A">
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
</instrument> </instrument>
<instrument name="MANDI" beamline="11B"> <instrument name="MANDI" beamline="11B">
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
<technique>Single Crystal Diffraction</technique> <technique>Single Crystal Diffraction</technique>
<technique>Protein Crystallography</technique> <technique>Protein Crystallography</technique>
</instrument> </instrument>
<instrument name="TOPAZ" beamline="12"> <instrument name="TOPAZ" beamline="12">
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
<technique>Single Crystal Diffraction</technique> <technique>Single Crystal Diffraction</technique>
<livedata listener="TOPAZLiveEventDataListener" address="128.219.164.132:9000" /> <livedata listener="TOPAZLiveEventDataListener" address="128.219.164.132:9000" />
<!-- Act like we're ISawEV talking to event_catcher --> <!-- Act like we're ISawEV talking to event_catcher -->
</instrument> </instrument>
<instrument name="HYSPEC" shortname="HYS" beamline="14B"> <instrument name="HYSPEC" shortname="HYS" beamline="14B">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>TOF Direct Geometry Spectroscopy</technique> <technique>TOF Direct Geometry Spectroscopy</technique>
<livedata address="hyspec-sms1.sns.gov:31415" /> <livedata address="hyspec-sms1.sns.gov:31415" />
</instrument> </instrument>
<instrument name="VISION" shortname="VIS" beamline="16B"> <instrument name="VISION" shortname="VIS" beamline="16B">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>TOF Indirect Geometry Spectroscopy</technique> <technique>TOF Indirect Geometry Spectroscopy</technique>
...@@ -432,57 +432,57 @@ ...@@ -432,57 +432,57 @@
<livedata address="vision-daq1.sns.gov:31415" /> <livedata address="vision-daq1.sns.gov:31415" />
</instrument> </instrument>
<instrument name="SEQUOIA" shortname="SEQ" beamline="17"> <instrument name="SEQUOIA" shortname="SEQ" beamline="17">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>TOF Direct Geometry Spectroscopy</technique> <technique>TOF Direct Geometry Spectroscopy</technique>
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
<livedata address="sequoia-sms.sns.gov:31415" /> <livedata address="sequoia-sms.sns.gov:31415" />
</instrument> </instrument>
<instrument name="ARCS" beamline="18"> <instrument name="ARCS" beamline="18">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>TOF Direct Geometry Spectroscopy</technique> <technique>TOF Direct Geometry Spectroscopy</technique>
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
</instrument> </instrument>
<instrument name="VENUS"> <instrument name="VENUS">
<technique>Imaging</technique> <technique>Imaging</technique>
<technique>Tomography</technique> <technique>Tomography</technique>
</instrument> </instrument>
<livedata listener="SNSLiveEventDataListener"/> <livedata listener="SNSLiveEventDataListener"/>
</facility> </facility>
<facility name="NCNR" FileExtensions=".dat,.xml"> <facility name="NCNR" FileExtensions=".dat,.xml">
<instrument name="NGSANS"> <instrument name="NGSANS">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
</instrument> </instrument>
</facility> </facility>
<facility name="LENS" FileExtensions=".nxs,.dat,.xml"> <facility name="LENS" FileExtensions=".nxs,.dat,.xml">
<instrument name="SANS"> <instrument name="SANS">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
</instrument> </instrument>
</facility> </facility>
<facility name="ILL" zeropadding="6" FileExtensions=".nxs,.hdf,.inx,.asc"> <facility name="ILL" zeropadding="6" FileExtensions=".nxs,.hdf,.inx,.asc">
<instrument name="IN4"> <instrument name="IN4">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>Reactor Direct Geometry Spectroscopy</technique> <technique>Reactor Direct Geometry Spectroscopy</technique>
<technique>Disk chopper time-of-flight spectrometer IN5</technique> <technique>Disk chopper time-of-flight spectrometer IN5</technique>
</instrument> </instrument>
<instrument name="IN5"> <instrument name="IN5">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>Reactor Direct Geometry Spectroscopy</technique> <technique>Reactor Direct Geometry Spectroscopy</technique>
<technique>Disk chopper time-of-flight spectrometer IN5</technique> <technique>Disk chopper time-of-flight spectrometer IN5</technique>
</instrument> </instrument>
<instrument name="IN6"> <instrument name="IN6">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>Reactor Direct Geometry Spectroscopy</technique> <technique>Reactor Direct Geometry Spectroscopy</technique>
<technique>Cold neutron time-focussing time-of-flight spectrometer</technique> <technique>Cold neutron time-focussing time-of-flight spectrometer</technique>
</instrument> </instrument>
...@@ -506,18 +506,18 @@ ...@@ -506,18 +506,18 @@
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>Reactor Indirect Geometry Spectroscopy</technique> <technique>Reactor Indirect Geometry Spectroscopy</technique>
</instrument> </instrument>
<instrument name="D33"> <instrument name="D33">
<technique>SANS</technique> <technique>SANS</technique>
</instrument> </instrument>
<instrument name="D2B"> <instrument name="D2B">
<technique>Powder diffraction</technique> <technique>Powder diffraction</technique>
</instrument> </instrument>
<instrument name="D17"> <instrument name="D17">
<technique>Reflectometry</technique> <technique>Reflectometry</technique>
</instrument> </instrument>
</facility> </facility>
...@@ -547,7 +547,7 @@ ...@@ -547,7 +547,7 @@
<instrument name="SANS-I"> <instrument name="SANS-I">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
</instrument> </instrument>
<instrument name="SANS-II"> <instrument name="SANS-II">
<technique>Small Angle Scattering</technique> <technique>Small Angle Scattering</technique>
</instrument> </instrument>
...@@ -567,7 +567,7 @@ ...@@ -567,7 +567,7 @@
<instrument name="FOCUS"> <instrument name="FOCUS">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>TOF Direct Geometry Spectroscopy</technique> <technique>TOF Direct Geometry Spectroscopy</technique>
</instrument> </instrument>
<instrument name="Rita-II"> <instrument name="Rita-II">
<technique>Triple Axis Spectroscopy</technique> <technique>Triple Axis Spectroscopy</technique>
...@@ -607,13 +607,13 @@ ...@@ -607,13 +607,13 @@
<zeropadding size="3"/> <zeropadding size="3"/>
<technique>Muon spectroscopy</technique> <technique>Muon spectroscopy</technique>
</instrument> </instrument>
</facility> </facility>
<!-- Reactor Orphee (France) --> <!-- Reactor Orphee (France) -->
<facility name="LLB" FileExtensions=".nxs,.hdf"> <facility name="LLB" FileExtensions=".nxs,.hdf">
<instrument name="MIBEMOL"> <instrument name="MIBEMOL">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>Reactor Direct Geometry Spectroscopy</technique> <technique>Reactor Direct Geometry Spectroscopy</technique>
</instrument> </instrument>
</facility> </facility>
...@@ -621,7 +621,7 @@ ...@@ -621,7 +621,7 @@
<!-- Facility MLZ (FRMII) (Germany) --> <!-- Facility MLZ (FRMII) (Germany) -->
<facility name="MLZ" FileExtensions=".nxs,.d_dat"> <facility name="MLZ" FileExtensions=".nxs,.d_dat">
<instrument name="DNS"> <instrument name="DNS">
<technique>Neutron Spectroscopy</technique> <technique>Neutron Spectroscopy</technique>
<technique>Reactor Direct Geometry Spectroscopy</technique> <technique>Reactor Direct Geometry Spectroscopy</technique>
<technique>TOF Direct Geometry Spectroscopy</technique> <technique>TOF Direct Geometry Spectroscopy</technique>
<technique>Neutron Diffraction</technique> <technique>Neutron Diffraction</technique>
...@@ -646,7 +646,7 @@ ...@@ -646,7 +646,7 @@
<technique>Test Listener</technique> <technique>Test Listener</technique>
<livedata address="localhost:59876" listener="ISISLiveEventDataListener" /> <livedata address="localhost:59876" listener="ISISLiveEventDataListener" />
</instrument> </instrument>
<instrument name="ADARA_FileReader"> <instrument name="ADARA_FileReader">
<technique>Test Listener</technique> <technique>Test Listener</technique>
<livedata listener="FileEventDataListener" address="127.0.0.1:0" /> <livedata listener="FileEventDataListener" address="127.0.0.1:0" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment