Changeset 705

Timestamp:

May 6, 2010 10:13:31 AM (12 years ago)

Author:

srkline

Message:

Fix conditional compile error if GenCurveFit? not installed

New version number 7.02 for Summer School release

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Analysis/Packages/GeneticOptimization/NCNR_GenFitUtils.ipf (modified) (5 diffs)
• InstalledVersion.txt (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GeneticOptimization/NCNR_GenFitUtils.ipf

@@ -154 +154 @@
 // need to pass back the chi-squared and number of points. "V_" globals don't appear
 //
+// function will only compile if the GenCurveFit XOP is installed - else it will return zero
+//
 Function DoGenCurveFit(useRes,useCursors,sw,fitYw,fs,funcStr,holdStr,val,lolim,hilim,pt1,pt2)
         Variable useRes,useCursors
@@ -162 +164 @@
         WAVE/T lolim,hilim
         Variable pt1,pt2                //already sorted if cursors are needed
+
+#if exists("GenCurveFit")
 
         // initialise the structure you will use
@@ -255 +259 @@
         //  /OPT=1 seems to make no difference whether it's used or not
         
-#if exists("GenCurveFit")
         // append the fit
         //do this only because GenCurveFit tries to append too quickly?
@@ -297 +300 @@
                 
         while(0)        
-#endif
         
 //      NVAR V_chisq = V_chisq
@@ -314 +316 @@
         
         return(V_chisq)
+#else
+        return(0)
+#endif  
 end

sans/Dev/trunk/NCNR_User_Procedures/InstalledVersion.txt

@@ -1 @@
-PACKAGE_VERSION=7.01;SANS_RED_VERSION=5.20;SANS_ANA_VERSION=4.10;USANS_RED_VERSION=2.3;
+PACKAGE_VERSION=7.02;SANS_RED_VERSION=5.20;SANS_ANA_VERSION=4.10;USANS_RED_VERSION=2.3;
 
 Only the first line of the file is read in.