diff options
| author | Thomas White <taw@physics.org> | 2011-07-13 17:14:28 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:33 +0100 |
| commit | 812bce99717e18289b02f515180c8d9ae8ca1827 (patch) | |
| tree | 2acd7cf42643917c3b76cf5c3897af16296e71c5 | |
| parent | d7f432c33754443d9552c5715f906bbf8b4765ca (diff) | |
Graph corrections
| -rw-r--r-- | src/scaling-report.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/scaling-report.c b/src/scaling-report.c index eb4429e4..a86875c9 100644 --- a/src/scaling-report.c +++ b/src/scaling-report.c @@ -137,6 +137,14 @@ static void plot_point(cairo_t *cr, double g_width, double g_height, pcalc = 1.01; bad = 1; } + if ( pobs < 0.0 ) { + pobs = -0.01; + bad = 1; + } + if ( pcalc < 0.0 ) { + pobs = -0.01; + bad = 1; + } if ( bad ) { cairo_set_source_rgb(cr, 1.0, 0.0, 0.0); @@ -167,6 +175,13 @@ static void partiality_graph(cairo_t *cr, const struct image *images, int n, show_text_simple(cr, "Calculated partiality", g_width/2.0, g_height+20.0, NULL, 0.0, J_CENTER); + show_text_simple(cr, "0.0", -20.0, g_height, NULL, 0.0, J_CENTER); + show_text_simple(cr, "1.0", -20.0, 0.0, NULL, 0.0, J_CENTER); + show_text_simple(cr, "0.0", 0.0, g_height+10.0, NULL, + -M_PI/3.0, J_RIGHT); + show_text_simple(cr, "1.0", g_width, g_height+10.0, NULL, + -M_PI/3.0, J_RIGHT); + for ( i=0; i<nbins; i++ ) { totals[i] = 0.0; counts[i] = 0; @@ -199,7 +214,7 @@ static void partiality_graph(cairo_t *cr, const struct image *images, int n, Ipart = get_intensity(refl); Ifull = get_intensity(f); - pobs = Ipart/Ifull; + pobs = Ipart/(images[i].osf*Ifull); pcalc = get_partiality(refl); bin = nbins * pcalc; @@ -249,14 +264,16 @@ static void scale_factor_histogram(cairo_t *cr, const struct image *images, double osf_high[nbins]; int counts[nbins]; const double g_width = 320.0; - const double g_height = 200.0; + const double g_height = 180.0; char tmp[32]; show_text_simple(cr, title, g_width/2.0, -18.0, "Sans Bold 10", 0.0, J_CENTER); - show_text_simple(cr, "Frequency", -50.0, g_height/2.0, + show_text_simple(cr, "Frequency", -15.0, g_height/2.0, NULL, -M_PI_2, J_CENTER); + show_text_simple(cr, "Inverse scale factor", g_width/2.0, g_height+12.0, + NULL, 0.0, J_CENTER); osf_max = 0.0; for ( i=0; i<n; i++ ) { @@ -277,7 +294,7 @@ static void scale_factor_histogram(cairo_t *cr, const struct image *images, double osf = images[i].osf; for ( b=0; b<nbins; b++ ) { - if ( (osf > osf_low[b]) && (osf < osf_high[b]) ) { + if ( (osf >= osf_low[b]) && (osf < osf_high[b]) ) { counts[b]++; break; } |