Changeset 1112 for sans

Timestamp:

Jul 20, 2018 1:33:20 PM (5 years ago)

Author:

srkline

Message:

a few bug fixes

added menu options to apply the median filter and/or the read noise subtraction to the raw data for troubleshooting/simple analysis rather than needing to convert to normalized WORK data.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_DetectorCorrections.ipf (modified) (2 diffs)
• V_Menu.ipf (modified) (1 diff)
• V_Protocol_Reduction.ipf (modified) (3 diffs)

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

@@ -1406 +1406 @@
 //      topY = 105
         
-//      bottomX = 7
+//      bottomX = 5
 //      bottomY = 35
         
@@ -1422 +1422 @@
 
 
+Proc pV_MedianFilterBack(folder)
+        String folder="RAW"
+        
+        V_MedianFilterBack(folder)
+end
+
+Function V_MedianFilterBack(folder)
+        String folder
+
+        Wave w = V_getDetectorDataW(folder,"B")
+//              w -= kReadNoiseLevel            // a constant value
+        
+        MatrixFilter /N=3 median w
+        Print "*** median noise filter applied to the back detector***"
+        
+        return(0)
+End
+
+
+Proc pV_SubtractReadNoiseBack(folder,ReadNoise)
+        String folder="RAW"
+        Variable readNoise=200
+        
+        V_SubtractReadNoiseBack(folder,readNoise)
+end
+
+Function V_SubtractReadNoiseBack(folder,readNoise)
+        String folder
+        Variable readNoise
+
+                Wave w = V_getDetectorDataW(folder,"B")
+                w -= readNoise          // a constant value
+                
+//              MatrixFilter /N=3 median w
+//              Print "*** median noise filter applied to the back detector***"
+        
+        return(0)
+End
+
+
+Proc pV_MedianAndReadNoiseBack(folder,ReadNoise)
+        String folder="RAW"
+        Variable readNoise=200
+        
+        V_MedianAndReadNoiseBack(folder,readNoise)
+end
+
+Function V_MedianAndReadNoiseBack(folder,readNoise)
+        String folder
+        Variable readNoise
+
+                Wave w = V_getDetectorDataW(folder,"B")
+                w -= readNoise          // a constant value
+                
+                MatrixFilter /N=3 median w
+                Print "*** median noise filter applied to the back detector***"
+        
+        return(0)
+End
+

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

@@ -31 +31 @@
                 "-"
                 "Back Detector Saturation",Vm_NumberSaturated()
+                "Median Filter Back Det",pV_MedianFilterBack()
+                "Subtract Read Noise",pV_SubtractReadNoiseBack()
+                "Median+Read Noise",pV_MedianAndReadNoiseBack()
         End
         SubMenu "Nexus File Corrections"

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

@@ -240 +240 @@
         numItems = ItemsInList(list,";")
         checked = 1
-        if(numitems == 4 || numitems == 5)              //allow for protocols with no SDEV list item
+//      if(numitems == 4 || numitems == 5)              //allow for protocols with no SDEV list item
+        if(numitems > 1)                //
                 //correct number of parameters, assume ok
                 String/G root:Packages:NIST:VSANS:Globals:Protocols:gAbsStr = list
@@ -812 +813 @@
         num=ItemsInList(newList)
 
-        String matchStr="*_DIV_*"               // this is part of the title of a VSANS _DIV_ file
+        String matchStr="*DIV*"         // this is part of the title of a VSANS _DIV_ file
         for(ii=0;ii<num;ii+=1)
                 item=StringFromList(ii, newList , ";")
@@ -864 +865 @@
         num=ItemsInList(newList)
 
-        String matchStr="*_MASK_*"              // this is part of the title of a VSANS _MASK_ file
+        String matchStr="*MASK*"                // this is part of the title of a VSANS _MASK_ file
         for(ii=0;ii<num;ii+=1)
                 item=StringFromList(ii, newList , ";")