aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2009-11-25 15:17:03 +0100
committerThomas White <taw@physics.org>2009-11-25 15:17:03 +0100
commit15c526821d0150b11ef5eb1f637d76e491eaa38c (patch)
tree4dcbb253e75355cb883b57d673fc6e381ba254c7 /src
parentb0e34adb4187a4a5e4fa738f72817de656bf568a (diff)
Move main.c to pattern_sim.c
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am9
-rw-r--r--src/pattern_sim.c (renamed from src/main.c)2
2 files changed, 7 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1220b7f2..3a251dfb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,10 @@
-bin_PROGRAMS = pattern_sim
+bin_PROGRAMS = pattern_sim #integr_sim
AM_CFLAGS = -Wall -g @CFLAGS@
-pattern_sim_SOURCES = main.c diffraction.c utils.c image.c cell.c hdf5-file.c \
- ewald.c detector.c sfac.c
+pattern_sim_SOURCES = pattern_sim.c diffraction.c utils.c image.c cell.c \
+ hdf5-file.c ewald.c detector.c sfac.c
pattern_sim_LDADD = @LIBS@
+
+integr_sim_SOURCES = integr_sim.c diffraction.c utils.c ewald.c sfac.c
+integr_sim_LDADD = @LIBS@
diff --git a/src/main.c b/src/pattern_sim.c
index b31d11d1..50319dce 100644
--- a/src/main.c
+++ b/src/pattern_sim.c
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
image.fmode = FORMULATION_CLEN;
image.x_centre = 512.5;
image.y_centre = 512.5;
- image.camera_len = 0.2; /* 20 cm (can move from 5cm-20cm) */
+ image.camera_len = 0.05; /* 5 cm (front CCD can move from 5cm-20cm) */
image.resolution = 13333.3; /* 75 micron pixel size */
image.xray_energy = eV_to_J(2.0e3); /* 2 keV energy */
image.lambda = ph_en_to_lambda(image.xray_energy); /* Wavelength */