Generate XDS.INP: Difference between revisions

Generate XDS.INP (view source)

Revision as of 15:10, 12 June 2010

11 bytes added , 12 June 2010

which catmar, which mccd_xdsparams.pl instead of /usr/local/bin

Kay

Bureaucrats

2,718

edits

@@ Line 7: / Line 7: @@
   # revision 0.04 . Kay Diederichs 4/2010 - include alternative ORGX, ORGY calculations for ADSC
   # revision 0.05 . Kay Diederichs 5/2010 - grep for "Corrected" in addition to "marccd" (needed for BESSY); a bit of error handling
-  # revision 0.06 . KD 6/2010 - add UNTRUSTED_RECTANGLE and UNTRUSTED_ELLIPSE
+  # revision 0.06 . KD 6/2010 - add UNTRUSTED_RECTANGLE and UNTRUSTED_ELLIPSE; use `which catmar`
   # tested with some datasets from ALS, SSRL, SLS, ESRF and BESSY; only MARCCD, ADSC/SMV, PILATUS detectors; for other detectors, values must be manually filled in.
   #
@@ Line 74: / Line 74: @@
     DETECTOR="CCDCHESS MINIMUM_VALID_PIXEL_VALUE= 1 OVERLOAD= 65000"
     echo this a a MARCCD detector
-    if [ -e /usr/local/bin/catmar ]; then
+    if [ -e `which catmar` ]; then
         # inspect frame header and get rid of blanks in imgheader output:
@@ Line 99: / Line 99: @@
     else
-        if [ -e /usr/local/bin/mccd_xdsparams.pl ]; then
+        if [ -e `which mccd_xdsparams.pl` ]; then
           mccd_xdsparams.pl -v `head -1 tmp1` > tmp2
           X_RAY_WAVELENGTH=`awk '/X-RAY_WAVELENGTH/{print $2}' tmp2`
@@ Line 107: / Line 107: @@
           OSCILLATION_RANGE=`awk '/OSCILLATION_RANGE/{print $2}' tmp2`
         else
-          echo "could not find /usr/local/bin/catmar - fill XXX values manually!"
+          echo "could not find catmar or mccd_xdsparams.pl - fill XXX values manually!"
         fi
     fi