Ignore:
Timestamp:
Sep 18, 2017 12:08:50 PM (5 years ago)
Author:
srkline
Message:

many minor changes after real VSANS data collected.

additional procedures added to allow easy correction of the incorrect header information from NICE.

Most notable addition is the pinhole resolution added to the calculation and the I(q) output. White beam is also treated (incorrectly) as a gaussian distrivution, but the results of smeared fitting look to be quite good.

Trimming and sorting routines are now (pinhole) resolution aware.

File identification routines have been updated to use the proper definitions of "purpose" and "intent". Both fields are now in the catalog, to allow for better sorting.

File:
1 edited

Legend:

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

    r1051 r1064  
    1515// -- currently, the initialization does nothing. 
    1616Function V_InitTransmissionPanel() 
    17  
    18         Execute "V_TransmissionPanel()" 
    1917         
     18        DoWindow/F V_TransmissionPanel 
     19        if(V_Flag == 0) 
     20                Execute "V_TransmissionPanel()" 
     21        endif 
    2022End 
    2123 
     
    2931//      ShowTools/A 
    3032        PopupMenu popup_0,pos={19.00,55.00},size={86.00,23.00},proc=V_TSamFilePopMenuProc,title="Sample" 
    31         PopupMenu popup_0,mode=1,value= V_getFileIntentList("SAMPLE",0)+V_getFileIntentList("EMPTY CELL",0) 
     33        PopupMenu popup_0,mode=1,value= V_getFilePurposeList("SCATTERING",0)//+V_getFileIntentList("EMPTY CELL",0) 
    3234        PopupMenu popup_1,pos={102,248},size={72.00,23.00},proc=V_TTransmFilePopMenuProc,title="Transmission" 
    33         PopupMenu popup_1,mode=1,value= V_getFileIntentList("TRANSMISSION",0) 
     35        PopupMenu popup_1,mode=1,value= V_getFilePurposeList("TRANSMISSION",0) 
    3436        PopupMenu popup_2,pos={164,353},size={72.00,23.00},proc=V_TEmpBeamPopMenuProc,title="Empty Beam" 
    3537        PopupMenu popup_2,mode=1,value= V_getFileIntentList("EMPTY BEAM",0) 
     
    103105                // TODO x- set the popup string to the matching name on exit 
    104106                        Variable targetID = groupIDW[ii] 
    105                         String list = V_getFileIntentList("TRANSMISSION",0) 
    106                         WAVE/T intentW = root:Packages:NIST:VSANS:CatVSHeaderInfo:Intent 
     107                        String list = V_getFilePurposeList("TRANSMISSION",0) 
     108                        WAVE/T purposeW = root:Packages:NIST:VSANS:CatVSHeaderInfo:Purpose 
    107109                        for(ii=0;ii<np;ii+=1) 
    108                                 if(cmpstr(intentW[ii],"TRANSMISSION")==0 && groupIDW[ii] == targetID) 
     110                                if(cmpstr(purposeW[ii],"TRANSMISSION")==0 && groupIDW[ii] == targetID) 
    109111                                        Print "transmission file match at ",filenameW[ii] 
    110112                                        SetVariable setvar_2,value=labelW[ii] 
     
    129131                                        PopupMenu popup_2,mode=WhichListItem(fileNameW[ii], list )+1 
    130132                                         
    131                                         SetVariable setvar_6,value =_STR:"ML" 
     133//                                      SetVariable setvar_6,value =_STR:"ML" 
    132134 
    133135                                        WAVE boxCoord = V_getBoxCoordinates(filenameW[ii]) 
     
    182184                        Variable popNum = pa.popNum 
    183185                        String popStr = pa.popStr 
     186                         
     187                        Print "empty beam match at ",popStr 
     188                        SetVariable setvar_4,value=_STR:V_getSampleDescription(popStr) 
     189                         
     190//                      SetVariable setvar_6,value =_STR:"ML" 
     191 
     192                        WAVE boxCoord = V_getBoxCoordinates(popStr) 
     193                        Print boxCoord 
     194                        SetVariable setvar_5,value=_STR:V_NumWave2List(boxCoord,";") 
     195                         
     196                         
    184197                        break 
    185198                case -1: // control being killed 
Note: See TracChangeset for help on using the changeset viewer.