Ignore:
Timestamp:
Feb 2, 2017 9:52:47 AM (6 years ago)
Author:
srkline
Message:

ADDED:

included common NCNR procedures for the PlotManager?, to allow plotting of 1D data sets using a familiar interface

greatly expanded Patch functionality to include input in the multiple sections of the Nexus file, including separate panels to handle patching of waves to the file - needed for non-linear coefficients, dead time, and XY beam centers. All patch operations are expandable as more fields become necessary to patch.

removed bug of group_id being defined in /reduction and in /sample (removed R/W that referenced /reduction)

added panel to "isolate" a single detector panel, allowing the corrections to be applied/removed/recalculated as needed to directly see their effects.

linked new procedures to their appropriate action buttons

Added more data fields (label, intent, etc.) to the VCALC to Nexus data writer to get more realistic values into the fake data files for testing

Added VCALC simulation functions with EMP and BGD in anticipation of testing the CORRECT step

more little bug and documentation fixes which I can't remember, but they are all important...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Utils.ipf

    r1019 r1022  
    4949        // 
    5050        // peak @ 0.015 in middle of middle detector, maybe not "real" vycor, but that is to be resolved 
    51         //      Make/O/D coef_BroadPeak = {1e-9, 3, 20, 500.0, 0.015,3,0.1}              
     51        //      Make/O/D coef_BroadPeak = {1e-9, 3, 20, 500.0, 0.015,3,0.1}      
     52        // 
     53        // 
     54        Variable addEmpBgd=0 
     55         
     56                 
    5257        String funcStr = VCALC_getModelFunctionStr() 
    5358        strswitch(funcStr) 
     
    7681                        tmpInten = VC_BlockedBeam(1,qTot[p][q]) 
    7782                        break 
     83                case "Debye +": 
     84                        tmpInten = VC_Debye(10,300,0.0001,qTot[p][q]) 
     85                        addEmpBgd = 1 
     86                        break 
     87                case "AgBeh +": 
     88                        tmpInten = VC_BroadPeak(1e-9,3,20,100.0,0.1,3,0.1,qTot[p][q]) 
     89                        addEmpBgd = 1 
     90                        break 
     91                case "Empty Cell +": 
     92                        tmpInten = VC_EC_Empirical(2.2e-8,3.346,0.0065,9.0,0.016,qTot[p][q]) 
     93                        tmpInten += VC_BlockedBeam(1,qTot[p][q]) 
     94                        break 
    7895                default: 
    7996                        tmpInten = VC_Debye(10,300,0.1,qTot[p][q]) 
    8097        endswitch 
    8198 
     99 
     100        if(addEmpBgd == 1) 
     101                tmpInten += VC_EC_Empirical(2.2e-8,3.346,0.0065,9.0,0.016,qTot[p][q]) 
     102                tmpInten += VC_BlockedBeam(1,qTot[p][q]) 
     103        endif 
     104 
     105         
    82106// TODO: this is faked to get around the singularity at the center of the back detector 
    83107// 
Note: See TracChangeset for help on using the changeset viewer.