Changeset 111 for sans/Analysis/branches/ajj_23APR07

Timestamp:

May 9, 2007 9:07:05 AM (16 years ago)

Author:

ajj

Message:

Fixed test function SmearedCyl_PolyRadiusX() so that it now actually can call the underlying function.

Can now be used for some speed tests - SANS data only.

File:

• sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP/ResolutionSmearing.c (modified) (4 diffs)

sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XOP/ResolutionSmearing.c

@@ -11 +11 @@
 #include "GaussWeights.h"
 #include "ResolutionSmearing.h"
+#include "libSANSAnalysis.h"
 
 int
@@ -320 +321 @@
         double nord,va,vb,summ,yyy,zi,Pi;
         double answer,Resoln,i_shad,i_qbar,i_sigq;
+        char buf[256];
         
         Pi = 4.0*atan(1.0);
-        
         i_shad = p->i_shad;
         i_qbar = p->i_qbar;
         i_sigq = p->i_sigq;
         
-        
         dp = WaveData(p->waveHandle);
         q = p->x;
-
+        
+        p->result = Cyl_PolyRadius(dp,q);
+        return 0;
         
         if (i_sigq >= 0){
@@ -340 +342 @@
                 }
                 vb = 3*i_sigq + i_qbar;
-                
                 summ = 0.0;
                 ii=0;
@@ -369 +370 @@
                 //answer = qtrap_USANS(fi,pp,va,vb,tol,maxiter);
                 //answer /= vb;
+                
+                //Just return a value that is clearly nonsense, but is non-zero
+                //USANS Smearing code not in form suitable for this test of direct calling
+                //of C library function. AJJ May 9 2007
                 answer = -10;
         }
-        
-        
         p->result = answer;
         
         return 0;
-        }
+}