Changeset 690 for sans/Dev/trunk

Timestamp:

Apr 14, 2010 10:53:31 AM (13 years ago)

Author:

srkline

Message:

Added model documentation for FuzzySpheres? and CSParallelpiped

Added axis labels to data loaded through XML loader

Writing of XML USANS data is now properly handling cursors

Location:

sans/Dev/trunk

Files:

• NCNR_Help_Files/SANS_Model_Docs_v4.10.ihf (modified) (previous)
• NCNR_User_Procedures/Analysis/Models/NewModels_2009/FuzzySpheres_v40.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Common/NIST_XML_v40.ipf (modified) (4 diffs)
• NCNR_User_Procedures/Reduction/USANS/WriteUSANSData.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/FuzzySpheres_v40.ipf

@@ -28 +28 @@
         xwave_fuzz = alog( log(qmin) + x*((log(qmax)-log(qmin))/num) )
         Make/O/D coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6,1,50,0.001}
-        make/O/T parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","Lorentz Scale","Lorentz length","bkg (cm-1 sr-1)"}
+        make/O/T parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","Lorentz Scale","Lorentz length (A)","bkg (cm-1 sr-1)"}
         Edit parameters_fuzz,coef_fuzz
         
@@ -56 +56 @@
         // Setup parameter table for model function
         Make/O/D smear_coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6,1,50,0.001}                                        
-        make/o/t smear_parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","Lorentz Scale","Lorentz length","bkg (cm-1 sr-1)"} 
+        make/o/t smear_parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","Lorentz Scale","Lorentz length (A)","bkg (cm-1 sr-1)"}     
         Edit smear_parameters_fuzz,smear_coef_fuzz                                      
         

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

@@ -175 +175 @@
                                                                         ErrorBars/T=0 $w1 Y,wave=($w2,$w2)
                                                                         ModifyGraph tickUnit(left)=1
+                                                                        Label left "I(q)"
+                                                                        Label bottom "q (A\\S-1\\M)"
                                                                         Legend
                                                                 endif
@@ -184 +186 @@
                                                                 ErrorBars/T=0 $w1 Y,wave=($w2,$w2)
                                                                 ModifyGraph tickUnit(left)=1
+                                                                Label left "I(q)"
+                                                                Label bottom "q (A\\S-1\\M)"
                                                                 Legend
                                                         endif
@@ -302 +306 @@
                                                                 ErrorBars/T=0 $w1 Y,wave=($w2,$w2)
                                                                 ModifyGraph tickUnit(left)=1
+                                                                Label left "I(q)"
+                                                                Label bottom "q (A\\S-1\\M)"
                                                                 Legend
                                                         endif
@@ -311 +317 @@
                                                         ErrorBars/T=0 $w1 Y,wave=($w2,$w2)
                                                         ModifyGraph tickUnit(left)=1
+                                                        Label left "I(q)"
+                                                        Label bottom "q (A\\S-1\\M)"
                                                         Legend
                                                 endif

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

@@ -254 +254 @@
         Endif
         
+        //write out partial set?
+        // duplicate the original data, all 3 waves
+        Duplicate/O qvals,tq,ti,te
+        ti=inten
+        te=sig
+        if( (lo!=hi) && (lo<hi))
+                redimension/N=(hi-lo+1) tq,ti,te,dumWave                //lo to hi, inclusive
+                tq=qvals[p+lo]
+                ti=inten[p+lo]
+                te=sig[p+lo]
+        endif
+        
         //Data
-        Wave nf.Q = qvals
+        Wave nf.Q = tq
         nf.unitsQ = "1/A"
-        Wave nf.I = inten
+        Wave nf.I = ti
         nf.unitsI = "1/cm"
-        Wave nf.Idev = sig
+        Wave nf.Idev = te
         nf.unitsIdev = "1/cm"
         // for slit-smeared USANS, set only a 4th column to  -dQv
@@ -268 +280 @@
         //fprintf refnum,"FILE: %s\t\t CREATED: %s\r\n",textw[0],textw[1]
         
-                //tailor the output given the type of data written out...
+        //tailor the output given the type of data written out...
         WAVE inten_EMP=$(USANSFolder+":EMP:DetCts")
         String samStr="",empStr="",dateStr="",samLabelStr="",paramStr="",empLevStr="",bkgLevStr=""
@@ -309 +321 @@
         
         //AJJ to fix with sensible values
-        nf.run = "Test"
+        nf.run = ""
         nf.nameSASinstrument = "BT5 USANS"
         nf.SASnote = ""