Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Oleksii Turkot
CrystFEL
Commits
6c06f74f
Commit
6c06f74f
authored
Jun 07, 2011
by
Thomas White
Browse files
Get rid of pattern_sim --near-bragg
parent
97c023d0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
6c06f74f
...
...
@@ -41,8 +41,7 @@ src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c src/utils.c \
src/image.c src/cell.c src/hdf5-file.c
\
src/detector.c src/peaks.c
\
src/reflist-utils.c src/beam-parameters.c
\
src/symmetry.c src/thread-pool.c src/reflist.c
\
src/geometry.c
src/symmetry.c src/thread-pool.c src/reflist.c
if
HAVE_OPENCL
src_pattern_sim_SOURCES
+=
src/diffraction-gpu.c src/cl-utils.c
...
...
Makefile.in
View file @
6c06f74f
...
...
@@ -193,15 +193,14 @@ am__src_pattern_sim_SOURCES_DIST = src/pattern_sim.c src/diffraction.c \
src/utils.c src/image.c src/cell.c src/hdf5-file.c
\
src/detector.c src/peaks.c src/reflist-utils.c
\
src/beam-parameters.c src/symmetry.c src/thread-pool.c
\
src/reflist.c src/geometry.c src/diffraction-gpu.c
\
src/cl-utils.c
src/reflist.c src/diffraction-gpu.c src/cl-utils.c
am_src_pattern_sim_OBJECTS
=
src/pattern_sim.
$(OBJEXT)
\
src/diffraction.
$(OBJEXT)
src/utils.
$(OBJEXT)
\
src/image.
$(OBJEXT)
src/cell.
$(OBJEXT)
src/hdf5-file.
$(OBJEXT)
\
src/detector.
$(OBJEXT)
src/peaks.
$(OBJEXT)
\
src/reflist-utils.
$(OBJEXT)
src/beam-parameters.
$(OBJEXT)
\
src/symmetry.
$(OBJEXT)
src/thread-pool.
$(OBJEXT)
\
src/reflist.
$(OBJEXT)
src/geometry.
$(OBJEXT)
$(am__objects_1)
src/reflist.
$(OBJEXT)
$(am__objects_1)
src_pattern_sim_OBJECTS
=
$(am_src_pattern_sim_OBJECTS)
src_pattern_sim_LDADD
=
$(LDADD)
src_pattern_sim_DEPENDENCIES
=
$(top_builddir)
/lib/libgnu.a
...
...
@@ -635,7 +634,7 @@ src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c \
src/utils.c src/image.c src/cell.c src/hdf5-file.c
\
src/detector.c src/peaks.c src/reflist-utils.c
\
src/beam-parameters.c src/symmetry.c src/thread-pool.c
\
src/reflist.c
src/geometry.c
$(am__append_3)
src/reflist.c
$(am__append_3)
@HAVE_OPENCL_TRUE@
tests_gpu_sim_check_SOURCES
=
tests/gpu_sim_check.c src/utils.c
\
@HAVE_OPENCL_TRUE@ src/diffraction.c src/diffraction-gpu.c
\
@HAVE_OPENCL_TRUE@ src/thread-pool.c src/cell.c src/cl-utils.c
\
...
...
src/pattern_sim.c
View file @
6c06f74f
...
...
@@ -33,7 +33,6 @@
#include
"symmetry.h"
#include
"reflist.h"
#include
"reflist-utils.h"
#include
"geometry.h"
static
void
show_help
(
const
char
*
s
)
...
...
@@ -55,7 +54,6 @@ static void show_help(const char *s)
" -g, --geometry=<file> Get detector geometry from file.
\n
"
" -b, --beam=<file> Get beam parameters from file.
\n
"
"
\n
"
" --near-bragg Output h,k,l,I near Bragg conditions.
\n
"
" -n, --number=<N> Generate N images. Default 1.
\n
"
" --no-images Do not output any HDF5 files.
\n
"
" -o, --output=<filename> Output HDF5 filename. Default: sim.h5.
\n
"
...
...
@@ -201,7 +199,6 @@ int main(int argc, char *argv[])
double
*
phases
;
unsigned
char
*
flags
;
int
config_simdetails
=
0
;
int
config_nearbragg
=
0
;
int
config_randomquat
=
0
;
int
config_noimages
=
0
;
int
config_nonoise
=
0
;
...
...
@@ -232,7 +229,6 @@ int main(int argc, char *argv[])
{
"help"
,
0
,
NULL
,
'h'
},
{
"simulation-details"
,
0
,
&
config_simdetails
,
1
},
{
"gpu"
,
0
,
&
config_gpu
,
1
},
{
"near-bragg"
,
0
,
&
config_nearbragg
,
1
},
{
"random-orientation"
,
0
,
NULL
,
'r'
},
{
"number"
,
1
,
NULL
,
'n'
},
{
"no-images"
,
0
,
&
config_noimages
,
1
},
...
...
@@ -546,18 +542,6 @@ int main(int argc, char *argv[])
record_image
(
&
image
,
!
config_nonoise
);
if
(
config_nearbragg
)
{
image
.
div
=
image
.
beam
->
divergence
;
image
.
bw
=
image
.
beam
->
bandwidth
;
image
.
profile_radius
=
0.0001e9
;
image
.
reflections
=
find_intersections
(
&
image
,
image
.
indexed_cell
,
0
);
integrate_reflections
(
&
image
,
0
,
0
,
0
);
}
if
(
powder_fn
!=
NULL
)
{
int
x
,
y
,
w
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment