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
39f9e154
Commit
39f9e154
authored
Nov 14, 2019
by
Wolfgang Brehm
Committed by
Thomas White
Nov 15, 2019
Browse files
Add partiality model GGPM
parent
f9101682
Changes
3
Hide whitespace changes
Inline
Side-by-side
libcrystfel/src/geometry.c
View file @
39f9e154
...
...
@@ -412,6 +412,7 @@ static Reflection *check_reflection(struct image *image, Crystal *cryst,
set_lorentz
(
refl
,
1
.
0
);
set_symmetric_indices
(
refl
,
h
,
k
,
l
);
set_redundancy
(
refl
,
1
);
set_partiality
(
refl
,
partiality
);
return
refl
;
}
...
...
@@ -903,6 +904,11 @@ void calculate_partialities(Crystal *cryst, PartialityModel pmodel)
set_random_partialities
(
cryst
);
break
;
case
PMODEL_GGPM
:
/* Do nothing, because this is the model used for prediction,
* so the partialities have been set by check_reflection */
break
;
default
:
ERROR
(
"Unknown partiality model %i
\n
"
,
pmodel
);
break
;
...
...
libcrystfel/src/geometry.h
View file @
39f9e154
...
...
@@ -61,6 +61,7 @@ typedef enum {
PMODEL_XSPHERE
,
/**< Flat sphere model with super-Gaussian spectrum */
PMODEL_OFFSET
,
/**< Ewald offset model for monochromatic beam */
PMODEL_RANDOM
,
/**< Randomly assigned partialities */
PMODEL_GGPM
/**< Generalised gaussian prediction model */
}
PartialityModel
;
...
...
src/partialator.c
View file @
39f9e154
...
...
@@ -1281,6 +1281,8 @@ int main(int argc, char *argv[])
pmodel
=
PMODEL_OFFSET
;
}
else
if
(
strcmp
(
pmodel_str
,
"random"
)
==
0
)
{
pmodel
=
PMODEL_RANDOM
;
}
else
if
(
strcmp
(
pmodel_str
,
"ggpm"
)
==
0
)
{
pmodel
=
PMODEL_GGPM
;
}
else
{
ERROR
(
"Unknown partiality model '%s'.
\n
"
,
pmodel_str
);
return
1
;
...
...
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