Skip to content
This repository has been archived by the owner on Apr 3, 2019. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/feature/8313_gui_reduction'
Browse files Browse the repository at this point in the history
  • Loading branch information
@PeterParker
PeterParker committed Nov 11, 2013
2 parents ba54ae5 + b55e675 commit 16c65e2
Show file tree
Hide file tree
Showing 11 changed files with 654 additions and 0 deletions.
180 changes: 180 additions & 0 deletions Data/SANS2D/DIRECTM1_15785_12m_31Oct12_v12.dat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
Wed 31-OCT-2012 14:24 Workspace: directbeam_new_hist

175 0 0 0 1 175 0
0 0 0 0
3 (F12.5,2E16.6)
0.85000 1.506282e-01 1.418926e-02
0.95000 1.353661e-01 7.474214e-03
1.05000 1.447277e-01 4.821445e-03
1.15000 3.047401e-01 6.053542e-03
1.25000 2.975498e-01 3.698748e-03
1.35000 4.230266e-01 4.113621e-03
1.45000 3.807100e-01 3.211595e-03
1.55000 3.829780e-01 6.034385e-03
1.65000 3.795446e-01 1.021295e-02
1.75000 3.082940e-01 1.191177e-02
1.85000 3.140532e-01 1.588424e-02
1.95000 2.724597e-01 1.704949e-02
2.05000 2.424132e-01 1.805056e-02
2.15000 2.355711e-01 2.052379e-02
2.25000 1.923376e-01 1.929835e-02
2.35000 1.970745e-01 1.991296e-02
2.45000 1.909876e-01 1.543844e-02
2.55000 1.998027e-01 1.216460e-02
2.65000 1.916480e-01 7.947666e-03
2.75000 1.875177e-01 6.344396e-03
2.85000 1.813364e-01 5.999514e-03
2.95000 1.681647e-01 5.445259e-03
3.05000 1.561846e-01 4.943683e-03
3.15000 1.446551e-01 4.652913e-03
3.25000 1.360569e-01 4.467662e-03
3.35000 1.267845e-01 4.248145e-03
3.45000 1.183353e-01 4.050860e-03
3.55000 1.134110e-01 3.950975e-03
3.65000 1.041842e-01 3.696578e-03
3.75000 9.973221e-02 3.602282e-03
3.85000 9.408233e-02 3.433412e-03
3.95000 8.589824e-02 3.133573e-03
4.05000 8.554198e-02 3.117136e-03
4.15000 8.738111e-02 3.180722e-03
4.25000 8.706354e-02 3.170178e-03
4.35000 8.452056e-02 3.035750e-03
4.45000 8.085281e-02 2.870260e-03
4.55000 7.784277e-02 2.735144e-03
4.65000 7.563483e-02 2.631951e-03
4.75000 7.570593e-02 2.611004e-03
4.85000 7.488271e-02 2.529187e-03
4.95000 7.350104e-02 2.432089e-03
5.05000 7.352484e-02 2.384707e-03
5.15000 6.988922e-02 2.223123e-03
5.25000 6.724057e-02 2.099570e-03
5.35000 6.438620e-02 1.972699e-03
5.45000 6.072476e-02 1.824766e-03
5.55000 5.899687e-02 1.755810e-03
5.65000 5.497104e-02 1.636073e-03
5.75000 5.300942e-02 1.578481e-03
5.85000 5.031583e-02 1.498804e-03
5.95000 4.743676e-02 1.413710e-03
6.05000 4.785704e-02 1.426009e-03
6.15000 4.608667e-02 1.372572e-03
6.25000 4.589558e-02 1.366557e-03
6.35000 4.538376e-02 1.350846e-03
6.45000 4.438526e-02 1.320637e-03
6.55000 4.487857e-02 1.336691e-03
6.65000 4.301157e-02 1.282952e-03
6.75000 4.331848e-02 1.293414e-03
6.85000 4.259443e-02 1.274339e-03
6.95000 4.137494e-02 1.239997e-03
7.05000 4.215561e-02 1.299683e-03
7.15000 4.051629e-02 1.316481e-03
7.25000 4.032723e-02 1.377389e-03
7.35000 3.938580e-02 1.412254e-03
7.45000 3.797816e-02 1.425681e-03
7.55000 3.808138e-02 1.494148e-03
7.65000 3.677758e-02 1.505191e-03
7.75000 3.638339e-02 1.550951e-03
7.85000 3.588202e-02 1.590919e-03
7.95000 3.448907e-02 1.588077e-03
8.05000 3.455336e-02 1.650873e-03
8.15000 3.356115e-02 1.660686e-03
8.25000 3.303234e-02 1.691224e-03
8.35000 3.256946e-02 1.723902e-03
8.45000 3.136343e-02 1.714191e-03
8.55000 3.182052e-02 1.787339e-03
8.65000 3.012083e-02 1.732397e-03
8.75000 2.974781e-02 1.749599e-03
8.85000 2.977108e-02 1.789891e-03
8.95000 2.874837e-02 1.766342e-03
9.05000 2.919652e-02 1.832114e-03
9.15000 2.896760e-02 1.854893e-03
9.25000 2.857631e-02 1.867102e-03
9.35000 2.774908e-02 1.851605e-03
9.45000 2.670206e-02 1.817183e-03
9.55000 2.651845e-02 1.845372e-03
9.65000 2.613300e-02 1.862365e-03
9.75000 2.569247e-02 1.874049e-03
9.85000 2.574823e-02 1.922363e-03
9.95000 2.461435e-02 1.880252e-03
10.05000 2.460700e-02 1.921697e-03
10.15000 2.439487e-02 1.945618e-03
10.25000 2.355405e-02 1.918946e-03
10.35000 2.355494e-02 1.960610e-03
10.45000 2.250157e-02 1.912291e-03
10.55000 2.222946e-02 1.912908e-03
10.65000 2.191778e-02 1.894686e-03
10.75000 2.157092e-02 1.873077e-03
10.85000 2.239568e-02 1.954456e-03
10.95000 2.068336e-02 1.817432e-03
11.05000 2.006776e-02 1.774193e-03
11.15000 2.036275e-02 1.808076e-03
11.25000 2.062485e-02 1.838621e-03
11.35000 1.986380e-02 1.783611e-03
11.45000 1.831787e-02 1.657653e-03
11.55000 1.958316e-02 1.777569e-03
11.65000 1.910329e-02 1.744863e-03
11.75000 1.853703e-02 1.702938e-03
11.85000 1.889622e-02 1.736564e-03
11.95000 1.797960e-02 1.654137e-03
12.05000 1.771776e-02 1.630726e-03
12.15000 1.791449e-02 1.648759e-03
12.25000 1.776562e-02 1.634838e-03
12.35000 1.748838e-02 1.613451e-03
12.45000 1.629085e-02 1.507902e-03
12.55000 1.578130e-02 1.463600e-03
12.65000 1.643130e-02 1.522568e-03
12.75000 1.699346e-02 1.571246e-03
12.85000 1.619415e-02 1.502937e-03
12.95000 1.526062e-02 1.422697e-03
13.05000 1.556893e-02 1.451712e-03
13.15000 1.601066e-02 1.492230e-03
13.25000 1.574089e-02 1.468707e-03
13.35000 1.560484e-02 1.460270e-03
13.45000 1.558604e-02 1.459464e-03
13.55000 1.518876e-02 1.426542e-03
13.65000 1.486921e-02 1.401015e-03
13.75000 1.480183e-02 1.394437e-03
13.85000 1.453772e-02 1.374977e-03
13.95000 1.378901e-02 1.310970e-03
14.05000 1.412000e-02 1.339536e-03
14.15000 1.322278e-02 1.258605e-03
14.25000 1.278135e-02 1.214898e-03
14.35000 1.232196e-02 1.188042e-03
14.45000 1.184970e-02 1.146034e-03
14.55000 1.136966e-02 1.103441e-03
14.65000 1.088745e-02 1.072942e-03
14.75000 1.040923e-02 1.022874e-03
14.85000 9.941047e-03 9.859355e-04
14.95000 9.488545e-03 9.401902e-04
15.05000 9.057334e-03 8.965282e-04
15.15000 8.652717e-03 8.748057e-04
15.25000 8.279726e-03 8.408937e-04
15.35000 7.943153e-03 8.222080e-04
15.45000 7.647043e-03 8.182842e-04
15.55000 7.390818e-03 7.648629e-04
15.65000 7.171632e-03 7.438696e-04
15.75000 6.986685e-03 7.263928e-04
15.85000 6.833254e-03 7.120033e-04
15.95000 6.708470e-03 7.006098e-04
16.05000 6.609557e-03 6.919374e-04
16.15000 6.533822e-03 6.857200e-04
16.25000 6.478690e-03 6.817051e-04
16.35000 6.441662e-03 6.796446e-04
16.45000 6.420344e-03 6.793006e-04
16.55000 6.412393e-03 6.804401e-04
16.65000 6.415565e-03 6.828378e-04
16.75000 6.427625e-03 6.862676e-04
16.85000 6.446437e-03 6.905123e-04
16.95000 6.469908e-03 6.953551e-04
17.05000 6.495981e-03 7.005831e-04
17.15000 6.522660e-03 7.059853e-04
17.25000 6.547984e-03 7.113524e-04
17.35000 6.570065e-03 7.164783e-04
17.45000 6.587023e-03 7.211570e-04
17.55000 6.597102e-03 7.251884e-04
17.65000 6.598536e-03 7.283736e-04
17.75000 6.590345e-03 7.305909e-04
17.85000 6.572972e-03 7.322262e-04
17.95000 6.547069e-03 7.329877e-04
18.05000 6.513303e-03 7.329347e-04
18.15000 6.472324e-03 7.321274e-04
18.25000 6.424770e-03 7.306233e-04
59 changes: 59 additions & 0 deletions Data/SANS2D/MaskSANS2DReductionGUI.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
PRINT for changer
MASK/CLEAR
MASK/CLEAR/TIME
L/WAV 1.5 12.5 0.125/LIN

