Ignore:
Timestamp:
Apr 9, 2007 3:42:39 PM (15 years ago)
Author:
srkline
Message:

2nd pass of pulling out NCNR calls. Also cleared a lot of deadwood from the code, removing depricated functions that were mostly already commented out.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/SANSReduction/branches/kline_29MAR07/Put in User Procedures/SANS_Reduction_v5.00/FIT_Ops.ipf

    r70 r76  
    732732End 
    733733 
    734 //function returning a string (list) of semicolon separated filenames 
    735 //that are not version numbers, and not raw data files 
    736 //(can't really pare out other files any better - trying to just get ascii I vs. q) 
    737 //works in folder specified by catPathName, (abort if it doesn't exist) 
    738 // 
    739 //** not used anymore - simpler file filter is used instead 
    740 // 
    741 //Function/S GetValidFITRPAPopupList() 
    742 // 
    743 //      String list = "none;something;" 
    744 //       
    745 //      PathInfo catPathName 
    746 //      String path = S_path 
    747 //      if(V_flag == 0) 
    748 //              Abort "path does not exist - use Pick Path button" 
    749 //      Endif 
    750 //       
    751 //      list = IndexedFile(catPathName,-1,"????")               //get all files in folder 
    752 //       
    753 //      //trim version numbers from list 
    754 //      Variable num = ItemsInList(list,";") 
    755 //      Variable ii,isRAW 
    756 //      String item = "",listCopy = "", fullName = "",partialName = "" 
    757 //       
    758 //      ii=1 
    759 //      do 
    760 //              item = num2str(ii) 
    761 //              list = RemoveFromList(item,list,";") 
    762 //              ii+=1 
    763 //      while (ii<12) 
    764 //       
    765 //      //trim raw data files from list 
    766 //      listCopy = list                                 //scan through items in copy, change list 
    767 //      num = ItemsInList(listCopy,";")         //get the new number of items in the list 
    768 //      ii=0 
    769 //      do 
    770 //              //build valid fileName 
    771 //              item = StringFromList(ii,listCopy,";") 
    772 //              if (strlen(item) !=0 ) 
    773 //                      partialName  = FindValidFileName(item) 
    774 //                      if(strlen(partialName) !=0)             //non-null return from FindValidFileName() 
    775 //                              fullName = path + partialName 
    776 //                              //check if RAW, if so, remove from list 
    777 //                              isRAW = CheckIfRAWData(fullName) 
    778 //                              if(isRAW) 
    779 //                                      list = RemoveFromList(item,list,";") 
    780 //                              Endif 
    781 //                      Endif 
    782 //              Endif 
    783 //              ii+=1 
    784 //      While(ii<num) 
    785 //       
    786 //      return list 
    787 //End 
     734 
    788735 
    789736// window recreation macro to draw the fit/rpa panel 
     
    11071054        qrgh = x*sqrt(nh*ap2/6) 
    11081055        qrgd = x*sqrt(nd*ap2/6) 
    1109         iabs_rpa = kn/(1/(ch*dbf(qrgh)) + 1/(cd*dbf(qrgd)) - chiv) 
     1056        iabs_rpa = kn/(1/(ch*FIT_dbf(qrgh)) + 1/(cd*FIT_dbf(qrgd)) - chiv) 
    11101057        iabs = corr*iabs_rpa + inc 
    11111058         
     
    11331080        qrgh = x*sqrt(nh*ap2/6) 
    11341081        qrgd = x*sqrt(nd*ap2/6) 
    1135         iabs_rpa = kn/(1/(ch*dbf(qrgh)) + 1/(cd*dbf(qrgd)) - chiv) 
     1082        iabs_rpa = kn/(1/(ch*FIT_dbf(qrgh)) + 1/(cd*FIT_dbf(qrgd)) - chiv) 
    11361083        iabs = corr*iabs_rpa + inc 
    11371084         
     
    11591106//The following lines were commented out in the fortran function 
    11601107        //qrgd = x*sqrt(nd*ap2/6) 
    1161         //iabs_rpa = kn/(1/(ch*dbf(qrgh)) + 1/(cd*dbf(qrgd)) - chiv) 
    1162  
    1163         iabs_rpa = kn*dbf(qrgh) 
     1108        //iabs_rpa = kn/(1/(ch*FIT_dbf(qrgh)) + 1/(cd*FIT_dbf(qrgd)) - chiv) 
     1109 
     1110        iabs_rpa = kn*FIT_dbf(qrgh) 
    11641111        iabs = iabs_rpa + inc 
    11651112         
     
    11701117 
    11711118//Debye Function used for polymer standards 
    1172 Function dbf(rgq) 
     1119Function FIT_dbf(rgq) 
    11731120        Variable rgq 
    11741121        Variable x 
Note: See TracChangeset for help on using the changeset viewer.