From f0a9bc268244b4538e909d0b4f2ca84fbf196a90 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 20 Nov 2009 17:55:36 +0100 Subject: Experimental values 0.5 x 0.1 micron needles CAMP chamber, CCD furthest back, pnCCD 2 keV X-rays --- src/diffraction.c | 6 +++--- src/main.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/diffraction.c b/src/diffraction.c index d1cc266c..d8ffd108 100644 --- a/src/diffraction.c +++ b/src/diffraction.c @@ -44,9 +44,9 @@ static double lattice_factor(struct threevec q, double ax, double ay, double az, { struct threevec Udotq; double f1, f2, f3; - int na = 32; - int nb = 32; - int nc = 32; + int na = 4; + int nb = 4; + int nc = 30; Udotq.u = (ax*q.u + ay*q.v + az*q.w)/2.0; Udotq.v = (bx*q.u + by*q.v + bz*q.w)/2.0; diff --git a/src/main.c b/src/main.c index 54876718..b7755ce6 100644 --- a/src/main.c +++ b/src/main.c @@ -68,13 +68,13 @@ int main(int argc, char *argv[]) deg2rad(120.0)); /* Define image parameters */ - image.width = 512; - image.height = 512; + image.width = 1024; + image.height = 1024; image.fmode = FORMULATION_CLEN; - image.x_centre = 255.5; - image.y_centre = 255.5; - image.camera_len = 0.2; /* 20 cm */ - image.resolution = 5120; /* 512 pixels in 10 cm */ + image.x_centre = 512.5; + image.y_centre = 512.5; + image.camera_len = 0.2; /* 20 cm (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 */ image.molecule = NULL; -- cgit v1.2.3