Ignore:
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:
3 added
4 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/NCNR_Package_Loader.ipf

    r433 r448  
    124124        strswitch(itemStr)      // string switch 
    125125                case "Load NCNR SANS Reduction Macros":  
    126                         Execute/P "INSERTINCLUDE \"Includes_v510\"" 
     126                        Execute/P "INSERTINCLUDE \"Includes_v520\"" 
    127127                        Execute/P "COMPILEPROCEDURES " 
    128128                        Execute/P ("Initialize()") 
     
    136136                case "Unload NCNR SANS Reduction Macros":        
    137137                // very dangerous - don't really want to implement this because it will surely crash 
    138                         Execute/P "DELETEINCLUDE \"Includes_v510\"" 
     138                        Execute/P "DELETEINCLUDE \"Includes_v520\"" 
    139139                        Execute/P "COMPILEPROCEDURES " 
    140140                        DoWindow Main_Panel 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_DataReadWrite.ipf

    r412 r448  
    793793        // 
    794794        // necessary values 
    795         realw[10]=5                     //detector calibration constants, needed for averaging 
     795        realw[10]=8                     //detector calibration constants, needed for averaging 
    796796        realw[11]=10000 
    797797        realw[12]=0 
    798         realw[13]=5 
     798        realw[13]=8 
    799799        realw[14]=10000 
    800800        realw[15]=0 
    801801        // 
    802802        // used in the resolution calculation, ONLY here to keep the routine from crashing 
    803         realw[20]=65            //det size 
     803        realw[20]=102           //det size 
    804804        realw[27]=dlam  //delta lambda 
    805805        realw[21]=bsDiam        //BS size 
     
    11431143         
    11441144        //your code here 
    1145         WriteReal(fname,num,5152) 
     1145        //WriteReal(fname,num,5152) 
     1146         
     1147         
     1148        WriteReal(fname,num,5265) 
    11461149         
    11471150        // line 4 column 4 
     1151         
     1152        // real calculated distance line 6 colunm1 
    11481153         
    11491154        return(0) 
     
    15141519        // your code returning value 
    15151520//      value = getRealValueFromHeader_2(fname,60,28,5,4,4)  
    1516         value = getRealValueFromHeader(fname,18) 
     1521//      value = getRealValueFromHeader(fname,18)  detector distance but need to add the offset due to the table 
     1522         
     1523        value = getRealValueFromHeader(fname,25) 
     1524         
    15171525         
    15181526        return(value) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_Utils.ipf

    r412 r448  
    2727//      Variable/G root:myGlobals:PixelResDefault = 0.5                 //pixel resolution in cm 
    2828         
    29         Variable/G root:myGlobals:DeadtimeDefault = 0.9e-6              //deadtime in seconds 
     29        Variable/G root:myGlobals:DeadtimeDefault =  (0.9e-6 )/128              //deadtime in seconds 
    3030         
    3131        Variable/G root:myGlobals:BeamstopYTol = 100     
     
    173173         
    174174// your code here 
    175 deadtime = 0.9e-6 
     175deadtime = (2e-6) 
    176176 
    177177        return(deadtime) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_v520.ipf

    r420 r448  
    3030#include "PlotUtilsMacro_v40" 
    3131#include "NIST_XML_v40" 
     32#include "cansasXML_v11" 
    3233#include "USANS_SlitSmearing_v40" 
    3334#include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere 
     
    5758#include "SASCALC" 
    5859#include "CheckVersionFTP"                              //added June 2008 
     60#include "MultScatter_MonteCarlo_2D"                    //Oct 2008 SRK for SASCALC simulation 
     61 
    5962 
    6063#include "TISANE" 
Note: See TracChangeset for help on using the changeset viewer.