Ignore:
Timestamp:
Apr 30, 2019 12:17:29 PM (3 years ago)
Author:
srkline
Message:

added a batch patch routine to correct the sample aperture shape and size since it may be incorrectly written by NICE

defined the sector angles to match the SANS definition and updated the associated logic for the averaging and sector display

updated sorting of the file catalog to allow sorting by SDD_F and countRate_F. Also added a second sort key to keep the run numbers in order whenever sorting any other column.

File:
1 edited

Legend:

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

    r1144 r1148  
    733733        Button SortLambdaButton,                        pos={25,188},   size={140,24},proc=V_CatVSANSTable_SortProc,title="Lambda" 
    734734        Button SortCountTimButton,              pos={25,218},   size={140,24},proc=V_CatVSANSTable_SortProc,title="Count Time" 
    735         Button SortTotalCountsButton,           pos={25,248},   size={140,24},proc=V_CatVSANSTable_SortProc,title="Total Counts" 
    736         Button SortCountRateButton,             pos={25,278},   size={140,24},proc=V_CatVSANSTable_SortProc,title="Count Rate" 
     735        Button SortSDDFButton,          pos={25,248},   size={140,24},proc=V_CatVSANSTable_SortProc,title="SDD F" 
     736        Button SortCountRateFButton,            pos={25,278},   size={140,24},proc=V_CatVSANSTable_SortProc,title="Count Rate F" 
    737737        Button SortMonitorCountsButton, pos={25,308},   size={140,24},proc=V_CatVSANSTable_SortProc,title="Monitor Counts" 
    738738        Button SortTransmissionButton,  pos={25,338},   size={140,24},proc=V_CatVSANSTable_SortProc,title="Transmission" 
     
    854854                        break 
    855855                         
    856                 case "SortTotalCountsButton": 
     856                case "SortSDDFButton": 
    857857//                      Sort GTotCnts, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens, GRunNumber, GIsTrans, GRot, GTemp, GField, GMCR  
    858858//                      Sort GTotCnts,  GPurpose, GFilenames, GLabels, GDateTime,  GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness,   GNumAttens,   GRot, GTemp, GField, GMCR, GIntent, G_ID 
    859                         sortKey = "TotCnts" 
    860  
    861                         break 
    862                          
    863                 case "SortCountRateButton": 
     859                        sortKey = "SDD_F" 
     860 
     861                        break 
     862                         
     863                case "SortCountRateFButton": 
    864864//                      Sort GCntRate, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens, GRunNumber, GIsTrans, GRot, GTemp, GField, GMCR  
    865865//                      Sort GCntRate,  GPurpose, GFilenames, GLabels, GDateTime,  GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness,   GNumAttens,   GRot, GTemp, GField, GMCR, GIntent, G_ID 
    866                         sortKey = "CntRate" 
     866                        sortKey = "CntRate_F" 
    867867 
    868868                        break 
     
    890890         
    891891        //do the sort 
    892         sprintf cmd, "Sort %s, %s", sortKey,list 
     892//      sprintf cmd, "Sort %s, %s", sortKey,list 
     893// use braces and second key to keep anything with the same first "key" value in numerical run number order 
     894        sprintf cmd, "Sort {%s,Filenames} %s", sortKey,list 
    893895//      Print cmd                       // For debugging 
    894896         
Note: See TracChangeset for help on using the changeset viewer.