Changes

80 bytes added ,  12:43, 23 October 2019
m
→‎The script: some more terminal output in ADSC section
Line 347: Line 347:  
       BEAM_CENTER_X=`grep BEAM_CENTER_X tmp2 | sed s/BEAM_CENTER_X=//`
 
       BEAM_CENTER_X=`grep BEAM_CENTER_X tmp2 | sed s/BEAM_CENTER_X=//`
 
       BEAM_CENTER_Y=`grep BEAM_CENTER_Y tmp2 | sed s/BEAM_CENTER_Y=//`
 
       BEAM_CENTER_Y=`grep BEAM_CENTER_Y tmp2 | sed s/BEAM_CENTER_Y=//`
# fix 2010-04-26 - tell user about possible ORGX, ORGY alternatives -  
+
   
 
       COMMENT_ORGXY="
 
       COMMENT_ORGXY="
 
! Following are possible beam center interpretations for ADSC detectors"
 
! Following are possible beam center interpretations for ADSC detectors"
# at ESRF, PF, ALS 5.0.2 and ... (pls fill in!) the following should be used:         
+
# at ESRF, PF, ALS 5.0.2, AS MX2 and ... (pls fill in!) the following should be used:         
 
       ORGX1=`echo "scale=1; $BEAM_CENTER_Y/$QX" | bc -l`
 
       ORGX1=`echo "scale=1; $BEAM_CENTER_Y/$QX" | bc -l`
 
       ORGY1=`echo "scale=1; $BEAM_CENTER_X/$QX" | bc -l`
 
       ORGY1=`echo "scale=1; $BEAM_CENTER_X/$QX" | bc -l`
 
       echo - at ESRF, PF, ALS 8.2.1, APS Argonne BLs use: ORGX=$ORGX1 ORGY=$ORGY1                     
 
       echo - at ESRF, PF, ALS 8.2.1, APS Argonne BLs use: ORGX=$ORGX1 ORGY=$ORGY1                     
 
       COMMENT_ORGXY="${COMMENT_ORGXY}
 
       COMMENT_ORGXY="${COMMENT_ORGXY}
! ORGX= $ORGX1 ORGY= $ORGY1 ! For ESRF, PF, APS Argonne ..."
+
! ORGX= $ORGX1 ORGY= $ORGY1 ! For ESRF, PF, APS, AS MX2 ..."
 
# this 2nd alternative convention should be used at the following beamlines (pls complete the list): ALS 5.0.3, ...
 
# this 2nd alternative convention should be used at the following beamlines (pls complete the list): ALS 5.0.3, ...
 
       ORGX2=`echo "scale=1; $NX-$BEAM_CENTER_X/$QX" | bc -l `
 
       ORGX2=`echo "scale=1; $NX-$BEAM_CENTER_X/$QX" | bc -l `
Line 378: Line 378:  
       # Decision of beam center convention based on detector serial numbers.
 
       # Decision of beam center convention based on detector serial numbers.
 
       DET_SN=`grep DETECTOR_SN tmp2 | sed -e "s/DETECTOR_SN=//"`
 
       DET_SN=`grep DETECTOR_SN tmp2 | sed -e "s/DETECTOR_SN=//"`
       # For convention 1; Known PF detectors = 449: NW12A Q210, 472: NE3A Q270, 474: BL17A Q270, 912: BL5A Q315, 923: ALS BL5.0.2 Q315, 933: AichiSR BL2S1 Q315, 916: APS 24 IDE
+
      echo Detector serial number is $DET_SN
 +
       # For convention 1; Known PF detectors = 449: NW12A Q210, 472: NE3A Q270, 474: BL17A Q270, 912: BL5A Q315, 923: ALS BL5.0.2 Q315, 933: AichiSR BL2S1 Q315, 916: APS 24 IDE, 928: AS MX2
 
       ORG1_SNs="
 
       ORG1_SNs="
 
449
 
449
Line 398: Line 399:  
       ORGX=$ORGX1
 
       ORGX=$ORGX1
 
       ORGY=$ORGY1
 
       ORGY=$ORGY1
 +
      echo this was chosen
 
       elif echo "${DET_SN}${ORG4_SNs}" | sort | uniq -d | grep [0-9] > /dev/null; then
 
       elif echo "${DET_SN}${ORG4_SNs}" | sort | uniq -d | grep [0-9] > /dev/null; then
 
       ORGX=$ORGX4
 
       ORGX=$ORGX4
 
       ORGY=$ORGY4
 
       ORGY=$ORGY4
 +
      echo this was chosen
 
       else
 
       else
 
       ORGX=$ORGX3
 
       ORGX=$ORGX3
 
       ORGY=$ORGY3
 
       ORGY=$ORGY3
 +
      echo this was chosen
 
       fi
 
       fi
  
2,517

edits