Changeset 1088 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Timestamp:

Feb 26, 2018 3:31:01 PM (5 years ago)

Author:

srkline

Message:

corrected bad logic in reduction when reducing to 2D. Nothing was wrong, just a meaningless error dialog was presented.

updated the beamstop sizes in SASCALC for the NGB-10m SANS instrument. Now the 4 beamstops are 1", 1.5", 2" and 3".

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf (modified) (5 diffs)

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

@@ -2326 +2326 @@
 // all of this is bypassed if the lenses are in
 //
+// returns beam diameter in [cm]
+//
 Function beamDiameter(direction)
         String direction
@@ -2371 +2373 @@
 
 //on NG3 and NG7, allowable sizes are 1,2,3,4" diameter
+//
+// at the NGB-10m instrument, allowable sizes are 1, 1.5, 2, 3 (inches) ( SRK 2018)
+//
 //will return values larger than 4.0*2.54 if a larger beam is needed
 //
@@ -2378 +2383 @@
         NVAR yesLens = root:Packages:NIST:SAS:gUsingLenses
         Variable bm=0
-        Variable bs=0.0
+        Variable bs=0.0,pass=0
+ 
+        SVAR selInstr = root:Packages:NIST:SAS:gInstStr         // "NG3","NG7","NGB"
    
         if(yesLens)
@@ -2386 +2393 @@
                 bm = beamDiameter("maximum")
                 do
-                bs += 1
+                        if(cmpstr(selInstr,"NGB") == 0)
+                                pass +=1
+                                if(pass == 1)
+                                        bs = 1
+                                endif
+                                if(pass == 2)
+                                        bs = 1.5
+                                endif
+                                if(pass == 3)
+                                        bs = 2
+                                endif
+                                if(pass == 4)
+                                        bs = 3
+                                endif
+                                if(pass > 4)
+                                        bs += 1
+                                endif
+                                                                
+                        else
+                        bs += 1                 // always add 1" at a time to the beam stop (NG3B-30m and NG7)
+                endif
+                
            while ( (bs*2.54 < bm) || (bs > 30.0))                       //30 = ridiculous limit to avoid inf loop
         endif
@@ -2394 +2422 @@
         rw[21] = bs*25.4                //store the BS diameter in mm
         
-    return (bs*2.54)            //return diameter in cm, not inches for txt
+   return (bs*2.54)             //return diameter in cm, not inches for txt
 End