aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2016-05-13 14:30:08 +0200
committerThomas White <taw@physics.org>2016-05-13 14:30:08 +0200
commit998c273be056b84e378bdec95fc36998d663ba14 (patch)
tree70240cd5fd7834fc0ad98ef3814e11a95b399c35 /src
parent56a0a242fad06ecb8714e3c6eaa8817fb2680663 (diff)
{check,compare}_hkl: Add warnings when using potentially silly option choices
Diffstat (limited to 'src')
-rw-r--r--src/check_hkl.c14
-rw-r--r--src/compare_hkl.c15
2 files changed, 25 insertions, 4 deletions
diff --git a/src/check_hkl.c b/src/check_hkl.c
index 0449c7a9..def986c9 100644
--- a/src/check_hkl.c
+++ b/src/check_hkl.c
@@ -3,11 +3,11 @@
*
* Characterise reflection lists
*
- * Copyright © 2012-2015 Deutsches Elektronen-Synchrotron DESY,
+ * Copyright © 2012-2016 Deutsches Elektronen-Synchrotron DESY,
* a research centre of the Helmholtz Association.
*
* Authors:
- * 2010-2015 Thomas White <taw@physics.org>
+ * 2010-2016 Thomas White <taw@physics.org>
*
* This file is part of CrystFEL.
*
@@ -780,6 +780,9 @@ int main(int argc, char *argv[])
ERROR("Invalid value for --sigma-cutoff\n");
return 1;
}
+ STATUS("WARNING: You are using --sigma-cutoff. "
+ "Be aware that the figures of merit will not "
+ "reflect the entire data set!\n");
break;
case 5 :
@@ -827,6 +830,13 @@ int main(int argc, char *argv[])
return 1;
}
+ if ( !ltest && (ignorenegs || zeronegs) ) {
+ ERROR("WARNING: You are using --zero-negs or --ignore-negs "
+ "even though it's not required.\n");
+ ERROR("The figures of merit will not reflect the entire data "
+ "set!\n");
+ }
+
if ( sym_str == NULL ) {
sym_str = strdup("1");
}
diff --git a/src/compare_hkl.c b/src/compare_hkl.c
index 3dd4662e..51e51dc9 100644
--- a/src/compare_hkl.c
+++ b/src/compare_hkl.c
@@ -3,11 +3,11 @@
*
* Compare reflection lists
*
- * Copyright © 2012-2015 Deutsches Elektronen-Synchrotron DESY,
+ * Copyright © 2012-2016 Deutsches Elektronen-Synchrotron DESY,
* a research centre of the Helmholtz Association.
*
* Authors:
- * 2010-2015 Thomas White <taw@physics.org>
+ * 2010-2016 Thomas White <taw@physics.org>
* 2013 Lorenzo Galli <lorenzo.galli@desy.de>
*
* This file is part of CrystFEL.
@@ -1226,6 +1226,9 @@ int main(int argc, char *argv[])
ERROR("Invalid value for --sigma-cutoff\n");
return 1;
}
+ STATUS("WARNING: You are using --sigma-cutoff. "
+ "Be aware that the figures of merit will not "
+ "reflect the entire data set!\n");
break;
case 6 :
@@ -1300,6 +1303,14 @@ int main(int argc, char *argv[])
}
}
+ if ( (fom != FOM_R1F) && (config_ignorenegs || config_zeronegs) ) {
+ ERROR("WARNING: You are using --zero-negs or --ignore-negs "
+ "even though your chosen figure of merit does not "
+ "require it.\n");
+ ERROR("The figures of merit will not reflect the entire data "
+ "set!\n");
+ }
+
if ( sym_str == NULL ) {
sym_str = strdup("1");
}