Changes

From XDSwiki
Jump to navigationJump to search
1,934 bytes added ,  20:41, 19 October 2020
v0.97 add Eiger2 UNTRUSTED_RECTANGLEs from Andreas Förster
Line 112: Line 112:  
# revision 0.94 . KD 16/03/2020 bugfix for Bruker-cbf to make bc accept e.g. 3.1e-005 by using awk printf "%.5f" instead of awk print  
 
# revision 0.94 . KD 16/03/2020 bugfix for Bruker-cbf to make bc accept e.g. 3.1e-005 by using awk printf "%.5f" instead of awk print  
 
# revision 0.95 . KD 29/07/2020 fix DLS Eiger HDF5 variant OSCILLATION_RANGE, STARTING_ANGLE. Attention: DLS Eiger variant needs h5dump 1.10 for OVERLOAD!
 
# revision 0.95 . KD 29/07/2020 fix DLS Eiger HDF5 variant OSCILLATION_RANGE, STARTING_ANGLE. Attention: DLS Eiger variant needs h5dump 1.10 for OVERLOAD!
# revision 0.96 . KD 03/10/2020 make script echo detector serial number if inverted ROTATION_AXIS is detected. Suspect APS PILATUS3 6M, S/N 60-0137 inverted.
+
# revision 0.96 . KD 03/10/2020 make script echo detector serial number if inverted ROTATION_AXIS is detected.
REVISION="0.96 (3-Oct-2020)"
+
# revision 0.97 . KD 19/10/2020 add UNTRUSTED_RECTANGLEs for Eiger2 (which has a few pixels less than Eiger (thanks to Andreas Förster)
 +
REVISION="0.97 (19-Oct-2020)"
    
#                                                                                                             
 
#                                                                                                             
Line 941: Line 942:  
!                                                  and does not seem to have any downsides.  
 
!                                                  and does not seem to have any downsides.  
 
eof
 
eof
   if [ $NX == "1475" ]; then
+
   if [ $NX == "1028"  -a $NY == "1062" ]; then
 +
# Eiger2 1M ; v0.97 numbers from Andreas Förster
 +
    cat >> XDS.INP << eof
 +
UNTRUSTED_RECTANGLE=    0 1029    512  551
 +
eof
 +
  elif [ $NX == "1475" ]; then
 
     if ! grep -q Flat_field tmp2 ; then
 
     if ! grep -q Flat_field tmp2 ; then
 
     cat >> XDS.INP << eof
 
     cat >> XDS.INP << eof
Line 974: Line 980:  
eof
 
eof
 
     fi
 
     fi
 +
  elif [ $NX == "2068"  -a $NY == "2162" ]; then
 +
# Eiger2 4M ; v0.97 numbers from Andreas Förster
 +
    cat >> XDS.INP << eof
 +
!EXCLUSION OF VERTICAL DEAD AREAS OF THE EIGER2 4M DETECTOR
 +
UNTRUSTED_RECTANGLE= 1028 1041      0 2163
 +
!EXCLUSION OF HORIZONTAL DEAD AREAS OF THE EIGER 4M DETECTOR
 +
UNTRUSTED_RECTANGLE=    0 2069    512  551
 +
UNTRUSTED_RECTANGLE=    0 2069  1062 1101
 +
UNTRUSTED_RECTANGLE=    0 2069  1612 1651
 +
eof
 
   elif [ $NX == "2463" ]; then
 
   elif [ $NX == "2463" ]; then
 
# Pilatus 6M
 
# Pilatus 6M
Line 1,007: Line 1,023:  
UNTRUSTED_RECTANGLE= 0 3110 2717 2757
 
UNTRUSTED_RECTANGLE= 0 3110 2717 2757
 
eof
 
eof
   elif [ $NX == "4150" -a $NY == "4371" ]; then
+
  elif [ $NX == "3108"  -a $NY == "3262" ]; then
 +
# Eiger2 9M ; v0.97 numbers from Andreas Förster
 +
    cat >> XDS.INP << eof
 +
!EXCLUSION OF VERTICAL DEAD AREAS OF THE EIGER2 9M DETECTOR
 +
UNTRUSTED_RECTANGLE= 1028 1041      0 3262
 +
UNTRUSTED_RECTANGLE= 2068 2081      0 3263
 +
!EXCLUSION OF HORIZONTAL DEAD AREAS OF THE EIGER2 9M DETECTOR
 +
UNTRUSTED_RECTANGLE=    0 3109    512  551
 +
UNTRUSTED_RECTANGLE=    0 3109  1062 1101
 +
UNTRUSTED_RECTANGLE=    0 3109  1612 1651
 +
UNTRUSTED_RECTANGLE=    0 3109  2162 2201
 +
UNTRUSTED_RECTANGLE=    0 3109  2712 2751
 +
eof
 +
   elif [ $NX == "4150" -a $NY == "4371" ]; then
 
# Eiger 16M
 
# Eiger 16M
 
     cat >> XDS.INP << eof
 
     cat >> XDS.INP << eof
Line 1,022: Line 1,051:  
  UNTRUSTED_RECTANGLE= 2069 2082      0 4371  
 
  UNTRUSTED_RECTANGLE= 2069 2082      0 4371  
 
  UNTRUSTED_RECTANGLE= 3109 3122      0 4371
 
  UNTRUSTED_RECTANGLE= 3109 3122      0 4371
 +
eof
 +
  elif [ $NX == "4148" -a $NY == "4362" ]; then
 +
# Eiger2 16M ; v0.97 numbers from Andreas Förster
 +
    cat >> XDS.INP << eof
 +
!EXCLUSION OF HORIZONTAL DEAD AREAS OF THE EIGER2 16M DETECTOR
 +
UNTRUSTED_RECTANGLE= 1028 1041      0 4363
 +
UNTRUSTED_RECTANGLE= 2068 2081      0 4363
 +
UNTRUSTED_RECTANGLE= 3108 3121      0 4363
 +
!EXCLUSION OF VERTICAL DEAD AREAS OF THE EIGER2 16M DETECTOR
 +
UNTRUSTED_RECTANGLE=    0 4149    512  551
 +
UNTRUSTED_RECTANGLE=    0 4149  1062 1101
 +
UNTRUSTED_RECTANGLE=    0 4149  1612 1651
 +
UNTRUSTED_RECTANGLE=    0 4149  2162 2201
 +
UNTRUSTED_RECTANGLE=    0 4149  2712 2751
 +
UNTRUSTED_RECTANGLE=    0 4149  3262 3301
 +
UNTRUSTED_RECTANGLE=    0 4149  3812 3851
 
eof
 
eof
 
   fi
 
   fi
2,517

edits

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

Navigation menu