Ignore:
Timestamp:
Apr 22, 2010 11:02:46 AM (13 years ago)
Author:
srkline
Message:

fixed display bug in NSORT where normalizing to the 3rd (high Q) data file would not be displayed with the proper overlap. The data file was, however, written out correctly.

File:
1 edited

Legend:

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

    r693 r700  
    436436        Variable isOnPlot=0 
    437437         
    438         DoWindow/F NSORT_Graph 
    439         if(V_flag == 0) 
     438//      DoWindow/F NSORT_Graph 
     439        if(WinType("NSORT_Graph")==0) 
    440440                //no window, create one 
    441441                if(cmpstr(ctrlName,"Plot_1")==0) 
     
    494494Function DisplayHighSet() 
    495495        //function assumes that the window "NSORT_Graph" already exists 
    496         DoWindow/F NSORT_Graph 
     496//      DoWindow/F NSORT_Graph 
     497 
    497498        SetDataFolder root:HighQSet: 
    498         AppendToGraph $"HighQSet_i" vs $"HighQSet_q" 
    499         ModifyGraph log=1,mode=3,marker($"HighQSet_i")=8,msize=2,rgb($"HighQSet_i")=(0,0,65535),opaque($"HighQSet_i")=1 
    500         ErrorBars/T=0 $"HighQSet_i" Y,wave=($"HighQSet_s",$"HighQSet_s") 
    501         AppendToGraph $"TrimHighQSet_i" vs $"TrimHighQSet_q" 
    502         ModifyGraph mode($"TrimHighQSet_i")=3,marker($"TrimHighQSet_i")=19,msize=2,rgb($"TrimHighQSet_i")=(0,0,65535) 
     499        AppendToGraph/W=NSORT_Graph $"HighQSet_i" vs $"HighQSet_q" 
     500        ModifyGraph/W=NSORT_Graph log=1,mode=3,marker($"HighQSet_i")=8,msize=2,rgb($"HighQSet_i")=(0,0,65535),opaque($"HighQSet_i")=1 
     501        ErrorBars/W=NSORT_Graph/T=0 $"HighQSet_i" Y,wave=($"HighQSet_s",$"HighQSet_s") 
     502        AppendToGraph/W=NSORT_Graph $"TrimHighQSet_i" vs $"TrimHighQSet_q" 
     503        ModifyGraph/W=NSORT_Graph mode($"TrimHighQSet_i")=3,marker($"TrimHighQSet_i")=19,msize=2,rgb($"TrimHighQSet_i")=(0,0,65535) 
    503504        SetDataFolder root: 
    504505End 
     
    509510Function DisplayMedSet() 
    510511        //function assumes that the window "NSORT_Graph" already exists 
    511         DoWindow/F NSORT_Graph 
     512//      DoWindow/F NSORT_Graph 
     513         
    512514        SetDataFolder root:MedQSet: 
    513         AppendToGraph $"MedQSet_i" vs $"MedQSet_q" 
    514         ModifyGraph log=1,mode=3,marker($"MedQSet_i")=8,msize=2,rgb($"MedQSet_i")=(65535,0,0),opaque($"MedQSet_i")=1 
    515         ErrorBars/T=0 $"MedQSet_i" Y,wave=($"MedQSet_s",$"MedQSet_s") 
    516         AppendToGraph $"TrimMedQSet_i" vs $"TrimMedQSet_q" 
    517         ModifyGraph mode($"TrimMedQSet_i")=3,marker($"TrimMedQSet_i")=19,msize=2,rgb($"TrimMedQSet_i")=(65535,0,0) 
     515        AppendToGraph/W=NSORT_Graph $"MedQSet_i" vs $"MedQSet_q" 
     516        ModifyGraph/W=NSORT_Graph log=1,mode=3,marker($"MedQSet_i")=8,msize=2,rgb($"MedQSet_i")=(65535,0,0),opaque($"MedQSet_i")=1 
     517        ErrorBars/W=NSORT_Graph/T=0 $"MedQSet_i" Y,wave=($"MedQSet_s",$"MedQSet_s") 
     518        AppendToGraph/W=NSORT_Graph $"TrimMedQSet_i" vs $"TrimMedQSet_q" 
     519        ModifyGraph/W=NSORT_Graph mode($"TrimMedQSet_i")=3,marker($"TrimMedQSet_i")=19,msize=2,rgb($"TrimMedQSet_i")=(65535,0,0) 
    518520        SetDataFolder root: 
    519521End 
     
    524526Function DisplayLowSet() 
    525527        //function assumes that the window "NSORT_Graph" already exists 
    526         DoWindow/F NSORT_Graph 
     528//      DoWindow/F NSORT_Graph 
     529 
    527530        SetDataFolder root:LowQSet: 
    528         AppendToGraph $"LowQSet_i" vs $"LowQSet_q" 
    529         ModifyGraph log=1,mode=3,marker($"LowQSet_i")=8,msize=2,rgb($"LowQSet_i")=(2,39321,1),opaque($"LowQSet_i")=1 
    530         ErrorBars/T=0 $"LowQSet_i" Y,wave=($"LowQSet_s",$"LowQSet_s") 
    531         AppendToGraph $"TrimLowQSet_i" vs $"TrimLowQSet_q" 
    532         ModifyGraph mode($"TrimLowQSet_i")=3,marker($"TrimLowQSet_i")=19,msize=2,rgb($"TrimLowQSet_i")=(2,39321,1) 
     531        AppendToGraph/W=NSORT_Graph $"LowQSet_i" vs $"LowQSet_q" 
     532        ModifyGraph/W=NSORT_Graph log=1,mode=3,marker($"LowQSet_i")=8,msize=2,rgb($"LowQSet_i")=(2,39321,1),opaque($"LowQSet_i")=1 
     533        ErrorBars/W=NSORT_Graph/T=0 $"LowQSet_i" Y,wave=($"LowQSet_s",$"LowQSet_s") 
     534        AppendToGraph/W=NSORT_Graph $"TrimLowQSet_i" vs $"TrimLowQSet_q" 
     535        ModifyGraph/W=NSORT_Graph mode($"TrimLowQSet_i")=3,marker($"TrimLowQSet_i")=19,msize=2,rgb($"TrimLowQSet_i")=(2,39321,1) 
    533536        SetDataFolder root: 
    534537End 
     
    11281131                        i12 *= norm23 
    11291132                        sig12 *= norm23 
     1133                        // for the display, scale the trimmed sets 1 and 2 
     1134                        lowi *= norm23 
     1135                        lows *= norm23 
     1136                        medi *= norm23 
     1137                        meds *= norm23 
    11301138                Endif 
    11311139                 
     
    13651373                        i12 *= norm23 
    13661374                        sig12 *= norm23 
     1375                        // for the display, scale the trimmed sets 1 and 2 
     1376                        lowi *= norm23 
     1377                        lows *= norm23 
     1378                        medi *= norm23 
     1379                        meds *= norm23 
    13671380                Endif 
    13681381                 
Note: See TracChangeset for help on using the changeset viewer.