Ignore:
Timestamp:
Aug 29, 2017 12:55:04 PM (5 years ago)
Author:
srkline
Message:

many changes to the VCALC code and a few changes to the main code to get the units consistent, and centimeters everywhere possible. The real space distance array and the non-linear calibrations are still defined and calculated in mm. This can hopefully be changed in the future. Some constants in the data file will need to be updated to cm, such as the T/B setback, which has been confirmed to be 41.0 cm

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Testing_Data_Procs.ipf

    r1055 r1062  
    5151                V_writeDetectorData(fileName,detStr,tmpData) 
    5252                 
    53                 val = VCALC_getSDD(detStr)*100          // make sure value is in cm 
     53                val = VCALC_getSDD(detStr)              // make sure value is in cm 
    5454                print val 
    5555                V_writeDet_distance(fileName,detStr,val) 
    5656                 
    57                 val = VCALC_getTopBottomSDDOffset(detStr)               //val is in mm, as for data file 
     57                val = VCALC_getTopBottomSDDSetback(detStr)*10           //val is in mm, as for data file 
    5858                if(val != 0) 
    5959                        V_writeDet_TBSetback(fileName,detStr,val) 
    6060                endif 
    6161                 
    62                 // returns the total separation (assumed symmetric) in mm 
     62                // returns the total separation (assumed symmetric) in cm 
    6363                val = VCALC_getPanelSeparation(detStr)           
    64                 val /= 2*10                     // to get half of the separation, and convert to cm for the data file 
     64                val /= 2                // to get half of the separation, and cm for the data file 
    6565                // it's OK to call both of these. these functions check detStr for the correct value 
     66                if(cmpstr("L",detStr[1]) == 0 || cmpstr("B",detStr[1]) == 0) 
     67                        val *= -1       // negative separation position for L and Bottom 
     68                endif 
    6669                V_writeDet_LateralOffset(fileName,detStr,val) 
    6770                V_writeDet_VerticalOffset(fileName,detStr,val) 
Note: See TracChangeset for help on using the changeset viewer.