Changeset 400

Timestamp:

Aug 28, 2008 11:25:23 AM (14 years ago)

Author:

srkline

Message:

SmearedRPA was not properly data folder aware, and would balk if a smeared version was plotted before an unsmeared version. Functions now look in the proper data folders.

Location:

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models

Files:

• SA_includes_v400.ipf (modified) (1 diff)
• SmearedRPA_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/SA_includes_v400.ipf

@@ -61 +61 @@
         if(V_flag==1)
                 BrowseURL "ftp://webster.ncnr.nist.gov/pub/sans/kline/movies/"
+                // Andrew has set up a http page too. Try to use this in the future
+                //BrowseURL "http://www.ncnr.nist.gov/programs/sans/data/movies/reduction_analysis_movies.html"
         endif
 End

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/SmearedRPA_v40.ipf

@@ -149 +149 @@
 // simply calls the original single point calculation with
 // a wave assignment (this will behave nicely if given point ranges)
+//
+// there is no RPAFormX due to the extra inputValues wave of information...
+//
 Function RPAForm(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
@@ -165 +168 @@
         Variable x
         
-        Wave var=$"inputvalues"
-        Nvar lCASE=gCASE
+//      print (GetWavesDataFolder(w,1)+"inputvalues")
+
+        Wave var=$(GetWavesDataFolder(w,1)+"inputvalues")
+        Nvar lCASE=$(GetWavesDataFolder(w,1)+"gCASE")
 //      print lCASE
 //      Variable lCASE