Ignore:
Timestamp:
May 1, 2009 2:29:57 PM (14 years ago)
Author:
srkline
Message:

Two changes:
(1) Changed the behavior of DIV file creation. Now a panel is presented that asks for all of the information - run numbers, transmission, XY box, etc. and then does all of the reduction/replacing/saving with one click. Cedric's ticket #195

(2) Some fixes in USANS notebook generation - filtering out junk.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/LakeDesmearing_JB.ipf

    r481 r496  
    521521         
    522522        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder         
    523         NVAR XMLO = $(USANSFolder+"gUseXMLOutput") 
     523        NVAR XMLO = $(USANSFolder+":Globals:gUseXMLOutput") 
    524524         
    525525        String termStr="\r\n" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

    r481 r496  
    102102        //dummy waves for bkg and emp levels 
    103103        Make/O $(USANSFolder+":EMP:empLevel"),$(USANSFolder+":BKG:bkgLevel") 
    104         //WHY WHY WHY????? 
     104        //WHY WHY WHY????? - because dependencies can only involve globals. No locals allowed, since the dependency 
     105        // must remain in existence after the function is finished 
    105106        //Explicit dependency 
    106107        root:Packages:NIST:USANS:EMP:empLevel := root:Packages:NIST:USANS:Globals:MainPanel:gEmpCts //dependency to connect to SetVariable in panel 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/USANSCatNotebook.ipf

    r328 r496  
    7272        list = RemoveFromList(tmp, list  ,";") 
    7373        print tmp 
     74         
     75        // remove the ".DS_Store" 
     76        list = RemoveFromList(".DS_Store",list,";") 
     77         
     78        // remove .cor, .dsm reduced data files 
     79        tmp = ListMatch(list,"*.cor",";")                
     80        list = RemoveFromList(tmp, list  ,";") 
     81        tmp = ListMatch(list,"*.dsm",";")                
     82        list = RemoveFromList(tmp, list  ,";") 
     83        tmp = ListMatch(list,"*.pxp",";")                
     84        list = RemoveFromList(tmp, list  ,";") 
     85         
    7486         
    7587        //loop through all of the files in the list, reading header information  
     
    161173 
    162174End 
    163  
Note: See TracChangeset for help on using the changeset viewer.