33
edits
(version update) |
No edit summary |
||
Line 43: | Line 43: | ||
# revision 0.26 . KD 7/2012 - Mac-compatibility: replace od flags --skip-bytes= and --read-bytes= with -j and -N (thanks to Oliver Clarke for working this out!) | # revision 0.26 . KD 7/2012 - Mac-compatibility: replace od flags --skip-bytes= and --read-bytes= with -j and -N (thanks to Oliver Clarke for working this out!) | ||
# revision 0.27 . KD 11/2012 - EXCLUDE_RESOLUTION_RANGE lines and generic Pilatus Flat_field test | # revision 0.27 . KD 11/2012 - EXCLUDE_RESOLUTION_RANGE lines and generic Pilatus Flat_field test | ||
REVISION="0. | # revision 0.28 . Keitaro 11/2012 - for MarCCD: read oscillation range from the position 1024+736 (fix for omega rotation) | ||
REVISION="0.28 (28-Nov-2012)" | |||
# | # | ||
# usage: e.g. generate_XDS.INP "frms/mydata_1_???.img" | # usage: e.g. generate_XDS.INP "frms/mydata_1_???.img" | ||
Line 141: | Line 142: | ||
ORGY=`echo "scale=2; $ORGY/1000" | bc -l ` | ORGY=`echo "scale=2; $ORGY/1000" | bc -l ` | ||
let SKIP=1024+ | let SKIP=1024+736 | ||
OSCILLATION_RANGE=$(od -t dI -j $SKIP -N 4 $FIRSTFRAME | head -1 | awk '{print $2}') | |||
OSCILLATION_RANGE=`echo "scale=3; $OSCILLATION_RANGE/1000" | bc -l` | |||
OSCILLATION_RANGE=`echo "scale=3; | |||
let SKIP=1024+256+128+256+128+4 | let SKIP=1024+256+128+256+128+4 | ||
Line 407: | Line 406: | ||
# revision 0.28 Oliver Clarke 10/12 - xds_graph was not plotting h00, 0k0, 00l reflections when a reference dataset was present. Fixed. | # revision 0.28 Oliver Clarke 10/12 - xds_graph was not plotting h00, 0k0, 00l reflections when a reference dataset was present. Fixed. | ||
# revision 0.29 KD 11/2012 - EXCLUDE_RESOLUTION_RANGE lines and generic Pilatus Flat_field test | # revision 0.29 KD 11/2012 - EXCLUDE_RESOLUTION_RANGE lines and generic Pilatus Flat_field test | ||
REVISION="0. | # revision 0.30 Keitaro 11/2012 - for MarCCD: read oscillation range from the position 1024+736 (fix for omega rotation) XXX for STARTING_ANGLE=, needs more work to support both phi and omega rotation | ||
REVISION="0.30 (28-Nov-2012)" | |||
# | # | ||
# usage: e.g. xds_generate_all "frms/mydata_1_???.img" | # usage: e.g. xds_generate_all "frms/mydata_1_???.img" | ||
Line 512: | Line 512: | ||
let SKIP=1024+256+128+256+44 | let SKIP=1024+256+128+256+44 | ||
PHISTART=$(od -t dI -j $SKIP -N 4 $FIRSTFRAME | head -1 | awk '{print $2}') | PHISTART=$(od -t dI -j $SKIP -N 4 $FIRSTFRAME | head -1 | awk '{print $2}') | ||
STARTING_ANGLE=`echo "scale=3; ($PHISTART/1000)" | bc -l` | STARTING_ANGLE=`echo "scale=3; ($PHISTART/1000)" | bc -l` | ||
let SKIP=1024+736 | |||
OSCILLATION_RANGE=$(od -t dI -j $SKIP -N 4 $FIRSTFRAME | head -1 | awk '{print $2}') | |||
OSCILLATION_RANGE=`echo "scale=3; $OSCILLATION_RANGE/1000" | bc -l` | |||
let SKIP=1024+256+128+256+128+4 | let SKIP=1024+256+128+256+128+4 |
edits