diff --git a/Code/Mantid/Instrument/HIFI_Definition.xml b/Code/Mantid/Instrument/HIFI_Definition.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9745ae6bb216bf756c7080623621a7d9c935e071
--- /dev/null
+++ b/Code/Mantid/Instrument/HIFI_Definition.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- For help on the notation used to specify an Instrument Definition File
+ see http://www.mantidproject.org/IDF -->
+<instrument name="HIFI" valid-from ="1900-01-31 23:59:59"
+ valid-to ="2100-01-31 23:59:59"
+ last-modified="2010-08-27 00:00:00">
+
+ <defaults>
+ <length unit="meter"/>
+ <angle unit="degree"/>
+ <parameter eq="" type="double" extract-single-value-as="mean" />
+ <reference-frame>
+ <!-- The z-axis is set parallel to and in the direction of the beam. the
+ y-axis points up and the coordinate system is right handed. -->
+ <along-beam axis="z"/>
+ <pointing-up axis="y"/>
+ <handedness val="right"/>
+ </reference-frame>
+ </defaults>
+
+
+ <!-- BRIEF DESCRIPTION OF HIFI INSTRUMENT:
+
+ FOR NOW THIS IDF IS SIMPLY A COPY OF MUSR IDF
+ -->
+
+
+ <!-- LIST OF PHYSICAL COMPONENTS (which the instrument consists of) -->
+
+ <!-- dummy components added for visualisation purposes.
+ To easy spot what geometry the instrument is in -->
+
+ <component type="along z">
+ <location />
+ </component>
+
+ <type name="along z">
+ <cylinder id="A">
+ <centre-of-bottom-base x="0.0" y="0.0" z="0.0" />
+ <axis x="0.0" y="0" z="1" />
+ <radius val="0.002" />
+ <height val="0.10" />
+ </cylinder>
+ </type>
+
+ <component type="along x">
+ <location />
+ </component>
+
+ <type name="along x">
+ <cylinder id="B">
+ <centre-of-bottom-base x="0.0" y="0.0" z="0.0" />
+ <axis x="1.0" y="0" z="0" />
+ <radius val="0.002" />
+ <height val="0.10" />
+ </cylinder>
+ </type>
+
+ <component type="along y">
+ <location />
+ </component>
+
+ <type name="along y">
+ <cylinder id="C">
+ <centre-of-bottom-base x="0.0" y="0.0" z="0.0" />
+ <axis x="0.0" y="1" z="0" />
+ <radius val="0.002" />
+ <height val="0.10" />
+ </cylinder>
+ </type>
+
+ <!-- source and sample-position components -->
+
+ <component type="source">
+ <location z="-10.0" />
+ </component>
+ <type name="source" is="Source" />
+
+ <component type="some-sample-holder">
+ <location />
+ </component>
+
+ <type name="some-sample-holder" is="SamplePos" />
+
+
+ <!-- detector components -->
+
+ <component type="both rings" idlist="both rings">
+ <location />
+ <!-- Here link orientation of instrument to horizontal or vertical in Nexus file-->
+ <parameter name="roty" logfile-id="fromNexus" extract-single-value-as="position 1" />
+ </component>
+
+ <type name="both rings" >
+ <component type="ring-front" >
+ <location z="-0.145" name="front" /> <!-- -0.06 - 0.17/2 = -0.145 -->
+ </component>
+ <component type="ring-back" >
+ <location z="0.145" name="back" />
+ </component>
+ </type>
+
+ <type name="ring-front">
+ <component type="pixel">
+ <location r="0.14" t="90" p="309.375000" rot="309.375000" name="det33"/>
+ <location r="0.14" t="90" p="298.125000" rot="298.125000" name="det34"/>
+ <location r="0.14" t="90" p="286.875000" rot="286.875000" name="det35"/>
+ <location r="0.14" t="90" p="275.625000" rot="275.625000" name="det36"/>
+ <location r="0.14" t="90" p="264.375000" rot="264.375000" name="det37"/>
+ <location r="0.14" t="90" p="253.125000" rot="253.125000" name="det38"/>
+ <location r="0.14" t="90" p="241.875000" rot="241.875000" name="det39"/>
+ <location r="0.14" t="90" p="230.625000" rot="230.625000" name="det40"/>
+ <location r="0.14" t="90" p="219.375000" rot="219.375000" name="det41"/>
+ <location r="0.14" t="90" p="208.125000" rot="208.125000" name="det42"/>
+ <location r="0.14" t="90" p="196.875000" rot="196.875000" name="det43"/>
+ <location r="0.14" t="90" p="185.625000" rot="185.625000" name="det44"/>
+ <location r="0.14" t="90" p="174.375000" rot="174.375000" name="det45"/>
+ <location r="0.14" t="90" p="163.125000" rot="163.125000" name="det46"/>
+ <location r="0.14" t="90" p="151.875000" rot="151.875000" name="det47"/>
+ <location r="0.14" t="90" p="140.625000" rot="140.625000" name="det48"/>
+ <location r="0.14" t="90" p="129.375000" rot="129.375000" name="det49"/>
+ <location r="0.14" t="90" p="118.125000" rot="118.125000" name="det50"/>
+ <location r="0.14" t="90" p="106.875000" rot="106.875000" name="det51"/>
+ <location r="0.14" t="90" p="95.625000" rot="95.625000" name="det52"/>
+ <location r="0.14" t="90" p="84.375000" rot="84.375000" name="det53"/>
+ <location r="0.14" t="90" p="73.125000" rot="73.125000" name="det54"/>
+ <location r="0.14" t="90" p="61.875000" rot="61.875000" name="det55"/>
+ <location r="0.14" t="90" p="50.625000" rot="50.625000" name="det56"/>
+ <location r="0.14" t="90" p="39.375000" rot="39.375000" name="det57"/>
+ <location r="0.14" t="90" p="28.125000" rot="28.125000" name="det58"/>
+ <location r="0.14" t="90" p="16.875000" rot="16.875000" name="det59"/>
+ <location r="0.14" t="90" p="5.625000" rot="5.625000" name="det60"/>
+ <location r="0.14" t="90" p="354.375000" rot="354.375000" name="det61"/>
+ <location r="0.14" t="90" p="343.125000" rot="343.125000" name="det62"/>
+ <location r="0.14" t="90" p="331.875000" rot="331.875000" name="det63"/>
+ <location r="0.14" t="90" p="320.625000" rot="320.625000" name="det64"/>
+ </component>
+ </type>
+
+ <type name="ring-back">
+ <component type="pixel">
+ <location r="0.14" t="90" p="230.625000" rot="230.625000" name="det1"/>
+ <location r="0.14" t="90" p="241.875000" rot="241.875000" name="det2"/>
+ <location r="0.14" t="90" p="253.125000" rot="253.125000" name="det3"/>
+ <location r="0.14" t="90" p="264.375000" rot="264.375000" name="det4"/>
+ <location r="0.14" t="90" p="275.625000" rot="275.625000" name="det5"/>
+ <location r="0.14" t="90" p="286.875000" rot="286.875000" name="det6"/>
+ <location r="0.14" t="90" p="298.125000" rot="298.125000" name="det7"/>
+ <location r="0.14" t="90" p="309.375000" rot="309.375000" name="det8"/>
+ <location r="0.14" t="90" p="320.625000" rot="320.625000" name="det9"/>
+ <location r="0.14" t="90" p="331.875000" rot="331.875000" name="det10"/>
+ <location r="0.14" t="90" p="343.125000" rot="343.125000" name="det11"/>
+ <location r="0.14" t="90" p="354.375000" rot="354.375000" name="det12"/>
+ <location r="0.14" t="90" p="5.625000" rot="5.625000" name="det13"/>
+ <location r="0.14" t="90" p="16.875000" rot="16.875000" name="det14"/>
+ <location r="0.14" t="90" p="28.125000" rot="28.125000" name="det15"/>
+ <location r="0.14" t="90" p="39.375000" rot="39.375000" name="det16"/>
+ <location r="0.14" t="90" p="50.625000" rot="50.625000" name="det17"/>
+ <location r="0.14" t="90" p="61.875000" rot="61.875000" name="det18"/>
+ <location r="0.14" t="90" p="73.125000" rot="73.125000" name="det19"/>
+ <location r="0.14" t="90" p="84.375000" rot="84.375000" name="det20"/>
+ <location r="0.14" t="90" p="95.625000" rot="95.625000" name="det21"/>
+ <location r="0.14" t="90" p="106.875000" rot="106.875000" name="det22"/>
+ <location r="0.14" t="90" p="118.125000" rot="118.125000" name="det23"/>
+ <location r="0.14" t="90" p="129.375000" rot="129.375000" name="det24"/>
+ <location r="0.14" t="90" p="140.625000" rot="140.625000" name="det25"/>
+ <location r="0.14" t="90" p="151.875000" rot="151.875000" name="det26"/>
+ <location r="0.14" t="90" p="163.125000" rot="163.125000" name="det27"/>
+ <location r="0.14" t="90" p="174.375000" rot="174.375000" name="det28"/>
+ <location r="0.14" t="90" p="185.625000" rot="185.625000" name="det29"/>
+ <location r="0.14" t="90" p="196.875000" rot="196.875000" name="det30"/>
+ <location r="0.14" t="90" p="208.125000" rot="208.125000" name="det31"/>
+ <location r="0.14" t="90" p="219.375000" rot="219.375000" name="det32"/>
+ </component>
+ </type>
+
+ <type name="pixel" is="detector">
+
+ <!-- It is implicitely assumed here that the front y-z plane (looking down
+ the x-axis) is the surface that see the neutron beam. This surface is
+ 5cm along y and 17cm along z and the dept along x is 1cm. -->
+ <cuboid id="shape">
+ <left-front-bottom-point x="0.0" y="-0.0125" z="-0.085" />
+ <left-front-top-point x="0.0" y="0.0125" z="-0.085" />
+ <left-back-bottom-point x="0.01" y="-0.0125" z="-0.085" />
+ <right-front-bottom-point x="0.0" y="-0.0125" z="0.085" />
+ </cuboid>
+ <algebra val="shape" />
+ </type>
+
+
+
+ <!-- DETECTOR ID LISTS -->
+
+ <idlist idname="both rings">
+ <id start="33" end="64" />
+ <id start="1" end="32" />
+ </idlist>
+
+</instrument>
diff --git a/Code/Mantid/Instrument/MUSR_Definition.xml b/Code/Mantid/Instrument/MUSR_Definition.xml
index e3f3d544fee999739b9d435f0f5d2085b23759c4..5524e53736abddc75ab72d08488f92c7901234b6 100644
--- a/Code/Mantid/Instrument/MUSR_Definition.xml
+++ b/Code/Mantid/Instrument/MUSR_Definition.xml
@@ -17,12 +17,6 @@
<handedness val="right"/>
</reference-frame>
</defaults>
-
-
- <!-- BRIEF DESCRIPTION OF CRISP INSTRUMENT:
-
- Data for the MuSR instrument
- -->
<!-- LIST OF PHYSICAL COMPONENTS (which the instrument consists of) -->