Skip to content
Snippets Groups Projects
Unverified Commit a93ba629 authored by Nick Draper's avatar Nick Draper Committed by GitHub
Browse files

Merge pull request #27255 from martyngigg/PEARL-idf-update 

Update to PEARL IDF
parents d4802ee0 ccaf1d83
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 161 additions and 160 deletions
Testing/SystemTests/tests/analysis/reference/ISIS_Powder-PEARL00098472_splined.nxs.md5
+ 1
− 1
View file @ a93ba629
a0adaa334c342cbc836a135616e168d4
7aec3124fafd77c79f9ff31ec70f8339
Testing/SystemTests/tests/analysis/reference/ISIS_Powder-PEARL00098507_tt70Atten.nxs.md5
+ 1
− 1
View file @ a93ba629
242555ded7a3baeb291727c784370b96
8f6df42ac43cfe96d497f99c5c5a30b3
Testing/SystemTests/tests/analysis/reference/ISIS_Powder-PEARL00098507_tt70_absorb.nxs.md5
+ 1
− 1
View file @ a93ba629
a8786906c6a30ddb73c9a2633b414e3f
12bfbef792b3e3b6e85f1daa5c015108
Testing/SystemTests/tests/analysis/reference/ISIS_Powder_PRL98472_tt70_all.nxs.md5
+ 1
− 1
View file @ a93ba629
0344a747f9eabd506c2222af3efe96f6
6f031f7900e7e5d8231b4d98056969ae
Testing/SystemTests/tests/analysis/reference/ISIS_Powder_PRL98472_tt70_groups.nxs.md5
+ 1
− 1
View file @ a93ba629
5c2522a082080fb67ef2a03ee3cecf0e
f5d202c4753c13c78ce69d3a556c91d5
Testing/SystemTests/tests/analysis/reference/ISIS_Powder_PRL98472_tt70_mods.nxs.md5
+ 1
− 1
View file @ a93ba629
feec8df0604e5eb593b75fc47c72064c
ed93f0c4d5320296b2c310eb535b7b06
Testing/SystemTests/tests/analysis/reference/ISIS_Powder_PRL98472_tt70_trans.nxs.md5
+ 1
− 1
View file @ a93ba629
912260aa96f33e3a5a117724b3a890e2
8aa3f331626592dc6ed6e5b811d0a1a7
docs/source/release/v4.2.0/framework.rst
+ 2
− 1
View file @ a93ba629
......@@ -28,7 +28,8 @@ Algorithms
Instrument Definition Files
---------------------------
- A definition file for the NEAT instrument at HZB as been added along with an entry in the facilities file.
* A definition file for the NEAT instrument at HZB as been added along with an entry in the facilities file.
* The PEARL IDF has been updated with corrections to the instrument flight path and monitor distances.
Data Objects
------------
......
instrument/PEARL_Definition_new_lowangle.xml
+ 152
− 152
View file @ a93ba629
<?xml version="1.0" encoding="UTF-8" ?>
<!-- For help on the notation used to specify an Instrument Definition File
<!-- For help on the notation used to specify an Instrument Definition File
see http://www.mantidproject.org/IDF -->
<instrument xmlns="http://www.mantidproject.org/IDF/1.0"
<instrument xmlns="http://www.mantidproject.org/IDF/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
name="PEARL" valid-from ="2012-05-14 23:59:59"
name="PEARL" valid-from ="2012-05-15 23:59:59"
valid-to ="2100-01-31 23:59:59"
last-modified="2012-05-17 11:40:00">
last-modified="2019-10-11 17:35:00">
<!--<defaults>
<length unit="meter" />
<angle unit="degree" />
<location x="0.0" y="0.0" z="0.0" rot="0.0" axis-x="0.0" axis-y="0.0" axis-z="1.0"/>
<location x="0.0" y="0.0" z="0.0" rot="0.0" axis-x="0.0" axis-y="0.0" axis-z="1.0"/>
<reference-frame>
<along-beam axis="z" />
<pointing-up axis="y" />
......@@ -24,7 +24,7 @@
<angle unit="degree"/>
<location x="0.0" y="0.0" z="0.0" rot="0.0" axis-x="0.0" axis-y="0.0" axis-z="1.0"/>
<reference-frame>
<!-- The z-axis is set parallel to and in the direction of the beam. the
<!-- 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"/>
......@@ -32,23 +32,23 @@
</reference-frame>
<offsets spherical="delta" />
<!-- Comment 'components-are-facing' out if you don't want the
components defined in this file to face a position by default -->
components defined in this file to face a position by default -->
<components-are-facing x="0.0" y="0.0" z="0.0" />
</defaults>
<!-- DESCRIPTION OF INSTRUMENT IN WORDS:
<!-- DESCRIPTION OF INSTRUMENT IN WORDS:
Description of the PEARL instrument
-->
<!-- LIST OF PHYSICAL COMPONENTS (which the instrument consists of) -->
<!-- source and sample-position components -->
<component type="undulator">
<location z="-12.8" />
<location z="-12.75" />
</component>
<component type="nickel-holder">
......@@ -71,7 +71,7 @@
<!-- detector and monitor components -->
<component type="monitors defined by matt" idlist="monitors id by matt">
<component type="monitors defined by Chris" idlist="monitors id by Chris">
<location> <facing val="none"/> </location>
</component>
......@@ -79,7 +79,7 @@
<location r="0" t="0" p="0"> <facing val="none"/> </location>
</component>
<component type="bank2" idlist="bank2">
<location r="0" t="0" p="0"> <facing val="none"/> </location>
<location r="0" t="0" p="0"> <facing val="none"/> </location>
</component>
<component type="bank3" idlist="bank3">
<location r="0" t="0" p="0"> <facing val="none"/> </location>
......@@ -134,14 +134,14 @@
<type name="bank2">
<component type="pearl_module" name="107 angle bank" idlist="bank2">
<location r="0.785" t="107.0" p="270" rot="90" name="mod10">
</location>
<location r="0.785" t="107.0" p="270" rot="90" name="mod10">
</location>
</component>
</type>
<type name="bank3">
<component type="pearl_module" name="127 angle bank" idlist="bank3">
<location r="0.785" t="127.0" p="270" rot="90" name="mod11"> </location>
<location r="0.785" t="127.0" p="270" rot="90" name="mod11"> </location>
</component>
</type>
......@@ -158,13 +158,13 @@
</component>
</type>
<type name="monitors defined by matt">
<component type="monitor" >
<location r="1.68061" t="180" p="0" name="upstream_monitor_det1" />
<location r="1.62917" t="180" p="0" name="upstream_monitor_det2" />
<location r="0.73141" t="180" p="0" name="upstream_monitor_det3" />
<location r="0.622146" t="0" p="0" name="down_monitor_det4" />
<location r="5.105454" t="0" p="0" name="down_monitor_det5" />
<type name="monitors defined by Chris">
<component type="monitor">
<location r="1.62155697" t="180" p="0" name="upstream_monitor_det1" />
<location r="1.56719915" t="180" p="0" name="upstream_monitor_det2" />
<location r="0.74473986" t="180" p="0" name="upstream_monitor_det3" />
<location r="0.68637495" t="0" p="0" name="down_monitor_det4" />
<location r="5.21601636" t="0" p="0" name="down_monitor_det5" />
</component>
</type>
<!-- LIST OF COMPONENT TYPES -->
......@@ -273,130 +273,130 @@
</component>
</type>
<type name="pearl_lowangle_module">
<component type="new_scintillator_pearl">
<location x="0.2975" y="0" z="0" name="Det1"/>
<location x="0.2925" y="0" z="0" name="Det2"/>
<location x="0.2875" y="0" z="0" name="Det3"/>
<location x="0.2825" y="0" z="0" name="Det4"/>
<location x="0.2775" y="0" z="0" name="Det5"/>
<location x="0.2725" y="0" z="0" name="Det6"/>
<location x="0.2675" y="0" z="0" name="Det7"/>
<location x="0.2625" y="0" z="0" name="Det8"/>
<location x="0.2575" y="0" z="0" name="Det9"/>
<location x="0.2525" y="0" z="0" name="Det10"/>
<location x="0.2475" y="0" z="0" name="Det11"/>
<location x="0.2425" y="0" z="0" name="Det12"/>
<location x="0.2375" y="0" z="0" name="Det13"/>
<location x="0.2325" y="0" z="0" name="Det14"/>
<location x="0.2275" y="0" z="0" name="Det15"/>
<location x="0.2225" y="0" z="0" name="Det16"/>
<location x="0.2175" y="0" z="0" name="Det17"/>
<location x="0.2125" y="0" z="0" name="Det18"/>
<location x="0.2075" y="0" z="0" name="Det19"/>
<location x="0.2025" y="0" z="0" name="Det20"/>
<location x="0.1975" y="0" z="0" name="Det21"/>
<location x="0.1925" y="0" z="0" name="Det22"/>
<location x="0.1875" y="0" z="0" name="Det23"/>
<location x="0.1825" y="0" z="0" name="Det24"/>
<location x="0.1775" y="0" z="0" name="Det25"/>
<location x="0.1725" y="0" z="0" name="Det26"/>
<location x="0.1675" y="0" z="0" name="Det27"/>
<location x="0.1625" y="0" z="0" name="Det28"/>
<location x="0.1575" y="0" z="0" name="Det29"/>
<location x="0.1525" y="0" z="0" name="Det30"/>
<location x="0.1475" y="0" z="0" name="Det31"/>
<location x="0.1425" y="0" z="0" name="Det32"/>
<location x="0.1375" y="0" z="0" name="Det33"/>
<location x="0.1325" y="0" z="0" name="Det34"/>
<location x="0.1275" y="0" z="0" name="Det35"/>
<location x="0.1225" y="0" z="0" name="Det36"/>
<location x="0.1175" y="0" z="0" name="Det37"/>
<location x="0.1125" y="0" z="0" name="Det38"/>
<location x="0.1075" y="0" z="0" name="Det39"/>
<location x="0.1025" y="0" z="0" name="Det40"/>
<location x="0.0975" y="0" z="0" name="Det41"/>
<location x="0.0925" y="0" z="0" name="Det42"/>
<location x="0.0875" y="0" z="0" name="Det43"/>
<location x="0.0825" y="0" z="0" name="Det44"/>
<location x="0.0775" y="0" z="0" name="Det45"/>
<location x="0.0725" y="0" z="0" name="Det46"/>
<location x="0.0675" y="0" z="0" name="Det47"/>
<location x="0.0625" y="0" z="0" name="Det48"/>
<location x="0.0575" y="0" z="0" name="Det49"/>
<location x="0.0525" y="0" z="0" name="Det50"/>
<location x="0.0475" y="0" z="0" name="Det51"/>
<location x="0.0425" y="0" z="0" name="Det52"/>
<location x="0.0375" y="0" z="0" name="Det53"/>
<location x="0.0325" y="0" z="0" name="Det54"/>
<location x="0.0275" y="0" z="0" name="Det55"/>
<location x="0.0225" y="0" z="0" name="Det56"/>
<location x="0.0175" y="0" z="0" name="Det57"/>
<location x="0.0125" y="0" z="0" name="Det58"/>
<location x="0.0075" y="0" z="0" name="Det59"/>
<location x="0.0025" y="0" z="0" name="Det60"/>
<location x="-0.0625" y="0" z="0" name="Det61"/>
<location x="-0.0675" y="0" z="0" name="Det62"/>
<location x="-0.0725" y="0" z="0" name="Det63"/>
<location x="-0.0775" y="0" z="0" name="Det64"/>
<location x="-0.0825" y="0" z="0" name="Det65"/>
<location x="-0.0875" y="0" z="0" name="Det66"/>
<location x="-0.0925" y="0" z="0" name="Det67"/>
<location x="-0.0975" y="0" z="0" name="Det68"/>
<location x="-0.1025" y="0" z="0" name="Det69"/>
<location x="-0.1075" y="0" z="0" name="Det70"/>
<location x="-0.1125" y="0" z="0" name="Det71"/>
<location x="-0.1175" y="0" z="0" name="Det72"/>
<location x="-0.1225" y="0" z="0" name="Det73"/>
<location x="-0.1275" y="0" z="0" name="Det74"/>
<location x="-0.1325" y="0" z="0" name="Det75"/>
<location x="-0.1375" y="0" z="0" name="Det76"/>
<location x="-0.1425" y="0" z="0" name="Det77"/>
<location x="-0.1475" y="0" z="0" name="Det78"/>
<location x="-0.1525" y="0" z="0" name="Det79"/>
<location x="-0.1575" y="0" z="0" name="Det80"/>
<location x="-0.1625" y="0" z="0" name="Det81"/>
<location x="-0.1675" y="0" z="0" name="Det82"/>
<location x="-0.1725" y="0" z="0" name="Det83"/>
<location x="-0.1775" y="0" z="0" name="Det84"/>
<location x="-0.1825" y="0" z="0" name="Det85"/>
<location x="-0.1875" y="0" z="0" name="Det86"/>
<location x="-0.1925" y="0" z="0" name="Det87"/>
<location x="-0.1975" y="0" z="0" name="Det88"/>
<location x="-0.2025" y="0" z="0" name="Det89"/>
<location x="-0.2075" y="0" z="0" name="Det90"/>
<location x="-0.2125" y="0" z="0" name="Det91"/>
<location x="-0.2175" y="0" z="0" name="Det92"/>
<location x="-0.2225" y="0" z="0" name="Det93"/>
<location x="-0.2275" y="0" z="0" name="Det94"/>
<location x="-0.2325" y="0" z="0" name="Det95"/>
<location x="-0.2375" y="0" z="0" name="Det96"/>
<location x="-0.2425" y="0" z="0" name="Det97"/>
<location x="-0.2475" y="0" z="0" name="Det98"/>
<location x="-0.2525" y="0" z="0" name="Det99"/>
<location x="-0.2575" y="0" z="0" name="Det100"/>
<location x="-0.2625" y="0" z="0" name="Det101"/>
<location x="-0.2675" y="0" z="0" name="Det102"/>
<location x="-0.2725" y="0" z="0" name="Det103"/>
<location x="-0.2775" y="0" z="0" name="Det104"/>
<location x="-0.2825" y="0" z="0" name="Det105"/>
<location x="-0.2875" y="0" z="0" name="Det106"/>
<location x="-0.2925" y="0" z="0" name="Det107"/>
<location x="-0.2975" y="0" z="0" name="Det108"/>
<location x="-0.3025" y="0" z="0" name="Det109"/>
<location x="-0.3075" y="0" z="0" name="Det110"/>
<location x="-0.3125" y="0" z="0" name="Det111"/>
<location x="-0.3175" y="0" z="0" name="Det112"/>
<location x="-0.3225" y="0" z="0" name="Det113"/>
<location x="-0.3275" y="0" z="0" name="Det114"/>
<location x="-0.3325" y="0" z="0" name="Det115"/>
<location x="-0.3375" y="0" z="0" name="Det116"/>
<location x="-0.3425" y="0" z="0" name="Det117"/>
<location x="-0.3475" y="0" z="0" name="Det118"/>
<location x="-0.3525" y="0" z="0" name="Det119"/>
<location x="-0.3575" y="0" z="0" name="Det120"/>
</component>
</type>
<type name="pearl_lowangle_module">
<component type="new_scintillator_pearl">
<location x="0.2975" y="0" z="0" name="Det1"/>
<location x="0.2925" y="0" z="0" name="Det2"/>
<location x="0.2875" y="0" z="0" name="Det3"/>
<location x="0.2825" y="0" z="0" name="Det4"/>
<location x="0.2775" y="0" z="0" name="Det5"/>
<location x="0.2725" y="0" z="0" name="Det6"/>
<location x="0.2675" y="0" z="0" name="Det7"/>
<location x="0.2625" y="0" z="0" name="Det8"/>
<location x="0.2575" y="0" z="0" name="Det9"/>
<location x="0.2525" y="0" z="0" name="Det10"/>
<location x="0.2475" y="0" z="0" name="Det11"/>
<location x="0.2425" y="0" z="0" name="Det12"/>
<location x="0.2375" y="0" z="0" name="Det13"/>
<location x="0.2325" y="0" z="0" name="Det14"/>
<location x="0.2275" y="0" z="0" name="Det15"/>
<location x="0.2225" y="0" z="0" name="Det16"/>
<location x="0.2175" y="0" z="0" name="Det17"/>
<location x="0.2125" y="0" z="0" name="Det18"/>
<location x="0.2075" y="0" z="0" name="Det19"/>
<location x="0.2025" y="0" z="0" name="Det20"/>
<location x="0.1975" y="0" z="0" name="Det21"/>
<location x="0.1925" y="0" z="0" name="Det22"/>
<location x="0.1875" y="0" z="0" name="Det23"/>
<location x="0.1825" y="0" z="0" name="Det24"/>
<location x="0.1775" y="0" z="0" name="Det25"/>
<location x="0.1725" y="0" z="0" name="Det26"/>
<location x="0.1675" y="0" z="0" name="Det27"/>
<location x="0.1625" y="0" z="0" name="Det28"/>
<location x="0.1575" y="0" z="0" name="Det29"/>
<location x="0.1525" y="0" z="0" name="Det30"/>
<location x="0.1475" y="0" z="0" name="Det31"/>
<location x="0.1425" y="0" z="0" name="Det32"/>
<location x="0.1375" y="0" z="0" name="Det33"/>
<location x="0.1325" y="0" z="0" name="Det34"/>
<location x="0.1275" y="0" z="0" name="Det35"/>
<location x="0.1225" y="0" z="0" name="Det36"/>
<location x="0.1175" y="0" z="0" name="Det37"/>
<location x="0.1125" y="0" z="0" name="Det38"/>
<location x="0.1075" y="0" z="0" name="Det39"/>
<location x="0.1025" y="0" z="0" name="Det40"/>
<location x="0.0975" y="0" z="0" name="Det41"/>
<location x="0.0925" y="0" z="0" name="Det42"/>
<location x="0.0875" y="0" z="0" name="Det43"/>
<location x="0.0825" y="0" z="0" name="Det44"/>
<location x="0.0775" y="0" z="0" name="Det45"/>
<location x="0.0725" y="0" z="0" name="Det46"/>
<location x="0.0675" y="0" z="0" name="Det47"/>
<location x="0.0625" y="0" z="0" name="Det48"/>
<location x="0.0575" y="0" z="0" name="Det49"/>
<location x="0.0525" y="0" z="0" name="Det50"/>
<location x="0.0475" y="0" z="0" name="Det51"/>
<location x="0.0425" y="0" z="0" name="Det52"/>
<location x="0.0375" y="0" z="0" name="Det53"/>
<location x="0.0325" y="0" z="0" name="Det54"/>
<location x="0.0275" y="0" z="0" name="Det55"/>
<location x="0.0225" y="0" z="0" name="Det56"/>
<location x="0.0175" y="0" z="0" name="Det57"/>
<location x="0.0125" y="0" z="0" name="Det58"/>
<location x="0.0075" y="0" z="0" name="Det59"/>
<location x="0.0025" y="0" z="0" name="Det60"/>
<location x="-0.0625" y="0" z="0" name="Det61"/>
<location x="-0.0675" y="0" z="0" name="Det62"/>
<location x="-0.0725" y="0" z="0" name="Det63"/>
<location x="-0.0775" y="0" z="0" name="Det64"/>
<location x="-0.0825" y="0" z="0" name="Det65"/>
<location x="-0.0875" y="0" z="0" name="Det66"/>
<location x="-0.0925" y="0" z="0" name="Det67"/>
<location x="-0.0975" y="0" z="0" name="Det68"/>
<location x="-0.1025" y="0" z="0" name="Det69"/>
<location x="-0.1075" y="0" z="0" name="Det70"/>
<location x="-0.1125" y="0" z="0" name="Det71"/>
<location x="-0.1175" y="0" z="0" name="Det72"/>
<location x="-0.1225" y="0" z="0" name="Det73"/>
<location x="-0.1275" y="0" z="0" name="Det74"/>
<location x="-0.1325" y="0" z="0" name="Det75"/>
<location x="-0.1375" y="0" z="0" name="Det76"/>
<location x="-0.1425" y="0" z="0" name="Det77"/>
<location x="-0.1475" y="0" z="0" name="Det78"/>
<location x="-0.1525" y="0" z="0" name="Det79"/>
<location x="-0.1575" y="0" z="0" name="Det80"/>
<location x="-0.1625" y="0" z="0" name="Det81"/>
<location x="-0.1675" y="0" z="0" name="Det82"/>
<location x="-0.1725" y="0" z="0" name="Det83"/>
<location x="-0.1775" y="0" z="0" name="Det84"/>
<location x="-0.1825" y="0" z="0" name="Det85"/>
<location x="-0.1875" y="0" z="0" name="Det86"/>
<location x="-0.1925" y="0" z="0" name="Det87"/>
<location x="-0.1975" y="0" z="0" name="Det88"/>
<location x="-0.2025" y="0" z="0" name="Det89"/>
<location x="-0.2075" y="0" z="0" name="Det90"/>
<location x="-0.2125" y="0" z="0" name="Det91"/>
<location x="-0.2175" y="0" z="0" name="Det92"/>
<location x="-0.2225" y="0" z="0" name="Det93"/>
<location x="-0.2275" y="0" z="0" name="Det94"/>
<location x="-0.2325" y="0" z="0" name="Det95"/>
<location x="-0.2375" y="0" z="0" name="Det96"/>
<location x="-0.2425" y="0" z="0" name="Det97"/>
<location x="-0.2475" y="0" z="0" name="Det98"/>
<location x="-0.2525" y="0" z="0" name="Det99"/>
<location x="-0.2575" y="0" z="0" name="Det100"/>
<location x="-0.2625" y="0" z="0" name="Det101"/>
<location x="-0.2675" y="0" z="0" name="Det102"/>
<location x="-0.2725" y="0" z="0" name="Det103"/>
<location x="-0.2775" y="0" z="0" name="Det104"/>
<location x="-0.2825" y="0" z="0" name="Det105"/>
<location x="-0.2875" y="0" z="0" name="Det106"/>
<location x="-0.2925" y="0" z="0" name="Det107"/>
<location x="-0.2975" y="0" z="0" name="Det108"/>
<location x="-0.3025" y="0" z="0" name="Det109"/>
<location x="-0.3075" y="0" z="0" name="Det110"/>
<location x="-0.3125" y="0" z="0" name="Det111"/>
<location x="-0.3175" y="0" z="0" name="Det112"/>
<location x="-0.3225" y="0" z="0" name="Det113"/>
<location x="-0.3275" y="0" z="0" name="Det114"/>
<location x="-0.3325" y="0" z="0" name="Det115"/>
<location x="-0.3375" y="0" z="0" name="Det116"/>
<location x="-0.3425" y="0" z="0" name="Det117"/>
<location x="-0.3475" y="0" z="0" name="Det118"/>
<location x="-0.3525" y="0" z="0" name="Det119"/>
<location x="-0.3575" y="0" z="0" name="Det120"/>
</component>
</type>
<type name="new_scintillator_pearl" is="detector">
......@@ -445,7 +445,7 @@
<id start="6001" end="6078"/>
<id start="7001" end="7078"/>
<id start="8001" end="8078"/>
<id start="9001" end="9078"/>
<id start="9001" end="9078"/>
</idlist>
<idlist idname="bank2">
......@@ -464,12 +464,12 @@
<id start="13001" end="13120"/>
</idlist>
<idlist idname="monitors id by matt">
<idlist idname="monitors id by Chris">
<id start="1" end="5"/>
</idlist>
<!--
<!--
<idlist idname="bank1">
<id start="1" end="702"/>
</idlist>
......@@ -486,7 +486,7 @@
<id start="859" end="936"/>
</idlist>
<idlist idname="monitors id by matt">
<idlist idname="monitors id by Chris">
<id start="1" end="5"/>
</idlist>
-->
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment