Changeset 288

Timestamp:

Feb 19, 2008 3:45:20 PM (15 years ago)

Author:

srkline

Message:

fixing the conditional compile check for 2D XOP functions, which is not allowed in Macros...

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/Models_2D

Files:

• CoreShellCyl2D_v40.ipf (modified) (1 diff)
• Cylinder_2D_v40.ipf (modified) (2 diffs)
• Ellipsoid2D_v40.ipf (modified) (1 diff)
• EllipticalCylinder2D_v40.ipf (modified) (1 diff)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/Models_2D/CoreShellCyl2D_v40.ipf

@@ -22 +22 @@
         Prompt str,"Pick the data folder containing the 2D data",popup,getAList(4)
 
-#if !exists("CoreShellCylinder_2DX")
-        Abort "You must have the SANSAnalysis XOP installed to use 2D models"
-#endif
+        if (!exists("CoreShellCylinder_2DX"))
+                Abort "You must have the SANSAnalysis XOP installed to use 2D models"
+        endif
         
         SetDataFolder $("root:"+str)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/Models_2D/Cylinder_2D_v40.ipf

@@ -14 +14 @@
 ///  REQUIRES DANSE XOP for 2D FUNCTIONS
 
+
 //
 // the calculation is done as for the QxQy data set:
@@ -22 +23 @@
         Prompt str,"Pick the data folder containing the 2D data",popup,getAList(4)
         
-#if !exists("Cylinder_2DX")
-        Abort "You must have the SANSAnalysis XOP installed to use 2D models"
-#endif
-
+        if (!exists("Cylinder_2DX") )
+                Abort "You must have the SANSAnalysis XOP installed to use 2D models"
+        endif
         SetDataFolder $("root:"+str)
         

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/Models_2D/Ellipsoid2D_v40.ipf

@@ -24 +24 @@
         Prompt str,"Pick the data folder containing the 2D data",popup,getAList(4)
 
-#if !exists("Ellipsoid_2DX")
-        Abort "You must have the SANSAnalysis XOP installed to use 2D models"
-#endif
+        if (!exists("Ellipsoid_2DX"))
+                Abort "You must have the SANSAnalysis XOP installed to use 2D models"
+        endif
         
         SetDataFolder $("root:"+str)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/Models_2D/EllipticalCylinder2D_v40.ipf

@@ -22 +22 @@
         Prompt str,"Pick the data folder containing the 2D data",popup,getAList(4)
 
-#if !exists("EllipticalCylinder_2DX")
-        Abort "You must have the SANSAnalysis XOP installed to use 2D models"
-#endif
+        if (!exists("EllipticalCylinder_2DX"))
+                Abort "You must have the SANSAnalysis XOP installed to use 2D models"
+        endif
         
         SetDataFolder $("root:"+str)