Ignore:
Timestamp:
Mar 13, 2009 4:10:44 PM (14 years ago)
Author:
ajj
Message:

Sundry changes...

Location:
sans/Dev/trunk/NCNR_User_Procedures
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

    r449 r481  
    2424        Variable/G root:Packages:NIST:USANSUseTrap = 0 
    2525        Variable/G root:Packages:NIST:USANS_dQv = 0.117 
     26         
     27        //Ugly. Put this here to make sure things don't break 
     28        String/G root:Packages:NIST:gXMLLoader_Title 
    2629         
    2730        DoWindow/F WrapperPanel 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

    r477 r481  
    289289        Variable dsNum 
    290290 
    291         SVAR title = root:myGlobals:gXMLLoader_Title 
     291        SVAR title = root:Packages:NIST:gXMLLoader_Title 
    292292 
    293293 
     
    297297        //Check for value when there are multiple datasets 
    298298        FindValue/TEXT="Title"/TXOP=4/Z meta 
    299         title = meta[V_Value][1] 
    300  
     299        title = TrimWS(meta[V_Value][1]) 
     300        print meta[V_Value][1] 
     301        print title 
    301302         //Check for Run value 
    302303         FindValue/TEXT="Run_"+num2str(dsNum)/TXOP=4/Z meta 
    303304        if (V_Value >= 0) 
    304                 title = title+" "+meta[V_Value][1] 
     305                title = title+" "+TrimWS(meta[V_Value][1]) 
     306                print title 
    305307        else 
    306308                FindValue/TEXT="Run"/TXOP=4/Z meta 
    307                 title = title+" "+meta[V_Value][1]       
     309                title = title+" "+TrimWS(meta[V_Value][1])       
     310                print title 
    308311        endif 
    309312 
     
    354357        DrawText 11,72,"Current Sample Title:" 
    355358        GroupBox group0 pos={8,55},size={484,50} 
    356         TitleBox tb_CurrentTitle,pos={150,57}, variable=:myGlobals:gXMLLoader_Title,fSize=12,frame=0     
     359        TitleBox tb_CurrentTitle,pos={150,57}, variable=root:Packages:NIST:gXMLLoader_Title,fSize=12,frame=0     
    357360        SetVariable sv_NewTitle,pos={11,77},size={476,18},title="New Sample Title" 
    358         SetVariable sv_NewTitle,fSize=12,value=root:myGlobals:gXMLLoader_Title 
     361        SetVariable sv_NewTitle,fSize=12,value=root:Packages:NIST:gXMLLoader_Title 
    359362        Button btn_SetNewTitle title="Set New Title",pos={150,110},size={200,20} 
    360363        Button btn_SetNewTitle proc=SetNewTitleButtonProc 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/cansasXML_v11.ipf

    r403 r481  
    200200                title =  CS_1i_locateTitle(fileID, SASentryPath) 
    201201                Title_folder = CS_cleanFolderName(Title) 
     202                print Title_folder 
    202203                NewDataFolder/O/S  $Title_folder 
    203204 
     
    229230        STRING proposal 
    230231        STRING result 
    231         result = CleanupName(proposal, 0) 
     232        result = TrimWS(CleanupName(proposal, 0)) 
    232233        IF ( CheckName(result, 11) != 0 ) 
    233                 result = UniqueName(result, 11, 0) 
     234                result = TrimWS(UniqueName(result, 11, 0)) 
    234235        ENDIF 
    235236        RETURN result 
     
    574575        // /cs:SASroot/cs:SASentry/cs:Title is the expected location, but it could be empty 
    575576        TitlePath = SASentryPath + "/cs:Title" 
    576         Title = XMLstrFmXpath(fileID,  TitlePath, nsStr, "") 
     577        Title = TrimWS(XMLstrFmXpath(fileID,  TitlePath, nsStr, "")) 
    577578        // search harder for a title 
    578579        IF (strlen(Title) == 0) 
    579580                TitlePath = SASentryPath + "/@name" 
    580                 Title = XMLstrFmXpath(fileID,  TitlePath, nsStr, "") 
     581                Title = TrimWS(XMLstrFmXpath(fileID,  TitlePath, nsStr, "")) 
    581582        ENDIF 
    582583        IF (strlen(Title) == 0) 
    583584                TitlePath = SASentryPath + "/cs:SASsample/cs:ID" 
    584                 Title = XMLstrFmXpath(fileID,  TitlePath, nsStr, "") 
     585                Title = TrimWS(XMLstrFmXpath(fileID,  TitlePath, nsStr, "")) 
    585586        ENDIF 
    586587        IF (strlen(Title) == 0) 
    587588                TitlePath = SASentryPath + "/cs:SASsample/@name" 
    588                 Title = XMLstrFmXpath(fileID,  TitlePath, nsStr, "") 
     589                Title = TrimWS(XMLstrFmXpath(fileID,  TitlePath, nsStr, "")) 
    589590        ENDIF 
    590591        IF (strlen(Title) == 0) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Initialize.ipf

    r461 r481  
    116116         
    117117        //set XML globals 
    118         String/G root:myGlobals:gXMLLoader_Title = "" 
     118        String/G root:Packages:NIST:gXMLLoader_Title = "" 
    119119 
    120120         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/LakeDesmearing_JB.ipf

    r477 r481  
    521521         
    522522        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder         
     523        NVAR XMLO = $(USANSFolder+"gUseXMLOutput") 
    523524         
    524525        String termStr="\r\n" 
     
    590591        sprintf str1,"Chi^2 = %g   PowerLaw m = %4.2f   Iterations = %d",chiFinal,m,iter 
    591592        sprintf str2,"%d box smooth passes and %d smoothing spline passes",boxPass,splinePass 
     593         
     594        if (xmlo == 1) 
     595         
     596                 
     597         
     598        endif 
     599         
    592600         
    593601        //actually open the file 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

    r477 r481  
    6262        String USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder 
    6363        //NB This is also hardcoded a bit further down - search for "WHY WHY WHY" AJJ Sept 08 
     64         
     65        //Preference value to determine if we are outputting XML 
     66        Variable/G root:Packages:NIST:USANS:Globals:gUseXMLOutput = 0 
    6467         
    6568        Make/O/T/N=1 fileWave,samWave,empWave,curWave //Added curWave Sept 06 A. Jackson 
Note: See TracChangeset for help on using the changeset viewer.