diff --git a/instrument/CNCS_Definition.xml b/instrument/CNCS_Definition.xml
index a1efa60551f6c54b29c15115ffd1d34a904adebf..d5eeda077bb049e43d71f841d3265afdf78292ed 100644
--- a/instrument/CNCS_Definition.xml
+++ b/instrument/CNCS_Definition.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='ASCII'?>
-<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.mantidproject.org/IDF/1.0" last-modified="2018-06-05 17:07:00" name="CNCS" valid-from="2018-06-06 00:00:00" valid-to="2100-01-31 23:59:59" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
+<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.mantidproject.org/IDF/1.0" last-modified="2017-08-04 14:27:05.221979" name="CNCS" valid-from="2017-08-07 10:00:00" valid-to="2100-01-31 23:59:59" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
<!--Created by Andrei Savici-->
<defaults>
<length unit="metre"/>
@@ -187,351 +187,351 @@
</type>
<type name="bank1">
<component type="eightpack">
- <location x="2.63355695254" y="-0.00805304172392" z="-2.29214867449">
- <rot axis-x="0" axis-y="1" axis-z="0" val="310.095284113"/>
+ <location x="2.63735" y="0.0" z="-2.29545">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="311.035"/>
</location>
</component>
</type>
<type name="bank2">
<component type="eightpack">
- <location x="2.77256117998" y="-0.0133951121808" z="-2.12323320526">
- <rot axis-x="0" axis-y="1" axis-z="0" val="306.979174274"/>
+ <location x="2.77368" y="0.0" z="-2.12409">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="307.445"/>
</location>
</component>
</type>
<type name="bank3">
<component type="eightpack">
- <location x="2.89851577529" y="-0.00123121673387" z="-1.94441846014">
- <rot axis-x="0" axis-y="1" axis-z="0" val="303.30468949"/>
+ <location x="2.90141" y="0.0" z="-1.94636">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="303.855"/>
</location>
</component>
</type>
<type name="bank4">
<component type="eightpack">
- <location x="3.01477465936" y="-0.00693633636999" z="-1.75922288183">
- <rot axis-x="0" axis-y="1" axis-z="0" val="300.345869554"/>
+ <location x="3.0098" y="0.0" z="-1.75632">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="300.265"/>
</location>
</component>
</type>
<type name="bank5">
<component type="eightpack">
- <location x="3.11746367922" y="-0.0108113046477" z="-1.56621929396">
- <rot axis-x="0" axis-y="1" axis-z="0" val="296.456557214"/>
+ <location x="3.11436" y="0.0" z="-1.56466">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="296.675"/>
</location>
</component>
</type>
<type name="bank6">
<component type="eightpack">
- <location x="3.20979297312" y="-0.0132655563398" z="-1.36809538516">
- <rot axis-x="0" axis-y="1" axis-z="0" val="292.710225026"/>
+ <location x="3.21459" y="0.0" z="-1.37014">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="293.085"/>
</location>
</component>
</type>
<type name="bank7">
<component type="eightpack">
- <location x="3.28899795171" y="-0.00907508027178" z="-1.16437252936">
- <rot axis-x="0" axis-y="1" axis-z="0" val="288.784305155"/>
+ <location x="3.29416" y="0.0" z="-1.1662">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="289.495"/>
</location>
</component>
</type>
<type name="bank8">
<component type="eightpack">
- <location x="3.35383059114" y="-0.014200783058" z="-0.955681799296">
- <rot axis-x="0" axis-y="1" axis-z="0" val="285.964875382"/>
+ <location x="3.35972" y="0.0" z="-0.95736">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="285.905"/>
</location>
</component>
</type>
<type name="bank9">
<component type="eightpack">
- <location x="3.40603337032" y="-0.0123268163096" z="-0.743574532015">
- <rot axis-x="0" axis-y="1" axis-z="0" val="280.573346522"/>
+ <location x="3.41183" y="0.0" z="-0.74484">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="282.315"/>
</location>
</component>
</type>
<type name="bank10">
<component type="eightpack">
- <location x="3.44624583379" y="-0.00716720894632" z="-0.528890581008">
- <rot axis-x="0" axis-y="1" axis-z="0" val="278.137682795"/>
+ <location x="3.45152" y="0.0" z="-0.5297">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="278.725"/>
</location>
</component>
</type>
<type name="bank11">
<component type="eightpack">
- <location x="3.46822516874" y="-0.00873259331623" z="-0.311663409684">
- <rot axis-x="0" axis-y="1" axis-z="0" val="274.555536615"/>
+ <location x="3.47364" y="0.0" z="-0.31215">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="275.135"/>
</location>
</component>
</type>
<type name="bank12">
<component type="eightpack">
- <location x="3.48588054048" y="-0.012602871609" z="-0.0940242115606">
- <rot axis-x="0" axis-y="1" axis-z="0" val="270.309537951"/>
+ <location x="3.49351" y="0.0" z="-0.09423">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="271.545"/>
</location>
</component>
</type>
<type name="bank13">
<component type="eightpack">
- <location x="3.48567456526" y="-0.00620164264455" z="0.124459506865">
- <rot axis-x="0" axis-y="1" axis-z="0" val="267.878783665"/>
+ <location x="3.49269" y="0.0" z="0.12471">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="267.955"/>
</location>
</component>
</type>
<type name="bank14">
<component type="eightpack">
- <location x="3.47079708049" y="-0.0137497709454" z="0.342456982984">
- <rot axis-x="0" axis-y="1" axis-z="0" val="265.029521548"/>
+ <location x="3.47701" y="0.0" z="0.34307">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="264.365"/>
</location>
</component>
</type>
<type name="bank15">
<component type="eightpack">
- <location x="3.44128033482" y="-0.00502819699127" z="0.55890618377">
- <rot axis-x="0" axis-y="1" axis-z="0" val="260.182926369"/>
+ <location x="3.44703" y="0.0" z="0.55984">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="260.775"/>
</location>
</component>
</type>
<type name="bank16">
<component type="eightpack">
- <location x="3.3991609803" y="-0.00752369159089" z="0.773202448942">
- <rot axis-x="0" axis-y="1" axis-z="0" val="257.448298706"/>
+ <location x="3.40636" y="0.0" z="0.77484">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="257.185"/>
</location>
</component>
</type>
<type name="bank17">
<component type="eightpack">
- <location x="3.34287011946" y="-0.00792010807182" z="0.984179354588">
- <rot axis-x="0" axis-y="1" axis-z="0" val="252.792302733"/>
+ <location x="3.34919" y="0.0" z="0.98604">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="253.595"/>
</location>
</component>
</type>
<type name="bank18">
<component type="eightpack">
- <location x="3.2753503843" y="-0.0143907172707" z="1.19180952429">
- <rot axis-x="0" axis-y="1" axis-z="0" val="250.604346554"/>
+ <location x="3.28181" y="0.0" z="1.19416">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="250.005"/>
</location>
</component>
</type>
<type name="bank19">
<component type="eightpack">
- <location x="3.19418649853" y="-0.00452590191061" z="1.39450647593">
- <rot axis-x="0" axis-y="1" axis-z="0" val="245.791776242"/>
+ <location x="3.20015" y="0.0" z="1.39711">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="246.415"/>
</location>
</component>
</type>
<type name="bank20">
<component type="eightpack">
- <location x="3.09912954381" y="-0.0119547358163" z="1.59102184612">
- <rot axis-x="0" axis-y="1" axis-z="0" val="244.383464915"/>
+ <location x="3.10645" y="0.0" z="1.59478">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="242.825"/>
</location>
</component>
</type>
<type name="bank21">
<component type="eightpack">
- <location x="2.99326160527" y="-0.012445432441" z="1.78186374592">
- <rot axis-x="0" axis-y="1" axis-z="0" val="237.721818422"/>
+ <location x="2.99895" y="0.0" z="1.78525">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="239.235"/>
</location>
</component>
</type>
<type name="bank22">
<component type="eightpack">
- <location x="2.87669240886" y="-0.0113253580343" z="1.96640017557">
- <rot axis-x="0" axis-y="1" axis-z="0" val="236.409623629"/>
+ <location x="2.88092" y="0.0" z="1.96929">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="235.645"/>
</location>
</component>
</type>
<type name="bank23">
<component type="eightpack">
- <location x="2.74898401819" y="-0.00930178398323" z="2.14349470035">
- <rot axis-x="0" axis-y="1" axis-z="0" val="232.913407853"/>
+ <location x="2.75271" y="0.0" z="2.1464">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="232.055"/>
</location>
</component>
</type>
<type name="bank24">
<component type="eightpack">
- <location x="2.60877469676" y="-0.0146699665282" z="2.31089134884">
- <rot axis-x="0" axis-y="1" axis-z="0" val="229.456532174"/>
+ <location x="2.614" y="0.0" z="2.31552">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="228.465"/>
</location>
</component>
</type>
<type name="bank25">
<component type="eightpack">
- <location x="2.45894413155" y="-0.00753717213798" z="2.46969438863">
- <rot axis-x="0" axis-y="1" axis-z="0" val="224.62688334"/>
+ <location x="2.46346" y="0.0" z="2.47423">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="224.875"/>
</location>
</component>
</type>
<type name="bank26">
<component type="eightpack">
- <location x="2.30039901369" y="-0.0117132573435" z="2.61987004547">
- <rot axis-x="0" axis-y="1" axis-z="0" val="222.527186466"/>
+ <location x="2.305" y="0.0" z="2.62511">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="221.285"/>
</location>
</component>
</type>
<type name="bank27">
<component type="eightpack">
- <location x="2.13120612275" y="-0.00877337511546" z="2.75795102452">
- <rot axis-x="0" axis-y="1" axis-z="0" val="217.636718307"/>
+ <location x="2.13544" y="0.0" z="2.76343">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="217.695"/>
</location>
</component>
</type>
<type name="bank28">
<component type="eightpack">
- <location x="1.9547541504" y="-0.0109956579123" z="2.8866156519">
- <rot axis-x="0" axis-y="1" axis-z="0" val="215.23179403"/>
+ <location x="1.95838" y="0.0" z="2.89197">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="214.105"/>
</location>
</component>
</type>
<type name="bank29">
<component type="eightpack">
- <location x="1.76883751249" y="-0.00730845950967" z="3.00108842319">
- <rot axis-x="0" axis-y="1" axis-z="0" val="209.68669999"/>
+ <location x="1.77231" y="0.0" z="3.00698">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="210.515"/>
</location>
</component>
</type>
<type name="bank30">
<component type="eightpack">
- <location x="1.57816925724" y="-0.00737303526833" z="3.10738415194">
- <rot axis-x="0" axis-y="1" axis-z="0" val="208.576553184"/>
+ <location x="1.58093" y="0.0" z="3.11282">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="206.925"/>
</location>
</component>
</type>
<type name="bank31">
<component type="eightpack">
- <location x="1.3794540841" y="-0.005402171248" z="3.19767202568">
- <rot axis-x="0" axis-y="1" axis-z="0" val="201.92734285"/>
+ <location x="1.38202" y="0.0" z="3.20362">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="203.335"/>
</location>
</component>
</type>
<type name="bank32">
<component type="eightpack">
- <location x="1.17678670897" y="-0.0115788528581" z="3.27852874933">
- <rot axis-x="0" axis-y="1" axis-z="0" val="200.726329951"/>
+ <location x="1.17907" y="0.0" z="3.28489">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="199.745"/>
</location>
</component>
</type>
<type name="bank33">
<component type="eightpack">
- <location x="0.968972394697" y="-0.00683760440037" z="3.34504534016">
- <rot axis-x="0" axis-y="1" axis-z="0" val="195.631038297"/>
+ <location x="0.97079" y="0.0" z="3.35132">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="196.155"/>
</location>
</component>
</type>
<type name="bank34">
<component type="eightpack">
- <location x="0.757951108677" y="-0.00444990916791" z="3.40064289582">
- <rot axis-x="0" axis-y="1" axis-z="0" val="193.057797345"/>
+ <location x="0.75929" y="0.0" z="3.40665">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="192.565"/>
</location>
</component>
</type>
<type name="bank35">
<component type="eightpack">
- <location x="0.545080793899" y="-0.01" z="3.45122049833">
- <rot axis-x="0" axis-y="1" axis-z="0" val="188.975076375"/>
+ <location x="0.5444" y="0.0" z="3.44691">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="188.975"/>
</location>
</component>
</type>
<type name="bank36">
<component type="eightpack">
- <location x="0.327902139883" y="-0.01" z="3.47857962201">
- <rot axis-x="0" axis-y="1" axis-z="0" val="185.384973183"/>
+ <location x="0.32756" y="0.0" z="3.47495">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="185.385"/>
</location>
</component>
</type>
<type name="bank37">
<component type="eightpack">
- <location x="-0.327905727411" y="-0.01" z="3.47857928384">
- <rot axis-x="0" axis-y="1" axis-z="0" val="174.614967727"/>
+ <location x="-0.32713" y="0.0" z="3.47035">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="174.615"/>
</location>
</component>
</type>
<type name="bank38">
<component type="eightpack">
- <location x="-0.543747952399" y="-0.00927709874794" z="3.44278956723">
- <rot axis-x="0" axis-y="1" axis-z="0" val="172.041859035"/>
+ <location x="-0.54329" y="0.0" z="3.43989">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="171.025"/>
</location>
</component>
</type>
<type name="bank39">
<component type="eightpack">
- <location x="-0.758193432882" y="-0.00216691558037" z="3.40172872739">
- <rot axis-x="0" axis-y="1" axis-z="0" val="167.470789286"/>
+ <location x="-0.75956" y="0.0" z="3.40786">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="167.435"/>
</location>
</component>
</type>
<type name="bank40">
<component type="eightpack">
- <location x="-0.969248399002" y="-0.00738005173467" z="3.34596405867">
- <rot axis-x="0" axis-y="1" axis-z="0" val="164.609097209"/>
+ <location x="-0.97133" y="0.0" z="3.35315">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="163.845"/>
</location>
</component>
</type>
<type name="bank41">
<component type="eightpack">
- <location x="-1.17734263799" y="-0.00887621904661" z="3.28008237784">
- <rot axis-x="0" axis-y="1" axis-z="0" val="160.197107354"/>
+ <location x="-1.1797" y="0.0" z="3.28665">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="160.255"/>
</location>
</component>
</type>
<type name="bank42">
<component type="eightpack">
- <location x="-1.38049925322" y="-0.00597561468068" z="3.20011305921">
- <rot axis-x="0" axis-y="1" axis-z="0" val="156.590131905"/>
+ <location x="-1.383" y="0.0" z="3.20591">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="156.665"/>
</location>
</component>
</type>
<type name="bank43">
<component type="eightpack">
- <location x="-1.57686250891" y="-0.00752655425868" z="3.10480483645">
- <rot axis-x="0" axis-y="1" axis-z="0" val="152.848008015"/>
+ <location x="-1.58008" y="0.0" z="3.11114">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="153.075"/>
</location>
</component>
</type>
<type name="bank44">
<component type="eightpack">
- <location x="-1.76951975981" y="-0.0124187146447" z="3.00225558571">
- <rot axis-x="0" axis-y="1" axis-z="0" val="149.904284089"/>
+ <location x="-1.7731" y="0.0" z="3.00833">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="149.485"/>
</location>
</component>
</type>
<type name="bank45">
<component type="eightpack">
- <location x="-1.95405490949" y="-0.0139878081402" z="2.885576101">
- <rot axis-x="0" axis-y="1" axis-z="0" val="145.59853451"/>
+ <location x="-1.95808" y="0.0" z="2.89152">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="145.895"/>
</location>
</component>
</type>
<type name="bank46">
<component type="eightpack">
- <location x="-2.13165966631" y="-0.011019158111" z="2.75853621879">
- <rot axis-x="0" axis-y="1" axis-z="0" val="142.990749843"/>
+ <location x="-2.13633" y="0.0" z="2.76458">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="142.305"/>
</location>
</component>
</type>
<type name="bank47">
<component type="eightpack">
- <location x="-2.29960990575" y="-0.00554741904044" z="2.6189771691">
- <rot axis-x="0" axis-y="1" axis-z="0" val="138.190725729"/>
+ <location x="-2.30503" y="0.0" z="2.62515">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="138.715"/>
</location>
</component>
</type>
<type name="bank48">
<component type="eightpack">
- <location x="-2.45762516547" y="-0.00379270969503" z="2.46837305924">
- <rot axis-x="0" axis-y="1" axis-z="0" val="137.270198096"/>
+ <location x="-2.46268" y="0.0" z="2.47345">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="135.125"/>
</location>
</component>
</type>
<type name="bank49">
<component type="eightpack">
- <location x="-2.5981211834" y="-0.012970683728" z="2.30144952633">
- <rot axis-x="0" axis-y="1" axis-z="0" val="130.245873152"/>
+ <location x="-2.60196" y="0.0" z="2.30485">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="131.535"/>
</location>
</component>
</type>
<type name="bank50">
<component type="eightpack">
- <location x="-2.73574328325" y="-0.0145770580078" z="2.13317246019">
- <rot axis-x="0" axis-y="1" axis-z="0" val="129.308919959"/>
+ <location x="-2.74541" y="0.0" z="2.14071">
+ <rot axis-x="0" axis-y="1" axis-z="0" val="127.945"/>
</location>
</component>
</type>
@@ -553,134 +553,134 @@
<type name="tube" outline="yes">
<properties/>
<component type="pixel">
- <location name="pixel1" y="-1.021953125"/>
- <location name="pixel2" y="-1.005859375"/>
- <location name="pixel3" y="-0.989765625"/>
- <location name="pixel4" y="-0.973671875"/>
- <location name="pixel5" y="-0.957578125"/>
- <location name="pixel6" y="-0.941484375"/>
- <location name="pixel7" y="-0.925390625"/>
- <location name="pixel8" y="-0.909296875"/>
- <location name="pixel9" y="-0.893203125"/>
- <location name="pixel10" y="-0.877109375"/>
- <location name="pixel11" y="-0.861015625"/>
- <location name="pixel12" y="-0.844921875"/>
- <location name="pixel13" y="-0.828828125"/>
- <location name="pixel14" y="-0.812734375"/>
- <location name="pixel15" y="-0.796640625"/>
- <location name="pixel16" y="-0.780546875"/>
- <location name="pixel17" y="-0.764453125"/>
- <location name="pixel18" y="-0.748359375"/>
- <location name="pixel19" y="-0.732265625"/>
- <location name="pixel20" y="-0.716171875"/>
- <location name="pixel21" y="-0.700078125"/>
- <location name="pixel22" y="-0.683984375"/>
- <location name="pixel23" y="-0.667890625"/>
- <location name="pixel24" y="-0.651796875"/>
- <location name="pixel25" y="-0.635703125"/>
- <location name="pixel26" y="-0.619609375"/>
- <location name="pixel27" y="-0.603515625"/>
- <location name="pixel28" y="-0.587421875"/>
- <location name="pixel29" y="-0.571328125"/>
- <location name="pixel30" y="-0.555234375"/>
- <location name="pixel31" y="-0.539140625"/>
- <location name="pixel32" y="-0.523046875"/>
- <location name="pixel33" y="-0.506953125"/>
- <location name="pixel34" y="-0.490859375"/>
- <location name="pixel35" y="-0.474765625"/>
- <location name="pixel36" y="-0.458671875"/>
- <location name="pixel37" y="-0.442578125"/>
- <location name="pixel38" y="-0.426484375"/>
- <location name="pixel39" y="-0.410390625"/>
- <location name="pixel40" y="-0.394296875"/>
- <location name="pixel41" y="-0.378203125"/>
- <location name="pixel42" y="-0.362109375"/>
- <location name="pixel43" y="-0.346015625"/>
- <location name="pixel44" y="-0.329921875"/>
- <location name="pixel45" y="-0.313828125"/>
- <location name="pixel46" y="-0.297734375"/>
- <location name="pixel47" y="-0.281640625"/>
- <location name="pixel48" y="-0.265546875"/>
- <location name="pixel49" y="-0.249453125"/>
- <location name="pixel50" y="-0.233359375"/>
- <location name="pixel51" y="-0.217265625"/>
- <location name="pixel52" y="-0.201171875"/>
- <location name="pixel53" y="-0.185078125"/>
- <location name="pixel54" y="-0.168984375"/>
- <location name="pixel55" y="-0.152890625"/>
- <location name="pixel56" y="-0.136796875"/>
- <location name="pixel57" y="-0.120703125"/>
- <location name="pixel58" y="-0.104609375"/>
- <location name="pixel59" y="-0.088515625"/>
- <location name="pixel60" y="-0.072421875"/>
- <location name="pixel61" y="-0.056328125"/>
- <location name="pixel62" y="-0.040234375"/>
- <location name="pixel63" y="-0.024140625"/>
- <location name="pixel64" y="-0.008046875"/>
- <location name="pixel65" y="0.008046875"/>
- <location name="pixel66" y="0.024140625"/>
- <location name="pixel67" y="0.040234375"/>
- <location name="pixel68" y="0.056328125"/>
- <location name="pixel69" y="0.072421875"/>
- <location name="pixel70" y="0.088515625"/>
- <location name="pixel71" y="0.104609375"/>
- <location name="pixel72" y="0.120703125"/>
- <location name="pixel73" y="0.136796875"/>
- <location name="pixel74" y="0.152890625"/>
- <location name="pixel75" y="0.168984375"/>
- <location name="pixel76" y="0.185078125"/>
- <location name="pixel77" y="0.201171875"/>
- <location name="pixel78" y="0.217265625"/>
- <location name="pixel79" y="0.233359375"/>
- <location name="pixel80" y="0.249453125"/>
- <location name="pixel81" y="0.265546875"/>
- <location name="pixel82" y="0.281640625"/>
- <location name="pixel83" y="0.297734375"/>
- <location name="pixel84" y="0.313828125"/>
- <location name="pixel85" y="0.329921875"/>
- <location name="pixel86" y="0.346015625"/>
- <location name="pixel87" y="0.362109375"/>
- <location name="pixel88" y="0.378203125"/>
- <location name="pixel89" y="0.394296875"/>
- <location name="pixel90" y="0.410390625"/>
- <location name="pixel91" y="0.426484375"/>
- <location name="pixel92" y="0.442578125"/>
- <location name="pixel93" y="0.458671875"/>
- <location name="pixel94" y="0.474765625"/>
- <location name="pixel95" y="0.490859375"/>
- <location name="pixel96" y="0.506953125"/>
- <location name="pixel97" y="0.523046875"/>
- <location name="pixel98" y="0.539140625"/>
- <location name="pixel99" y="0.555234375"/>
- <location name="pixel100" y="0.571328125"/>
- <location name="pixel101" y="0.587421875"/>
- <location name="pixel102" y="0.603515625"/>
- <location name="pixel103" y="0.619609375"/>
- <location name="pixel104" y="0.635703125"/>
- <location name="pixel105" y="0.651796875"/>
- <location name="pixel106" y="0.667890625"/>
- <location name="pixel107" y="0.683984375"/>
- <location name="pixel108" y="0.700078125"/>
- <location name="pixel109" y="0.716171875"/>
- <location name="pixel110" y="0.732265625"/>
- <location name="pixel111" y="0.748359375"/>
- <location name="pixel112" y="0.764453125"/>
- <location name="pixel113" y="0.780546875"/>
- <location name="pixel114" y="0.796640625"/>
- <location name="pixel115" y="0.812734375"/>
- <location name="pixel116" y="0.828828125"/>
- <location name="pixel117" y="0.844921875"/>
- <location name="pixel118" y="0.861015625"/>
- <location name="pixel119" y="0.877109375"/>
- <location name="pixel120" y="0.893203125"/>
- <location name="pixel121" y="0.909296875"/>
- <location name="pixel122" y="0.925390625"/>
- <location name="pixel123" y="0.941484375"/>
- <location name="pixel124" y="0.957578125"/>
- <location name="pixel125" y="0.973671875"/>
- <location name="pixel126" y="0.989765625"/>
- <location name="pixel127" y="1.005859375"/>
- <location name="pixel128" y="1.021953125"/>
+ <location name="pixel1" y="-0.9921875"/>
+ <location name="pixel2" y="-0.9765625"/>
+ <location name="pixel3" y="-0.9609375"/>
+ <location name="pixel4" y="-0.9453125"/>
+ <location name="pixel5" y="-0.9296875"/>
+ <location name="pixel6" y="-0.9140625"/>
+ <location name="pixel7" y="-0.8984375"/>
+ <location name="pixel8" y="-0.8828125"/>
+ <location name="pixel9" y="-0.8671875"/>
+ <location name="pixel10" y="-0.8515625"/>
+ <location name="pixel11" y="-0.8359375"/>
+ <location name="pixel12" y="-0.8203125"/>
+ <location name="pixel13" y="-0.8046875"/>
+ <location name="pixel14" y="-0.7890625"/>
+ <location name="pixel15" y="-0.7734375"/>
+ <location name="pixel16" y="-0.7578125"/>
+ <location name="pixel17" y="-0.7421875"/>
+ <location name="pixel18" y="-0.7265625"/>
+ <location name="pixel19" y="-0.7109375"/>
+ <location name="pixel20" y="-0.6953125"/>
+ <location name="pixel21" y="-0.6796875"/>
+ <location name="pixel22" y="-0.6640625"/>
+ <location name="pixel23" y="-0.6484375"/>
+ <location name="pixel24" y="-0.6328125"/>
+ <location name="pixel25" y="-0.6171875"/>
+ <location name="pixel26" y="-0.6015625"/>
+ <location name="pixel27" y="-0.5859375"/>
+ <location name="pixel28" y="-0.5703125"/>
+ <location name="pixel29" y="-0.5546875"/>
+ <location name="pixel30" y="-0.5390625"/>
+ <location name="pixel31" y="-0.5234375"/>
+ <location name="pixel32" y="-0.5078125"/>
+ <location name="pixel33" y="-0.4921875"/>
+ <location name="pixel34" y="-0.4765625"/>
+ <location name="pixel35" y="-0.4609375"/>
+ <location name="pixel36" y="-0.4453125"/>
+ <location name="pixel37" y="-0.4296875"/>
+ <location name="pixel38" y="-0.4140625"/>
+ <location name="pixel39" y="-0.3984375"/>
+ <location name="pixel40" y="-0.3828125"/>
+ <location name="pixel41" y="-0.3671875"/>
+ <location name="pixel42" y="-0.3515625"/>
+ <location name="pixel43" y="-0.3359375"/>
+ <location name="pixel44" y="-0.3203125"/>
+ <location name="pixel45" y="-0.3046875"/>
+ <location name="pixel46" y="-0.2890625"/>
+ <location name="pixel47" y="-0.2734375"/>
+ <location name="pixel48" y="-0.2578125"/>
+ <location name="pixel49" y="-0.2421875"/>
+ <location name="pixel50" y="-0.2265625"/>
+ <location name="pixel51" y="-0.2109375"/>
+ <location name="pixel52" y="-0.1953125"/>
+ <location name="pixel53" y="-0.1796875"/>
+ <location name="pixel54" y="-0.1640625"/>
+ <location name="pixel55" y="-0.1484375"/>
+ <location name="pixel56" y="-0.1328125"/>
+ <location name="pixel57" y="-0.1171875"/>
+ <location name="pixel58" y="-0.1015625"/>
+ <location name="pixel59" y="-0.0859375"/>
+ <location name="pixel60" y="-0.0703125"/>
+ <location name="pixel61" y="-0.0546875"/>
+ <location name="pixel62" y="-0.0390625"/>
+ <location name="pixel63" y="-0.0234375"/>
+ <location name="pixel64" y="-0.0078125"/>
+ <location name="pixel65" y="0.0078125"/>
+ <location name="pixel66" y="0.0234375"/>
+ <location name="pixel67" y="0.0390625"/>
+ <location name="pixel68" y="0.0546875"/>
+ <location name="pixel69" y="0.0703125"/>
+ <location name="pixel70" y="0.0859375"/>
+ <location name="pixel71" y="0.1015625"/>
+ <location name="pixel72" y="0.1171875"/>
+ <location name="pixel73" y="0.1328125"/>
+ <location name="pixel74" y="0.1484375"/>
+ <location name="pixel75" y="0.1640625"/>
+ <location name="pixel76" y="0.1796875"/>
+ <location name="pixel77" y="0.1953125"/>
+ <location name="pixel78" y="0.2109375"/>
+ <location name="pixel79" y="0.2265625"/>
+ <location name="pixel80" y="0.2421875"/>
+ <location name="pixel81" y="0.2578125"/>
+ <location name="pixel82" y="0.2734375"/>
+ <location name="pixel83" y="0.2890625"/>
+ <location name="pixel84" y="0.3046875"/>
+ <location name="pixel85" y="0.3203125"/>
+ <location name="pixel86" y="0.3359375"/>
+ <location name="pixel87" y="0.3515625"/>
+ <location name="pixel88" y="0.3671875"/>
+ <location name="pixel89" y="0.3828125"/>
+ <location name="pixel90" y="0.3984375"/>
+ <location name="pixel91" y="0.4140625"/>
+ <location name="pixel92" y="0.4296875"/>
+ <location name="pixel93" y="0.4453125"/>
+ <location name="pixel94" y="0.4609375"/>
+ <location name="pixel95" y="0.4765625"/>
+ <location name="pixel96" y="0.4921875"/>
+ <location name="pixel97" y="0.5078125"/>
+ <location name="pixel98" y="0.5234375"/>
+ <location name="pixel99" y="0.5390625"/>
+ <location name="pixel100" y="0.5546875"/>
+ <location name="pixel101" y="0.5703125"/>
+ <location name="pixel102" y="0.5859375"/>
+ <location name="pixel103" y="0.6015625"/>
+ <location name="pixel104" y="0.6171875"/>
+ <location name="pixel105" y="0.6328125"/>
+ <location name="pixel106" y="0.6484375"/>
+ <location name="pixel107" y="0.6640625"/>
+ <location name="pixel108" y="0.6796875"/>
+ <location name="pixel109" y="0.6953125"/>
+ <location name="pixel110" y="0.7109375"/>
+ <location name="pixel111" y="0.7265625"/>
+ <location name="pixel112" y="0.7421875"/>
+ <location name="pixel113" y="0.7578125"/>
+ <location name="pixel114" y="0.7734375"/>
+ <location name="pixel115" y="0.7890625"/>
+ <location name="pixel116" y="0.8046875"/>
+ <location name="pixel117" y="0.8203125"/>
+ <location name="pixel118" y="0.8359375"/>
+ <location name="pixel119" y="0.8515625"/>
+ <location name="pixel120" y="0.8671875"/>
+ <location name="pixel121" y="0.8828125"/>
+ <location name="pixel122" y="0.8984375"/>
+ <location name="pixel123" y="0.9140625"/>
+ <location name="pixel124" y="0.9296875"/>
+ <location name="pixel125" y="0.9453125"/>
+ <location name="pixel126" y="0.9609375"/>
+ <location name="pixel127" y="0.9765625"/>
+ <location name="pixel128" y="0.9921875"/>
</component>
</type>
<!--PIXEL FOR STANDARD 2m 128 PIXEL TUBE-->
@@ -689,7 +689,7 @@
<centre-of-bottom-base p="0.0" r="0.0" t="0.0"/>
<axis x="0.0" y="1.0" z="0.0"/>
<radius val="0.0127"/>
- <height val="0.01609375"/>
+ <height val="0.015625"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
@@ -727,3 +727,4 @@
</parameter>
</component-link>
</instrument>
+
diff --git a/instrument/CNCS_Definition_20170807_20180605.xml b/instrument/CNCS_Definition_20170807_20180605.xml
deleted file mode 100644
index 077ee6c75b0449c3c6b280d1c2d5edc4af699f29..0000000000000000000000000000000000000000
--- a/instrument/CNCS_Definition_20170807_20180605.xml
+++ /dev/null
@@ -1,729 +0,0 @@
-<?xml version='1.0' encoding='ASCII'?>
-<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.mantidproject.org/IDF/1.0" last-modified="2017-08-04 14:27:05.221979" name="CNCS" valid-from="2017-08-07 10:00:00" valid-to="2018-06-05 23:59:59" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
- <!--Created by Andrei Savici-->
- <defaults>
- <length unit="metre"/>
- <angle unit="degree"/>
- <reference-frame>
- <along-beam axis="z"/>
- <pointing-up axis="y"/>
- <handedness val="right"/>
- </reference-frame>
- </defaults>
- <!--SOURCE AND SAMPLE POSITION-->
- <component type="moderator">
- <location z="-36.262"/>
- </component>
- <type is="Source" name="moderator"/>
- <component type="sample-position">
- <location x="0.0" y="0.0" z="0.0"/>
- </component>
- <type is="SamplePos" name="sample-position"/>
- <!--MONITORS-->
- <component idlist="monitors" type="monitors">
- <location/>
- </component>
- <type name="monitors">
- <component type="monitor">
- <location name="monitor1" z="-29.949"/>
- <location name="monitor2" z="-28.706"/>
- <location name="monitor3" z="-1.416"/>
- </component>
- </type>
- <component idlist="detectors" type="detectors">
- <location/>
- </component>
- <type name="detectors">
- <component type="bank1">
- <location/>
- </component>
- <component type="bank2">
- <location/>
- </component>
- <component type="bank3">
- <location/>
- </component>
- <component type="bank4">
- <location/>
- </component>
- <component type="bank5">
- <location/>
- </component>
- <component type="bank6">
- <location/>
- </component>
- <component type="bank7">
- <location/>
- </component>
- <component type="bank8">
- <location/>
- </component>
- <component type="bank9">
- <location/>
- </component>
- <component type="bank10">
- <location/>
- </component>
- <component type="bank11">
- <location/>
- </component>
- <component type="bank12">
- <location/>
- </component>
- <component type="bank13">
- <location/>
- </component>
- <component type="bank14">
- <location/>
- </component>
- <component type="bank15">
- <location/>
- </component>
- <component type="bank16">
- <location/>
- </component>
- <component type="bank17">
- <location/>
- </component>
- <component type="bank18">
- <location/>
- </component>
- <component type="bank19">
- <location/>
- </component>
- <component type="bank20">
- <location/>
- </component>
- <component type="bank21">
- <location/>
- </component>
- <component type="bank22">
- <location/>
- </component>
- <component type="bank23">
- <location/>
- </component>
- <component type="bank24">
- <location/>
- </component>
- <component type="bank25">
- <location/>
- </component>
- <component type="bank26">
- <location/>
- </component>
- <component type="bank27">
- <location/>
- </component>
- <component type="bank28">
- <location/>
- </component>
- <component type="bank29">
- <location/>
- </component>
- <component type="bank30">
- <location/>
- </component>
- <component type="bank31">
- <location/>
- </component>
- <component type="bank32">
- <location/>
- </component>
- <component type="bank33">
- <location/>
- </component>
- <component type="bank34">
- <location/>
- </component>
- <component type="bank35">
- <location/>
- </component>
- <component type="bank36">
- <location/>
- </component>
- <component type="bank37">
- <location/>
- </component>
- <component type="bank38">
- <location/>
- </component>
- <component type="bank39">
- <location/>
- </component>
- <component type="bank40">
- <location/>
- </component>
- <component type="bank41">
- <location/>
- </component>
- <component type="bank42">
- <location/>
- </component>
- <component type="bank43">
- <location/>
- </component>
- <component type="bank44">
- <location/>
- </component>
- <component type="bank45">
- <location/>
- </component>
- <component type="bank46">
- <location/>
- </component>
- <component type="bank47">
- <location/>
- </component>
- <component type="bank48">
- <location/>
- </component>
- <component type="bank49">
- <location/>
- </component>
- <component type="bank50">
- <location/>
- </component>
- </type>
- <type name="bank1">
- <component type="eightpack">
- <location x="2.63735" y="0.0" z="-2.29545">
- <rot axis-x="0" axis-y="1" axis-z="0" val="311.035"/>
- </location>
- </component>
- </type>
- <type name="bank2">
- <component type="eightpack">
- <location x="2.77368" y="0.0" z="-2.12409">
- <rot axis-x="0" axis-y="1" axis-z="0" val="307.445"/>
- </location>
- </component>
- </type>
- <type name="bank3">
- <component type="eightpack">
- <location x="2.90141" y="0.0" z="-1.94636">
- <rot axis-x="0" axis-y="1" axis-z="0" val="303.855"/>
- </location>
- </component>
- </type>
- <type name="bank4">
- <component type="eightpack">
- <location x="3.0098" y="0.0" z="-1.75632">
- <rot axis-x="0" axis-y="1" axis-z="0" val="300.265"/>
- </location>
- </component>
- </type>
- <type name="bank5">
- <component type="eightpack">
- <location x="3.11436" y="0.0" z="-1.56466">
- <rot axis-x="0" axis-y="1" axis-z="0" val="296.675"/>
- </location>
- </component>
- </type>
- <type name="bank6">
- <component type="eightpack">
- <location x="3.21459" y="0.0" z="-1.37014">
- <rot axis-x="0" axis-y="1" axis-z="0" val="293.085"/>
- </location>
- </component>
- </type>
- <type name="bank7">
- <component type="eightpack">
- <location x="3.29416" y="0.0" z="-1.1662">
- <rot axis-x="0" axis-y="1" axis-z="0" val="289.495"/>
- </location>
- </component>
- </type>
- <type name="bank8">
- <component type="eightpack">
- <location x="3.35972" y="0.0" z="-0.95736">
- <rot axis-x="0" axis-y="1" axis-z="0" val="285.905"/>
- </location>
- </component>
- </type>
- <type name="bank9">
- <component type="eightpack">
- <location x="3.41183" y="0.0" z="-0.74484">
- <rot axis-x="0" axis-y="1" axis-z="0" val="282.315"/>
- </location>
- </component>
- </type>
- <type name="bank10">
- <component type="eightpack">
- <location x="3.45152" y="0.0" z="-0.5297">
- <rot axis-x="0" axis-y="1" axis-z="0" val="278.725"/>
- </location>
- </component>
- </type>
- <type name="bank11">
- <component type="eightpack">
- <location x="3.47364" y="0.0" z="-0.31215">
- <rot axis-x="0" axis-y="1" axis-z="0" val="275.135"/>
- </location>
- </component>
- </type>
- <type name="bank12">
- <component type="eightpack">
- <location x="3.49351" y="0.0" z="-0.09423">
- <rot axis-x="0" axis-y="1" axis-z="0" val="271.545"/>
- </location>
- </component>
- </type>
- <type name="bank13">
- <component type="eightpack">
- <location x="3.49269" y="0.0" z="0.12471">
- <rot axis-x="0" axis-y="1" axis-z="0" val="267.955"/>
- </location>
- </component>
- </type>
- <type name="bank14">
- <component type="eightpack">
- <location x="3.47701" y="0.0" z="0.34307">
- <rot axis-x="0" axis-y="1" axis-z="0" val="264.365"/>
- </location>
- </component>
- </type>
- <type name="bank15">
- <component type="eightpack">
- <location x="3.44703" y="0.0" z="0.55984">
- <rot axis-x="0" axis-y="1" axis-z="0" val="260.775"/>
- </location>
- </component>
- </type>
- <type name="bank16">
- <component type="eightpack">
- <location x="3.40636" y="0.0" z="0.77484">
- <rot axis-x="0" axis-y="1" axis-z="0" val="257.185"/>
- </location>
- </component>
- </type>
- <type name="bank17">
- <component type="eightpack">
- <location x="3.34919" y="0.0" z="0.98604">
- <rot axis-x="0" axis-y="1" axis-z="0" val="253.595"/>
- </location>
- </component>
- </type>
- <type name="bank18">
- <component type="eightpack">
- <location x="3.28181" y="0.0" z="1.19416">
- <rot axis-x="0" axis-y="1" axis-z="0" val="250.005"/>
- </location>
- </component>
- </type>
- <type name="bank19">
- <component type="eightpack">
- <location x="3.20015" y="0.0" z="1.39711">
- <rot axis-x="0" axis-y="1" axis-z="0" val="246.415"/>
- </location>
- </component>
- </type>
- <type name="bank20">
- <component type="eightpack">
- <location x="3.10645" y="0.0" z="1.59478">
- <rot axis-x="0" axis-y="1" axis-z="0" val="242.825"/>
- </location>
- </component>
- </type>
- <type name="bank21">
- <component type="eightpack">
- <location x="2.99895" y="0.0" z="1.78525">
- <rot axis-x="0" axis-y="1" axis-z="0" val="239.235"/>
- </location>
- </component>
- </type>
- <type name="bank22">
- <component type="eightpack">
- <location x="2.88092" y="0.0" z="1.96929">
- <rot axis-x="0" axis-y="1" axis-z="0" val="235.645"/>
- </location>
- </component>
- </type>
- <type name="bank23">
- <component type="eightpack">
- <location x="2.75271" y="0.0" z="2.1464">
- <rot axis-x="0" axis-y="1" axis-z="0" val="232.055"/>
- </location>
- </component>
- </type>
- <type name="bank24">
- <component type="eightpack">
- <location x="2.614" y="0.0" z="2.31552">
- <rot axis-x="0" axis-y="1" axis-z="0" val="228.465"/>
- </location>
- </component>
- </type>
- <type name="bank25">
- <component type="eightpack">
- <location x="2.46346" y="0.0" z="2.47423">
- <rot axis-x="0" axis-y="1" axis-z="0" val="224.875"/>
- </location>
- </component>
- </type>
- <type name="bank26">
- <component type="eightpack">
- <location x="2.305" y="0.0" z="2.62511">
- <rot axis-x="0" axis-y="1" axis-z="0" val="221.285"/>
- </location>
- </component>
- </type>
- <type name="bank27">
- <component type="eightpack">
- <location x="2.13544" y="0.0" z="2.76343">
- <rot axis-x="0" axis-y="1" axis-z="0" val="217.695"/>
- </location>
- </component>
- </type>
- <type name="bank28">
- <component type="eightpack">
- <location x="1.95838" y="0.0" z="2.89197">
- <rot axis-x="0" axis-y="1" axis-z="0" val="214.105"/>
- </location>
- </component>
- </type>
- <type name="bank29">
- <component type="eightpack">
- <location x="1.77231" y="0.0" z="3.00698">
- <rot axis-x="0" axis-y="1" axis-z="0" val="210.515"/>
- </location>
- </component>
- </type>
- <type name="bank30">
- <component type="eightpack">
- <location x="1.58093" y="0.0" z="3.11282">
- <rot axis-x="0" axis-y="1" axis-z="0" val="206.925"/>
- </location>
- </component>
- </type>
- <type name="bank31">
- <component type="eightpack">
- <location x="1.38202" y="0.0" z="3.20362">
- <rot axis-x="0" axis-y="1" axis-z="0" val="203.335"/>
- </location>
- </component>
- </type>
- <type name="bank32">
- <component type="eightpack">
- <location x="1.17907" y="0.0" z="3.28489">
- <rot axis-x="0" axis-y="1" axis-z="0" val="199.745"/>
- </location>
- </component>
- </type>
- <type name="bank33">
- <component type="eightpack">
- <location x="0.97079" y="0.0" z="3.35132">
- <rot axis-x="0" axis-y="1" axis-z="0" val="196.155"/>
- </location>
- </component>
- </type>
- <type name="bank34">
- <component type="eightpack">
- <location x="0.75929" y="0.0" z="3.40665">
- <rot axis-x="0" axis-y="1" axis-z="0" val="192.565"/>
- </location>
- </component>
- </type>
- <type name="bank35">
- <component type="eightpack">
- <location x="0.5444" y="0.0" z="3.44691">
- <rot axis-x="0" axis-y="1" axis-z="0" val="188.975"/>
- </location>
- </component>
- </type>
- <type name="bank36">
- <component type="eightpack">
- <location x="0.32756" y="0.0" z="3.47495">
- <rot axis-x="0" axis-y="1" axis-z="0" val="185.385"/>
- </location>
- </component>
- </type>
- <type name="bank37">
- <component type="eightpack">
- <location x="-0.32713" y="0.0" z="3.47035">
- <rot axis-x="0" axis-y="1" axis-z="0" val="174.615"/>
- </location>
- </component>
- </type>
- <type name="bank38">
- <component type="eightpack">
- <location x="-0.54329" y="0.0" z="3.43989">
- <rot axis-x="0" axis-y="1" axis-z="0" val="171.025"/>
- </location>
- </component>
- </type>
- <type name="bank39">
- <component type="eightpack">
- <location x="-0.75956" y="0.0" z="3.40786">
- <rot axis-x="0" axis-y="1" axis-z="0" val="167.435"/>
- </location>
- </component>
- </type>
- <type name="bank40">
- <component type="eightpack">
- <location x="-0.97133" y="0.0" z="3.35315">
- <rot axis-x="0" axis-y="1" axis-z="0" val="163.845"/>
- </location>
- </component>
- </type>
- <type name="bank41">
- <component type="eightpack">
- <location x="-1.1797" y="0.0" z="3.28665">
- <rot axis-x="0" axis-y="1" axis-z="0" val="160.255"/>
- </location>
- </component>
- </type>
- <type name="bank42">
- <component type="eightpack">
- <location x="-1.383" y="0.0" z="3.20591">
- <rot axis-x="0" axis-y="1" axis-z="0" val="156.665"/>
- </location>
- </component>
- </type>
- <type name="bank43">
- <component type="eightpack">
- <location x="-1.58008" y="0.0" z="3.11114">
- <rot axis-x="0" axis-y="1" axis-z="0" val="153.075"/>
- </location>
- </component>
- </type>
- <type name="bank44">
- <component type="eightpack">
- <location x="-1.7731" y="0.0" z="3.00833">
- <rot axis-x="0" axis-y="1" axis-z="0" val="149.485"/>
- </location>
- </component>
- </type>
- <type name="bank45">
- <component type="eightpack">
- <location x="-1.95808" y="0.0" z="2.89152">
- <rot axis-x="0" axis-y="1" axis-z="0" val="145.895"/>
- </location>
- </component>
- </type>
- <type name="bank46">
- <component type="eightpack">
- <location x="-2.13633" y="0.0" z="2.76458">
- <rot axis-x="0" axis-y="1" axis-z="0" val="142.305"/>
- </location>
- </component>
- </type>
- <type name="bank47">
- <component type="eightpack">
- <location x="-2.30503" y="0.0" z="2.62515">
- <rot axis-x="0" axis-y="1" axis-z="0" val="138.715"/>
- </location>
- </component>
- </type>
- <type name="bank48">
- <component type="eightpack">
- <location x="-2.46268" y="0.0" z="2.47345">
- <rot axis-x="0" axis-y="1" axis-z="0" val="135.125"/>
- </location>
- </component>
- </type>
- <type name="bank49">
- <component type="eightpack">
- <location x="-2.60196" y="0.0" z="2.30485">
- <rot axis-x="0" axis-y="1" axis-z="0" val="131.535"/>
- </location>
- </component>
- </type>
- <type name="bank50">
- <component type="eightpack">
- <location x="-2.74541" y="0.0" z="2.14071">
- <rot axis-x="0" axis-y="1" axis-z="0" val="127.945"/>
- </location>
- </component>
- </type>
- <!--STANDARD 8-PACK-->
- <type name="eightpack">
- <properties/>
- <component type="tube">
- <location name="tube1" x="-0.096012"/>
- <location name="tube2" x="-0.06858"/>
- <location name="tube3" x="-0.041148"/>
- <location name="tube4" x="-0.013716"/>
- <location name="tube5" x="0.013716"/>
- <location name="tube6" x="0.041148"/>
- <location name="tube7" x="0.06858"/>
- <location name="tube8" x="0.096012"/>
- </component>
- </type>
- <!--STANDARD 2m 128 PIXEL TUBE-->
- <type name="tube" outline="yes">
- <properties/>
- <component type="pixel">
- <location name="pixel1" y="-0.9921875"/>
- <location name="pixel2" y="-0.9765625"/>
- <location name="pixel3" y="-0.9609375"/>
- <location name="pixel4" y="-0.9453125"/>
- <location name="pixel5" y="-0.9296875"/>
- <location name="pixel6" y="-0.9140625"/>
- <location name="pixel7" y="-0.8984375"/>
- <location name="pixel8" y="-0.8828125"/>
- <location name="pixel9" y="-0.8671875"/>
- <location name="pixel10" y="-0.8515625"/>
- <location name="pixel11" y="-0.8359375"/>
- <location name="pixel12" y="-0.8203125"/>
- <location name="pixel13" y="-0.8046875"/>
- <location name="pixel14" y="-0.7890625"/>
- <location name="pixel15" y="-0.7734375"/>
- <location name="pixel16" y="-0.7578125"/>
- <location name="pixel17" y="-0.7421875"/>
- <location name="pixel18" y="-0.7265625"/>
- <location name="pixel19" y="-0.7109375"/>
- <location name="pixel20" y="-0.6953125"/>
- <location name="pixel21" y="-0.6796875"/>
- <location name="pixel22" y="-0.6640625"/>
- <location name="pixel23" y="-0.6484375"/>
- <location name="pixel24" y="-0.6328125"/>
- <location name="pixel25" y="-0.6171875"/>
- <location name="pixel26" y="-0.6015625"/>
- <location name="pixel27" y="-0.5859375"/>
- <location name="pixel28" y="-0.5703125"/>
- <location name="pixel29" y="-0.5546875"/>
- <location name="pixel30" y="-0.5390625"/>
- <location name="pixel31" y="-0.5234375"/>
- <location name="pixel32" y="-0.5078125"/>
- <location name="pixel33" y="-0.4921875"/>
- <location name="pixel34" y="-0.4765625"/>
- <location name="pixel35" y="-0.4609375"/>
- <location name="pixel36" y="-0.4453125"/>
- <location name="pixel37" y="-0.4296875"/>
- <location name="pixel38" y="-0.4140625"/>
- <location name="pixel39" y="-0.3984375"/>
- <location name="pixel40" y="-0.3828125"/>
- <location name="pixel41" y="-0.3671875"/>
- <location name="pixel42" y="-0.3515625"/>
- <location name="pixel43" y="-0.3359375"/>
- <location name="pixel44" y="-0.3203125"/>
- <location name="pixel45" y="-0.3046875"/>
- <location name="pixel46" y="-0.2890625"/>
- <location name="pixel47" y="-0.2734375"/>
- <location name="pixel48" y="-0.2578125"/>
- <location name="pixel49" y="-0.2421875"/>
- <location name="pixel50" y="-0.2265625"/>
- <location name="pixel51" y="-0.2109375"/>
- <location name="pixel52" y="-0.1953125"/>
- <location name="pixel53" y="-0.1796875"/>
- <location name="pixel54" y="-0.1640625"/>
- <location name="pixel55" y="-0.1484375"/>
- <location name="pixel56" y="-0.1328125"/>
- <location name="pixel57" y="-0.1171875"/>
- <location name="pixel58" y="-0.1015625"/>
- <location name="pixel59" y="-0.0859375"/>
- <location name="pixel60" y="-0.0703125"/>
- <location name="pixel61" y="-0.0546875"/>
- <location name="pixel62" y="-0.0390625"/>
- <location name="pixel63" y="-0.0234375"/>
- <location name="pixel64" y="-0.0078125"/>
- <location name="pixel65" y="0.0078125"/>
- <location name="pixel66" y="0.0234375"/>
- <location name="pixel67" y="0.0390625"/>
- <location name="pixel68" y="0.0546875"/>
- <location name="pixel69" y="0.0703125"/>
- <location name="pixel70" y="0.0859375"/>
- <location name="pixel71" y="0.1015625"/>
- <location name="pixel72" y="0.1171875"/>
- <location name="pixel73" y="0.1328125"/>
- <location name="pixel74" y="0.1484375"/>
- <location name="pixel75" y="0.1640625"/>
- <location name="pixel76" y="0.1796875"/>
- <location name="pixel77" y="0.1953125"/>
- <location name="pixel78" y="0.2109375"/>
- <location name="pixel79" y="0.2265625"/>
- <location name="pixel80" y="0.2421875"/>
- <location name="pixel81" y="0.2578125"/>
- <location name="pixel82" y="0.2734375"/>
- <location name="pixel83" y="0.2890625"/>
- <location name="pixel84" y="0.3046875"/>
- <location name="pixel85" y="0.3203125"/>
- <location name="pixel86" y="0.3359375"/>
- <location name="pixel87" y="0.3515625"/>
- <location name="pixel88" y="0.3671875"/>
- <location name="pixel89" y="0.3828125"/>
- <location name="pixel90" y="0.3984375"/>
- <location name="pixel91" y="0.4140625"/>
- <location name="pixel92" y="0.4296875"/>
- <location name="pixel93" y="0.4453125"/>
- <location name="pixel94" y="0.4609375"/>
- <location name="pixel95" y="0.4765625"/>
- <location name="pixel96" y="0.4921875"/>
- <location name="pixel97" y="0.5078125"/>
- <location name="pixel98" y="0.5234375"/>
- <location name="pixel99" y="0.5390625"/>
- <location name="pixel100" y="0.5546875"/>
- <location name="pixel101" y="0.5703125"/>
- <location name="pixel102" y="0.5859375"/>
- <location name="pixel103" y="0.6015625"/>
- <location name="pixel104" y="0.6171875"/>
- <location name="pixel105" y="0.6328125"/>
- <location name="pixel106" y="0.6484375"/>
- <location name="pixel107" y="0.6640625"/>
- <location name="pixel108" y="0.6796875"/>
- <location name="pixel109" y="0.6953125"/>
- <location name="pixel110" y="0.7109375"/>
- <location name="pixel111" y="0.7265625"/>
- <location name="pixel112" y="0.7421875"/>
- <location name="pixel113" y="0.7578125"/>
- <location name="pixel114" y="0.7734375"/>
- <location name="pixel115" y="0.7890625"/>
- <location name="pixel116" y="0.8046875"/>
- <location name="pixel117" y="0.8203125"/>
- <location name="pixel118" y="0.8359375"/>
- <location name="pixel119" y="0.8515625"/>
- <location name="pixel120" y="0.8671875"/>
- <location name="pixel121" y="0.8828125"/>
- <location name="pixel122" y="0.8984375"/>
- <location name="pixel123" y="0.9140625"/>
- <location name="pixel124" y="0.9296875"/>
- <location name="pixel125" y="0.9453125"/>
- <location name="pixel126" y="0.9609375"/>
- <location name="pixel127" y="0.9765625"/>
- <location name="pixel128" y="0.9921875"/>
- </component>
- </type>
- <!--PIXEL FOR STANDARD 2m 128 PIXEL TUBE-->
- <type is="detector" name="pixel">
- <cylinder id="cyl-approx">
- <centre-of-bottom-base p="0.0" r="0.0" t="0.0"/>
- <axis x="0.0" y="1.0" z="0.0"/>
- <radius val="0.0127"/>
- <height val="0.015625"/>
- </cylinder>
- <algebra val="cyl-approx"/>
- </type>
- <!--MONITOR SHAPE-->
- <!--FIXME: Do something real here.-->
- <type is="monitor" name="monitor">
- <cylinder id="cyl-approx">
- <centre-of-bottom-base p="0.0" r="0.0" t="0.0"/>
- <axis x="0.0" y="0.0" z="1.0"/>
- <radius val="0.01"/>
- <height val="0.03"/>
- </cylinder>
- <algebra val="cyl-approx"/>
- </type>
- <!--DETECTOR IDs-->
- <idlist idname="detectors">
- <id end="51199" start="0"/>
- </idlist>
- <!--MONITOR IDs-->
- <idlist idname="monitors">
- <id val="-1"/>
- <id val="-2"/>
- <id val="-3"/>
- </idlist>
- <!--DETECTOR PARAMETERS-->
- <component-link name="detectors">
- <parameter name="tube_pressure">
- <value units="atm" val="6.0"/>
- </parameter>
- <parameter name="tube_thickness">
- <value units="metre" val="0.0008"/>
- </parameter>
- <parameter name="tube_temperature">
- <value units="K" val="290.0"/>
- </parameter>
- </component-link>
-</instrument>
diff --git a/instrument/CNCS_Parameters.xml b/instrument/CNCS_Parameters.xml
index 3a8fea1a2d6a536f6ee9e585993fd33aae5e79a1..d74c37f5878514e8628827d030720c6259469de7 100644
--- a/instrument/CNCS_Parameters.xml
+++ b/instrument/CNCS_Parameters.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<parameter-file instrument="CNCS" valid-from="2018-06-06 00:00:00">
+<parameter-file instrument="CNCS" valid-from="2011-01-21T00:00:00">
<component-link name="CNCS">
@@ -193,8 +193,7 @@
<parameter name="t0_formula" type="string">
<!--<value val="198.2 * (1.0 + incidentEnergy)^(-0.84098)" /> Old formula (valid till august 2015) -->
<!--<value val="157.539+ln(incidentEnergy)*(-33.04593+ln(incidentEnergy)*(-8.07523+ln(incidentEnergy)*(2.2143-0.109521767*ln(incidentEnergy))))"/> Old formula (valid from august 2015 to august 2017) -->
- <!-- <value val="111.67-28.527*ln(incidentEnergy)-1.4753*ln(incidentEnergy)*ln(incidentEnergy)"/> -->
- <value val="131.54757872-53.76763428*ln(incidentEnergy)-(-13.86307494)*ln(incidentEnergy)*ln(incidentEnergy)-(2.6780689)*ln(incidentEnergy) *ln(incidentEnergy) *ln(incidentEnergy)"/>
+ <value val="111.67-28.527*ln(incidentEnergy)-1.4753*ln(incidentEnergy)*ln(incidentEnergy)"/>
</parameter>
<parameter name="treat-background-as-events" type="string">
@@ -203,3 +202,4 @@
</component-link>
</parameter-file>
+
diff --git a/instrument/CNCS_Parameters_20170807_20180605.xml b/instrument/CNCS_Parameters_20170807_20180605.xml
deleted file mode 100644
index 72fe7d51060a2e9c0ae2fa3e0b273b09fb57114e..0000000000000000000000000000000000000000
--- a/instrument/CNCS_Parameters_20170807_20180605.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<parameter-file instrument="CNCS" valid-from="2017-08-07 10:00:00">
-
- <component-link name="CNCS">
-
- <parameter name="deltaE-mode" type="string">
- <value val="direct" />
- </parameter>
-
- <parameter name="ei-mon1-spec">
- <value val="2" />
- </parameter>
-
- <parameter name="ei-mon2-spec">
- <value val="3" />
- </parameter>
-
- <parameter name="TS_mapping_file" type="string">
- <value val="CNCS_TS_2008_08_18.dat" />
- </parameter>
-
- <!-- TODO: Update with real vanadium mass -->
- <parameter name="vanadium-mass">
- <value val="-1" />
- </parameter>
-
- <parameter name="bkgd-range-min">
- <value val="44500" />
- </parameter>
-
- <parameter name="bkgd-range-max">
- <value val="48000" />
- </parameter>
-
- <parameter name="scale-factor">
- <value val="1.0" />
- </parameter>
-
- <parameter name="monovan-integr-min">
- <value val="-1" />
- </parameter>
-
- <parameter name="monovan-integr-max">
- <value val="1" />
- </parameter>
-
- <!-- Diagnostic test defaults -->
-
- <!-- Absolute lo threshold for vanadium diag (tiny) -->
- <parameter name="diag_tiny">
- <value val="1e-10"/>
- </parameter>
-
- <!-- Absolute hi threshold for vanadium diag (huge) -->
- <parameter name="diag_huge">
- <value val="1e10"/>
- </parameter>
-
- <!-- Remove zeroes in background (s_zero)-->
- <parameter name="diag_samp_zero">
- <value val="0.0"/>
- </parameter>
-
- <!-- Fraction of median to consider counting low for the white beam diag (sv_lo)-->
- <parameter name="diag_samp_lo">
- <value val="0.0"/>
- </parameter>
-
- <!-- Fraction of median to consider counting high for the white beam diag (sv_hi)-->
- <parameter name="diag_samp_hi">
- <value val="5.0"/>
- </parameter>
-
- <!-- Error criterion as a multiple of error bar for background (sv_sig) -->
- <parameter name="diag_samp_sig">
- <value val="3.3"/>
- </parameter>
-
- <!-- Lower bound defining outliers as fraction of median value (v_out_lo)-->
- <parameter name="diag_van_out_lo">
- <value val="0.01"/>
- </parameter>
-
- <!-- Upper bound defining outliers as fraction of median value (v_out_hi)-->
- <parameter name="diag_van_out_hi">
- <value val="100."/>
- </parameter>
-
- <!-- Fraction of median to consider counting low for the white beam diag (vv_lo)-->
- <parameter name="diag_van_lo">
- <value val="0.1"/>
- </parameter>
-
- <!-- Fraction of median to consider counting high for the white beam diag (vv_hi)-->
- <parameter name="diag_van_hi">
- <value val="1.5"/>
- </parameter>
-
- <!-- Error criterion as a multiple of error bar for background (vv_sig) -->
- <parameter name="diag_van_sig">
- <value val="3.3"/>
- </parameter>
-
- <!-- True if background is to be checked -->
- <parameter name="check_background">
- <value val="0.0"/>
- </parameter>
-
- <!-- True if the bleed tests should be run -->
- <parameter name="diag_bleed_test">
- <value val="0.0"/>
- </parameter>
-
- <!-- Variation for ratio test with second white beam -->
- <parameter name="diag_variation">
- <value val="1.1"/>
- </parameter>
-
- <!-- Absolute units conversion average -->
-
- <parameter name="monovan_lo_bound">
- <value val="0.01" />
- </parameter>
-
- <parameter name="monovan_hi_bound">
- <value val="100" />
- </parameter>
-
- <parameter name="monovan_lo_frac">
- <value val="0.8" />
- </parameter>
-
- <parameter name="monovan_hi_frac">
- <value val="1.2" />
- </parameter>
-
- <!-- All the following parameters are taken directly from the MARI definition
- and are WRONG! They are only here for now to get things working -->
-
- <parameter name="wb-scale-factor">
- <value val="1.0" />
- </parameter>
-
- <parameter name="wb-integr-min"><!-- tof=53000 -->
- <value val="2.93" />
- </parameter>
-
- <parameter name="wb-integr-max"><!-- tof=52000 -->
- <value val="3.07" />
- </parameter>
-
- <parameter name="norm-mon1-spec">
- <value val="-3" />
- </parameter>
-
- <parameter name="norm-mon1-min">
- <value val="1000" />
- </parameter>
-
- <parameter name="norm-mon1-max">
- <value val="2000" />
- </parameter>
-
- <parameter name="abs-average-min">
- <value val="1e-10" />
- </parameter>
-
- <parameter name="abs-average-max">
- <value val="1e10" />
- </parameter>
-
- <parameter name="abs-median-lbound">
- <value val="0.01" />
- </parameter>
-
- <parameter name="abs-median-ubound">
- <value val="100" />
- </parameter>
-
- <parameter name="abs-median-lo-frac">
- <value val="0.8" />
- </parameter>
-
- <parameter name="abs-median-hi-frac">
- <value val="1.2" />
- </parameter>
-
- <parameter name="abs-median-signif">
- <value val="3.3" />
- </parameter>
-
- <!-- formula for t0 calculation. See http://muparser.sourceforge.net/mup_features.html#idDef2 for available operators-->
- <parameter name="t0_formula" type="string">
- <!--<value val="198.2 * (1.0 + incidentEnergy)^(-0.84098)" /> Old formula (valid till august 2015) -->
- <!--<value val="157.539+ln(incidentEnergy)*(-33.04593+ln(incidentEnergy)*(-8.07523+ln(incidentEnergy)*(2.2143-0.109521767*ln(incidentEnergy))))"/> Old formula (valid from august 2015 to august 2017) -->
- <value val="111.67-28.527*ln(incidentEnergy)-1.4753*ln(incidentEnergy)*ln(incidentEnergy)"/>
- </parameter>
-
- <parameter name="treat-background-as-events" type="string">
- <value val="yes" />
- </parameter>
-
- </component-link>
-</parameter-file>