 Timestamp:
 Aug 23, 2017 10:03:41 AM (5 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorCorrections.ipf
r1055 r1061 565 565 566 566 sdd = V_getDet_ActualDistance(fname,detStr) //sdd derived, including setback [cm] 567 sdd/=100 // sdd reported in cm, pass in m 567 568 568 // this is the ctr in pixels xx (now it is in cm!) 569 569 // xCtr = V_getDet_beam_center_x(fname,detStr) … … 587 587 588 588 // calculate all of the qvalues 589 // sdd is passed in [cm] 589 590 qTot = V_CalcQval(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY) 590 591 qx = V_CalcQX(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY) … … 605 606 // to each pixel 606 607 // 607 //sdd is in meters 608 //sdd is in [cm] 609 // distX and distY are in [mm] 608 610 //wavelength is in Angstroms 609 611 // … … 616 618 Variable dx,dy,qval,two_theta,dist 617 619 618 sdd *=100 //convert to cm 620 619 621 dx = (distX[xaxval][yaxval]  xctr) //delta x in mm 620 622 dy = (distY[xaxval][yaxval]  yctr) //delta y in mm … … 648 650 qval = V_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY) 649 651 650 sdd *=100 //convert to cm 652 651 653 dx = (distX[xaxval][yaxval]  xctr) //delta x in mm 652 654 dy = (distY[xaxval][yaxval]  yctr) //delta y in mm … … 682 684 qval = V_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY) 683 685 684 sdd *=100 //convert to cm 686 685 687 dx = (distX[xaxval][yaxval]  xctr) //delta x in mm 686 688 dy = (distY[xaxval][yaxval]  yctr) //delta y in mm … … 717 719 qval = V_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY) 718 720 719 sdd *=100 //convert to cm 721 720 722 dx = (distX[xaxval][yaxval]  xctr) //delta x in mm 721 723 dy = (distY[xaxval][yaxval]  yctr) //delta y in mm … … 755 757 // orientation = V_getDet_tubeOrientation(fname,detStr) 756 758 sdd = V_getDet_ActualDistance(fname,detStr) 757 sdd/=100 // sdd in cm, pass in m 759 758 760 759 761 // this is ctr in mm … … 775 777 776 778 tmp_dist /= 10 // convert mm to cm 777 sdd *=100 //convert to cm779 // sdd is in [cm] 778 780 779 781 tmp_theta = atan(tmp_dist/sdd) //this is two_theta, the scattering angle … … 988 990 // orientation = V_getDet_tubeOrientation(fname,detStr) 989 991 sdd = V_getDet_ActualDistance(fname,detStr) 990 sdd/=100 // sdd in cm, pass in m991 992 992 993 // this is ctr in mm … … 1009 1010 1010 1011 tmp_dist /= 10 // convert mm to cm 1011 sdd *=100 //convert to cm1012 // sdd is in [cm] 1012 1013 1013 1014 tmp_theta = atan(tmp_dist/sdd) //this is two_theta, the scattering angle … … 1283 1284 // 1284 1285 // TODO: 1285 //  DoAlert 0,"This has not yet been updated for VSANS" 1286 //  how is the error propagation handled? 1286 // x DoAlert 0,"This has not yet been updated for VSANS" 1287 //  how is the error propagation handled? Be sure it is calculated correctly when DIV is generated 1288 // and is applied correctly here... 1287 1289 // 1288 1290 //function will divide the contents of "workType" folder with the contents of … … 1314 1316 1315 1317 data /= div_data 1316 1318 1319 // TODO:  correct the error propagation 1317 1320 data_err /= div_data 1318 1321
Note: See TracChangeset
for help on using the changeset viewer.