aboutsummaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2017-07-21 11:39:27 +0200
committerThomas White <taw@physics.org>2017-07-21 11:39:27 +0200
commit1585396d6bbe3375d21b2906251ee6762a6fcca4 (patch)
treeb009efdce0f787d63a262619870037710f3256e6 /src/merge.c
parentc47b072d15a1e4828e052910bbdab8c7c4bd88de (diff)
Tidy up some warnings
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c
index 9734c469..2be136a1 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -158,7 +158,8 @@ static void run_merge_job(void *vwargs, int cookie)
Reflection *f;
signed int h, k, l;
double mean, sumweight, M2, temp, delta, R;
- double corr, res, w, esd;
+ double corr, res, w;
+ //double esd;
if ( get_partiality(refl) < MIN_PART_MERGE ) continue;
@@ -199,7 +200,7 @@ static void run_merge_job(void *vwargs, int cookie)
continue;
}
- esd = get_esd_intensity(refl) * corr;
+ //esd = get_esd_intensity(refl) * corr;
w = 1.0;
/* Running mean and variance calculation */