Changeset 1088

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".

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• SANS/SASCALC.ipf (modified) (5 diffs)
• VSANS/V_Protocol_Reduction.ipf (modified) (3 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
 

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

@@ +1 @@
+#pragma TextEncoding = "MacRoman"
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma version=5.0
-#pragma IgorVersion=6.1
+#pragma IgorVersion=7
 
 //************************
@@ -2337 +2338 @@
 //
 
+//
+// (DONE)
+// -x this generates a "Bin Type Not Found" error if reducing only to a 2D level (like for DIV)
+//              because binTypeStr is null
         String binTypeStr = StringByKey("BINTYPE",prot[5],"=",";")
         // plotting is not really necessary, and the graph may not be open - so skip for now?
         Variable binType
-        binType = V_BinTypeStr2Num(binTypeStr)
-        if(binType == 0)
-                        Abort "Binning mode not found in V_QBinAllPanels() "// when no case matches
+        // only get the binning type if user asks for averaging
+        If(cmpstr(av_type,"none") != 0)
+                binType = V_BinTypeStr2Num(binTypeStr)
+                if(binType == 0)
+                                Abort "Binning mode not found in V_QBinAllPanels() "// when no case matches
+                endif
         endif
-
 
 //
@@ -2403 +2410 @@
 // -- BAD logic here, skipping the normal graph if annular is chosen. Go back and see how I do this
 // in SANS for a better and more foolproof way to do this
+// x- don't draw the graph if "none" is the average type!
         //
-        if(cmpstr(av_type,"Annular") != 0)
+        if(cmpstr(av_type,"Annular") != 0 && (cmpstr(av_type,"none") != 0) )
                 V_PlotData_Panel()              //this brings the plot window to the front, or draws it (ONLY)
                 V_Update1D_Graph(activeType,binType)            //update the graph, data was already binned