Changeset 348 for sans/Dev/trunk/NCNR_User_Procedures/SANS

Timestamp:

May 2, 2008 4:28:42 PM (15 years ago)

Author:

ajj

Message:

Fixed bug with HPMSA global wave path

File:

• sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/HPMSA_v40.ipf (modified) (5 diffs)

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

@@ -11 +11 @@
 
         //      Set up data folder for global variables
-        if(!DataFolderExists("root:HayPenMSA"))
-                NewDataFolder root:HayPenMSA
+        if(!DataFolderExists(":HayPenMSA"))
+                NewDataFolder :HayPenMSA
         endif
-        Make/O/D/N=17 root:HayPenMSA:gMSAWave
+        Make/O/D/N=17 :HayPenMSA:gMSAWave
         //
         make/o/d/n=(num) xwave_hpmsa, ywave_hpmsa, xdiamwave_hpmsa      
@@ -127 +127 @@
 //      NVAR evar=root:HayPenMSA:evar = gMSAWave[16]
 //use wave instead
-        WAVE gMSAWave = $"root:HayPenMSA:gMSAWave"
+        WAVE gMSAWave = $":HayPenMSA:gMSAWave"
         
 
@@ -295 +295 @@
         
       variable itm=40.0, acc=5.0E-6, ix,ig,ii,del,e1,e2,f1,f2
-      WAVE gMSAWave = $"root:HayPenMSA:gMSAWave"
+      WAVE gMSAWave = $":HayPenMSA:gMSAWave"
       
 //      NVAR a=root:HayPenMSA:a
@@ -415 +415 @@
       variable w0,w1,w2,w3,w4,w12,w13,w14,w15,w16,w24,w25,w26,w32,w34,w3425,w35,w3526,w36,w46,w56
       variable fa,fap,ca,e24g,pwk,qpw,pg,ii,del,fun,fund,g24
-      WAVE gMSAWave = $"root:HayPenMSA:gMSAWave"
+      WAVE gMSAWave = $":HayPenMSA:gMSAWave"
       
 //      NVAR a=root:HayPenMSA:a
@@ -737 +737 @@
         
         variable SofQ,etaz,akz,gekz,e24,x1,x2,ck,sk,ak2,qk,q2k,qk2,qk3,qqk,sink,cosk,asink,qcosk,aqk,inter              
-        WAVE gMSAWave = $"root:HayPenMSA:gMSAWave"
+        WAVE gMSAWave = $":HayPenMSA:gMSAWave"