Ignore:
Timestamp:
May 25, 2017 1:29:50 PM (6 years ago)
Author:
srkline
Message:

Added the angle dependent transmission correction to the data correction in the raw_to_work step, in 2D

added a testing file that can generate fake event data, read, write, and decode it. Read is based on GBLoadWave. Hoepfully I'll not need to write an XOP. manipulation of the 64 bit words are done with simple bit shifts and logic.

also added are a number of error checking routines to improve behavior when wave, folders, etc. are missing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MainPanel.ipf

    r1040 r1041  
    7979End 
    8080 
     81Proc Patch_XY_MainButtonProc(ctrlName) : ButtonControl 
     82        String ctrlName 
     83 
     84        V_PatchDet_xyCenters_Panel() 
     85End 
     86 
     87Proc Patch_DeadTime_MainButtonProc(ctrlName) : ButtonControl 
     88        String ctrlName 
     89 
     90        V_PatchDetectorDeadtimePanel() 
     91End 
     92 
     93Proc Patch_Calib_MainButtonProc(ctrlName) : ButtonControl 
     94        String ctrlName 
     95 
     96        V_PatchDetectorCalibrationPanel() 
     97End 
     98 
     99 
    81100Proc TransMainButtonProc(ctrlName) : ButtonControl 
    82101        String ctrlName 
     
    114133 
    115134//      ShowNSORTPanel() 
     135         
     136End 
     137 
     138Proc Combine1D_MainButtonProc(ctrlName) : ButtonControl 
     139        String ctrlName 
     140 
     141//      ShowCombinePanel() 
    116142        V_CombineDataGraph() 
    117 End 
    118  
    119 Proc Combine1D_MainButtonProc(ctrlName) : ButtonControl 
    120         String ctrlName 
    121  
    122         ShowCombinePanel() 
    123143End 
    124144 
     
    360380        Button MainButton_0e,pos={15,210},size={130,20},proc=CatSort_MainButtonProc,title="Sort Catalog" 
    361381        Button MainButton_0e,help={"Sort the Data Catalog, courtesy of ANSTO"} 
    362         Button MainButton_0f,pos={170,90},size={90,20},proc=DataTree_MainButtonProc,title="Data Tree" 
     382        Button MainButton_0f,pos={300,90},size={90,20},proc=DataTree_MainButtonProc,title="Data Tree" 
    363383        Button MainButton_0f,help={"Show the header and data tree"} 
    364384        Button MainButton_0g,pos={170,180},size={110,20},proc=RTReduce_MainButtonProc,title="RT Reduction" 
    365385        Button MainButton_0g,help={"Reduce live (incomplete) data files during acquisition"} 
    366  
     386        Button MainButton_0h,pos={170,90},size={90,20},proc=Patch_XY_MainButtonProc,title="Patch XY" 
     387        Button MainButton_0h,help={"Patch will update incorrect information in raw data headers"} 
     388        Button MainButton_0i,pos={170,120},size={110,20},proc=Patch_DeadTime_MainButtonProc,title="Patch DeadTime" 
     389        Button MainButton_0i,help={"Patch will update incorrect information in raw data headers"} 
     390        Button MainButton_0j,pos={170,150},size={90,20},proc=Patch_Calib_MainButtonProc,title="Patch Calib" 
     391        Button MainButton_0j,help={"Patch will update incorrect information in raw data headers"} 
    367392 
    368393//on tab(1) - Reduction 
     
    383408        Button MainButton_2a,pos={15,90},size={60,20},proc=Plot1D_MainButtonProc,title="Plot" 
    384409        Button MainButton_2a,help={"Loads and plots a 1-D dataset in the format expected by \"FIT\""} 
    385         Button MainButton_2b,pos={15,120},size={60,20},proc=Sort1D_MainButtonProc,title="Sort" 
    386         Button MainButton_2b,help={"Sorts and combines 2 or 3 separate 1-D datasets into a single file. Use \"Plot\" button to import 1-D data files"} 
     410//      Button MainButton_2b,pos={15,120},size={60,20},proc=Sort1D_MainButtonProc,title="Sort" 
     411//      Button MainButton_2b,help={"Sorts and combines 2 or 3 separate 1-D datasets into a single file. Use \"Plot\" button to import 1-D data files"} 
    387412        Button MainButton_2c,pos={15,150},size={60,20},proc=Fit1D_MainButtonProc,title="FIT" 
    388413        Button MainButton_2c,help={"Shows panel for performing a variety of linearized fits to 1-D data files. Use \"Plot\" button to import 1-D data files"} 
     
    396421        Button MainButton_2f,help={"Shows panel for batch combination of 1D data files. Use after you're comfortable with NSORT"} 
    397422        Button MainButton_2a,disable=1 
    398         Button MainButton_2b,disable=1 
     423//      Button MainButton_2b,disable=1 
    399424        Button MainButton_2c,disable=1 
    400425//      Button MainButton_2d,disable=1 
     
    411436        Button MainButton_3c,pos={15,150},size={90,20},proc=ReadMask_MainButtonProc,title="Read Mask" 
    412437        Button MainButton_3c,help={"Reads a mask file into the proper work folder, and displays a small image of the mask. Yellow areas will be excluded from the data"} 
    413         Button MainButton_3d,pos={15,180},size={100,20},title="Tile RAW 2D",proc=ShowTilePanel_MainButtonProc 
    414         Button MainButton_3d,help={"Adds selected RAW data files to a layout."} 
     438//      Button MainButton_3d,pos={15,180},size={100,20},title="Tile RAW 2D",proc=ShowTilePanel_MainButtonProc 
     439//      Button MainButton_3d,help={"Adds selected RAW data files to a layout."} 
    415440        Button MainButton_3e,pos={150,90},size={100,20},title="Copy Work",proc=CopyWork_MainButtonProc 
    416441        Button MainButton_3e,help={"Copies WORK data from specified folder to destination folder."} 
    417         Button MainButton_3f,pos={150,120},size={110,20},title="WorkFile Math",proc=WorkMath_MainButtonProc 
    418         Button MainButton_3f,help={"Perfom simple math operations on workfile data"} 
     442//      Button MainButton_3f,pos={150,120},size={110,20},title="WorkFile Math",proc=WorkMath_MainButtonProc 
     443//      Button MainButton_3f,help={"Perfom simple math operations on workfile data"} 
    419444        Button MainButton_3g,pos={150,180},size={100,20},title="Event Data",proc=Event_MainButtonProc 
    420445        Button MainButton_3g,help={"Manipulate TISANE Timeslice data"} 
     
    423448        Button MainButton_3b,disable=1 
    424449        Button MainButton_3c,disable=1 
    425         Button MainButton_3d,disable=1 
     450//      Button MainButton_3d,disable=1 
    426451        Button MainButton_3e,disable=1 
    427         Button MainButton_3f,disable=1 
     452//      Button MainButton_3f,disable=1 
    428453        Button MainButton_3g,disable=1 
    429454 
     
    431456        Button MainButton_4a,pos={15,90},size={80,20},proc=Draw3D_MainButtonProc,title="3D Display" 
    432457        Button MainButton_4a,help={"Plots a 3-D surface of the selected file type"} 
    433         Button MainButton_4b,pos={15,120},size={120,20},proc=ShowSchematic_MainButtonProc,title="Show Schematic" 
    434         Button MainButton_4b,help={"Use this to show a schematic of the data reduction process for a selected sample file and reduction protocol"} 
    435         Button MainButton_4c,pos={15,150},size={80,20},proc=ShowAvePanel_MainButtonProc,title="Average" 
    436         Button MainButton_4c,help={"Shows a panel for interactive selection of the 1-D averaging step"} 
     458//      Button MainButton_4b,pos={15,120},size={120,20},proc=ShowSchematic_MainButtonProc,title="Show Schematic" 
     459//      Button MainButton_4b,help={"Use this to show a schematic of the data reduction process for a selected sample file and reduction protocol"} 
     460//      Button MainButton_4c,pos={15,150},size={80,20},proc=ShowAvePanel_MainButtonProc,title="Average" 
     461//      Button MainButton_4c,help={"Shows a panel for interactive selection of the 1-D averaging step"} 
    437462//      Button MainButton_4d,pos={15,180},size={110,20},proc=CatShort_MainButtonProc,title="CAT/Notebook" 
    438463//      Button MainButton_4d,help={"This will generate a CATalog notebook of all files in a specified local folder"} 
     
    441466        Button MainButton_4f,pos={180,120},size={130,20},proc=PRODIV_MainButtonProc,title="Make DIV file" 
    442467        Button MainButton_4f,help={"Merges two stored workfiles (CORrected) into a DIV file, and saves the result"} 
    443         Button MainButton_4g,pos={180,150},size={130,20},proc=Raw2ASCII_MainButtonProc,title="RAW ASCII Export" 
    444         Button MainButton_4g,help={"Exports selected RAW (2D) data file(s) as ASCII, either as pixel values or I(Qx,Qy)"} 
     468//      Button MainButton_4g,pos={180,150},size={130,20},proc=Raw2ASCII_MainButtonProc,title="RAW ASCII Export" 
     469//      Button MainButton_4g,help={"Exports selected RAW (2D) data file(s) as ASCII, either as pixel values or I(Qx,Qy)"} 
    445470        Button MainButton_4h,pos={180,180},size={130,20},proc=Preferences_MainButtonProc,title="Preferences" 
    446471        Button MainButton_4h,help={"Sets user preferences for selected parameters"} 
    447472         
    448473        Button MainButton_4a,disable=1 
    449         Button MainButton_4b,disable=1 
    450         Button MainButton_4c,disable=1 
     474//      Button MainButton_4b,disable=1 
     475//      Button MainButton_4c,disable=1 
    451476//      Button MainButton_4d,disable=1 
    452477//      Button MainButton_4e,disable=1 
    453478        Button MainButton_4f,disable=1 
    454         Button MainButton_4g,disable=1 
     479//      Button MainButton_4g,disable=1 
    455480        Button MainButton_4h,disable=1 
    456481//       
Note: See TracChangeset for help on using the changeset viewer.