Changeset 853 for sans/Dev/trunk/NCNR_User_Procedures/Reduction

Timestamp:

Apr 25, 2012 2:03:35 PM (11 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/NCNR_User_Procedures/Reduction

Files:

• Polarization/Pol_FlipperPanel.ipf (modified) (2 diffs)
• Polarization/Pol_PolarizationCorrection.ipf (modified) (7 diffs)
• SANS/ProtocolAsPanel.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_FlipperPanel.ipf

@@ -291 +291 @@
         
 // Put the average values into the wave note and display on the panel
+                        SVAR gT0 = root:Packages:NIST:Polarization:Cells:gT0
+                        
                         noteStr = note(w)
                         noteStr = ReplaceNumberByKey("P_sm_f", noteStr, PsmPf ,"=", ",", 0)
@@ -296 +298 @@
                         noteStr = ReplaceNumberByKey("err_P_sm_f", noteStr, err_PsmPf ,"=", ",", 0)
                         noteStr = ReplaceNumberByKey("err_P_sm", noteStr, err_Psm ,"=", ",", 0)
+                        noteStr = ReplaceStringByKey("T0", noteStr, gT0 ,"=", ",", 0)
+                        
                         
                         // replace the string

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
 
-
-// **** search for TODO to find items still to be fixed in other procedures  **********
 
 
@@ -26 +24 @@
 // will probably be easiest written as expansions.
 //
-
-
 
 
@@ -76 +72 @@
 //              properly made, and then properly copied to the "_UU", and then properly copied back to the untagged waves
 //              for use in the reduction? (now at this later date, I don't understand this question...)
+//
+// -- still not sure what is needed for absolute scaling
+//
+// -- what is the sample transmission, and exactly what +/- states are the proper measurements to use for thransmission?
+//
+// -- generate some sort of report of what was set up, and what was used in the calculation
+//
 //
 
@@ -1325 +1328 @@
 End
 
-
+// TODO
+// -- clean up the wave note method to get the file loaded information passed around for display
 // a function to tag the data in a particular folder with the UD state
 Function TagLoadedData(type,pType)
@@ -1341 +1345 @@
         Duplicate/O $(destPath + ":realsread"),$(destPath + ":realsread"+pType)
         
+        SVAR FileList = $(destPath + ":FileList")               //stick the list of files as a wave note. Very inelegant...
+        Note $(destPath + ":textread"+pType),FileList
+        
+        
         return(0)
 End
 
-
+// TODO
+// -- Be sure that fRawWindowHook is picking up all of the correct information - identifying what the 
+//    displayed data set really is...
+//
 // a procedure (easier than a function) to point the current data to the tagged data
 Proc DisplayTaggedData(type,pType)
@@ -1363 +1374 @@
         $(destPath + ":data") = $(destPath + ":linear_data"+pType)
 
+
+        root:myGlobals:gDataDisplayType = type + pType
+        
         UpdateDisplayInformation(type)
-// using fRawWindowHook() gets the log/lin correct
-//      fRawWindowHook()
-
-
+
+        //update the displayed filename, using FileList in the current data folder
+        String/G root:myGlobals:gCurDispFile = note($(destPath + ":textread"+pType))            //read from the wave note
+        
 End
 
@@ -1377 +1391 @@
 // polCor result has _UU_pc
 //
+// error propagation through the inversion follows the paper...
 //
 Function PolCorButton(ba) : ButtonControl

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf

@@ -1973 +1973 @@
         String type
 
-        String newTitle = "WORK_"+type
-        DoWindow/F SANS_Data
-        DoWindow/T SANS_Data, newTitle
-        KillStrings/Z newTitle
+//      String newTitle = "WORK_"+type
+//      DoWindow/F SANS_Data
+//      DoWindow/T SANS_Data, newTitle
+//      KillStrings/Z newTitle
         
         //need to update the display with "data" from the correct dataFolder