diff options
| author | Thomas White <taw@physics.org> | 2014-11-09 06:09:53 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-11-09 06:09:53 +0100 |
| commit | 39d7adab86fcc9adf19aa175fe5ae425000e7dd8 (patch) | |
| tree | 41a0f25e2b4d08706b3024895aff2441753e62c6 /src | |
| parent | d7f3262f6de5f3859e88cbda3b42fdc056d447ce (diff) | |
Add warnings to everything which used to take a beam file
Diffstat (limited to 'src')
| -rw-r--r-- | src/indexamajig.c | 9 | ||||
| -rw-r--r-- | src/partial_sim.c | 9 | ||||
| -rw-r--r-- | src/pattern_sim.c | 13 |
3 files changed, 24 insertions, 7 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index 02829b55..80894804 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -253,6 +253,7 @@ int main(int argc, char *argv[]) {"prefix", 1, NULL, 'x'}, {"threshold", 1, NULL, 't'}, {"image", 1, NULL, 'e'}, + {"beam", 1, NULL, 'b'}, /* Long-only options with no arguments */ {"filter-noise", 0, &iargs.noisefilter, 1}, @@ -297,7 +298,7 @@ int main(int argc, char *argv[]) }; /* Short options */ - while ((c = getopt_long(argc, argv, "hi:o:z:p:x:j:g:t:e:v", + while ((c = getopt_long(argc, argv, "hi:o:z:p:x:j:g:t:e:vb:", longopts, NULL)) != -1) { switch (c) { @@ -311,6 +312,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 indexamajig command line.\n"); + return 1; + case 'i' : filename = strdup(optarg); break; diff --git a/src/partial_sim.c b/src/partial_sim.c index 77b5a73b..504abf52 100644 --- a/src/partial_sim.c +++ b/src/partial_sim.c @@ -453,6 +453,7 @@ int main(int argc, char *argv[]) const struct option longopts[] = { {"help", 0, NULL, 'h'}, {"version", 0, NULL, 'v'}, + {"beam", 1, NULL, 'b'}, {"output", 1, NULL, 'o'}, {"input", 1, NULL, 'i'}, {"pdb", 1, NULL, 'p'}, @@ -478,7 +479,7 @@ int main(int argc, char *argv[]) }; /* Short options */ - while ((c = getopt_long(argc, argv, "hi:o:p:g:y:n:r:j:c:v", + while ((c = getopt_long(argc, argv, "hi:o:p:g:y:n:r:j:c:vb:", longopts, NULL)) != -1) { switch (c) { @@ -492,6 +493,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 partial_sim command line.\n"); + return 1; + case 'i' : input_file = strdup(optarg); break; 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; |