Changeset 1168 for sans

Timestamp:

Jun 12, 2019 11:27:39 AM (4 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:

• V_BeamCenter.ipf (modified) (1 diff)
• V_Write_VSANS_QIS.ipf (modified) (5 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_BeamCenter.ipf

@@ -961 +961 @@
         
         
-        // default value for B
-        newXCtr_cm[8] = 50
-        newYCtr_cm[8] = 50
+        // default value for B (approx center) in pixels
+        newXCtr_cm[8] = 340
+        newYCtr_cm[8] = 828
 
                 

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Write_VSANS_QIS.ipf

@@ -673 +673 @@
 //              labelWave[20] = "Data columns are Qx - Qy - Qz - I(Qx,Qy) - Err I(Qx,Qy)"
         //      labelWave[20] = "Data columns are Qx - Qy - I(Qx,Qy) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)"
-                labelWave[27] = "Data columns are Qx - Qy - I(Qx,Qy) - err(I) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)"
+                labelWave[27] = "Data columns are Qx - Qy - I(Qx,Qy) - err(I) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow) - Mask"
                 labelWave[28] = "The error wave may not be properly propagated (1/2019)"
                 labelWave[29] = "ASCII data created " +date()+" "+time()
@@ -687 +687 @@
                 WAVE data = V_getDetectorDataW(type,detStr)
                 WAVE data_err = V_getDetectorDataErrW(type,detStr)
+
+// JUN 2019 get the mask data           
+                WAVE MaskData = V_getDetectorDataW("MSK",detStr)
+
                 
                 // TOOD - replace hard wired paths with Read functions
@@ -777 +781 @@
                 Duplicate/O fSubS,fSubS_s
                 Duplicate/O data_err,sw_s
+                Duplicate/O MaskData,MaskData_s
                 
                 //so that double precision data is not written out
                 Redimension/S qx_val_s,qy_val_s,qz_val_s,z_val_s,sw_s
-                Redimension/S SigmaQx_s,SigmaQy_s,fSubS_s
-        
-                Redimension/N=(pixX*pixY) qx_val_s,qy_val_s,qz_val_s,z_val_s,sw_s
+                Redimension/S SigmaQx_s,SigmaQy_s,fSubS_s,MaskData_s
+        
+                Redimension/N=(pixX*pixY) qx_val_s,qy_val_s,qz_val_s,z_val_s,sw_s,MaskData_s
                 
                 //not demo-compatible, but approx 8x faster!!   
@@ -788 +793 @@
                 
 //              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
-                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
+                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
 #else
                 Open refNum as detSavePath
@@ -794 +799 @@
                 fprintf refnum,"\r\n"
 //              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
-                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
+                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
                 Close refNum
 #endif
                 
-                KillWaves/Z qx_val_s,qy_val_s,z_val_s,qz_val_s,SigmaQx_s,SigmaQy_s,fSubS_s,sw,sw_s
-                
-                Killwaves/Z qval,sigmaQx,SigmaQy,fSubS,phi,r_dist
+                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
+                
+                Killwaves/Z qval,sigmaQx,SigmaQy,fSubS,phi,r_dist,MaskData
                 
                 Print "QxQy_Export File written: ", V_GetFileNameFromPathNoSemi(detSavePath)