aboutsummaryrefslogtreecommitdiff
path: root/src/pattern_sim.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-11-09 06:09:53 +0100
committerThomas White <taw@physics.org>2014-11-09 06:09:53 +0100
commit39d7adab86fcc9adf19aa175fe5ae425000e7dd8 (patch)
tree41a0f25e2b4d08706b3024895aff2441753e62c6 /src/pattern_sim.c
parentd7f3262f6de5f3859e88cbda3b42fdc056d447ce (diff)
Add warnings to everything which used to take a beam file
Diffstat (limited to 'src/pattern_sim.c')
-rw-r--r--src/pattern_sim.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/pattern_sim.c b/src/pattern_sim.c
index 0410da21..a53472ff 100644
--- a/src/pattern_sim.c
+++ b/src/pattern_sim.c
@@ -279,6 +279,7 @@ int main(int argc, char *argv[])
{"help", 0, NULL, 'h'},
{"version", 0, NULL, 'v'},
{"gpu", 0, &config_gpu, 1},
+ {"beam", 1, NULL, 'b'},
{"random-orientation", 0, NULL, 'r'},
{"number", 1, NULL, 'n'},
{"no-images", 0, &config_noimages, 1},
@@ -310,7 +311,7 @@ int main(int argc, char *argv[])
};
/* Short options */
- while ((c = getopt_long(argc, argv, "hrn:i:t:p:o:g:y:s:x:v",
+ while ((c = getopt_long(argc, argv, "hrn:i:t:p:o:g:y:s:x:vb:",
longopts, NULL)) != -1) {
switch (c) {
@@ -324,6 +325,12 @@ int main(int argc, char *argv[])
printf(CRYSTFEL_BOILERPLATE"\n");
return 0;
+ case 'b' :
+ ERROR("WARNING: This version of CrystFEL no longer "
+ "uses beam files. Please remove the beam file "
+ "from your pattern_sim command line.\n");
+ return 1;
+
case 'r' :
config_randomquat = 1;
break;
@@ -360,10 +367,6 @@ int main(int argc, char *argv[])
geometry = strdup(optarg);
break;
- case 'b' :
- beamfile = strdup(optarg);
- break;
-
case 'y' :
sym_str = strdup(optarg);
break;