Changeset 1115 for sans

Timestamp:

Sep 13, 2018 2:03:34 PM (4 years ago)

Author:

srkline

Message:

attempting to put the zip file of the package in some accessible location since webster has been cut off.

Location:

sans/Dev

Files:

• tags/NCNR_SANS_Package_7.85.zip (added)
• trunk/NCNR_User_Procedures/Reduction/SANS/EventModeProcessing.ipf (modified) (1 diff)
• trunk/NCNR_User_Procedures/Reduction/SANS/Menu.ipf (modified) (1 diff)
• trunk/NCNR_User_Procedures/Reduction/VSANS/V_EventModeProcessing.ipf (modified) (3 diffs)
• trunk/NCNR_User_Procedures/Reduction/VSANS/V_WorkFolderUtils.ipf (modified) (1 diff)

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

@@ -4349 +4349 @@
         
 End
+
+
+
+Proc InsertTimeReset(period)
+        Variable period
+        
+        fInsertTimeReset(period)
+End
+
+
+//
+// for event data where a time reset signal was not sent, but the data is
+// actually periodic. This function will reset the time at the input period.
+// This assumes that you accurately know the period, and that the start time
+// of the data coincides with the start time of the period, otherwise the 
+// time reset will happen in the middle of the cycle.
+//
+// period = period of reset (s)
+//
+Function fInsertTimeReset(period)
+        Variable period
+        
+        SetDataFolder root:Packages:NIST:Event:
+        
+        Wave rescaledTime = rescaledTime
+        Wave timePt = timePt
+        Variable rollTime,rollTicks,ii,delta
+        
+        Variable period_ticks
+        
+        period_ticks = period*1e7               //period in ticks
+        
+
+        for(ii=0;ii<numpnts(rescaledTime)-1;ii+=1)
+                if(rescaledTime[ii] > period)
+                        MultiThread timePt[ii,] -= period_ticks
+                        MultiThread rescaledTime[ii,] -= period
+                endif
+        endfor
+
+// updates the longest time (as does every operation of adjusting the data)
+        NVAR t_longest = root:Packages:NIST:Event:gEvent_t_longest
+        t_longest = waveMax(rescaledTime)
+        SetDataFolder root:
+
+        return(0)
+End
+

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

@@ -55 +55 @@
                 "Add Current Slice",AccumulateSlices(1)
                 "Display Accumulated Slices",AccumulateSlices(2)        
+                "-"
+                "Insert Time Reset",InsertTimeReset()
         End
         "-"

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

@@ -1050 +1050 @@
         // load from raw?
         // if so, which carriage?
-        String loadFromRAW
+        String loadFromRAW="No"
         String detStr
         if(cmpstr(ctrlName,"button23")==0)
@@ -1180 +1180 @@
 
         if(mode == MODE_STREAM)         // continuous "Stream" mode - start from zero
-        v_tic()
-        printf "Duplicate wave = "
-                Duplicate/O timePt rescaledTime
-        v_toc()
-        v_tic()
-        printf "rescale time = "
-//              rescaledTime = 1*(timePt-timePt[0])             //convert to nanoseconds and start from zero
-                rescaledTime = timeStep_s*(timePt-timePt[0])            //convert to seconds and start from zero
-        v_toc()
-        v_tic()
-        printf "find wave Max = "
-                t_longest = waveMax(rescaledTime)               //should be the last point      
-        v_toc()
+                v_tic()
+                printf "Duplicate wave = "
+                        KillWaves/Z rescaledTime
+                        Duplicate/O timePt rescaledTime
+                v_toc()
+                v_tic()
+                printf "rescale time = "
+        //              rescaledTime = 1*(timePt-timePt[0])             //convert to nanoseconds and start from zero
+                        rescaledTime = timeStep_s*(timePt-timePt[0])            //convert to seconds and start from zero
+                v_toc()
+                v_tic()
+                printf "find wave Max = "
+                        t_longest = waveMax(rescaledTime)               //should be the last point      
+                v_toc()
         endif
 
         
         if(mode == MODE_OSCILL)         // oscillatory mode - don't adjust the times, we get periodic t0 to reset t=0
+                KillWaves/Z rescaledTime
                 Duplicate/O timePt rescaledTime
                 rescaledTime *= timeStep_s                      //convert to seconds and that's all
@@ -1209 +1211 @@
 // MODE_TOF
         if(mode == MODE_TOF)            // TOF mode - don't adjust the times, we get periodic t0 to reset t=0
+                KillWaves/Z rescaledTime
                 Duplicate/O timePt rescaledTime
                 rescaledTime *= timeStep_s              //convert to seconds and that's all

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

@@ -895 +895 @@
         
         saved_mon_tmp = V_getBeamMonNormSaved_count(tmpType)
-        scale_tmp = saved_mon_dest/defMon                       //un-scaling factor
+        scale_tmp = saved_mon_tmp/defMon                        //un-scaling factor
 
         new_scale = defMon / (saved_mon_dest+saved_mon_tmp)