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
f5276f34
Commit
f5276f34
authored
Sep 10, 2010
by
Thomas White
Browse files
indexamajig: Add --no-closer-peak option
parent
64b735e3
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/indexamajig.c
View file @
f5276f34
...
...
@@ -63,6 +63,7 @@ struct process_args
int
config_sanity
;
int
config_satcorr
;
int
config_sa
;
int
config_closer
;
float
threshold
;
struct
detector
*
det
;
IndexingMethod
indm
;
...
...
@@ -163,6 +164,9 @@ static void show_help(const char *s)
"
\n
"
"
\n
Options you probably won't need:
\n\n
"
" --no-check-prefix Don't attempt to correct the --prefix.
\n
"
" --no-closer-peak Don't integrate from the location of a nearby peak
\n
"
" instead of the position closest to the reciprocal
\n
"
" lattice point.
\n
"
);
}
...
...
@@ -409,7 +413,7 @@ static struct process_result process_image(struct process_args *pargs)
if
(
config_nearbragg
)
{
output_intensities
(
&
image
,
image
.
indexed_cell
,
pargs
->
output_mutex
,
config_polar
,
pargs
->
config_sa
);
pargs
->
config_sa
,
pargs
->
config_closer
);
}
simage
=
get_simage
(
&
image
,
config_alternate
);
...
...
@@ -514,6 +518,7 @@ int main(int argc, char *argv[])
int
config_satcorr
=
0
;
int
config_sa
=
1
;
int
config_checkprefix
=
1
;
int
config_closer
=
1
;
float
threshold
=
800
.
0
;
struct
detector
*
det
;
char
*
geometry
=
NULL
;
...
...
@@ -561,6 +566,7 @@ int main(int argc, char *argv[])
{
"no-sa"
,
0
,
&
config_sa
,
0
},
{
"threshold"
,
1
,
NULL
,
't'
},
{
"no-check-prefix"
,
0
,
&
config_checkprefix
,
0
},
{
"no-closer-peak"
,
0
,
&
config_closer
,
0
},
{
0
,
0
,
NULL
,
0
}
};
...
...
@@ -758,6 +764,7 @@ int main(int argc, char *argv[])
pargs
->
config_sanity
=
config_sanity
;
pargs
->
config_satcorr
=
config_satcorr
;
pargs
->
config_sa
=
config_sa
;
pargs
->
config_closer
=
config_closer
;
pargs
->
cell
=
cell
;
pargs
->
det
=
det
;
pargs
->
ipriv
=
ipriv
;
...
...
src/pattern_sim.c
View file @
f5276f34
...
...
@@ -418,7 +418,7 @@ int main(int argc, char *argv[])
if
(
config_nearbragg
)
{
find_projected_peaks
(
&
image
,
cell
);
output_intensities
(
&
image
,
cell
,
NULL
,
0
,
1
);
output_intensities
(
&
image
,
cell
,
NULL
,
0
,
1
,
0
);
}
if
(
powder_fn
!=
NULL
)
{
...
...
src/peaks.c
View file @
f5276f34
...
...
@@ -561,7 +561,8 @@ int peak_sanity_check(struct image *image, UnitCell *cell)
void
output_intensities
(
struct
image
*
image
,
UnitCell
*
cell
,
pthread_mutex_t
*
mutex
,
int
polar
,
int
sa
)
pthread_mutex_t
*
mutex
,
int
polar
,
int
sa
,
int
use_closer
)
{
int
i
;
int
n_found
;
...
...
src/peaks.h
View file @
f5276f34
...
...
@@ -22,7 +22,8 @@
extern
void
search_peaks
(
struct
image
*
image
,
float
threshold
);
extern
void
dump_peaks
(
struct
image
*
image
,
pthread_mutex_t
*
mutex
);
extern
void
output_intensities
(
struct
image
*
image
,
UnitCell
*
cell
,
pthread_mutex_t
*
mutex
,
int
polar
,
int
sa
);
pthread_mutex_t
*
mutex
,
int
polar
,
int
sa
,
int
use_closer
);
extern
int
peak_sanity_check
(
struct
image
*
image
,
UnitCell
*
cell
);
extern
int
find_projected_peaks
(
struct
image
*
image
,
UnitCell
*
cell
);
extern
int
integrate_peak
(
struct
image
*
image
,
int
xp
,
int
yp
,
...
...
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