Ignore:
Timestamp:
Feb 6, 2019 12:25:46 PM (4 years ago)
Author:
srkline
Message:

changes to the USANS procedures to accommodate the re-ordering of the data columns in the raw USANS data that is to be output from NICE, versus what was previously written out by ICP.

A global flag switches between the two reading modes. On startup, the preferences panel is automatically opened to the USANS tab so that the user can immediately set the flag correctly. Currently it defaults to "checked" to read the New data format.

File:
1 edited

Legend:

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

    r1121 r1122  
    13261326// can't do this, or it will simply bypass the missing parameter dialog! 
    13271327//      V_GetAvgInfo(av_typ,autoSave,autoName,binType,qCtr,qDelta,detGroup) 
    1328         av_typ = StringByKey("AVTYPE", gAvgInfoStr  ,"=",";") 
    1329         autoSave = StringByKey("SAVE", gAvgInfoStr  ,"=",";") 
    1330         autoName = StringByKey("NAME", gAvgInfoStr  ,"=",";") 
    1331         binType = StringByKey("BINTYPE", gAvgInfoStr  ,"=",";") 
    1332         qCtr = NumberByKey("QCENTER", gAvgInfoStr  ,"=",";") 
    1333         qDelta = NumberByKey("QDELTA", gAvgInfoStr  ,"=",";") 
    1334         detGroup = StringByKey("DETGROUP", gAvgInfoStr  ,"=",";") 
    1335         phi = NumberByKey("PHI", gAvgInfoStr  ,"=",";") 
    1336         dphi = NumberByKey("DPHI", gAvgInfoStr  ,"=",";") 
     1328                av_typ = StringByKey("AVTYPE", gAvgInfoStr  ,"=",";") 
     1329                autoSave = StringByKey("SAVE", gAvgInfoStr  ,"=",";") 
     1330                autoName = StringByKey("NAME", gAvgInfoStr  ,"=",";") 
     1331                binType = StringByKey("BINTYPE", gAvgInfoStr  ,"=",";") 
     1332                qCtr = NumberByKey("QCENTER", gAvgInfoStr  ,"=",";") 
     1333                qDelta = NumberByKey("QDELTA", gAvgInfoStr  ,"=",";") 
     1334                detGroup = StringByKey("DETGROUP", gAvgInfoStr  ,"=",";") 
     1335                phi = NumberByKey("PHI", gAvgInfoStr  ,"=",";") 
     1336                dphi = NumberByKey("DPHI", gAvgInfoStr  ,"=",";") 
    13371337 
    13381338//      Execute "V_GetAvgInfo_Full()" 
     
    13501350//      Prompt autoPlot,"Plot the averaged Data?",popup,"Yes;No" 
    13511351        Prompt side,"Include detector halves?",popup,"both;right;left" 
    1352         Prompt phi,"Orientation Angle (-90,90) degrees (Rectangular or Sector)" 
    1353         Prompt dphi, "Azimuthal range (0,45) degrees (Sector only)" 
     1352        Prompt phi,"Orientation Angle (0,359) degrees (Rectangular or Sector)" 
     1353        Prompt dphi, "Sector range (+/-) degrees (0,45) (Sector only)" 
    13541354//      Prompt width, "Width of Rectangular average (1,128)" 
    13551355        Prompt binType,"Binning Type?",popup,ksBinTypeStr 
Note: See TracChangeset for help on using the changeset viewer.