Changeset 133 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00

Timestamp:

Jul 26, 2007 2:29:51 PM (16 years ago)

Author:

srkline

Message:

Linearized fits package is now (I think) data folder aware, and hides its bits inside myGlobals

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/LinearizedFits/LinearizedFits.ipf (modified) (9 diffs)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/LinearizedFits/LinearizedFits.ipf

@@ -143 +143 @@
                 //selection not null
                 partialName = S_value
-                //Print partialName
         Endif
         //get a valid file based on this partialName and catPathName
@@ -154 +153 @@
         
         //load in the data (into the root directory)
-        A_LoadOneDDataWithName(tempName)
+        A_LoadOneDDataWithName(tempName,0)              //let A_Rescale_Data() do the plotting
         //Print S_fileName
         //Print tempName
         
-        String cleanLastFileName = "root:"+CleanupName(root:myGlobals:gLastFileName,0)
-
-        tempName=cleanLastFileName+"_q"
+        String cleanLastFileName = CleanupName(partialName,0)
+        String dataStr = "root:"+cleanLastFileName+":"
+        tempName=dataStr + cleanLastFileName+"_q"
         Duplicate/O $tempName xAxisWave
-        tempName=cleanLastFileName+"_i"
+        tempName=dataStr + cleanLastFileName+"_i"
         Duplicate/O $tempName yAxisWave
-        tempName=cleanLastFileName+"_s"
+        tempName=dataStr + cleanLastFileName+"_s"
         Duplicate/O $tempName yErrWave
 
         //Plot, and adjust the scaling to match the axis scaling set by the popups
-        A_Rescale_Data()
+        A_Rescale_Data(dataStr)
         
 End
@@ -209 +208 @@
 // (does not fit the data)
 //
-Function A_Rescale_Data()
+// dataStr is the root:folder: of the data that was loaded
+Function A_Rescale_Data(dataStr)
+        String dataStr
         
         //Scaling exponents and background value
@@ -250 +251 @@
         //do the rescaling of the data
         // get the current experimental q, I, and std dev. waves (as they would be loaded )
-
-        //ControlInfo/W=A_FitPanel ywave
-        //get the filename from the global as it's loaded, rather from the popup - as version numbers
-        // do cause problems here. This global is also used later in this function
-        SVAR gLastFileName = root:myGlobals:gLastFileName
-        
-        Wave xw = $( CleanupName((gLastFileName + "_q"),0) )
-        Wave yw = $( CleanupName((gLastFileName + "_i"),0) )
-        Wave ew = $( CleanupName((gLastFileName + "_s"),0) )
+        String baseStr = ParseFilePath(0,dataStr,":",1,0)               //give me the last part of the path
+        
+        Wave xw = $(dataStr+baseStr+"_q")
+        Wave yw = $(dataStr+baseStr+"_i")
+        Wave ew = $(dataStr+baseStr+"_s")
         
         //variables set for each model to control look of graph
@@ -420 +417 @@
         //plot the data
         
-        String cleanLastFileName = "root:"+CleanupName(gLastFileName,0)
+//      String cleanLastFileName = "root:"+CleanupName(gLastFileName,0)
         If(WinType("A_FitWindow") == 0)
                 Display /W=(5,42,480,400)/K=1 yAxisWave vs xAxisWave
@@ -436 +433 @@
         SetAxis/A
         ModifyGraph tickUnit=1          //suppress tick units in labels
-        TextBox/C/N=textLabel/A=RB "File = "+cleanLastFileName
+        TextBox/C/N=textLabel/A=RB "File = "+baseStr
         //clear the old fit from the window, if it exists
         RemoveFromGraph/W=A_FitWindow/Z fit_yAxisWave
@@ -495 +492 @@
                 Abort "You must Load and Plot a File before fitting the data"
         endif
+        
         // rescale the data, to make sure it's as selected on the panel
-        A_Rescale_Data()
+        ControlInfo/W=A_FitPanel $"ywave"
+        String partialName = CleanupName(S_value,0)
+        A_Rescale_Data("root:"+partialName+":")
         
         // now go do the fit
@@ -524 +524 @@
         //ystr and xstr are the axis strings - filter with a do-loop
         String ystr="",xstr=""
-        SVAR gLastFileName = root:myGlobals:gLastFileName
         //ControlInfo/W=A_FitPanel ywave
-        Wave xw = $( CleanupName((gLastFileName + "_q"),0) )
+        Wave xw = $("root:"+partialName+":"+partialName + "_q")
         ControlInfo/W=A_FitPanel yModel
         ystr = S_Value
@@ -735 +734 @@
                 DoWindow/K $"A_FitWindow"
         endif
+        SetDataFolder root:
+        Killwaves/Z xAxisWave,yAxisWave,yErrWave,residWave,yWtWave,fit_yAxisWave
         Execute/P "DELETEINCLUDE \"LinearizedFits\""
         Execute/P "COMPILEPROCEDURES "