Changeset 630 for sans/Dev

Timestamp:

Feb 5, 2010 4:15:18 PM (13 years ago)

Author:

srkline

Message:

Added a "signature" to the simulated 2D data set, setting a few pixels in the lower-left corner to known values. These points are behind the default mask.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• MultScatter_MonteCarlo_2D.ipf (modified) (1 diff)
• SASCALC.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

@@ -1364 +1364 @@
         
         NVAR rawCts = root:Packages:NIST:SAS:gRawCounts
-        if(!rawCts)                     //go ahead and do the linear scaling
+        if(!rawCts)                     //go ahead and do the abs scaling to the linear_data
                 linear_data = linear_data / kappa
                 linear_data /= detectorEff
-        endif           
+        endif
+        
+        // add a signature to the data file to tag as a simulation
+        linear_data[0][0] = 1
+        linear_data[2][0] = 1
+        linear_data[0][2] = 1
+        linear_data[1][1] = 1
+//      linear_data[2][2] = 1
+        linear_data[1][0] = 0
+//      linear_data[2][1] = 0
+        linear_data[0][1] = 0
+//      linear_data[1][2] = 0
+                        
         data = linear_data
-        
         // re-average the 2D data
         S_CircularAverageTo1D("SAS")

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf

@@ -1146 +1146 @@
         Wave mask = $(destPath + ":mask")
         mask = 0
-        //two pixels all around
-        mask[0,1][] = 1
-        mask[126,127][] = 1
-        mask[][0,1] = 1
-        mask[][126,127] = 1
+        //three pixels all around
+        mask[0,2][] = 1
+        mask[125,127][] = 1
+        mask[][0,2] = 1
+        mask[][125,127] = 1
         //
         //pixels within rcentr of beam center are broken into 9 parts (units of mm)