aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2012-02-24 14:05:30 +0100
committerThomas White <taw@physics.org>2012-02-24 14:05:30 +0100
commit4f3cc1d9d9732b413009bafb30941809102492fb (patch)
treef207ead0670692fbcd3d8ee571d128f73c30a30b
parent77aa89c814cc73dca0dd977910c959bdc8ae0e78 (diff)
Remove I0 stuff
Nothing used it, and it can't really be useful for anything. Use 'osf' instead.
-rw-r--r--libcrystfel/src/hdf5-file.c9
-rw-r--r--libcrystfel/src/image.h5
-rw-r--r--libcrystfel/src/stream.c13
-rw-r--r--src/partial_sim.c1
-rw-r--r--src/pattern_sim.c2
-rw-r--r--tests/pr_gradient_check.c1
6 files changed, 0 insertions, 31 deletions
diff --git a/libcrystfel/src/hdf5-file.c b/libcrystfel/src/hdf5-file.c
index 05cff70c..c212abcb 100644
--- a/libcrystfel/src/hdf5-file.c
+++ b/libcrystfel/src/hdf5-file.c
@@ -459,15 +459,6 @@ int hdf5_read(struct hdfile *f, struct image *image, int satcorr)
/* Read wavelength from file */
image->lambda = get_wavelength(f);
- image->i0 = get_i0(f);
- if ( image->i0 < 0.0 ) {
- ERROR("Couldn't read incident intensity - using 1.0.\n");
- image->i0 = 1.0;
- image->i0_available = 0;
- } else {
- image->i0_available = 1;
- }
-
if ( satcorr ) debodge_saturation(f, image);
return 0;
diff --git a/libcrystfel/src/image.h b/libcrystfel/src/image.h
index a6120066..bdf4b18a 100644
--- a/libcrystfel/src/image.h
+++ b/libcrystfel/src/image.h
@@ -91,8 +91,6 @@ typedef struct _imagefeaturelist ImageFeatureList;
* double lambda;
* double div;
* double bw;
- * double i0;
- * int i0_available;
* double osf;
* double profile_radius;
* int pr_dud;
@@ -157,9 +155,6 @@ struct image {
double lambda; /* Wavelength in m */
double div; /* Divergence in radians */
double bw; /* Bandwidth as a fraction */
- double i0; /* Incident intensity */
- int i0_available; /* 0 if f0 wasn't available
- * from the input. */
double osf; /* Overall scaling factor */
double profile_radius; /* Radius of reflection */
int pr_dud; /* Post refinement failed */
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c
index 2b802599..7f2e341e 100644
--- a/libcrystfel/src/stream.c
+++ b/libcrystfel/src/stream.c
@@ -245,12 +245,6 @@ void write_chunk(FILE *ofh, struct image *i, struct hdfile *hdfile, int f)
}
- if ( i->i0_available ) {
- fprintf(ofh, "I0 = %7.5f (arbitrary units)\n", i->i0);
- } else {
- fprintf(ofh, "I0 = invalid\n");
- }
-
fprintf(ofh, "photon_energy_eV = %f\n",
J_to_eV(ph_lambda_to_en(i->lambda)));
@@ -341,8 +335,6 @@ int read_chunk(FILE *fh, struct image *image)
if ( find_start_of_chunk(fh) ) return 1;
- image->i0_available = 0;
- image->i0 = 1.0;
image->lambda = -1.0;
image->features = NULL;
image->reflections = NULL;
@@ -390,11 +382,6 @@ int read_chunk(FILE *fh, struct image *image)
}
}
- if ( strncmp(line, "I0 = ", 5) == 0 ) {
- image->i0 = atof(line+5);
- image->i0_available = 1;
- }
-
if ( sscanf(line, "astar = %f %f %f", &u, &v, &w) == 3 ) {
as.u = u*1e9; as.v = v*1e9; as.w = w*1e9;
have_as = 1;
diff --git a/src/partial_sim.c b/src/partial_sim.c
index e9baabcc..8d885901 100644
--- a/src/partial_sim.c
+++ b/src/partial_sim.c
@@ -493,7 +493,6 @@ int main(int argc, char *argv[])
image.div = beam->divergence;
image.bw = beam->bandwidth;
image.profile_radius = 0.003e9;
- image.i0_available = 0;
image.filename = malloc(256);
image.copyme = NULL;
diff --git a/src/pattern_sim.c b/src/pattern_sim.c
index 56ac25a9..634399c2 100644
--- a/src/pattern_sim.c
+++ b/src/pattern_sim.c
@@ -555,8 +555,6 @@ int main(int argc, char *argv[])
image.filename = NULL;
image.features = NULL;
image.flags = NULL;
- image.i0 = 1.0;
- image.i0_available = 1;
powder = calloc(image.width*image.height, sizeof(*powder));
diff --git a/tests/pr_gradient_check.c b/tests/pr_gradient_check.c
index 405fb234..75d0e7d3 100644
--- a/tests/pr_gradient_check.c
+++ b/tests/pr_gradient_check.c
@@ -296,7 +296,6 @@ int main(int argc, char *argv[])
image.bw = 0.01;
image.m = 0.0;
image.profile_radius = 0.005e9;
- image.i0_available = 0;
image.filename = malloc(256);
cell = cell_new_from_parameters(10.0e-9, 10.0e-9, 10.0e-9,