Changeset 832 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization

Timestamp:

Jan 6, 2012 11:37:33 AM (11 years ago)

Author:

srkline

Message:

minor changes + typo in Model Docs.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization

Files:

• Pol_FlipperPanel.ipf (modified) (1 diff)
• Pol_PolarizationPanels.ipf (modified) (5 diffs)

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

@@ -386 +386 @@
                                         cr3 = TotalCR_FromRun(w[selRow][%DD_Trans],err_cr3,0)   
                                         cr4 = TotalCR_FromRun(w[selRow][%UD_Trans],err_cr4,0)
-                                        cr5 = TotalCR_FromRun(w[selRow][%Blocked],err_cr5,1)            //blocked beam is NOT normalized to zero attenuators
+//                                      cr5 = TotalCR_FromRun(w[selRow][%Blocked],err_cr5,1)            //blocked beam is NOT normalized to zero attenuators
+                                        cr5 = TotalCR_FromRun(w[selRow][%Blocked],err_cr5,0)            //blocked beam is NOT normalized to zero attenuators
         
                                         calc[selRow][%cr_UU] = cr1

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

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
+
+
+// TODO:
+// - on the decay panel. need to be able to manually enter a date that is to or an offset
+//              number of hours. currently it takes the first file as t=0, which is often not correct
+//
 
 
@@ -683 +689 @@
                                 // 1 for each file, return the count rate and err_CR (normalize to atten or not)
         
-                                Print "The Blocked CR is not rescaled to zero attenuators"
+                                Print "************The Blocked CR *is* rescaled to zero attenuators -- "
                                 cr1 = TotalCR_FromRun(w[selRow][%Trans_He_In],err_cr1,0)
                                 cr2 = TotalCR_FromRun(w[selRow][%Trans_He_Out],err_cr2,0)
-                                cr3 = TotalCR_FromRun(w[selRow][%Blocked],err_cr3,1)                    //blocked beam is NOT normalized to zero attenuators
+//                              cr3 = TotalCR_FromRun(w[selRow][%Blocked],err_cr3,1)                    //blocked beam is NOT normalized to zero attenuators
+                                cr3 = TotalCR_FromRun(w[selRow][%Blocked],err_cr3,0)                    //blocked beam is NOT normalized to zero attenuators
                                 
                                 calc[selRow][%CR_Trans_He_In] = cr1
@@ -1281 +1288 @@
 // - files are all at same SDD
 // - files are all with same attenuation (just print a warning to cmd)
+// - due to ICE FP values, I need to do a fuzzy comparison
+//
 //
 Function ParseDecayRow(w,selRow)
@@ -1286 +1295 @@
         Variable selRow
         
-        Variable err=0, atten1,atten2,atten3,sdd1,sdd2,sdd3
+        Variable err=0, atten1,atten2,atten3,sdd1,sdd2,sdd3,tol
         String fname=""
+        tol = 0.01              //SDDs within 1%
+        
         // are all file numbers valid?
         fname = FindFileFromRunNumber(w[selRow][%Trans_He_In])
@@ -1316 +1327 @@
         endif
         
-        if( (sdd1 != sdd2) || (sdd2 != sdd3) || (sdd1 != sdd3) )
+        
+        if( (abs(sdd1 - sdd2) > tol) || (abs(sdd2 - sdd3) > tol) || (abs(sdd1 - sdd3) > tol) )
                 DoAlert 0,"Files in row "+num2str(selRow)+" are not all at the same detector distance"
                 err = 1