Changeset 162

Timestamp:

Sep 13, 2007 5:00:59 PM (15 years ago)

Author:

ajj

Message:

Fixed USANS Slit Smearing Calculation.
Still need to check that it gives the same answer as the Lake desmearing.

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/USANS_SlitSmearing.ipf (modified) (4 diffs)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/USANS_SlitSmearing.ipf

@@ -32 +32 @@
 
         Make/D/O/N=(USANS_N,USANS_N) $(basestr+"_res")
-        //Make/O/N=(N,N) W1mat
-        //Make/O/N=(N,N) W2mat
-        //Make/O/N=(N,N) Rmat
+        Make/D/O/N=(USANS_N,USANS_N) W1mat
+        Make/D/O/N=(USANS_N,USANS_N) W2mat
+        Make/D/O/N=(USANS_N,USANS_N) Rmat
         Wave weights = $(basestr+"_res")
 
         Variable/G USANS_m = EnterSlope()
-        if(USANS_m == 999)
-                Killwaves/Z $(basestr+"_res")
-                return(1)               //error
-        endif
+
         Variable tref = startMSTimer
         print "Calculating W1..."
-        weights = (p <= q ) && (q < USANS_N-1) ? CalcW1(p,q)  : 0
+        W1mat = (p <= q ) && (q <= USANS_N-2) ? CalcW1(p,q)  : 0
         print "Calculating W2..."
-        weights += (p+1 <= q ) && (q < USANS_N) ?  CalcW2(p,q) : 0
+        W2mat = (p+1 <= q ) && (q <= USANS_N-1) ?  CalcW2(p,q) : 0
         print "Calculating Remainders..."
-        weights += (q == USANS_N-1) ? CalcR(p) : 0
+        Rmat = (q == USANS_N-1) ? CalcR(p) : 0
 //      print "Summing weights..."
-//      Weights = W1mat + W2mat + Rmat
+        weights = W1mat + W2mat + Rmat
         print "Done"
         Variable ms = stopMSTimer(tref)
@@ -64 +61 @@
         Prompt slope "Enter a slope"
         DoPrompt "Enter Slope", slope
-                If (V_Flag) 
-                        return (999)            //return a bogus slope if the user canceled
-                Endif   
+                If (V_Flag)
+                        return (999)                    //return a bogus slope if the user canceled
+                Endif
         print "slope=", slope
         return slope
@@ -122 +119 @@
 
         SVAR USANS_basestr
+        NVAR m = USANS_m
         NVAR N = USANS_N
         NVAR dQv = USANS_dQv
@@ -127 +125 @@
         Variable retval
         Wave Qval = $(USANS_basestr+"_q")
+        Wave Ival = $(USANS_basestr+"_i")
         Variable/G USANS_intQpt = Qval[i]
         
         Variable lower = sqrt(qval[N-1]^2-qval[i]^2)
-        Variable upper = lower +dQv
+        Variable upper = dQv
+
+        if (i == N)
+                lower = 0
+        endif 
         
         retval = Integrate1D(Remainder,lower,upper)
+        
+        retval *= 1/dQv
         
         Return retval