Skip to content

Commit

Permalink
add scaling factor file
Browse files Browse the repository at this point in the history
  • Loading branch information
mdoucet committed Oct 10, 2023
1 parent 73061a8 commit 41a095c
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 10 deletions.
14 changes: 14 additions & 0 deletions reduction/data/sf_197912_Si_auto.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# y=a+bx
#
# LambdaRequested[Angstroms] S1H[mm] (S2/Si)H[mm] S1W[mm] (S2/Si)W[mm] a b error_a error_b
#
# Medium=Si, runs: [197920, 197921, 197922, 197923, 197924, 197925, 197926, 197927, 197928, 197929, 197930, 197931]
IncidentMedium=Si LambdaRequested=9.74 S1H=0.391 S2iH=0.24999999999999978 S1W=20.005 S2iW=20.000084375 a=1.1051209892255538 b=-5.536686634970115e-07 error_a=0.046673303933524965 error_b=1.3017622676214164e-06
IncidentMedium=Si LambdaRequested=7.043 S1H=0.39 S2iH=0.24999999999999978 S1W=19.992000000000005 S2iW=19.990864375000002 a=6.624303827034047 b=1.9231042128909928e-05 error_a=0.23125978138549352 error_b=9.279372359246127e-06
IncidentMedium=Si LambdaRequested=4.25 S1H=0.39 S2iH=0.24999999999999978 S1W=8.779 S2iW=8.780164375000002 a=8.75398849357537 b=-6.239347857228599e-06 error_a=0.15587483079701075 error_b=1.0388703810709363e-05
IncidentMedium=Si LambdaRequested=4.25 S1H=0.39 S2iH=0.24999999999999978 S1W=20.002 S2iW=19.999844375000002 a=28.31954243229449 b=0.0002003050656095656 error_a=0.7130628472852898 error_b=4.9196407008843005e-05
IncidentMedium=Si LambdaRequested=4.25 S1H=0.77 S2iH=0.49312 S1W=12.489000000000004 S2iW=12.485564375000003 a=56.96110033165272 b=0.00045559347475948174 error_a=1.4432418996052785 error_b=9.964396884662548e-05
IncidentMedium=Si LambdaRequested=4.25 S1H=0.774 S2iH=0.4930399999999997 S1W=20.001000000000005 S2iW=20.000244375 a=95.4881689206927 b=0.0016575755736445996 error_a=3.2570515587675617 error_b=0.000232019634982032
IncidentMedium=Si LambdaRequested=4.25 S1H=1.525 S2iH=0.976 S1W=16.384000000000004 S2iW=16.395444375000004 a=287.7419292479784 b=0.005562308984045385 error_a=9.969604764598307 error_b=0.0007110247627138489
IncidentMedium=Si LambdaRequested=4.25 S1H=1.528 S2iH=0.976 S1W=20.004 S2iW=20.000244375 a=332.49023403588535 b=0.008767781144698134 error_a=14.607696123771715 error_b=0.0010689456945882393
IncidentMedium=Si LambdaRequested=4.25 S1H=3.016 S2iH=1.9319199999999999 S1W=20.003000000000004 S2iW=20.000164375 a=1251.1589339171892 b=0.03449397209395385 error_a=54.91140386385528 error_b=0.0040175332367975046
16 changes: 8 additions & 8 deletions reduction/data/template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<q_step>0.02</q_step>
<q_min>0.005</q_min>
<scaling_factor_flag>True</scaling_factor_flag>
<scaling_factor_file>/SNS/REF_L/IPTS-30101/shared/autoreduce/sf_197912_Si_auto.cfg</scaling_factor_file>
<scaling_factor_file>data/sf_197912_Si_auto.cfg</scaling_factor_file>
<incident_medium_list>Si</incident_medium_list>
<incident_medium_index_selected>0</incident_medium_index_selected>
<slits_width_flag>True</slits_width_flag>
Expand Down Expand Up @@ -97,7 +97,7 @@
<q_step>0.02</q_step>
<q_min>0.005</q_min>
<scaling_factor_flag>True</scaling_factor_flag>
<scaling_factor_file>/SNS/REF_L/IPTS-30101/shared/autoreduce/sf_197912_Si_auto.cfg</scaling_factor_file>
<scaling_factor_file>data/sf_197912_Si_auto.cfg</scaling_factor_file>
<incident_medium_list>Si</incident_medium_list>
<incident_medium_index_selected>0</incident_medium_index_selected>
<slits_width_flag>True</slits_width_flag>
Expand Down Expand Up @@ -144,7 +144,7 @@
<q_step>0.02</q_step>
<q_min>0.005</q_min>
<scaling_factor_flag>True</scaling_factor_flag>
<scaling_factor_file>/SNS/REF_L/IPTS-30101/shared/autoreduce/sf_197912_Si_auto.cfg</scaling_factor_file>
<scaling_factor_file>data/sf_197912_Si_auto.cfg</scaling_factor_file>
<incident_medium_list>Si</incident_medium_list>
<incident_medium_index_selected>0</incident_medium_index_selected>
<slits_width_flag>True</slits_width_flag>
Expand Down Expand Up @@ -191,7 +191,7 @@
<q_step>0.02</q_step>
<q_min>0.005</q_min>
<scaling_factor_flag>True</scaling_factor_flag>
<scaling_factor_file>/SNS/REF_L/IPTS-30101/shared/autoreduce/sf_197912_Si_auto.cfg</scaling_factor_file>
<scaling_factor_file>data/sf_197912_Si_auto.cfg</scaling_factor_file>
<incident_medium_list>Si</incident_medium_list>
<incident_medium_index_selected>0</incident_medium_index_selected>
<slits_width_flag>True</slits_width_flag>
Expand Down Expand Up @@ -238,7 +238,7 @@
<q_step>0.02</q_step>
<q_min>0.005</q_min>
<scaling_factor_flag>True</scaling_factor_flag>
<scaling_factor_file>/SNS/REF_L/IPTS-30101/shared/autoreduce/sf_197912_Si_auto.cfg</scaling_factor_file>
<scaling_factor_file>data/sf_197912_Si_auto.cfg</scaling_factor_file>
<incident_medium_list>Si</incident_medium_list>
<incident_medium_index_selected>0</incident_medium_index_selected>
<slits_width_flag>True</slits_width_flag>
Expand Down Expand Up @@ -285,7 +285,7 @@
<q_step>0.02</q_step>
<q_min>0.005</q_min>
<scaling_factor_flag>True</scaling_factor_flag>
<scaling_factor_file>/SNS/REF_L/IPTS-30101/shared/autoreduce/sf_197912_Si_auto.cfg</scaling_factor_file>
<scaling_factor_file>data/sf_197912_Si_auto.cfg</scaling_factor_file>
<incident_medium_list>Si</incident_medium_list>
<incident_medium_index_selected>0</incident_medium_index_selected>
<slits_width_flag>True</slits_width_flag>
Expand Down Expand Up @@ -332,7 +332,7 @@
<q_step>0.02</q_step>
<q_min>0.005</q_min>
<scaling_factor_flag>True</scaling_factor_flag>
<scaling_factor_file>/SNS/REF_L/IPTS-30101/shared/autoreduce/sf_197912_Si_auto.cfg</scaling_factor_file>
<scaling_factor_file>data/sf_197912_Si_auto.cfg</scaling_factor_file>
<incident_medium_list>Si</incident_medium_list>
<incident_medium_index_selected>0</incident_medium_index_selected>
<slits_width_flag>True</slits_width_flag>
Expand Down Expand Up @@ -379,7 +379,7 @@
<q_step>0.02</q_step>
<q_min>0.005</q_min>
<scaling_factor_flag>True</scaling_factor_flag>
<scaling_factor_file>/SNS/REF_L/IPTS-30101/shared/autoreduce/sf_197912_Si_auto.cfg</scaling_factor_file>
<scaling_factor_file>data/sf_197912_Si_auto.cfg</scaling_factor_file>
<incident_medium_list>Si</incident_medium_list>
<incident_medium_index_selected>0</incident_medium_index_selected>
<slits_width_flag>True</slits_width_flag>
Expand Down
2 changes: 0 additions & 2 deletions reduction/test/test_reduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ def test_full_reduction():
Test the fill reduction chain
"""
template_path = 'data/template.xml'

print(os.listdir('tests/data/liquidsreflectometer-data/nexus/'))
qz_all = []
refl_all = []
d_refl_all = []
Expand Down

0 comments on commit 41a095c

Please sign in to comment.