Changeset 428 for sans/Dev

Timestamp:

Oct 10, 2008 5:22:36 PM (14 years ago)

Author:

srkline

Message:

bug fixes to SASCALC to mesh with work folders now being in a NIST data folder

added file for load/show/hide of the SANS Redn/USANS Redn/Analysis? packages, so they can all be included in one. There are no conflicts currently. As time permits, duplicated code *could* be removed, or better left alone.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/NCNR_Package_Loader.ipf (added)
• Reduction/SANS/SASCALC.ipf (modified) (4 diffs)

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

@@ -311 +311 @@
         Button FreezeButton proc=FreezeButtonProc
         Button ClearButton title="Clear",size={60,20},pos={377,166}
-        Button ClearButton proc=ClearButtonProc
+        Button ClearButton proc=S_ClearButtonProc
         GroupBox group0,pos={6,1},size={108,36},title="Instrument"
         SetDataFolder fldrSav0
@@ -604 +604 @@
         root:Packages:NIST:SAS:linear_data = root:sim_lin
         
-        S_CircularAverageTo1D("Packages:NIST:SAS")
+        S_CircularAverageTo1D("SAS")
         
         //multiply by sphere FF (S_SphereForm(scale,radius,delrho,bkg,x))
@@ -633 +633 @@
         beamstopDiam()
         
-        S_CircularAverageTo1D("Packages:NIST:SAS")
+        S_CircularAverageTo1D("SAS")
         WAVE aveint=root:Packages:NIST:SAS:aveint
         WAVE qval=root:Packages:NIST:SAS:qval
@@ -728 +728 @@
 //clears the frozen traces on the graph, asks if you want to clear the saved text
 //
-Function ClearButtonProc(ctrlName) : ButtonControl
+Function S_ClearButtonProc(ctrlName) : ButtonControl
         String ctrlName