Changeset 448

Timestamp:

Nov 14, 2008 12:03:24 PM (14 years ago)

Author:

srkline

Message:

Adding Lionel's changes to read in and correct ILL data tube-by-tube for deadtime

Updated loaders to v520

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/NCNR_Package_Loader.ipf (modified) (2 diffs)
• Reduction/SANS/ILL_DataReadWrite.ipf (modified) (3 diffs)
• Reduction/SANS/ILL_Utils.ipf (modified) (2 diffs)
• Reduction/SANS/Includes_v520.ipf (modified) (2 diffs)
• Reduction/SANS/Includes_v520_ILL.ipf (added)
• Reduction/SANS/InitializeILL.ipf (added)
• Reduction/SANS/WorkFileUtilsLP.ipf (added)

sans/Dev/trunk/NCNR_User_Procedures/Common/NCNR_Package_Loader.ipf

@@ -124 +124 @@
         strswitch(itemStr)      // string switch
                 case "Load NCNR SANS Reduction Macros": 
-                        Execute/P "INSERTINCLUDE \"Includes_v510\""
+                        Execute/P "INSERTINCLUDE \"Includes_v520\""
                         Execute/P "COMPILEPROCEDURES "
                         Execute/P ("Initialize()")
@@ -136 +136 @@
                 case "Unload NCNR SANS Reduction Macros":       
                 // very dangerous - don't really want to implement this because it will surely crash
-                        Execute/P "DELETEINCLUDE \"Includes_v510\""
+                        Execute/P "DELETEINCLUDE \"Includes_v520\""
                         Execute/P "COMPILEPROCEDURES "
                         DoWindow Main_Panel

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_DataReadWrite.ipf

@@ -793 +793 @@
         //
         // necessary values
-        realw[10]=5                     //detector calibration constants, needed for averaging
+        realw[10]=8                     //detector calibration constants, needed for averaging
         realw[11]=10000
         realw[12]=0
-        realw[13]=5
+        realw[13]=8
         realw[14]=10000
         realw[15]=0
         //
         // used in the resolution calculation, ONLY here to keep the routine from crashing
-        realw[20]=65            //det size
+        realw[20]=102           //det size
         realw[27]=dlam  //delta lambda
         realw[21]=bsDiam        //BS size
@@ -1143 +1143 @@
         
         //your code here
-        WriteReal(fname,num,5152)
+        //WriteReal(fname,num,5152)
+        
+        
+        WriteReal(fname,num,5265)
         
         // line 4 column 4
+        
+        // real calculated distance line 6 colunm1
         
         return(0)
@@ -1514 +1519 @@
         // your code returning value
 //      value = getRealValueFromHeader_2(fname,60,28,5,4,4) 
-        value = getRealValueFromHeader(fname,18)
+//      value = getRealValueFromHeader(fname,18)  detector distance but need to add the offset due to the table
+        
+        value = getRealValueFromHeader(fname,25)
+        
         
         return(value)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_Utils.ipf

@@ -27 +27 @@
 //      Variable/G root:myGlobals:PixelResDefault = 0.5                 //pixel resolution in cm
         
-        Variable/G root:myGlobals:DeadtimeDefault = 0.9e-6              //deadtime in seconds
+        Variable/G root:myGlobals:DeadtimeDefault =  (0.9e-6 )/128              //deadtime in seconds
         
         Variable/G root:myGlobals:BeamstopYTol = 100    
@@ -173 +173 @@
         
 // your code here
-deadtime = 0.9e-6
+deadtime = (2e-6)
 
         return(deadtime)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_v520.ipf

@@ -30 +30 @@
 #include "PlotUtilsMacro_v40"
 #include "NIST_XML_v40"
+#include "cansasXML_v11"
 #include "USANS_SlitSmearing_v40"
 #include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere
@@ -57 +58 @@
 #include "SASCALC"
 #include "CheckVersionFTP"                              //added June 2008
+#include "MultScatter_MonteCarlo_2D"                    //Oct 2008 SRK for SASCALC simulation
+
 
 #include "TISANE"