Changeset 516 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

Timestamp:

Jun 29, 2009 1:51:03 PM (14 years ago)

Author:

srkline

Message:

Fixed bugs introduced in r515 concerning the back-compatibility of the kw=val strings for the
model functions. Now should work correctly when no models are loaded.

Changed integration limits on paracrystal models

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf (modified) (6 diffs)

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

@@ -36 +36 @@
                 if(exists("root:Packages:NIST:suffixKWStr")==0)
                         String/G root:Packages:NIST:suffixKWStr=""
+                endif
+                if(exists("root:Packages:NIST:paramKWStr")==0)
+                        String/G root:Packages:NIST:paramKWStr=""
                 endif
                 Execute "WrapperPanel()"
@@ -499 +502 @@
         String paramStr=""
         SVAR/Z listStr=root:Packages:NIST:paramKWStr
+
         if(SVAR_Exists(listStr))
                 paramStr = StringByKey(funcStr, listStr  ,"=",";",0)
@@ -505 +509 @@
                 endif
         else    //global string does not exist, create it and fill it in
+                Variable/G root:Pacakges:NIST:gReconstructStrings = 1                   //coefficients old style and must be rebuilt too
                 String/G root:Packages:NIST:paramKWStr=""
                 SVAR/Z listStr=root:Packages:NIST:paramKWStr
-        endif
-        // find everything
-        SVAR suffixKWStr = root:Packages:NIST:suffixKWStr
+        endif   
+        
+        // find everything to rebuild only if the model has been plotted (if so, coefficients will exist)
         String coef = getFunctionCoef(funcStr)
-        String suffix = getModelSuffix(coef)            //!! normally takes funcStr
-        
-        // add to the suffix list
-        suffixKWStr += funcStr+"="+suffix+";"
-        
-        // add to the paramList
+        if(strlen(coef)==0)
+                //model not plotted, don't reconstruct, return null string
+                return(paramStr)
+        endif
         
         ///// NEED TO BE IN PROPER DATA FOLDER FOR SMEARED FUNCTIONS
@@ -533 +536 @@
                 SetDataFolder root:
         endif
-                        
+        
+        // model was plotted, find the suffix to fill in the parameter wave
+        SVAR suffListStr=root:Packages:NIST:suffixKWStr
+        String suffix = StringByKey(coef, suffListStr  ,"=",";",0)
         
         String paramWave = WaveList("*par*"+suffix,"","TEXT:1")         //should be one wave name, no trailing semicolon
@@ -558 +564 @@
 //
 // does NOT return the leading "_" as part of the suffix
+// may need to set the string correctly - so lost of messing around for back-compatibility
 Function/S getModelSuffix(funcStr)
         String funcStr
@@ -564 +571 @@
         String suffixStr = StringByKey(funcStr, listStr  ,"=",";",0)
 
-        if(strlen(suffixStr)==0)
-                // run through the param function to set the strings properly
-                String str = getFunctionParams(funcStr)
-                suffixStr = getModelSuffix(funcStr)             //then call again
-        endif
-        return(suffixStr)
+        if(strlen(suffixStr) !=0)               //found it, get out
+                return(suffixStr)
+        endif
+        
+        // was the model plotted?
+        String coef = getFunctionCoef(funcStr)
+        if(strlen(coef)==0)             
+                //nothing plotted
+                return("")
+        else
+                //plotted, find the coeff
+                String suffix = StringByKey(coef, ListStr  ,"=",";",0)
+        
+                // add to the suffix list in the new style, if it was found
+                if(strlen(suffix) !=0)
+                        listStr += funcStr+"="+suffix+";"
+                endif
+                return(suffix)
+        endif
+        
+        return("")
 End