Changes

From XDSwiki
Jump to navigationJump to search
799 bytes added ,  10:05, 25 October 2019
→‎The script: add OLDMAR detector type
Line 106: Line 106:  
# revision 0.88 . KD 16/10/2019 fixes for SSRF, add "-maxdepth 1" to "find -H ..."
 
# revision 0.88 . KD 16/10/2019 fixes for SSRF, add "-maxdepth 1" to "find -H ..."
 
# revision 0.89 . KD 21/10/2019 add ADSC S/N 905 at ALS 8.2.1, S/N 928 at Australian Synchrotron MX2 beamline; final SSRF fixes
 
# revision 0.89 . KD 21/10/2019 add ADSC S/N 905 at ALS 8.2.1, S/N 928 at Australian Synchrotron MX2 beamline; final SSRF fixes
REVISION="0.89 (23-Oct-2019)"
+
# revision 0.90 . KD 25/10/2019 add OLDMAR detector type. Tested w/ SBGrid data set 6. Anomalous signal may have wrong hand!
 +
REVISION="0.90 (25-Oct-2019)"
    
#                                                                                                             
 
#                                                                                                             
Line 232: Line 233:  
  grep -q mar345 tmp2 && DET=MAR345     
 
  grep -q mar345 tmp2 && DET=MAR345     
 
  grep -q BRUKER tmp2 && grep -q CBF tmp2  && DET=Bruker-cbf   
 
  grep -q BRUKER tmp2 && grep -q CBF tmp2  && DET=Bruker-cbf   
  grep -q CMOS1 tmp2 && DET=adsc-CMOS1                  
+
  grep -q CMOS1 tmp2 && DET=adsc-CMOS1  
 +
grep -q MARCONTROL tmp2 && DET=OLDMAR                   
 
else
 
else
 
  h5dump -d "/entry/instrument/detector/description" $FIRSTFRAME | grep -i Eiger > /dev/null && DET=eiger
 
  h5dump -d "/entry/instrument/detector/description" $FIRSTFRAME | grep -i Eiger > /dev/null && DET=eiger
Line 675: Line 677:  
  X_RAY_WAVELENGTH=`grep 'WAVELENGTH' tmp2 | awk '{print $2}'`  
 
  X_RAY_WAVELENGTH=`grep 'WAVELENGTH' tmp2 | awk '{print $2}'`  
 
  OSCILLATION_RANGE=`grep 'PHI' tmp2 | awk '{print $5-$3}'`     
 
  OSCILLATION_RANGE=`grep 'PHI' tmp2 | awk '{print $5-$3}'`     
  TRUSTED_REGION="0 0.99"         
+
  TRUSTED_REGION="0 0.99"  
 +
 
 +
elif [ "$DET" == "OLDMAR" ]; then
 +
 
 +
echo  "Data from old type MAR image plate detector"
 +
DETECTOR="MAR  MINIMUM_VALID_PIXEL_VALUE=0  OVERLOAD=130000"
 +
NX=`awk 'NR==2 {print $2}' tmp2`
 +
NY=$NX
 +
QX=`awk 'NR==2 {print $15}' tmp2`
 +
QY=$QX
 +
ORGX=`awk 'NR==2 {print $19}' tmp2`
 +
ORGY=`awk 'NR==2 {print $20}' tmp2`
 +
DETECTOR_DISTANCE=`awk 'NR==2 {print $22}' tmp2`             
 +
X_RAY_WAVELENGTH=`awk 'NR==2 {print $21}' tmp2`
 +
OSCILLATION_RANGE=`awk 'NR==2 {print $24-$23}' tmp2`   
 +
TRUSTED_REGION="0 0.99" 
 +
rotation_axis="0 1 0" 
 +
echo unsure if sign of anomalous signal is correct - please verify or try both hands!
 +
        
 
elif [ "$DET" == "Bruker-cbf" ]; then
 
elif [ "$DET" == "Bruker-cbf" ]; then
 
    
 
    
2,522

edits

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

Navigation menu