Changeset 995 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_WorkFolderUtils.ipf

Timestamp:

Apr 29, 2016 5:04:20 PM (6 years ago)

Author:

srkline

Message:

more changes, bug fixes, detector dead time fix

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_WorkFolderUtils.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_WorkFolderUtils.ipf

@@ -472 +472 @@
                         Wave w = V_getDetectorDataW(fname,detStr)
                         Wave w_err = V_getDetectorDataErrW(fname,detStr)
-//                      Wave w_dt = V_getDetector_deadtime(fname,detStr)
+                        // any other dimensions to pass in?
 //                      SolidAngleCorrection(fill this in)
                         
@@ -485 +485 @@
         // -- loop over all of the detectors
         // -- B detector is a special case (do separately, then loop over NoB)
+        // -- this DOES alter the data
+        // -- verify the error propagation
+        //
+        Variable countRate
         NVAR gDoDeadTimeCor = root:Packages:NIST:VSANS:Globals:gDoDeadTimeCor
         if (gDoDeadTimeCor == 1)
@@ -497 +501 @@
                                 Variable b_dt = V_getDetector_deadtime_B(fname,detStr)
                                 // do the correction for the back panel
-                                
-                                //      itim = integersread[2]
-                                //      cntrate = sum(data,-inf,inf)/itim               //use sum of detector counts rather than scaler value
-                                //      //TODO - do correct dead time correction for tubes
-                                //      deadtime = 1//DetectorDeadtime(textread[3],textread[9],dateAndTimeStr=textRead[1],dtime=realsRead[48])  //pick the correct deadtime
-                                //      dscale = 1/(1-deadTime*cntrate)
-                                //      
-                                        
-                                // dead time correction
-                                //      data *= dscale          //deadtime correction for everyone else, including NCNR
-                                //      data_err *= dscale
-                                
-                                
+                                countRate = sum(w,-inf,inf)/ctTime              //use sum of detector counts
+
+                                w = w/(1-countRate*b_dt)
+                                w_err = w_err/(1-countRate*b_dt)
+                                                                
                         else
                                 // do the corrections for 8 tube panels
-
                                 Wave w_dt = V_getDetector_deadtime(fname,detStr)
-                                //                      DeadTimeCorrectionTubes(w,w_err,w_dt,ctTime)
-
-
+                                DeadTimeCorrectionTubes(w,w_err,w_dt,ctTime)
+                                
                         endif
                 endfor