Changeset 1100 for sans/Dev/trunk/NCNR_User_Procedures/Common/Packages

Timestamp:

May 18, 2018 10:32:22 AM (5 years ago)

Author:

srkline

Message:

Significant restructuring of V_ExecuteProtocol to make the logic of the flow more tractable and adaptable in the future.

Added major change to VSANS event mode reduction panel to allow F and M binned events to be saved to a copy of the correspondng data file. A new data reduction panel for multiple slice reduction is now presented for Event data. This allows reduction of a single slice (all 8 F,M panels, back ignored), or all of the slices.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager

Files:

• PlotUtilsMacro_v40.ipf (modified) (1 diff)
• USANS_SlitSmearing_v40.ipf (modified) (11 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

@@ -361 +361 @@
                                 dQv = -$w3[0]
 
-//TODO: be sure that this works correctly and can be included in either
+//DONE: this works correctly and can be included in either
 // a VSANS reduction experiment, or a standalone analysis package
 // -- since this is a Proc, not a function, #conditional compile does not work,
 // but, since it's a Proc, it is not compiled, so missing functions aren't flagged as a compile error
-                                if (exists("NCNR_VSANS")==6)                    //defined in the main  VSANS #includes file.
-                                        DoAlert 0,"**Treating data as VSANS data**"
+//                              if (exists("NCNR_VSANS")==6)                    //defined in the main  VSANS #includes file.
+//                                      DoAlert 0,"**Treating data as VSANS data**"
                                         Duplicate/O $w3,$(baseStr+"_dQv")                       //save a copy for VSANS
                                         $(baseStr+"_dQv") = -$(baseStr+"_dQv")
-                                        V_USANS_CalcWeights(baseStr,dQv)
-                                else
-                                        DoAlert 0,"Treating data as USANS (normal slit-smeared data)"
                                         USANS_CalcWeights(baseStr,dQv)
-                                endif                           
+//                              else
+//                                      DoAlert 0,"Treating data as USANS (normal slit-smeared data)"
+//                                      USANS_CalcWeights(baseStr,dQv)
+//                              endif                           
 
                                 

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/USANS_SlitSmearing_v40.ipf

@@ -2 +2 @@
 #pragma version=3.00
 #pragma IgorVersion=6.1
+
+///////
+// JAN-MAY 2018
+//
+//
+// This is a first approximation to model slit smeared VSANS data
+// - the dQv value is now a "per-Q" quantity, rather than a single global value
+// - the wavelength smearing must be accounted for by a separate numerical integral
+//   BEFORE this step is applied.
+//  -- this is significant issue for White Beam conditions
+//
+
+
+
+
 
 //Functions for doing USANS Slit smearing by method of weight matrix
@@ -360 +375 @@
 End
 
+// MAY 2018
+// updated to use dQv as a per-q wave, not a single global value
 Function CalcW1(i,j)
         Variable i,j
@@ -368 +385 @@
 
         
-        
-        NVAR dQv = USANS_dQv
+// replaced with a wave 
+//      NVAR dQv = USANS_dQv
         
         Variable UU,UL,dqj,rU,rL,wU,wL,dqw
         Wave Qval = $(USANS_basestr+"_q"+trimStr)
+        Wave dQv = $(USANS_basestr+"_dQv"+trimStr)
         
         UU =sqrt(Qval[j+1]^2-Qval[i]^2)
@@ -380 +398 @@
         rL = sqrt(UL^2+Qval[i]^2)
         
-        wU = (1.0/dQv)*(Qval[j+1]*UU/dqw - 0.5*UU*rU/dqw - 0.5*Qval[i]^2*ln(UU+rU)/dqw )
-        wL = (1.0/dQv)*(Qval[j+1]*UL/dqw - 0.5*UL*rL/dqw - 0.5*Qval[i]^2*ln(UL+rL)/dqw )
+        wU = (1.0/dQv[i])*(Qval[j+1]*UU/dqw - 0.5*UU*rU/dqw - 0.5*Qval[i]^2*ln(UU+rU)/dqw )
+        wL = (1.0/dQv[i])*(Qval[j+1]*UL/dqw - 0.5*UL*rL/dqw - 0.5*Qval[i]^2*ln(UL+rL)/dqw )
         
         Return wU-wL
@@ -387 +405 @@
 End
 
+// MAY 2018
+// updated to use dQv as a per-q wave, not a single global value
 Function CalcW2(i,j)
         Variable i,j
@@ -395 +415 @@
 
 
-
-        NVAR dQv = USANS_dQv
+// replaced with a wave 
+//      NVAR dQv = USANS_dQv
         
         variable UU,UL,dqw,rU,rL,wU,wL
         
         Wave Qval = $(USANS_basestr+"_q"+trimStr)
+        Wave dQv = $(USANS_basestr+"_dQv"+trimStr)
 
         UU = sqrt(Qval[j]^2-Qval[i]^2)                  
@@ -407 +428 @@
         rU = sqrt(UU^2+Qval[i]^2)
         rL = sqrt(UL^2+Qval[i]^2)
-        wU = (1.0/dQv)*( -Qval[j-1]*UU/dqw + 0.5*UU*rU/dqw + 0.5*Qval[i]^2*ln(UU+rU)/dqw )
-        wL = (1.0/dQv)*( -Qval[j-1]*UL/dqw + 0.5*UL*rL/dqw + 0.5*Qval[i]^2*ln(UL+rL)/dqw )
+        wU = (1.0/dQv[i])*( -Qval[j-1]*UU/dqw + 0.5*UU*rU/dqw + 0.5*Qval[i]^2*ln(UU+rU)/dqw )
+        wL = (1.0/dQv[i])*( -Qval[j-1]*UL/dqw + 0.5*UL*rL/dqw + 0.5*Qval[i]^2*ln(UL+rL)/dqw )
 
         Return wU-wL
@@ -414 +435 @@
 End
 
+// MAY 2018
+// updated to use dQv as a per-q wave, not a single global value
 Function CalcR(i)
         Variable i
@@ -424 +447 @@
         NVAR m = USANS_m
         NVAR N = USANS_N
-        NVAR dQv = USANS_dQv
+// replaced with a wave 
+//      NVAR dQv = USANS_dQv
         
         Variable retval
@@ -430 +454 @@
         Wave Ival = $(USANS_basestr+"_i"+trimStr)
         Variable/G USANS_intQpt = Qval[i]
+        Wave dQv = $(USANS_basestr+"_dQv"+trimStr)
+
         
         Variable lower = sqrt(qval[N-1]^2-qval[i]^2)
-        Variable upper = dQv
+        Variable upper
+        upper = dQv[i]
 
         if (i == N)
@@ -440 +467 @@
         retval = Integrate1D(Remainder,lower,upper)
         
-        retval *= 1/dQv
+        retval *= 1/dQv[i]
         
         Return retval