Changeset 480


Ignore:
Timestamp:
Mar 6, 2009 5:11:44 PM (14 years ago)
Author:
srkline
Message:

minor bug fixes:
Schematic.ipf: fixed duplicate error, was incorrect folder path
Invariant.ipf: "Can't find dQv" error, now looks in proper data folder

Location:
sans/Dev/trunk
Files:
5 edited

Legend:

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

    r444 r480  
    323323End             //Make76GaussPoints() 
    324324 
    325 // !!!!! reduces the length of qt and zi by one !!!!! 
     325// !!!!! reduces the length of wt and zi by one !!!!! 
    326326// 
    327327Function Make_N_GaussPoints(wt,zi) 
     
    13151315        return(0) 
    13161316end 
    1317  
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

    r477 r480  
    277277        PopupMenu ywave,pos={10,60},size={231,20},proc=Inv_FilePopMenuProc,title="Data File" 
    278278        PopupMenu ywave,help={"Select the experimental intensity values"} 
    279         PopupMenu ywave,mode=1,popvalue="DDAB_EMATF_1p_25C.absb",value= #"root:Packages:NIST:invariant:gDataPopList" 
     279        PopupMenu ywave,mode=1,value= #"root:Packages:NIST:invariant:gDataPopList" 
    280280        Button loadButton,pos={10,90},size={130,20},proc=Inv_Load_Proc,title="Load and Plot File" 
    281281        Button loadButton,help={"After choosing a file, load it into memory and plot it with this button."} 
     
    653653 
    654654        NVAR isSlitSmeared=root:Packages:NIST:invariant:gIsSlitSmeared 
    655         SVAR fileStr=root:Packages:NIST:gLastFileName 
     655//      SVAR fileStr=root:Packages:NIST:gLastFileName 
    656656         
    657657        //reset the global to the checkbox state 
     
    659659         
    660660        if(checked)             //get the smearing info 
    661                 String cleanLastFileName = "root:"+CleanupName(fileStr,0) 
     661                ControlInfo/W=Invariant_Panel ywave 
     662                String folderStr=CleanupName(S_value,0) 
    662663                NVAR dQv=root:Packages:NIST:invariant:gDqv 
    663                 String tempName = cleanLastFileName+"sq" 
    664                 Wave/Z w=$tempName 
    665                 if(WaveExists(w) && w[0] < 0) 
    666                         dQv = - w[0] 
    667                         Print "Data is slit-smeared, dqv = ",w[0] 
     664                NVAR/Z loaded_dQv = $("root:"+folderStr+":USANS_dQv") 
     665                if(NVAR_Exists(loaded_dQv)) 
     666                        dQv = loaded_dQv 
     667                        Print "Data is slit-smeared, dqv = ",dQv 
    668668                else 
    669669                        DoAlert 0,"Can't find the slit height from the data. Enter the value manually if the data is truly slit-smeared, or uncheck the box." 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r477 r480  
    816816        while(1) 
    817817         
    818         // remove myGlobals, Packages from the folder list 
     818        // remove myGlobals, Packages, etc. from the folder list 
    819819        if(type==4) 
    820820                str = RemoveFromList("myGlobals", str , ";" ) 
    821821                str = RemoveFromList("Packages", str, ";") 
    822822                str = RemoveFromList("AutoFit", str, ";") 
     823                str = RemoveFromList("TISANE", str, ";") 
    823824        endif 
    824825         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Schematic.ipf

    r418 r480  
    346346                        if(cmpstr(choice,"MSK overlay")==0) 
    347347                                nameStr = type+"MSK_PNG" 
    348                                 Duplicate/O root:Packages:NIST:MSK:data root:MSK:overlay 
     348                                Duplicate/O root:Packages:NIST:MSK:data root:Packages:NIST:MSK:overlay 
    349349                                Redimension/D root:Packages:NIST:MSK:overlay 
    350350                                String tempStr = "root:Packages:NIST:MSK:overlay" 
Note: See TracChangeset for help on using the changeset viewer.