Changeset 611 for sans/Dev

Timestamp:

Dec 8, 2009 6:18:04 PM (13 years ago)

Author:

srkline

Message:

Added USANS help for adding files. Ticket #214

Location:

sans/Dev/trunk

Files:

• NCNR_Help_Files/USANSReductionHelp_v2.3.ihf (modified) (previous)
• NCNR_User_Procedures/Reduction/USANS/BT5_AddFiles.ipf (modified) (8 diffs)
• NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/BT5_AddFiles.ipf

@@ -5 +5 @@
 // Version 1.0
 // SRK 7 OCT 2009
+//
+
+// Adding two raw .bt5 files:
+//      - only files with the same angle range and the same number of points can be added.
+//      - NO shifting is done - these are raw data files, and the angular shift is not known
+//      - it can be repeated multiple times to add more than two files together
+//      - the two added files are listed in the title of the summed file.
+
+// Adding two data sets:
+//      - here, two entire data sets (inlcluding the main beam) are added together after
+//         loading and normalizing and coverting to Q. The data file is NOT saved out, because
+//              it is not a format that can be re-read in for reduction.
+//      - to use the summed data set, it is first summed in a separate panel, and then transferred
+//              to either the active "SAM" or "EMP" data
+//      - since the zero offset can make the point values not exactly the same, only those within a 
+//              certain tolerance are actually added. Points that cannot be added are still kept in the final
+//              data set.
 //
 
@@ -15 +32 @@
 // - convert to countrate seems like a good idea, then 1+1=2 and I can propagate errors
 //  -- but how to save the data? At this point, errCR != sqrt(CR)
+// -> answer is -- don't save the full data sets that have been summed...
 //
 // - Why can't I just use the whole set of files from the main USANS panel, and add what needs
@@ -20 +38 @@
 //   the shift to...
 //
-//
-// - need a global for the tolerance (and a good reason to use that particular value)
-//
 // - do I have anything hard-wired in the code that needs to be generalized before release? 
-//
-// - add descriptions of this to the help files
 //
 
@@ -62 +75 @@
 //      Variable/G root:Packages:NIST:USANS:Globals:gUseXMLOutput = 0
         String/G FilterStr
+        Variable/G gAddUSANSTolerance = 0.01            // add points if x is within 1% (an arbitrary choice!)
 
         Make/O/T/N=1 fileWave,AWave,BWave 
@@ -141 +155 @@
         Button pickSavePathButton,pos={97,8},size={80,20},proc=PickSaveButtonProc,title="SavePath..."
         Button pickSavePathButton,help={"Select the data folder where data is to be saved to disk"}
-        Button USANSHelpButton,pos={220,6},size={50,20},proc=USANSHelpButtonProc,title="Help"
+        Button USANSHelpButton,pos={220,6},size={50,20},proc=USANSAddFilesHelpButton,title="Help"
         Button USANSHelpButton,help={"Show the USANS reduction help file"}
 
@@ -159 +173 @@
         
 EndMacro
+
+// Show the help file, don't necessarily keep it with the experiment (/K=1)
+Function USANSAddFilesHelpButton(ctrlName) : ButtonControl
+        String ctrlName
+        
+        DisplayHelpTopic/Z/K=1 "Adding Two Data Sets"
+        if(V_flag !=0)
+                DoAlert 0,"The USANS Data Reduction Help file could not be found"
+        endif
+        return(0)
+End
 
 Function AddUSANSDone(ba) : ButtonControl
@@ -266 +291 @@
         
         
-        Variable minPt,minDelta,tol
+        Variable minPt,minDelta
         Variable ii,jj,nA,nB,sumPt=0
         nA = numpnts(Angle_A)
@@ -272 +297 @@
         Make/O/D/N=(nB) tmp_delta
         
-        tol = 0.01              //1% error allowed      
+        NVAR tol = root:Packages:NIST:USANS:Globals:AddPanel:gAddUSANSTolerance //1% error allowed as default
+                
         for(ii=0;ii<nA;ii+=1)
                 Redimension/N=(nB) tmp_delta

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf

@@ -171 +171 @@
                 ModifyGraph mode(DetCts_COR)=3,marker(DetCts_COR)=19
                 ModifyGraph tickUnit=1
-                ErrorBars DetCts_COR Y,wave=(ErrDetCts_COR,ErrDetCts_COR)
+                ErrorBars/T=0 DetCts_COR Y,wave=(ErrDetCts_COR,ErrDetCts_COR)
         endif