Changeset 779


Ignore:
Timestamp:
Jan 3, 2011 12:06:23 PM (12 years ago)
Author:
srkline
Message:

fixed a bug in ILL_DataReadWrite that always set the sample aperture diameter to 10 mm. It appears that the raw data files have zero as the aperture diameter, so if zero is found, 10 is returned. Otheriwse, if a value is found, it is returned.

Added a few tweaks to the Histogram Pair procedures on the Marquee.

deleted extra pragma statement from CircSectAve?.ipf

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CircSectAve.ipf

    r764 r779  
    2020 
    2121 
    22 // this fuction also does sector averaging  
     22// this function also does sector averaging  
    2323//the parameters in the global keyword-string must have already been set somewhere 
    2424//either directly, from the protocol, or from the Average_Panel 
    2525//** the keyword-list has already been "pre-parsed" to send only Circular or Sector 
    26 //averages to this routine. Rectangualr or annular averages get done elsewhere 
     26//averages to this routine. Rectangular or annular averages get done elsewhere 
    2727// TYPE parameter determines which data folder to work from 
    2828// 
     
    497497 
    498498 
    499 #pragma rtGlobals=1             // Use modern global access method. 
    500  
    501  
    502499// -- seems to work, now I need to give it a name, add it to the list, and  
    503500// make sure I've thought of all of the cases - then the average can be passed as case "Sector_PlusMinus" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_DataReadWrite.ipf

    r777 r779  
    12311231        // your code returning value 
    12321232//      value = getRealValueFromHeader_2(fname,60,28,5,15,3)  
    1233         value = getRealValueFromHeader(fname,72) 
    1234          
    1235         value = 10 
     1233        value = getRealValueFromHeader(fname,73) 
     1234         
     1235        if(value == 0)          //in case no aperture size was written to raw data file 
     1236                value = 10 
     1237        endif 
    12361238         
    12371239        return(value) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Marquee.ipf

    r778 r779  
    660660                 
    661661        // so use a pair of cursors instead (how do I easily get rid of them?) - a "done" button 
    662         Cursor/W=SANS_Data/K B 
    663         Cursor/W=SANS_Data/K C 
    664          
    665         Cursor/W=SANS_Data/F/I B data (xin-xwidth), (yin-yWidth) 
    666         Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) B 
    667 //      Cursor/W=SANS_Data/M/A=0 B 
    668          
    669         Cursor/W=SANS_Data/F/I C data (xin+xwidth), (yin+yWidth) 
    670         Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) C 
    671 //      Cursor/W=SANS_Data/M/A=0 C 
    672                          
     662        DoWindow SANS_Data 
     663        if(V_flag) 
     664                Cursor/W=SANS_Data/K B 
     665                Cursor/W=SANS_Data/K C 
     666         
     667                Cursor/W=SANS_Data/F/I B data (xin-xwidth), (yin-yWidth) 
     668                Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) B 
     669        //      Cursor/W=SANS_Data/M/A=0 B 
     670                 
     671                Cursor/W=SANS_Data/F/I C data (xin+xwidth), (yin+yWidth) 
     672                Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) C 
     673        //      Cursor/W=SANS_Data/M/A=0 C 
     674        endif    
    673675        return(0) 
    674676end 
     
    698700        Label left "Counts" 
    699701        Label bottom "Pixel (detector coordinates)" 
    700         SetAxis/A/N=2 left 
     702        SetAxis/A/N=0 left 
    701703        TextBox/C/N=text0/X=5.0/Y=5.0 "TOP" 
    702704        TextBox/C/N=text0_1/X=5.0/Y=67.0 "RIGHT" 
     
    767769                        // click code here 
    768770                        DoWindow/K HistoPair 
    769                         Cursor/W=SANS_Data/K A 
    770                         Cursor/W=SANS_Data/K B 
    771                         Cursor/W=SANS_Data/K C 
     771                         
     772                        DoWindow SANS_Data 
     773                        if(V_flag) 
     774                                Cursor/W=SANS_Data/K A 
     775                                Cursor/W=SANS_Data/K B 
     776                                Cursor/W=SANS_Data/K C 
     777                        endif 
    772778                        break 
    773779        endswitch 
Note: See TracChangeset for help on using the changeset viewer.