Changeset 853


Ignore:
Timestamp:
Apr 25, 2012 2:03:35 PM (10 years ago)
Author:
srkline
Message:

Some minor bug fixes to the behavior of the polarization routines.

Removed some extra function names from the fit function list

Added some equations to the Polarization documentation to record what equations are actually used. Details of the error propagation have not been added.

Location:
sans/Dev/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r843 r853  
    11951195        list = RemoveFromList("MakeTriplet;SobolPoints2D;X_CylindersAtPoints;X_CylindersHexagonalGrid;X_CylindersSquareGrid;maxDistance_Threaded;KR_MultiCylinder;",list,";") 
    11961196        list = RemoveFromList("X_CoreShellCylinderHexGrid;FillPlaneHexagonal;FillPlaneSquareGrid;",list,";") 
    1197          
     1197 
     1198// from Polarization 
     1199        list = RemoveFromList("ParseDecayRow;ParseFlipperRow;",list,";") 
     1200 
    11981201         
    11991202        list = SortList(list) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_FlipperPanel.ipf

    r851 r853  
    291291         
    292292// Put the average values into the wave note and display on the panel 
     293                        SVAR gT0 = root:Packages:NIST:Polarization:Cells:gT0 
     294                         
    293295                        noteStr = note(w) 
    294296                        noteStr = ReplaceNumberByKey("P_sm_f", noteStr, PsmPf ,"=", ",", 0) 
     
    296298                        noteStr = ReplaceNumberByKey("err_P_sm_f", noteStr, err_PsmPf ,"=", ",", 0) 
    297299                        noteStr = ReplaceNumberByKey("err_P_sm", noteStr, err_Psm ,"=", ",", 0) 
     300                        noteStr = ReplaceStringByKey("T0", noteStr, gT0 ,"=", ",", 0) 
     301                         
    298302                         
    299303                        // replace the string 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf

    r851 r853  
    11#pragma rtGlobals=1             // Use modern global access method. 
    22 
    3  
    4 // **** search for TODO to find items still to be fixed in other procedures  ********** 
    53 
    64 
     
    2624// will probably be easiest written as expansions. 
    2725// 
    28  
    29  
    3026 
    3127 
     
    7672//              properly made, and then properly copied to the "_UU", and then properly copied back to the untagged waves 
    7773//              for use in the reduction? (now at this later date, I don't understand this question...) 
     74// 
     75// -- still not sure what is needed for absolute scaling 
     76// 
     77// -- what is the sample transmission, and exactly what +/- states are the proper measurements to use for thransmission? 
     78// 
     79// -- generate some sort of report of what was set up, and what was used in the calculation 
     80// 
    7881// 
    7982 
     
    13251328End 
    13261329 
    1327  
     1330// TODO 
     1331// -- clean up the wave note method to get the file loaded information passed around for display 
    13281332// a function to tag the data in a particular folder with the UD state 
    13291333Function TagLoadedData(type,pType) 
     
    13411345        Duplicate/O $(destPath + ":realsread"),$(destPath + ":realsread"+pType) 
    13421346         
     1347        SVAR FileList = $(destPath + ":FileList")               //stick the list of files as a wave note. Very inelegant... 
     1348        Note $(destPath + ":textread"+pType),FileList 
     1349         
     1350         
    13431351        return(0) 
    13441352End 
    13451353 
    1346  
     1354// TODO 
     1355// -- Be sure that fRawWindowHook is picking up all of the correct information - identifying what the  
     1356//    displayed data set really is... 
     1357// 
    13471358// a procedure (easier than a function) to point the current data to the tagged data 
    13481359Proc DisplayTaggedData(type,pType) 
     
    13631374        $(destPath + ":data") = $(destPath + ":linear_data"+pType) 
    13641375 
     1376 
     1377        root:myGlobals:gDataDisplayType = type + pType 
     1378         
    13651379        UpdateDisplayInformation(type) 
    1366 // using fRawWindowHook() gets the log/lin correct 
    1367 //      fRawWindowHook() 
    1368  
    1369  
     1380 
     1381        //update the displayed filename, using FileList in the current data folder 
     1382        String/G root:myGlobals:gCurDispFile = note($(destPath + ":textread"+pType))            //read from the wave note 
     1383         
    13701384End 
    13711385 
     
    13771391// polCor result has _UU_pc 
    13781392// 
     1393// error propagation through the inversion follows the paper... 
    13791394// 
    13801395Function PolCorButton(ba) : ButtonControl 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf

    r794 r853  
    19731973        String type 
    19741974 
    1975         String newTitle = "WORK_"+type 
    1976         DoWindow/F SANS_Data 
    1977         DoWindow/T SANS_Data, newTitle 
    1978         KillStrings/Z newTitle 
     1975//      String newTitle = "WORK_"+type 
     1976//      DoWindow/F SANS_Data 
     1977//      DoWindow/T SANS_Data, newTitle 
     1978//      KillStrings/Z newTitle 
    19791979         
    19801980        //need to update the display with "data" from the correct dataFolder 
Note: See TracChangeset for help on using the changeset viewer.