L/Q .001,.001,.0126,-.08,.2
!L/Q .001 .8 .08/log
L/QXY 0 0.05 .001/lin
BACK/M1 35000 65000
BACK/M2 85000 98000
DET/REAR
GRAVITY/ON
!FIT/TRANS/OFF
FIT/TRANS/LOG 1.5 12.5
mask/rear h0
mask/rear h190>h191
mask/rear h167>h172
mask/rear v0
mask/rear v191
mask/front h0
mask/front h190>h191
mask/front v0
mask/front v191
! dead wire near top
mask/front h156>h159
!masking off beamstop arm - 12mm wide @ 19degrees
!mask/rear/line 12 19
! spot on rhs beam stop at 11m
! mask h57>h66+v134>v141
!
! mask for Bragg at 12m, 26/03/11, 3 time channels
mask/time 17500 22000
!
L/R 41 -1 3
!L/Q/RCut 200
!L/Q/WCut 8.0
!PRINT REMOVED RCut=200 WCut=8
!
MON/DIRECT=DIRECTM1_15785_12m_31Oct12_v12.dat
MON/TRANS/SPECTRUM=1/INTERPOLATE
MON/SPECTRUM=1/INTERPOLATE
TRANS/TRANSPEC=3
!TRANS/TRANSPEC=4/SHIFT=-70
!
set centre 155.45 -169.6 5.1 5.1
!
! 25/10/13 centre gc 22021, fit gdw20 22023
set scales 0.074 1.0 1.0 1.0 1.0
! correction to actual sample position, notionally 81mm before shutter
SAMPLE/OFFSET +53.0
! Correction to SANS2D encoders in mm
DET/CORR REAR X -16.0
DET/CORR REAR Z 47.0
DET/CORR FRONT X -44.0
DET/CORR FRONT Y -20.0
DET/CORR FRONT Z 47.0
DET/CORR FRONT ROT 0.0
!
!! 01/10/13 MASKSANS2d_133F M3 by M1 trans Hellsing, Rennie, Jackson, L1=L2=12m A1=20 and A2=8mm
Binary file added Data/SANS2D/SANS2D00022023.nxs
View file
Binary file not shown.
Binary file added Data/SANS2D/SANS2D00022024.nxs
View file
Binary file not shown.
Binary file added Data/SANS2D/SANS2D00022041.nxs
View file
Binary file not shown.
Binary file added Data/SANS2D/SANS2D00022048.nxs
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions Data/SANS2D/sans2d_reduction_gui_batch.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MANTID_BATCH_FILE,creaated_on,31/10/2013,GESNER
sample_sans,22048,sample_trans,22041,sample_direct_beam,22024,can_sans,22023,can_trans,22024,can_direct_beam,22024,output_as,trans_test
Binary file added SystemTests/AnalysisTests/ReferenceResults/SANSReductionGUI.nxs
View file
Binary file not shown.

0 comments on commit 16c65e2

Please sign in to comment.