Changeset 1168


Ignore:
Timestamp:
Jun 12, 2019 11:27:39 AM (3 years ago)
Author:
srkline
Message:

adding an extra column to the QxQyASCII output for VSANS. This (9th) column is the mask (=1 if the data is masked, =0 if the data is not masked)

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS
Files:
2 edited

Legend:

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

    r1141 r1168  
    961961         
    962962         
    963         // default value for B 
    964         newXCtr_cm[8] = 50 
    965         newYCtr_cm[8] = 50 
     963        // default value for B (approx center) in pixels 
     964        newXCtr_cm[8] = 340 
     965        newYCtr_cm[8] = 828 
    966966 
    967967                 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Write_VSANS_QIS.ipf

    r1166 r1168  
    673673//              labelWave[20] = "Data columns are Qx - Qy - Qz - I(Qx,Qy) - Err I(Qx,Qy)" 
    674674        //      labelWave[20] = "Data columns are Qx - Qy - I(Qx,Qy) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)" 
    675                 labelWave[27] = "Data columns are Qx - Qy - I(Qx,Qy) - err(I) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)" 
     675                labelWave[27] = "Data columns are Qx - Qy - I(Qx,Qy) - err(I) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow) - Mask" 
    676676                labelWave[28] = "The error wave may not be properly propagated (1/2019)" 
    677677                labelWave[29] = "ASCII data created " +date()+" "+time() 
     
    687687                WAVE data = V_getDetectorDataW(type,detStr) 
    688688                WAVE data_err = V_getDetectorDataErrW(type,detStr) 
     689 
     690// JUN 2019 get the mask data            
     691                WAVE MaskData = V_getDetectorDataW("MSK",detStr) 
     692 
    689693                 
    690694                // TOOD - replace hard wired paths with Read functions 
     
    777781                Duplicate/O fSubS,fSubS_s 
    778782                Duplicate/O data_err,sw_s 
     783                Duplicate/O MaskData,MaskData_s 
    779784                 
    780785                //so that double precision data is not written out 
    781786                Redimension/S qx_val_s,qy_val_s,qz_val_s,z_val_s,sw_s 
    782                 Redimension/S SigmaQx_s,SigmaQy_s,fSubS_s 
    783          
    784                 Redimension/N=(pixX*pixY) qx_val_s,qy_val_s,qz_val_s,z_val_s,sw_s 
     787                Redimension/S SigmaQx_s,SigmaQy_s,fSubS_s,MaskData_s 
     788         
     789                Redimension/N=(pixX*pixY) qx_val_s,qy_val_s,qz_val_s,z_val_s,sw_s,MaskData_s 
    785790                 
    786791                //not demo-compatible, but approx 8x faster!!    
     
    788793                 
    789794//              Save/O/G/M="\r\n" labelWave,qx_val_s,qy_val_s,qz_val_s,z_val_s,sw_s as detSavePath      // without resolution 
    790                 Save/O/G/M="\r\n" labelWave,qx_val_s,qy_val_s,z_val_s,sw_s,qz_val_s,SigmaQx_s,SigmaQy_s,fSubS_s as detSavePath  // write out the resolution information 
     795                Save/O/G/M="\r\n" labelWave,qx_val_s,qy_val_s,z_val_s,sw_s,qz_val_s,SigmaQx_s,SigmaQy_s,fSubS_s,MaskData_s as detSavePath       // write out the resolution information 
    791796#else 
    792797                Open refNum as detSavePath 
     
    794799                fprintf refnum,"\r\n" 
    795800//              wfprintf refNum,"%8g\t%8g\t%8g\t%8g\t%8g\r\n",qx_val_s,qy_val_s,qz_val_s,z_val_s,sw_s 
    796                 wfprintf refNum,"%8g\t%8g\t%8g\t%8g\t%8g\t%8g\t%8g\t%8g\r\n",qx_val_s,qy_val_s,z_val_s,sw_s,qz_val_s,SigmaQx_s,SigmaQy_s,fSubS_s 
     801                wfprintf refNum,"%8g\t%8g\t%8g\t%8g\t%8g\t%8g\t%8g\t%8g\t%8g\r\n",qx_val_s,qy_val_s,z_val_s,sw_s,qz_val_s,SigmaQx_s,SigmaQy_s,fSubS_s,MaskData_s 
    797802                Close refNum 
    798803#endif 
    799804                 
    800                 KillWaves/Z qx_val_s,qy_val_s,z_val_s,qz_val_s,SigmaQx_s,SigmaQy_s,fSubS_s,sw,sw_s 
    801                  
    802                 Killwaves/Z qval,sigmaQx,SigmaQy,fSubS,phi,r_dist 
     805                KillWaves/Z qx_val_s,qy_val_s,z_val_s,qz_val_s,SigmaQx_s,SigmaQy_s,fSubS_s,sw,sw_s,MaskData_s 
     806                 
     807                Killwaves/Z qval,sigmaQx,SigmaQy,fSubS,phi,r_dist,MaskData 
    803808                 
    804809                Print "QxQy_Export File written: ", V_GetFileNameFromPathNoSemi(detSavePath) 
Note: See TracChangeset for help on using the changeset viewer.