Ignore:
Timestamp:
May 21, 2014 3:52:02 PM (9 years ago)
Author:
srkline
Message:

Updated the reduction Read/Write? and corresponding factility stubs to accomodate detector dead time written to the VAX header. It is currently not written to the header, but may be with NICE (hopefully).

With the move of NG3 SANS to CGB(upper), the NG3 designation in the account name [NGxSANSxx] has been replaced with CGB. Folders on charlotte and radio button on SASCALC are labeled "NGB30" to be more obvious which instrument it is.

FFT routines have minor typos cleaned up.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf

    r933 r940  
    3232//                                                      Configurations are outputted to text using command "SaveNICEConfigs()" 
    3333// 
     34//  MAY 2014 SRK -- changed nomenclature of NG3 to be CGB (shows on button as NGB30) - Nothing changes in the simulation 
     35//                  so this change is nothing but cosmetic. I will need to update the flux calibration, but there is no need to keep the old. 
     36// 
     37// 
     38// 
    3439// 
    3540// calculate what q-values you get based on the instruments settings 
     
    5358//              the global -- root:Packages:NIST:SAS:instrument (search for it everywhere...) 
    5459//              x- repair the naming/numbering scheme to look for the string "NGx" and switch on that, not a number, which is unreliable and confusing. 
     60// 
     61// 
     62//      TODO_CGB: 
     63//  For the moved NG3 instrument: 
     64//   -- update the flux values once some measurements have been done 
     65//   -- update the wavelength spread values once they have been measured 
     66//   -- be sure that no other dimensions have been changed after the move 
     67//   -- polarizer is gone now. Be sure apertures are correct in UpdateControls() 
     68//   -- any other changes??? 
    5569// 
    5670// use str2hex(str) (my function) to convert "A" to 10 
     
    118132        // for the panel 
    119133//      Variable/G root:Packages:NIST:SAS:gInst=3               //or 7 for NG7 
    120         String/G root:Packages:NIST:SAS:gInstStr="NG3"          //or "NG7" or "NGB"=10m or "CGB"=NG3 moved 
     134//      String/G root:Packages:NIST:SAS:gInstStr="NG3"          //or "NG7" or "NGB"=10m or "CGB"=NG3 moved 
     135        String/G root:Packages:NIST:SAS:gInstStr="CGB"          //or "NG7" or "NGB"=10m or "CGB"=NG3 moved 
    121136        Variable/G root:Packages:NIST:SAS:gNg=0 
    122137        Variable/G root:Packages:NIST:SAS:gTable=2              //2=chamber, 1=table 
     
    208223        SetDataFolder root:Packages:NIST:SAS 
    209224         
    210         String/G gSelectedInstrument="checkNG3" 
    211         String/G gInstStr = "NG3" 
     225//      String/G gSelectedInstrument="checkNG3" 
     226//      String/G gInstStr = "NG3" 
     227        String/G gSelectedInstrument="checkCGB" 
     228        String/G gInstStr = "CGB" 
    212229         
    213230        Variable/G s12 = 54.8 
     
    340357/// this is the (incomplete) definition of the 10m SANS instrument 
    341358// on NG-B, which will be referred to as NGB here to keep the NG(number) notation 
    342 // reserving NGB for the moved NG3 instrument 
     359// reserving CGB for the moved NG3 instrument 
    343360// which may be simpler here to keep functions from breaking... 
    344361// 
     
    519536        Slider SC_Slider_2,pos={394,21},size={47,65},proc=OffsetSliderProc,live=0,ticks=4 
    520537        Slider SC_Slider_2,limits={0,25,1},variable= root:Packages:NIST:SAS:gOffset//,thumbColor= (1,16019,65535) 
    521         CheckBox checkNG3,pos={20,19},size={36,14},proc=SelectInstrumentCheckProc,title="NG3" 
    522         CheckBox checkNG3,value=1,mode=1 
    523         CheckBox checkNG7,pos={66,19},size={36,14},proc=SelectInstrumentCheckProc,title="NG7" 
     538//      CheckBox checkNG3,pos={20,19},size={36,14},proc=SelectInstrumentCheckProc,title="NG3" 
     539//      CheckBox checkNG3,value=1,mode=1 
     540        CheckBox checkCGB,pos={17,19},size={36,14},proc=SelectInstrumentCheckProc,title="NGB30" 
     541        CheckBox checkCGB,value=1,mode=1 
     542        CheckBox checkNG7,pos={70,19},size={36,14},proc=SelectInstrumentCheckProc,title="NG7" 
    524543        CheckBox checkNG7,value=0,mode=1 
    525544 
     
    530549//      -- hide/unhide the 10m SANS 
    531550        if(show10mSANS) 
    532                 CheckBox checkNGB,pos={110,19},size={40,14},proc=SelectInstrumentCheckProc,title="NGB" 
     551                CheckBox checkNGB,pos={114,19},size={40,14},proc=SelectInstrumentCheckProc,title="NGB" 
    533552                CheckBox checkNGB,value=0,mode=1 
    534553        endif 
     
    551570        Button ClearButton proc=S_ClearButtonProc 
    552571//      GroupBox group0,pos={6,1},size={108,36},title="Instrument" 
    553         GroupBox group0,pos={6,1},size={160,36},title="Instrument" 
     572        GroupBox group0,pos={6,1},size={160,39},title="Instrument" 
    554573        SetDataFolder fldrSav0 
    555574         
     
    614633 
    615634        strswitch(selInstr)     // string switch 
     635                case "CGB": 
    616636                case "NG3":                     //  
    617637                        switch(ng)       
     
    830850 
    831851        strswitch(ctrlName)     // string switch 
    832                 case "checkNG3":                        //  
    833                         checkBox checkNG3,win=SASCALC, value=1 
     852                case "checkCGB":                        //  
     853                        checkBox checkCGB,win=SASCALC, value=1 
    834854                        checkBox checkNG7,win=SASCALC, value=0 
    835855                        checkBox checkNGB,win=SASCALC, value=0 
    836856                        initNG3() 
    837                         break                                            
     857                        break    
     858//              case "checkNG3":                        //  
     859//                      checkBox checkNG3,win=SASCALC, value=1 
     860//                      checkBox checkNG7,win=SASCALC, value=0 
     861//                      checkBox checkNGB,win=SASCALC, value=0 
     862//                      initNG3() 
     863//                      break                                            
    838864                case "checkNG7":                        //  
    839                         checkBox checkNG3,win=SASCALC, value=0 
     865//                      checkBox checkNG3,win=SASCALC, value=0 
     866                        checkBox checkCGB,win=SASCALC, value=0 
    840867                        checkBox checkNG7,win=SASCALC, value=1 
    841868                        checkBox checkNGB,win=SASCALC, value=0  
     
    843870                        break 
    844871                case "checkNGB":                // 10m SANS 
    845                         checkBox checkNG3,win=SASCALC, value=0 
     872//                      checkBox checkNG3,win=SASCALC, value=0 
     873                        checkBox checkCGB,win=SASCALC, value=0 
    846874                        checkBox checkNG7,win=SASCALC, value=0  
    847875                        checkBox checkNGB,win=SASCALC, value=1 
     
    922950                lens = checked   
    923951                strswitch(selInstr)     // string switch 
     952                        case "CGB": 
    924953                        case "NG3": 
    925954                                dist = 1317 
     
    9901019         
    9911020                // instrument specific distance requirements 
    992                 if(cmpstr(selInstr,"NG3") == 0 && dist != 1317) 
     1021//              if(cmpstr(selInstr,"NG3") == 0 && dist != 1317) 
     1022                if(cmpstr(selInstr,"CGB") == 0 && dist != 1317) 
    9931023                        lensNotAllowed=1 
    9941024                endif 
     
    9991029                 
    10001030                // instrument specific wavelength requirements 
    1001                 if(cmpstr(selInstr,"NG3") == 0 && !(lam == 8.4 || lam == 17.2) ) 
     1031//              if(cmpstr(selInstr,"NG3") == 0 && !(lam == 8.4 || lam == 17.2) ) 
     1032                if(cmpstr(selInstr,"CGB") == 0 && !(lam == 8.4 || lam == 17.2) ) 
    10021033                        lensNotAllowed=1 
    10031034                endif 
     
    21812212         
    21822213        strswitch(selInstr)     // string switch 
     2214                case "CGB": 
    21832215                case "NG3": 
    21842216                case "NG7": 
     
    22222254 
    22232255        strswitch(selInstr)     // string switch 
     2256                case "CGB": 
    22242257                case "NG3": 
    22252258                case "NG7": 
Note: See TracChangeset for help on using the changeset viewer.