diff options
| author | Thomas White <taw@physics.org> | 2011-07-07 15:17:40 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:32 +0100 |
| commit | 2c932f6cef1d273ef7f71fddd1582f9fb8bbe8d8 (patch) | |
| tree | b049b27a226669cc2cd0bf9dc5f88569101de9af | |
| parent | f96e5b1bfc8b5f4d2d63ddc9cfa58e6c7713c158 (diff) | |
Do errors properly
| -rw-r--r-- | src/hrs-scaling.c | 4 | ||||
| -rw-r--r-- | src/partial_sim.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/hrs-scaling.c b/src/hrs-scaling.c index 2c5c586c..b2d52f77 100644 --- a/src/hrs-scaling.c +++ b/src/hrs-scaling.c @@ -93,7 +93,9 @@ static void s_uhavha(signed int hat, signed int kat, signed int lat, if ( !get_scalable(refl) ) continue; ic = get_intensity(refl) / get_partiality(refl); - sigi = ic / 10.0; /* FIXME */ + + /* Get the error in the estimated full intensity */ + sigi = get_esd_intensity(refl) / get_partiality(refl); uha_val += 1.0 / pow(sigi, 2.0); vha_val += ic / pow(sigi, 2.0); diff --git a/src/partial_sim.c b/src/partial_sim.c index d97189dd..96aa0c7c 100644 --- a/src/partial_sim.c +++ b/src/partial_sim.c @@ -100,6 +100,7 @@ static void calculate_partials(RefList *partial, double osf, Ip = osf * p * If; set_int(refl, Ip); + set_esd_intensity(refl, Ip/10.0); } } |