Skip to content
GitLab
Commit 74dfd122 authored by Thomas White's avatar Thomas White Committed by Thomas White
Browse files

"facetron" is now known as "partialator"

parent d320a49e
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 74dfd122
......@@ -15,7 +15,7 @@ src/compare_hkl
src/powder_plot
src/render_hkl
src/calibrate_detector
src/facetron
src/partialator
src/cubeit
src/reintegrate
src/estimate_background
......
Makefile.am
View file @ 74dfd122
......@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = src/pattern_sim src/process_hkl src/get_hkl src/indexamajig \
src/compare_hkl src/powder_plot src/render_hkl \
src/calibrate_detector src/facetron src/reintegrate \
src/calibrate_detector src/partialator src/reintegrate \
src/estimate_background src/check_hkl
if HAVE_GTK
......@@ -69,16 +69,17 @@ src_calibrate_detector_SOURCES = src/calibrate_detector.c src/utils.c \
src/peaks.c src/detector.c src/cell.c \
src/thread-pool.c
src_facetron_SOURCES = src/facetron.c src/cell.c src/hdf5-file.c src/utils.c \
src/detector.c src/peaks.c src/image.c src/geometry.c \
src/reflections.c src/stream.c src/thread-pool.c \
src/beam-parameters.c src/symmetry.c \
src/post-refinement.c src/hrs-scaling.c
src_partialator_SOURCES = src/partialator.c src/cell.c src/hdf5-file.c \
src/utils.c src/detector.c src/peaks.c src/image.c \
src/geometry.c src/reflections.c src/stream.c \
src/thread-pool.c src/beam-parameters.c \
src/symmetry.c src/post-refinement.c \
src/hrs-scaling.c
if HAVE_CAIRO
src_cubeit_SOURCES = src/cubeit.c src/cell.c src/hdf5-file.c src/utils.c \
src/detector.c src/render.c src/filters.c src/image.c \
src/symmetry.c src/stream.c src/thread-pool.c
src/detector.c src/render.c src/filters.c src/image.c \
src/symmetry.c src/stream.c src/thread-pool.c
endif
src_reintegrate_SOURCES = src/reintegrate.c src/cell.c src/hdf5-file.c \
......
Makefile.in
View file @ 74dfd122
......@@ -39,7 +39,7 @@ bin_PROGRAMS = src/pattern_sim$(EXEEXT) src/process_hkl$(EXEEXT) \
src/get_hkl$(EXEEXT) src/indexamajig$(EXEEXT) \
src/compare_hkl$(EXEEXT) src/powder_plot$(EXEEXT) \
src/render_hkl$(EXEEXT) src/calibrate_detector$(EXEEXT) \
src/facetron$(EXEEXT) src/reintegrate$(EXEEXT) \
src/partialator$(EXEEXT) src/reintegrate$(EXEEXT) \
src/estimate_background$(EXEEXT) src/check_hkl$(EXEEXT) \
$(am__EXEEXT_1) $(am__EXEEXT_2)
@HAVE_GTK_TRUE@am__append_1 = src/hdfsee
......@@ -120,16 +120,6 @@ src_estimate_background_OBJECTS = \
$(am_src_estimate_background_OBJECTS)
src_estimate_background_LDADD = $(LDADD)
src_estimate_background_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
am_src_facetron_OBJECTS = src/facetron.$(OBJEXT) src/cell.$(OBJEXT) \
src/hdf5-file.$(OBJEXT) src/utils.$(OBJEXT) \
src/detector.$(OBJEXT) src/peaks.$(OBJEXT) src/image.$(OBJEXT) \
src/geometry.$(OBJEXT) src/reflections.$(OBJEXT) \
src/stream.$(OBJEXT) src/thread-pool.$(OBJEXT) \
src/beam-parameters.$(OBJEXT) src/symmetry.$(OBJEXT) \
src/post-refinement.$(OBJEXT) src/hrs-scaling.$(OBJEXT)
src_facetron_OBJECTS = $(am_src_facetron_OBJECTS)
src_facetron_LDADD = $(LDADD)
src_facetron_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
am_src_get_hkl_OBJECTS = src/get_hkl.$(OBJEXT) src/sfac.$(OBJEXT) \
src/cell.$(OBJEXT) src/utils.$(OBJEXT) \
src/reflections.$(OBJEXT) src/symmetry.$(OBJEXT) \
......@@ -168,6 +158,16 @@ am_src_indexamajig_OBJECTS = src/indexamajig.$(OBJEXT) \
src_indexamajig_OBJECTS = $(am_src_indexamajig_OBJECTS)
src_indexamajig_LDADD = $(LDADD)
src_indexamajig_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
am_src_partialator_OBJECTS = src/partialator.$(OBJEXT) \
src/cell.$(OBJEXT) src/hdf5-file.$(OBJEXT) src/utils.$(OBJEXT) \
src/detector.$(OBJEXT) src/peaks.$(OBJEXT) src/image.$(OBJEXT) \
src/geometry.$(OBJEXT) src/reflections.$(OBJEXT) \
src/stream.$(OBJEXT) src/thread-pool.$(OBJEXT) \
src/beam-parameters.$(OBJEXT) src/symmetry.$(OBJEXT) \
src/post-refinement.$(OBJEXT) src/hrs-scaling.$(OBJEXT)
src_partialator_OBJECTS = $(am_src_partialator_OBJECTS)
src_partialator_LDADD = $(LDADD)
src_partialator_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
am__src_pattern_sim_SOURCES_DIST = src/pattern_sim.c src/diffraction.c \
src/utils.c src/image.c src/cell.c src/hdf5-file.c \
src/detector.c src/sfac.c src/peaks.c src/reflections.c \
......@@ -237,17 +237,17 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(src_calibrate_detector_SOURCES) $(src_check_hkl_SOURCES) \
$(src_compare_hkl_SOURCES) $(src_cubeit_SOURCES) \
$(src_estimate_background_SOURCES) $(src_facetron_SOURCES) \
$(src_get_hkl_SOURCES) $(src_hdfsee_SOURCES) \
$(src_indexamajig_SOURCES) $(src_pattern_sim_SOURCES) \
$(src_estimate_background_SOURCES) $(src_get_hkl_SOURCES) \
$(src_hdfsee_SOURCES) $(src_indexamajig_SOURCES) \
$(src_partialator_SOURCES) $(src_pattern_sim_SOURCES) \
$(src_powder_plot_SOURCES) $(src_process_hkl_SOURCES) \
$(src_reintegrate_SOURCES) $(src_render_hkl_SOURCES)
DIST_SOURCES = $(src_calibrate_detector_SOURCES) \
$(src_check_hkl_SOURCES) $(src_compare_hkl_SOURCES) \
$(am__src_cubeit_SOURCES_DIST) \
$(src_estimate_background_SOURCES) $(src_facetron_SOURCES) \
$(src_get_hkl_SOURCES) $(am__src_hdfsee_SOURCES_DIST) \
$(am__src_indexamajig_SOURCES_DIST) \
$(src_estimate_background_SOURCES) $(src_get_hkl_SOURCES) \
$(am__src_hdfsee_SOURCES_DIST) \
$(am__src_indexamajig_SOURCES_DIST) $(src_partialator_SOURCES) \
$(am__src_pattern_sim_SOURCES_DIST) $(src_powder_plot_SOURCES) \
$(src_process_hkl_SOURCES) $(src_reintegrate_SOURCES) \
$(src_render_hkl_SOURCES)
......@@ -585,15 +585,16 @@ src_calibrate_detector_SOURCES = src/calibrate_detector.c src/utils.c \
src/peaks.c src/detector.c src/cell.c \
src/thread-pool.c
src_facetron_SOURCES = src/facetron.c src/cell.c src/hdf5-file.c src/utils.c \
src/detector.c src/peaks.c src/image.c src/geometry.c \
src/reflections.c src/stream.c src/thread-pool.c \
src/beam-parameters.c src/symmetry.c \
src/post-refinement.c src/hrs-scaling.c
src_partialator_SOURCES = src/partialator.c src/cell.c src/hdf5-file.c \
src/utils.c src/detector.c src/peaks.c src/image.c \
src/geometry.c src/reflections.c src/stream.c \
src/thread-pool.c src/beam-parameters.c \
src/symmetry.c src/post-refinement.c \
src/hrs-scaling.c
@HAVE_CAIRO_TRUE@src_cubeit_SOURCES = src/cubeit.c src/cell.c src/hdf5-file.c src/utils.c \
@HAVE_CAIRO_TRUE@ src/detector.c src/render.c src/filters.c src/image.c \
@HAVE_CAIRO_TRUE@ src/symmetry.c src/stream.c src/thread-pool.c
@HAVE_CAIRO_TRUE@ src/detector.c src/render.c src/filters.c src/image.c \
@HAVE_CAIRO_TRUE@ src/symmetry.c src/stream.c src/thread-pool.c
src_reintegrate_SOURCES = src/reintegrate.c src/cell.c src/hdf5-file.c \
src/utils.c src/detector.c src/peaks.c src/image.c \
......@@ -783,21 +784,10 @@ src/estimate_background.$(OBJEXT): src/$(am__dirstamp) \
src/estimate_background$(EXEEXT): $(src_estimate_background_OBJECTS) $(src_estimate_background_DEPENDENCIES) src/$(am__dirstamp)
@rm -f src/estimate_background$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(src_estimate_background_OBJECTS) $(src_estimate_background_LDADD) $(LIBS)
src/facetron.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/geometry.$(OBJEXT): src/$(am__dirstamp) \
src/get_hkl.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/beam-parameters.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/post-refinement.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/hrs-scaling.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/facetron$(EXEEXT): $(src_facetron_OBJECTS) $(src_facetron_DEPENDENCIES) src/$(am__dirstamp)
@rm -f src/facetron$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(src_facetron_OBJECTS) $(src_facetron_LDADD) $(LIBS)
src/get_hkl.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/get_hkl$(EXEEXT): $(src_get_hkl_OBJECTS) $(src_get_hkl_DEPENDENCIES) src/$(am__dirstamp)
@rm -f src/get_hkl$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(src_get_hkl_OBJECTS) $(src_get_hkl_LDADD) $(LIBS)
......@@ -818,6 +808,8 @@ src/mosflm.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/templates.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/geometry.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/diffraction-gpu.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/cl-utils.$(OBJEXT): src/$(am__dirstamp) \
......@@ -825,6 +817,15 @@ src/cl-utils.$(OBJEXT): src/$(am__dirstamp) \
src/indexamajig$(EXEEXT): $(src_indexamajig_OBJECTS) $(src_indexamajig_DEPENDENCIES) src/$(am__dirstamp)
@rm -f src/indexamajig$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(src_indexamajig_OBJECTS) $(src_indexamajig_LDADD) $(LIBS)
src/partialator.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/post-refinement.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/hrs-scaling.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/partialator$(EXEEXT): $(src_partialator_OBJECTS) $(src_partialator_DEPENDENCIES) src/$(am__dirstamp)
@rm -f src/partialator$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(src_partialator_OBJECTS) $(src_partialator_LDADD) $(LIBS)
src/pattern_sim.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
src/pattern_sim$(EXEEXT): $(src_pattern_sim_OBJECTS) $(src_pattern_sim_DEPENDENCIES) src/$(am__dirstamp)
......@@ -868,7 +869,6 @@ mostlyclean-compile:
-rm -f src/dirax.$(OBJEXT)
-rm -f src/displaywindow.$(OBJEXT)
-rm -f src/estimate_background.$(OBJEXT)
-rm -f src/facetron.$(OBJEXT)
-rm -f src/filters.$(OBJEXT)
-rm -f src/geometry.$(OBJEXT)
-rm -f src/get_hkl.$(OBJEXT)
......@@ -879,6 +879,7 @@ mostlyclean-compile:
-rm -f src/index.$(OBJEXT)
-rm -f src/indexamajig.$(OBJEXT)
-rm -f src/mosflm.$(OBJEXT)
-rm -f src/partialator.$(OBJEXT)
-rm -f src/pattern_sim.$(OBJEXT)
-rm -f src/peaks.$(OBJEXT)
-rm -f src/post-refinement.$(OBJEXT)
......@@ -913,7 +914,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dirax.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/displaywindow.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/estimate_background.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/facetron.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/filters.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/geometry.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/get_hkl.Po@am__quote@
......@@ -924,6 +924,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/index.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/indexamajig.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mosflm.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/partialator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pattern_sim.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/peaks.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/post-refinement.Po@am__quote@
......
src/facetron.c → src/partialator.c
View file @ 74dfd122
/*
* facetron.c
* partialator.c
*
* Profile fitting for coherent nanocrystallography
* Scaling and post refinement for coherent nanocrystallography
*
* (c) 2006-2010 Thomas White <taw@physics.org>
*
......@@ -44,7 +44,7 @@ static void show_help(const char *s)
{
printf("Syntax: %s [options]\n\n", s);
printf(
"Post-refinement and profile fitting for coherent nanocrystallography.\n"
"Scaling and post refinement for coherent nanocrystallography.\n"
"\n"
" -h, --help Display this help message.\n"
"\n"
......@@ -52,14 +52,15 @@ static void show_help(const char *s)
" (must be a file, not e.g. stdin)\n"
" -o, --output=<filename> Output filename. Default: facetron.hkl.\n"
" -g. --geometry=<file> Get detector geometry from file.\n"
" -b, --beam=<file> Get beam parameters from file (provides initial\n"
" values for parameters, and nominal wavelengths\n"
" if no per-shot value is found in an HDF5 file.\n"
" -b, --beam=<file> Get beam parameters from file, which provides\n"
" initial values for parameters, and nominal\n"
" wavelengths if no per-shot value is found in \n"
" an HDF5 file.\n"
" -x, --prefix=<p> Prefix filenames from input file with <p>.\n"
" --basename Remove the directory parts of the filenames.\n"
" --no-check-prefix Don't attempt to correct the --prefix.\n"
" -y, --symmetry=<sym> Merge according to symmetry <sym>.\n"
" -n, --iterations=<n> Run <n> cycles of post-refinement.\n"
" -n, --iterations=<n> Run <n> cycles of scaling and post-refinement.\n"
"\n"
" -j <n> Run <n> analyses in parallel.\n");
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

imprint | privacy | Conditions of Use