Changeset 849 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Panel.ipf

Timestamp:

Mar 26, 2012 11:26:28 AM (11 years ago)

Author:

srkline

Message:

Changes to the real-space modeling to sped up the drawing of cylinders, and to provide a few more examples of scritped, unattended calculations, and saving the 3D matrix.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Panel.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Panel.ipf

@@ -178 +178 @@
         
                 LoadWave/M/O/W/P=home           fileStr         //will ask for a file, Igor Binary format is assumed here
+                if(V_flag == 0)
+                        return(0)               //user cancel
+                endif
+                
                 String str
                 str=note(mat)
@@ -663 +667 @@
         Variable isOn=0
         String str
-        str = TraceNameList("winStr",";",1)             //only normal traces
-        isOn = stringmatch(str,traceStr)                //must be an exact match
+        str = TraceNameList(winStr,";",1)               //only normal traces
+        isOn = strsearch(str,traceStr,0)                //is the trace there?
+        isOn = isOn == -1 ? 0 : 1                       // return 0 if not there, 1 if there
 
         return(isOn)