Changeset 427 for sans/Dev/trunk

Timestamp:

Oct 10, 2008 3:46:24 PM (14 years ago)

Author:

srkline

Message:

bug fixes related to XML changes in the file loader in PlotUtilsMacro?

bug fix in Wrapper, in the error checking of coefficient wave names

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Analysis/Packages/Wrapper_v40.ipf (modified) (3 diffs)
• Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

@@ -677 +677 @@
         SVAR listStr=root:Packages:NIST:coefKWStr
         String properCoefStr = StringByKey(funcStr, listStr  ,"=",";",0)
+        if(cmpstr("",properCoefStr)==0)
+                return(0)               //false, no match found, so properCoefStr is returned null
+        endif
         if(cmpstr(coefStr,properCoefStr)==0)
                 return(1)               //true, the coef is the correct match
@@ -795 +798 @@
 // dispatch the fit
         do
+//              Variable t0 = stopMStimer(-2)           // corresponding print is at the end of the do-while loop (outside)
+                
                 if(useRes && useEps && useCursors && useConstr)         //do it all
                         FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, yw[pcsr(A),pcsr(B)] /X=xw /W=sw /I=1 /E=eps /D=fitYw /C=constr /STRC=fs
@@ -891 +896 @@
         
         while(0)
+        
+//      t0 = (stopMSTimer(-2) - t0)*1e-6
+//      Printf  "fit time = %g seconds\r\r",t0
         
         // append the fit

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

@@ -70 +70 @@
         SetDataFolder root:             //build sub-folders for each data set under root
         
-        if (exists("root:Packages:NIST:USANS:Globals:MainPanel:gDQv"))
+        if (exists("root:Packages:NIST:USANS:Globals:MainPanel:dQv"))
                 //Running from USANS reduction
-                Variable dQv = root:Packages:NIST:USANS:Globals:MainPanel:gDQv
-        endif
-        if(exists("root:Packages:NIST:USANS_gDQv"))
+                Variable dQv = root:Packages:NIST:USANS:Globals:MainPanel:dQv
+        endif
+        if(exists("root:Packages:NIST:USANS_dQv"))
                 //Running from SANS Analysis
-                Variable dQv = root:Packages:NIST:USANS_gDQv
+                Variable dQv = root:Packages:NIST:USANS_dQv
         endif
                 
@@ -96 +96 @@
                 LoadWave/G/D/A/Q fileStr
                 String fileNamePath = S_Path+S_fileName
-                String basestr = ParseFilePath(3,ParseFilePath(5,fileNamePath,":",0,0),":",0,0)
-                print "basestr :"+basestr
+//              String basestr = ParseFilePath(3,ParseFilePath(5,fileNamePath,":",0,0),":",0,0)
+                String baseStr = CleanupName(S_fileName,0)
+//              print "basestr :"+basestr
                 String fileName =  ParseFilePath(0,ParseFilePath(5,filestr,":",0,0),":",1,0)
-                print "filename :"+filename
+//              print "filename :"+filename
                 Variable numCols = V_flag