Changeset 1117 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MaskUtils.ipf

Timestamp:

Oct 18, 2018 12:09:16 PM (4 years ago)

Author:

srkline

Message:

extensive changes to accomodate 1x1 binning of the HighRes? detector. It is implemented as a global flag. Currently only 4x4 and 1x1 are allowed. 1x1 has never been tested in reality, only simulated data - so my assumed dimensions may not be correct. look for TODOHIGHRES in the file for places that may need to be updated for different file dimensions. Testing of the simulated data is proving to be excruciatingly slow, but passable for a test. Speed optimization will be needed if this is the final solution. Memory management will also be an issue since every "copy" of the highRes matrix is enormous. Carry as few of these around as possible in the future to keep the experiment size to something reasonable.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MaskUtils.ipf (modified) (3 diffs)

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

@@ -644 +644 @@
                         bottom = top+height
                         
-                        Print left,top,right,bottom
+//                      Print left,top,right,bottom
 
                         break                                           
@@ -836 +836 @@
                 NewDataFolder/O/S root:VSANS_MASK_file:entry:instrument         
                         Make/O/T/N=1    name    = "NG3_VSANS"
+                        
+                        
+//      NVAR gHighResBinning = root:Packages:NIST:VSANS:Globals:gHighResBinning
                 NewDataFolder/O/S root:VSANS_MASK_file:entry:instrument:detector_B      
-                        Make/O/I/N=(680,1656)   data    = 0
-                        data[][0,5] = 1
-                        data[][1650,1655] = 1
-                        data[0,5][] = 1
-                        data[675,679][] = 1
+                if(root:Packages:NIST:VSANS:Globals:gHighResBinning == 1)
+                                // TODOHIGHRES - the pixel values are hard-wired
+                                Make/O/I/N=(2720,6624)  data    = 0             
+
+                        // TODOHIGHRES -- these values are simply the 4x4 values x4
+                        // these will need to be updated
+                                data[][0,20] = 1
+                                data[][6603,6623] = 1           // 
+                                data[0,20][] = 1
+                                data[2599,2719][] = 1           // 
+                                
+                        else
+                                Make/O/I/N=(680,1656)   data    = 0             
+
+                                data[][0,5] = 1
+                                data[][1650,1655] = 1
+                                data[0,5][] = 1
+                                data[675,679][] = 1
+
+                endif
+                                
+                        
                 NewDataFolder/O/S root:VSANS_MASK_file:entry:instrument:detector_MR             
                         Make/O/I/N=(48,128)     data    = 0
@@ -908 +928 @@
                 NewDataFolder/O/S root:Packages:NIST:VSANS:MSK:entry:instrument         
                         Make/O/T/N=1    name    = "NG3_VSANS"
+                        
+        
+        NVAR gHighResBinning = root:Packages:NIST:VSANS:Globals:gHighResBinning
                 NewDataFolder/O/S root:Packages:NIST:VSANS:MSK:entry:instrument:detector_B      
-                        Make/O/I/N=(680,1656)   data    = 0
-                        data[][0,38] = 1
-                        data[][1548,1655] = 1
-                        data[0,10][] = 1
-                        data[669,679][] = 1
+                switch(gHighResBinning)
+                        case 1:
+                        // TODOHIGHRES - the pix values are hard-wired
+                                Make/O/I/N=(2720,6624)  data    = 0             
+
+                        // TODOHIGHRES -- these values are simply the 4x4 values x4
+                        // these will need to be updated
+                                data[][0,152] = 1
+                                data[][6195,6623] = 1           // 107 pix *4 =428
+                                data[0,40][] = 1
+                                data[2679,2719][] = 1           // 10 pix (*4)
+                                
+                                break
+                        case 4:
+                                Make/O/I/N=(680,1656)   data    = 0             
+
+                                data[][0,38] = 1
+                                data[][1548,1655] = 1
+                                data[0,10][] = 1
+                                data[669,679][] = 1
+                                break
+                        default:
+                                Abort "No binning case matches in V_GenerateDefaultMask"
+                endswitch
+        
+                        
                 NewDataFolder/O/S root:Packages:NIST:VSANS:MSK:entry:instrument:detector_MR             
                         Make/O/I/N=(48,128)     data    = 0