Changes

From XDSwiki
Jump to navigationJump to search
186 bytes added ,  12:12, 16 October 2019
→‎The script: fixes for SSRF; add "-maxdepth 0" to "find -H ..."
Line 104: Line 104:  
# revision 0.86 . Keitaro 03/05/2019 Add PILATUS3 6M, S/N 60-0123 at SSRF BL18U-1 with ROTATION_AXIS=-1 0 0
 
# revision 0.86 . Keitaro 03/05/2019 Add PILATUS3 6M, S/N 60-0123 at SSRF BL18U-1 with ROTATION_AXIS=-1 0 0
 
# revision 0.87 . KD 12/10/2019 Add PILATUS XXX, S/N XX-XXX at SSRF BL19U1 and MarCCD detector #43 at BL17B1 with ROTATION_AXIS=-1 0 0
 
# revision 0.87 . KD 12/10/2019 Add PILATUS XXX, S/N XX-XXX at SSRF BL19U1 and MarCCD detector #43 at BL17B1 with ROTATION_AXIS=-1 0 0
REVISION="0.87 (13-Oct-2019)"
+
# revision 0.88 . KD 16/10/2019 fixes for SSRF, add "-maxdepth 0" to "find -H ..."
 +
REVISION="0.88 (16-Oct-2019)"
    
#                                                                                                             
 
#                                                                                                             
Line 167: Line 168:  
# cope with blanks in directory / file name
 
# cope with blanks in directory / file name
 
IFS=$'\n'
 
IFS=$'\n'
find -H $dname -name "$bname" -or -name "${bname}.bz2" -or -name "${bname}.gz" -or -name "${bname}.xz" | egrep -v "_00000.cbf|_000.img" | sort > tmp1
+
find -H -maxdepth 0 $dname -name "$bname" -or -name "${bname}.bz2" -or -name "${bname}.gz" -or -name "${bname}.xz" | egrep -v "_00000.cbf|_000.img" | sort > tmp1
 
if [ ! -s tmp1 ]
 
if [ ! -s tmp1 ]
 
then
 
then
Line 484: Line 485:  
PILATUS3 6M, S/N 60-0127
 
PILATUS3 6M, S/N 60-0127
 
PILATUS3 6M, S/N 60-0123
 
PILATUS3 6M, S/N 60-0123
PILATUS XXX, S/N XX-XXX
   
"
 
"
 
       if echo "${DET_SN}${REVERSEPHI_SNs}" | sort | uniq -d | grep [0-9] > /dev/null; then
 
       if echo "${DET_SN}${REVERSEPHI_SNs}" | sort | uniq -d | grep [0-9] > /dev/null; then
 +
        REVERSE_PHI="yes"
 +
      fi
 +
      if [ "$DET_SN" == "PILATUS XX, S/N XX-XXX" ] ; then
 
         REVERSE_PHI="yes"
 
         REVERSE_PHI="yes"
 
       fi
 
       fi
Line 792: Line 795:  
   else
 
   else
 
     echo !LIB=/usr/local/lib64/dectris-neggia.so >> XDS.INP
 
     echo !LIB=/usr/local/lib64/dectris-neggia.so >> XDS.INP
     echo /usr/local/lib64/dectris-neggia.so was not found!
+
     echo /usr/local/lib64/dectris-neggia.so was not found - specify location manually!
 
   fi
 
   fi
 
fi  
 
fi  
Line 809: Line 812:  
   echo "ROTATION_AXIS= $rotation_axis  ! only read by IDXREF" >> XDS.INP
 
   echo "ROTATION_AXIS= $rotation_axis  ! only read by IDXREF" >> XDS.INP
 
  elif [ "$REVERSE_PHI" == "no" ]; then
 
  elif [ "$REVERSE_PHI" == "no" ]; then
   echo 'ROTATION_AXIS=1 0 0  ! Australian Synchrotron, SERCAT ID-22 (?), APS 19-ID (?), ESRF BM30A, SPring-8, SSRF BL17U need -1 0 0. Diamond ID24 needs 0 -1 0' >> XDS.INP
+
   echo 'ROTATION_AXIS=1 0 0  ! Australian Synchrotron, SERCAT ID-22 (?), APS 19-ID (?), ESRF BM30A, SPring-8, SSRF need -1 0 0. Diamond ID24 needs 0 -1 0' >> XDS.INP
 
  else
 
  else
 
   echo 'ROTATION_AXIS=-1 0 0  ! if this is wrong, please contact author.' >> XDS.INP
 
   echo 'ROTATION_AXIS=-1 0 0  ! if this is wrong, please contact author.' >> XDS.INP
2,461

edits

Cookies help us deliver our services. By using our services, you agree to our use of cookies.

Navigation menu