diff options
| author | Thomas White <taw@physics.org> | 2012-02-24 14:05:30 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-24 14:05:30 +0100 |
| commit | 4f3cc1d9d9732b413009bafb30941809102492fb (patch) | |
| tree | f207ead0670692fbcd3d8ee571d128f73c30a30b /libcrystfel/src | |
| parent | 77aa89c814cc73dca0dd977910c959bdc8ae0e78 (diff) | |
Remove I0 stuff
Nothing used it, and it can't really be useful for anything. Use 'osf' instead.
Diffstat (limited to 'libcrystfel/src')
| -rw-r--r-- | libcrystfel/src/hdf5-file.c | 9 | ||||
| -rw-r--r-- | libcrystfel/src/image.h | 5 | ||||
| -rw-r--r-- | libcrystfel/src/stream.c | 13 |
3 files changed, 0 insertions, 27 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; |