--- bin/sharp/autoSHARP/shelx.sh	2011-11-17 15:17:43.000000000 +0100
+++ /home/vonrhein/Projects/ESRF-2013/SHARP-2.8.1/bin/sharp/autoSHARP/shelx.sh	2013-03-26 08:46:57.000000000 +0100
@@ -229,18 +229,43 @@
 else
   shelxd=$BDG_shelxbin/shelxd
 fi
-__version=`$shelxd __$$.DoesNotExist 2>&1 | \
-  awk '/SHELXD-[0-9][0-9][0-9][0-9]/{print $2}' | \
-  sed "s/SHELXD-//g" | sed "s%/% %g" | \
+__shelxc_version=`$BDG_shelxbin/shelxc __$$.DoesNotExist </dev/null 2>&1 | \
+  awk '/Version/{print $(NF-1)}' | sed "s%/% %g" | \
   awk '{printf("%4.4d%2.2d\n",$1,$2)}'`
 rm -f __$$.DoesNotExist*
+shelxc_version=""
+if [ "X$__shelxc_version" != "X" ]; then
+  __nv=0
+  for __v in $autoSHARP_SHELXC_versions
+  do
+    __nv=`expr $__nv + 1`
+    [ $__shelxc_version -ge $__v ] && shelxc_version=$__v && __nvv=$__nv
+  done
+  HtmlNote "SHELXC version $shelxc_version found"
+  [ "X$__nv" != "X$__nvv" ] && HtmlWarning -S "newer SHELXC version available" \
+                                              "it seems as if there could be a newer SHELXC version" \
+                                              "available from http://shelx.uni-ac.gwdg.de/SHELX/." \
+                                              "We recommend to use at least the $__v version!"
+fi
+
+__shelxd_version=`$shelxd __$$.DoesNotExist 2>&1 | \
+  awk '/SHELXD-[0-9][0-9][0-9][0-9]/{print $2}/SHELXD [0-9][0-9][0-9][0-9]/{print $3}' | \
+  sed "s/SHELXD-//g" | sed "s%/% %g" | \
+  awk '{if(NF>1){x=$2}else{x=0};printf("%4.4d%2.2d\n",$1,x)}'`
+rm -f __$$.DoesNotExist*
 shelxd_version=""
-if [ "X$__version" != "X" ]; then
+if [ "X$__shelxd_version" != "X" ]; then
+  __nv=0
   for __v in $autoSHARP_SHELXD_versions
   do
-    [ $__version -ge $__v ] && shelxd_version=$__v
+    __nv=`expr $__nv + 1`
+    [ $__shelxd_version -ge $__v ] && shelxd_version=$__v && __nvv=$__nv
   done
   HtmlNote "SHELXD version $shelxd_version found"
+  [ "X$__nv" != "X$__nvv" ] && HtmlWarning -S "newer SHELXD version available" \
+                                              "it seems as if there could be a newer SHELXD version" \
+                                              "available from http://shelx.uni-ac.gwdg.de/SHELX/." \
+                                              "We recommend to use at least the $__v version!"
   eval "__v=\$autoSHARP_SHELX${shelxd_version}_ScoringMethod"
   [ "X$__v" != "X" ] && autoSHARP_SHELX_ScoringMethod=$__v
   #HtmlNote "Using scoring method $autoSHARP_SHELX_ScoringMethod"
@@ -727,8 +752,16 @@
       rcut1=`      awk -v c=$autoSHARP_SHELX_CcDanoCut -v ulim=$autoSHARP_SHELX_HighResDecision_UseLremInMad 'BEGIN{rcut=0.0}
         /^ Resl/{
           n=0
-          for (i=4;i<=NF;i=i+2) {
-            n++;r[n]=$i
+          if(index($0," - ")>0){
+            # Resl.   Inf - 8.0 - 6.0 - 5.0 - 4.0 - 3.5 - 3.0 - 2.8 - 2.6 - 2.4 - 2.2 - 2.00
+            for (i=4;i<=NF;i=i+2) {
+              n++;r[n]=$i
+            }
+          } else {
+            # Resl.   Inf.  4.45  3.53  3.08  2.80  2.60  2.45  2.33  2.22  2.14  2.06  2.00
+            for (i=3;i<=NF;i=i+1) {
+              n++;r[n]=$i
+            }
           }
           num=n
           ncc=0
@@ -776,7 +809,17 @@
       rcut2=`awk -v q='"' -v c=$autoSHARP_SHELX_DanoOverSanoCut 'BEGIN{rcut=0.0}
         /^ Resl/{
           n=0
-          for (i=4;i<=NF;i=i+2) {n++;r[n]=$i}
+          if(index($0," - ")>0){
+            # Resl.   Inf - 8.0 - 6.0 - 5.0 - 4.0 - 3.5 - 3.0 - 2.8 - 2.6 - 2.4 - 2.2 - 2.00
+            for (i=4;i<=NF;i=i+2) {
+              n++;r[n]=$i
+            }
+          } else {
+            # Resl.   Inf.  4.45  3.53  3.08  2.80  2.60  2.45  2.33  2.22  2.14  2.06  2.00
+            for (i=3;i<=NF;i=i+1) {
+              n++;r[n]=$i
+            }
+          }
           num=n
         }
         /^ .d..sig/{
@@ -801,7 +844,17 @@
       rcut3=`awk -v q1="'" -v q2="\"" -v c1=$autoSHARP_SHELX_DisoOverSisoCut -v c2=$autoSHARP_SHELX_DanoOverSanoCut 'BEGIN{rcut1=0.0;rcut2=0.0}
         /^ Resl/{
           n=0
-          for (i=4;i<=NF;i=i+2) {n++;r[n]=$i}
+          if(index($0," - ")>0){
+            # Resl.   Inf - 8.0 - 6.0 - 5.0 - 4.0 - 3.5 - 3.0 - 2.8 - 2.6 - 2.4 - 2.2 - 2.00
+            for (i=4;i<=NF;i=i+2) {
+              n++;r[n]=$i
+            }
+          } else {
+            # Resl.   Inf.  4.45  3.53  3.08  2.80  2.60  2.45  2.33  2.22  2.14  2.06  2.00
+            for (i=3;i<=NF;i=i+1) {
+              n++;r[n]=$i
+            }
+          }
           num=n
         }
         /^ .d..sig/{
@@ -840,7 +893,17 @@
       rcut3=`awk -v q="\"" -v c1=$autoSHARP_SHELX_IntensityOverSigmaCut 'BEGIN{rcut1=0.0}
         /^ Resl/{
           n=0
-          for (i=4;i<=NF;i=i+2) {n++;r[n]=$i}
+          if(index($0," - ")>0){
+            # Resl.   Inf - 8.0 - 6.0 - 5.0 - 4.0 - 3.5 - 3.0 - 2.8 - 2.6 - 2.4 - 2.2 - 2.00
+            for (i=4;i<=NF;i=i+2) {
+              n++;r[n]=$i
+            }
+          } else {
+            # Resl.   Inf.  4.45  3.53  3.08  2.80  2.60  2.45  2.33  2.22  2.14  2.06  2.00
+            for (i=3;i<=NF;i=i+1) {
+              n++;r[n]=$i
+            }
+          }
           num=n
         }
         /I.sig/{
@@ -857,7 +920,17 @@
       rcut3=`awk -v q="'" -v c1=$autoSHARP_SHELX_DisoOverSisoCut 'BEGIN{rcut1=0.0}
         /^ Resl/{
           n=0
-          for (i=4;i<=NF;i=i+2) {n++;r[n]=$i}
+          if(index($0," - ")>0){
+            # Resl.   Inf - 8.0 - 6.0 - 5.0 - 4.0 - 3.5 - 3.0 - 2.8 - 2.6 - 2.4 - 2.2 - 2.00
+            for (i=4;i<=NF;i=i+2) {
+              n++;r[n]=$i
+            }
+          } else {
+            # Resl.   Inf.  4.45  3.53  3.08  2.80  2.60  2.45  2.33  2.22  2.14  2.06  2.00
+            for (i=3;i<=NF;i=i+1) {
+              n++;r[n]=$i
+            }
+          }
           num=n
         }
         /^ .d..sig/{
@@ -1019,6 +1092,7 @@
               }
             }
           }
+           # Try    248, CPU 3, CC All/Weak 40.6 / 29.4, CFOM 70.0, best 70.1, PATFOM  117.2
           /^ Try/{
             patfom=$9-0.0
             if(patfom>patfommax){patfommax=patfom;patfomtry=$2}