Changeset 551

Timestamp:

Sep 10, 2009 3:45:30 PM (13 years ago)

Author:

srkline

Message:

in SASCALC - changed some of the logic to allow 2D simulation

in MultiScatter_MC:

• changed results wave to report coherent multiple scattering counters correctly (also changed XOP)
• added save of 1D sim data

in U_CALC:

• adjusted display for optimal view on windows
• 7 angle ranges now (added defaults, propagated where all controls are modified)
• added the angle axis correctly now as a free axis, with a hook linked to the bottom axis
• removed XS and trans calculations, as integration of ran_dev isn't well

in USANS_EmptyWaves:

• double precision waves

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• SANS/MultScatter_MonteCarlo_2D.ipf (modified) (13 diffs)
• SANS/SASCALC.ipf (modified) (3 diffs)
• USANS/USANS_EmptyWaves.ipf (modified) (11 diffs)
• USANS/U_CALC.ipf (modified) (34 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

@@ -62 +62 @@
 //
 //
+
+// setting the flag to 1 == 2D simulation
+// any other value for flag == 1D simulation
+//
+// must remember to close/reopen the simulation control panel to get the correct panel
+//
+Function Set_2DMonteCarlo_Flag(value)
+        Variable value
+        
+        NVAR flag=root:Packages:NIST:SAS:gDoMonteCarlo
+        flag=value
+        return(0)
+end
 
 // threaded call to the main function, adds up the individual runs, and returns what is to be displayed
@@ -175 +188 @@
         results[3] = retWave[2] - linear_data[xc][yc]                           //# reaching detector minus Q(0)
         results[4] = retWave[3]/retWave[1]                              //avg# times scattered
-        results[5] = retWave[4]/retWave[1]                                              //single coherent fraction
-        results[6] = retWave[5]/retWave[1]                              //double coherent fraction
+        results[5] = retWave[4]/retWave[7]                                              //single coherent fraction
+        results[6] = retWave[5]/retWave[7]                              //multiple coherent fraction
         results[7] = retWave[6]/retWave[1]                              //multiple scatter fraction
         results[8] = (retWave[0]-retWave[1])/retWave[0]                 //transmitted fraction
@@ -239 +252 @@
         results[3] = retWave[2] - linear_data[xc][yc]                           //# reaching detector minus Q(0)
         results[4] = retWave[3]/retWave[1]                              //avg# times scattered
-        results[5] = retWave[4]/retWave[1]                                              //single coherent fraction
-        results[6] = retWave[5]/retWave[1]                              //double coherent fraction
+        results[5] = retWave[4]/retWave[7]                                              //single coherent fraction
+        results[6] = retWave[5]/retWave[7]                              //double coherent fraction
         results[7] = retWave[6]/retWave[1]                              //multiple scatter fraction
         results[8] = (retWave[0]-retWave[1])/retWave[0]                 //transmitted fraction
@@ -288 +301 @@
         Variable NSingleIncoherent,NSingleCoherent,NScatterEvents,incoherentEvent,coherentEvent
         Variable NDoubleCoherent,NMultipleScatter,countIt,detEfficiency
+        Variable NMultipleCoherent,NCoherentEvents
         
         detEfficiency = 1.0             //70% counting efficiency = 0.7
@@ -351 +365 @@
         NMultipleScatter = 0
         NScatterEvents = 0
+        NMultipleCoherent = 0
+        NCoherentEvents = 0
 
 //C     INITIALIZE ARRAYS.
@@ -415 +431 @@
 //                              IF(ran > (ratio1+ratio2) )              //C             NEUTRON SCATTERED coherently
                                 IF(ran > ratio)         //C             NEUTRON SCATTERED coherently
-                                        coherentEvent = 1
+                                        coherentEvent += 1
                                         FIND_THETA = 0                  //false
                                         DO
@@ -441 +457 @@
                   // phi and theta are random over the entire sphere of scattering
                   // !can't just choose random theta and phi, won't be random over sphere solid angle
-                        incoherentEvent = 1
+                        incoherentEvent += 1
                         
                         ran = abs(enoise(1))            //[0,1]
@@ -514 +530 @@
                                                 NMultipleScatter += 1
                                         endif
+                                        if(coherentEvent >= 1 && incoherentEvent == 0)
+                                                NCoherentEvents += 1
+                                        endif
+                                        if(coherentEvent > 1 && incoherentEvent == 0)
+                                                NMultipleCoherent += 1
+                                        endif
+                                        
+                                        
                                         //Print "n1,index (x,y) = ",n1,index, xpixel,ypixel
                                         
@@ -534 +558 @@
         results[1] = n2
         results[2] = isOn
-        results[3] = NScatterEvents             //sum of # of times that neutrons scattered
+        results[3] = NScatterEvents             //sum of # of times that neutrons scattered (coh+incoh)
         results[4] = NSingleCoherent            //# of events that are single, coherent
-        results[5] = NDoubleCoherent
-        results[6] = NMultipleScatter           //# of multiple scattering events
+        results[5] = NMultipleCoherent  //# of scattered neutrons that are coherently scattered more than once
+        results[6] = NMultipleScatter           //# of scattered neutrons that are scattered more than once (coh and/or incoh)
+        results[7] = NCoherentEvents            //# of scattered neutrons that are scattered coherently one or more times
         
 //      Print "# absorbed = ",n3
@@ -843 +868 @@
 //      RenameWindow #,T_results
 //      SetActiveSubwindow ##
-EndMacro
+//EndMacro
 
 // as a stand-alone panel, extra control bar  (right) and subwindow implementations don't work right 
 // for various reasons...
 Window MC_SASCALC() : Panel
+
+        // when opening the panel, set the raw counts check to 1
+        root:Packages:NIST:SAS:gRawCounts = 1
+        
         PauseUpdate; Silent 1           // building window...
         NewPanel /W=(92,556,713,818)/K=1 as "SANS Simulator"
@@ -866 +895 @@
         SetVariable setvar0_3,pos={105,484},size={50,20},disable=1
         GroupBox group0,pos={15,42},size={267,130},title="Monte Carlo"
-        SetVariable cntVar,pos={190,73},size={80,15},proc=CountTimeSetVarProc,title="time(s)"
+        SetVariable cntVar,pos={185,73},size={90,15},proc=CountTimeSetVarProc,title="time(s)"
         SetVariable cntVar,format="%d"
         SetVariable cntVar,limits={1,600,1},value= root:Packages:NIST:SAS:gCntTime
@@ -1264 +1293 @@
         Button MC_button0,pos={17,181},size={130,20},proc=Sim_1D_DoItButtonProc,title="Do 1D Simulation"
         Button MC_button0,fColor=(3,52428,1)
+        Button MC_button1,pos={17,211},size={150,20},proc=Save_1DSimData,title="Save Simulated Data"
         GroupBox group0,pos={15,42},size={280,130},title="Sample Setup"
         CheckBox check0_1,pos={216,179},size={60,14},title="Yes Offset",variable= root:Packages:NIST:SAS:gDoTraceOffset
@@ -1369 +1399 @@
         return 0
 End
+
+
+//
+//
+//
+Function Save_1DSimData(ctrlName) : ButtonControl
+        String ctrlName
+
+        String type="SAS",fullpath=""
+        Variable dialog=1               //=1 will present dialog for name
+        
+        String destStr=""
+        destStr = "root:Packages:NIST:"+type
+        
+        Variable refNum
+        String formatStr = "%15.4g %15.4g %15.4g %15.4g %15.4g %15.4g\r\n"
+        String fname,ave="C",hdrStr1="",hdrStr2=""
+        Variable step=1
+        
+        If(1)
+                //setup a "fake protocol" wave, sice I have no idea of the current state of the data
+                Make/O/T/N=8 root:myGlobals:Protocols:SIMProtocol
+                Wave/T SIMProtocol = $"root:myGlobals:Protocols:SIMProtocol"
+                String junk="****SIMULATED DATA****"
+                //stick in the fake protocol...
+                NVAR ctTime = root:Packages:NIST:SAS:gCntTime
+                NVAR totalCts = root:Packages:NIST:SAS:g_1DTotCts                       //summed counts (simulated)
+                NVAR detCR = root:Packages:NIST:SAS:g_1DEstDetCR                // estimated detector count rate
+                NVAR fractScat = root:Packages:NIST:SAS:g_1DFracScatt
+        
+                SIMProtocol[0] = junk
+                SIMProtocol[1] = "\tCounting time (s) = "+num2str(ctTime)
+                SIMProtocol[2] = "\tTotal detector counts = "+num2str(totalCts)
+                SIMProtocol[3] = "\tDetector countrate (1/s) = "+num2str(detCR)
+                SIMProtocol[4] = "\tFraction of beam scattered coherently = "+num2str(fractScat)
+                SIMProtocol[5] = junk
+                SIMProtocol[6] = ""
+                SIMProtocol[7] = ""
+                //set the global
+                String/G root:myGlobals:Protocols:gProtoStr = "SIMProtocol"
+        Endif
+        
+        
+        //*****these waves MUST EXIST, or IGOR Pro will crash, with a type 2 error****
+        WAVE intw=$(destStr + ":integersRead")
+        WAVE rw=$(destStr + ":realsRead")
+        WAVE/T textw=$(destStr + ":textRead")
+        WAVE qvals =$(destStr + ":qval")
+        WAVE inten=$(destStr + ":aveint")
+        WAVE sig=$(destStr + ":sigave")
+        WAVE qbar = $(destStr + ":QBar")
+        WAVE sigmaq = $(destStr + ":SigmaQ")
+        WAVE fsubs = $(destStr + ":fSubS")
+
+        SVAR gProtoStr = root:myGlobals:Protocols:gProtoStr
+        Wave/T proto=$("root:myGlobals:Protocols:"+gProtoStr)
+        
+        //check each wave
+        If(!(WaveExists(intw)))
+                Abort "intw DNExist Save_1DSimData()"
+        Endif
+        If(!(WaveExists(rw)))
+                Abort "rw DNExist Save_1DSimData()"
+        Endif
+        If(!(WaveExists(textw)))
+                Abort "textw DNExist Save_1DSimData()"
+        Endif
+        If(!(WaveExists(qvals)))
+                Abort "qvals DNExist Save_1DSimData()"
+        Endif
+        If(!(WaveExists(inten)))
+                Abort "inten DNExist Save_1DSimData()"
+        Endif
+        If(!(WaveExists(sig)))
+                Abort "sig DNExist Save_1DSimData()"
+        Endif
+        If(!(WaveExists(qbar)))
+                Abort "qbar DNExist Save_1DSimData()"
+        Endif
+        If(!(WaveExists(sigmaq)))
+                Abort "sigmaq DNExist Save_1DSimData()"
+        Endif
+        If(!(WaveExists(fsubs)))
+                Abort "fsubs DNExist Save_1DSimData()"
+        Endif
+        If(!(WaveExists(proto)))
+                Abort "current protocol wave DNExist Save_1DSimData()"
+        Endif
+
+        //strings can be too long to print-- must trim to 255 chars
+        Variable ii,num=8
+        Make/O/T/N=(num) tempShortProto
+        for(ii=0;ii<num;ii+=1)
+                tempShortProto[ii] = (proto[ii])[0,240]
+        endfor
+        
+        if(dialog)
+                PathInfo/S catPathName
+                fullPath = DoSaveFileDialog("Save data as")
+                If(cmpstr(fullPath,"")==0)
+                        //user cancel, don't write out a file
+                        Close/A
+                        Abort "no data file was written"
+                Endif
+                //Print "dialog fullpath = ",fullpath
+        Endif
+        
+        NVAR monCt = root:Packages:NIST:SAS:gImon
+        NVAR thick = root:Packages:NIST:SAS:gThick
+        NVAR trans = root:Packages:NIST:SAS:gSamTrans                   //for 1D, default value
+        
+
+        
+        hdrStr1 = num2str(monCt)+"  "+num2str(rw[26])+"       "+num2str(rw[19])+"     "+num2str(rw[18])
+        hdrStr1 += "     "+num2str(trans)+"     "+num2str(thick) + ave +"   "+num2str(step) + "\r\n"
+
+        hdrStr2 = num2str(rw[16])+"  "+num2str(rw[17])+"  "+num2str(rw[23])+"    "+num2str(rw[24])+"    "
+        hdrStr2 += num2str(rw[25])+"    "+num2str(rw[27])+"    "+num2str(rw[21])+"    "+"ORNL  " + "\r\n"
+        
+        //actually open the file here
+        Open refNum as fullpath
+        
+        //write out the standard header information
+        fprintf refnum,"FILE: %s\t\t CREATED: %s\r\n","SIMULATED DATA",(date() +"  "+ time())
+        fprintf refnum,"LABEL: %s\r\n","SIMULATED DATA"
+        fprintf refnum,"MON CNT   LAMBDA   DET ANG   DET DIST   TRANS   THICK   AVE   STEP\r\n"
+        fprintf refnum,hdrStr1
+        fprintf refnum,"BCENT(X,Y)   A1(mm)   A2(mm)   A1A2DIST(m)   DL/L   BSTOP(mm)   DET_TYP \r\n"
+        fprintf refnum,hdrStr2
+//      fprintf refnum,headerFormat,rw[0],rw[26],rw[19],rw[18],rw[4],rw[5],ave,step
+
+        //insert protocol information here
+        //-1 list of sample files
+        //0 - bkg
+        //1 - emp
+        //2 - div
+        //3 - mask
+        //4 - abs params c2-c5
+        //5 - average params
+        fprintf refnum, "SAM: %s\r\n",tempShortProto[0]
+        fprintf refnum, "BGD: %s\r\n",tempShortProto[1]
+        fprintf refnum, "EMP: %s\r\n",tempShortProto[2]
+        fprintf refnum, "DIV: %s\r\n",tempShortProto[3]
+        fprintf refnum, "MASK: %s\r\n",tempShortProto[4]
+        fprintf refnum, "ABS: %s\r\n",tempShortProto[5]
+        fprintf refnum, "Average Choices: %s\r\n",tempShortProto[6]
+        
+        //write out the data columns
+        fprintf refnum,"The 6 columns are | Q (1/A) | I(Q) (1/cm) | std. dev. I(Q) (1/cm) | sigmaQ | meanQ | ShadowFactor|\r\n"
+        wfprintf refnum, formatStr, qvals,inten,sig,sigmaq,qbar,fsubs
+        
+        Close refnum
+        
+        SetDataFolder root:             //(redundant)
+        
+        //write confirmation of write operation to history area
+        Print "Averaged File written: ", GetFileNameFromPathNoSemi(fullPath)
+        KillWaves/Z tempShortProto
+
+        //clear the stuff that was created for case of saving files
+        If(1)
+                Killwaves/Z root:myGlobals:Protocols:SIMProtocol
+                String/G root:myGlobals:Protocols:gProtoStr = ""
+        Endif
+        
+        
+        return(0)
+        
+End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf

@@ -125 +125 @@
         String/G root:Packages:NIST:SAS:gSavePrefix = "SIMUL"
         Make/O/D/N=10 root:Packages:NIST:SAS:results = 0
-        Make/O/T/N=10 root:Packages:NIST:SAS:results_desc = {"total X-section (1/cm)","SAS X-section (1/cm)","number that scatter","number that reach detector","avg # times scattered","fraction single coherent","fraction double coherent","fraction multiple scattered","fraction transmitted","detector counts w/o beamstop"}
+        Make/O/T/N=10 root:Packages:NIST:SAS:results_desc = {"total X-section (1/cm)","SAS X-section (1/cm)","number that scatter","number that reach detector","avg # times scattered","fraction single coherent","fraction multiple coherent","fraction multiple scattered","fraction transmitted","detector counts w/beamstop"}
 
         Variable/G root:Packages:NIST:SAS:g_1DTotCts = 0                        //summed counts (simulated)
@@ -148 +148 @@
         //for plotting
         Variable/G root:Packages:NIST:SAS:gFreezeCount=1                //start the count at 1 to keep Jeff happy
-        Variable/G root:Packages:NIST:SAS:gDoTraceOffset=1              // (1==Yes, offset 2^n), 0==turn off the offset
+        Variable/G root:Packages:NIST:SAS:gDoTraceOffset=0              // (1==Yes, offset 2^n), 0==turn off the offset
         
 End
@@ -719 +719 @@
                         endif
                 endif
+                NVAR doSim = root:Packages:NIST:SAS:doSimulation
+                doSim=1
         else
                 //get rid of the controls (just try both)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/USANS_EmptyWaves.ipf

@@ -9 +9 @@
         num=numpnts(w)
         
-        printf "Make/O/N=%d  %s\r\r",num,name
+        printf "Make/O/D/N=%d  %s\r\r",num,name
 
         for(ii=0;ii<num;ii+=1)
@@ -23 +23 @@
         
 //Write2Save(CR_EC_0p25Gd,"CR_0p25")
-  Make/O/N=44  CR_0p25
+  Make/O/D/N=44  CR_0p25
 
   CR_0p25[0] = 3873.7
@@ -72 +72 @@
 //
 ///Write2Save(Q_EC_0p25Gd,"Q_0p25")
-  Make/O/N=44  Q_0p25
+  Make/O/D/N=44  Q_0p25
 
   Q_0p25[0] = 5.52469e-06
@@ -120 +120 @@
 
 //¥Write2Save(CR_EC_0p50Gd,"CR_0p50")
-  Make/O/N=38  CR_0p50
+  Make/O/D/N=38  CR_0p50
 
   CR_0p50[0] = 15828.3
@@ -162 +162 @@
   
 //¥Write2Save(Q_EC_0p50Gd,"Q_0p50")
-  Make/O/N=38  Q_0p50
+  Make/O/D/N=38  Q_0p50
 
   Q_0p50[0] = 3.68132e-06
@@ -204 +204 @@
   
 //  ¥Write2Save(CR_EC_0p625Gd,"CR_0p625")
-  Make/O/N=111  CR_0p625
+  Make/O/D/N=111  CR_0p625
 
   CR_0p625[0] = 21097
@@ -319 +319 @@
   
 //¥Write2Save(Q_EC_0p625Gd,"Q_0p625")
-  Make/O/N=111  Q_0p625
+  Make/O/D/N=111  Q_0p625
 
   Q_0p625[0] = 4.51567e-06
@@ -435 +435 @@
 
 //¥Write2Save(CR_EB_1p75Cd,"CR_1p75")
-  Make/O/N=62  CR_1p75
+  Make/O/D/N=62  CR_1p75
 
   CR_1p75[0] = 56049.9
@@ -501 +501 @@
   
 //¥Write2Save(Q_EB_1p75Cd,"Q_1p75")
-  Make/O/N=62  Q_1p75
+  Make/O/D/N=62  Q_1p75
 
   Q_1p75[0] = 2.39312e-06
@@ -567 +567 @@
 
 //¥Write2Save(CR_EB_2p0Cd,"CR_2p0")
-  Make/O/N=98  CR_2p0
+  Make/O/D/N=98  CR_2p0
 
   CR_2p0[0] = 56491
@@ -669 +669 @@
   
 //¥Write2Save(Q_EB_2p0Cd,"Q_2p0")
-  Make/O/N=98  Q_2p0
+  Make/O/D/N=98  Q_2p0
 
   Q_2p0[0] = 1.4972e-06

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/U_CALC.ipf

@@ -15 +15 @@
 //
 // - more presets
-// - fast ways to increase/decrease number of points
-// - fast ways to increase/decrease counting time
-//
-// - plot as countrate, not absolute scale
-// - 3e-5 cutoff
-// - ? don't plot lowest angle range (but needs to be in the count time)
+
+//
+// X plot as countrate, not absolute scale
+// X 3e-5 cutoff
+// X ? don't plot lowest angle range (but needs to be in the count time)
 // - need empty beam and empty cell count rate vs. aperture (Cd vs. Gd?)
 //
@@ -28 +27 @@
 // or at least compare to what the empty cell would give in the same count time
 //
-// model the direct beam?? currently the "red" region from -1 to 0.6 is almost entirely
+// -? model the direct beam?? currently the "red" region from -1 to 0.6 is almost entirely
 // the primary beam, so it's a bit artificial (qmin is really ~ 3e-5)
 //
 
 //
-// Need T_wide, T_rock, I peak for proper absolute scaling
+// Need T_wide, T_rock, I peak for proper absolute scaling, but I don't know if it's really important
+// to be able to simlulate to this extent
 //
 
@@ -103 +103 @@
         Variable/G gCtTime6 = 2000
         Variable/G gIncr6 = 2   
+        
+        Variable/G gAngLow7 = 50
+        Variable/G gAngHigh7 = 95
+        Variable/G gNumPts7 = 10
+        Variable/G gCtTime7 = 0
+        Variable/G gIncr7 = 5   
         
         // results, setup values
@@ -287 +293 @@
         Variable pos=strsearch(platform,"WINDOWS",0)
         if(pos >= 0)            //windows
-                Display /W=(55,44,955,544) /K=1
+                Display /W=(55,44,855,450) /K=1
         else            //mac
                 Display /W=(55,44,1055,544) /K=1
@@ -297 +303 @@
         ControlBar/L 500
         
-        GroupBox group0,pos={5,1},size={493,159},title="Instrument Setup"
-        GroupBox group1,pos={5,165},size={240,147},title="Sample Setup"
-        GroupBox group2,pos={5,325},size={259,147},title="Results"
+        GroupBox group0,pos={5,1},size={493,177},title="Instrument Setup"
+        GroupBox group1,pos={5,183},size={240,147},title="Sample Setup"
+        GroupBox group2,pos={5,343},size={259,147},title="Results"
         
         PopupMenu popup0,pos={17,19},size={165,20},title="Sample Aperture Diam (in)"
@@ -316 +322 @@
         SetVariable setvar1d,pos={left+299,top},size={100,15},title="# points",value= gNumPts1
         SetVariable setvar1e,pos={left+399,top},size={93,15},title="count (s)",value= gCtTime1
-        SetVariable setvar1a,labelBack=(65535,32768,32768)
+//      SetVariable setvar1a,labelBack=(65535,32768,32768)              //old rainbow
+        SetVariable setvar1a,labelBack=(49858,65535,65535)
         
         pt += inc
@@ -324 +331 @@
         SetVariable setvar2d,pos={left+299,top+pt},size={100,15},title="# points",value= gNumPts2
         SetVariable setvar2e,pos={left+399,top+pt},size={93,15},title="count (s)",value= gCtTime2
-        SetVariable setvar2a labelBack=(65535,65533,32768)
+//      SetVariable setvar2a labelBack=(65535,65533,32768)              //old rainbow
+        SetVariable setvar2a labelBack=(21074,8995,21074)
         
         pt += inc
@@ -332 +340 @@
         SetVariable setvar3d,pos={left+299,top+pt},size={100,15},title="# points",value= gNumPts3
         SetVariable setvar3e,pos={left+399,top+pt},size={93,15},title="count (s)",value= gCtTime3
-        SetVariable setvar3a labelBack=(32769,65535,32768)
+//      SetVariable setvar3a labelBack=(32769,65535,32768)              //old rainbow
+        SetVariable setvar3a labelBack=(0,60652,60652)
         
         pt += inc
@@ -340 +349 @@
         SetVariable setvar4d,pos={left+299,top+pt},size={100,15},title="# points",value= gNumPts4
         SetVariable setvar4e,pos={left+399,top+pt},size={93,15},title="count (s)",value= gCtTime4
-        SetVariable setvar4a labelBack=(32768,65535,65535)
+//      SetVariable setvar4a labelBack=(32768,65535,65535)              //old rainbow
+        SetVariable setvar4a labelBack=(0,51400,0)
         
         pt += inc
@@ -348 +358 @@
         SetVariable setvar5d,pos={left+299,top+pt},size={100,15},title="# points",value= gNumPts5
         SetVariable setvar5e,pos={left+399,top+pt},size={93,15},title="count (s)",value= gCtTime5
-        SetVariable setvar5a labelBack=(32768,54615,65535)
+//      SetVariable setvar5a labelBack=(32768,54615,65535)              //old rainbow
+        SetVariable setvar5a labelBack=(59367,49344,0)
         
         pt += inc
@@ -356 +367 @@
         SetVariable setvar6d,pos={left+299,top+pt},size={100,15},title="# points",value= gNumPts6
         SetVariable setvar6e,pos={left+399,top+pt},size={93,15},title="count (s)",value= gCtTime6
-        SetVariable setvar6a labelBack=(44253,29492,58982)
+//      SetVariable setvar6a labelBack=(44253,29492,58982)              //old rainbow
+        SetVariable setvar6a labelBack=(54998,0,0)
+
+        pt += inc
+        SetVariable setvar7a,pos={left+17,top+pt},size={90,15},title="theta min",value= gAngLow7
+        SetVariable setvar7b,pos={left+113,top+pt},size={89,15},title="theta max",value= gAngHigh7
+        SetVariable setvar7c,pos={left+209,top+pt},size={89,15},title="increm",value= gIncr7
+        SetVariable setvar7d,pos={left+299,top+pt},size={100,15},title="# points",value= gNumPts7
+        SetVariable setvar7e,pos={left+399,top+pt},size={93,15},title="count (s)",value= gCtTime7
+//      SetVariable setvar7a labelBack=(44253,29492,58982)              //old rainbow
+        SetVariable setvar7a labelBack=(39321,21845,51657)
 
 // the action procedures and limits/increments
@@ -365 +386 @@
         SetVariable setvar5a proc=ThetaMinSetVarProc
         SetVariable setvar6a proc=ThetaMinSetVarProc
+        SetVariable setvar7a proc=ThetaMinSetVarProc
 
 //
@@ -373 +395 @@
         SetVariable setvar5b proc=ThetaMaxSetVarProc
         SetVariable setvar6b proc=ThetaMaxSetVarProc
+        SetVariable setvar7b proc=ThetaMaxSetVarProc
 //
         SetVariable setvar1c proc=IncrSetVarProc,limits={0.01,0.1,0.01}
@@ -380 +403 @@
         SetVariable setvar5c proc=IncrSetVarProc,limits={0.5,5,1}
         SetVariable setvar6c proc=IncrSetVarProc,limits={1,10,2}
+        SetVariable setvar7c proc=IncrSetVarProc,limits={1,20,2}
 //
         SetVariable setvar1d proc=NumPtsSetVarProc,limits={2,50,1}
@@ -387 +411 @@
         SetVariable setvar5d proc=NumPtsSetVarProc,limits={2,50,1}
         SetVariable setvar6d proc=NumPtsSetVarProc,limits={2,50,1}
+        SetVariable setvar7d proc=NumPtsSetVarProc,limits={2,50,1}
 //
         SetVariable setvar1e proc=CtTimeSetVarProc,limits={-1,50000,1}
@@ -394 +419 @@
         SetVariable setvar5e proc=CtTimeSetVarProc,limits={-1,50000,100}
         SetVariable setvar6e proc=CtTimeSetVarProc,limits={-1,50000,100}
-        
-        Button button0,pos={left+280,180},size={60,20},fColor=(65535,65535,0),proc=U_SimPlotButtonProc,title="Plot"
-        CheckBox check0_2,pos={left+280,230},size={60,14},title="CountRate?",variable= root:Packages:NIST:USANS:Globals:U_Sim:g_1D_PlotCR
-        CheckBox check0_3,pos={left+280,250},size={60,14},title="Noise?",variable= root:Packages:NIST:USANS:Globals:U_Sim:g_1D_AddNoise
-        CheckBox check0_4 title="Show EMP?",pos={left+280,270},proc=ShowEMPCheckProc,value=0
+        SetVariable setvar7e proc=CtTimeSetVarProc,limits={-1,50000,100}
+        
+        Button button0,pos={left+280,200},size={130,20},fColor=(65535,65535,0),proc=U_SimPlotButtonProc,title="Simulate USANS"
+        CheckBox check0_2,pos={left+280,250},size={60,14},title="CountRate?",variable= root:Packages:NIST:USANS:Globals:U_Sim:g_1D_PlotCR
+        CheckBox check0_3,pos={left+280,270},size={60,14},title="Noise?",variable= root:Packages:NIST:USANS:Globals:U_Sim:g_1D_AddNoise
+        CheckBox check0_4 title="Show EMP?",pos={left+280,290},proc=ShowEMPCheckProc,value=0
 
 
@@ -405 +431 @@
         ThetaEditMode(2)                //checked on startup
         
-//      instrument setup
-        SetVariable U_setvar0_1,pos={left+20,211},size={160,15},title="Thickness (cm)"
+//      sample setup
+        SetVariable U_setvar0_1,pos={left+20,231},size={160,15},title="Thickness (cm)"
         SetVariable U_setvar0_1,limits={0,inf,0.1},value= root:Packages:NIST:USANS:Globals:U_Sim:gThick 
-        SetVariable U_setvar0_3,pos={left+20,235},size={160,15},title="Sample Transmission"
+        SetVariable U_setvar0_3,pos={left+20,255},size={160,15},title="Sample Transmission"
         SetVariable U_setvar0_3,limits={0,1,0.01},value= root:Packages:NIST:USANS:Globals:U_Sim:gSamTrans
-        PopupMenu U_popup0,pos={left+20,185},size={165,20},proc=Sim_USANS_ModelPopMenuProc,title="Model"
+        PopupMenu U_popup0,pos={left+20,205},size={165,20},proc=Sim_USANS_ModelPopMenuProc,title="Model"
         PopupMenu U_popup0,mode=1,value= #"U_FunctionPopupList()"
-        SetVariable setvar0,pos={left+20,259},size={120,15},title="Empty Level",disable=2
+        SetVariable setvar0,pos={left+20,279},size={120,15},title="Empty Level",disable=2
         SetVariable setvar0,limits={0,10,0.01},value= root:Packages:NIST:USANS:Globals:U_Sim:g_EmptyLevel
-        SetVariable setvar0_1,pos={left+20,284},size={120,15},title="Bkg Level",disable=2
+        SetVariable setvar0_1,pos={left+20,304},size={120,15},title="Bkg Level",disable=2
         SetVariable setvar0_1,limits={0,10,0.01},value= root:Packages:NIST:USANS:Globals:U_Sim:g_BkgLevel
         
@@ -420 +446 @@
         
 // a box for the results
-        SetVariable totalTime,pos={left+20,350},size={150,15},title="Count time (h:m)",value= gTotTimeStr
-//      ValDisplay valdisp0,pos={338,210},size={220,13},title="Total detector counts"
-//      ValDisplay valdisp0,limits={0,0,0},barmisc={0,1000},value= root:Packages:NIST:USANS:Globals:U_Sim:g_1DTotCts
-        ValDisplay valdisp0_2,pos={left+20,380},size={220,13},title="Fraction of beam scattered"
+        SetVariable totalTime,pos={left+20,370},size={150,15},title="Count time (h:m)",value= gTotTimeStr
+        ValDisplay valdisp0_2,pos={left+20,395},size={220,13},title="Fraction of beam scattered"
         ValDisplay valdisp0_2,limits={0,0,0},barmisc={0,1000},value= root:Packages:NIST:USANS:Globals:U_Sim:g_1DFracScatt
-        ValDisplay valdisp0_3,pos={left+20,410},size={220,13},title="Estimated transmission"
+        ValDisplay valdisp0_2,disable=1
+        ValDisplay valdisp0_3,pos={left+20,420},size={220,13},title="Estimated transmission"
         ValDisplay valdisp0_3,limits={0,0,0},barmisc={0,1000},value=root:Packages:NIST:USANS:Globals:U_Sim:g_1DEstTrans
-        Button button1,pos={left+20,440},size={50,20},proc=U_SaveButtonProc,title="Save"
+        ValDisplay valdisp0_3,disable=1
+        Button button1,pos={left+20,440},size={150,20},proc=U_SaveButtonProc,title="Save Simulated Data"
 
         
@@ -550 +576 @@
 End
 
-// hard-wired for 6 controls
+// hard-wired for 7 controls
 // return value is in seconds
 // global display string is set with hrs:min
@@ -557 +583 @@
         Variable ii,num,totTime=0
         String pathStr="root:Packages:NIST:USANS:Globals:U_Sim:"
-        num=6
+        num=7
         
         for(ii=1;ii<=num;ii+=1)
@@ -585 +611 @@
 End
 
-// changes edit mode of the theta min/max boxes for simplified setup
+// changes edit mode of the theta min/max boxes and increment for simplified setup
 // val = 2 = disable
 // val = 0 = edit enabled
@@ -593 +619 @@
         SetVariable setvar1a,win=UCALC,disable=val
         SetVariable setvar1b,win=UCALC,disable=val
+        SetVariable setvar1c,win=UCALC,disable=val
         
         SetVariable setvar2a,win=UCALC,disable=val
         SetVariable setvar2b,win=UCALC,disable=val
+        SetVariable setvar2c,win=UCALC,disable=val
         
         SetVariable setvar3a,win=UCALC,disable=val
         SetVariable setvar3b,win=UCALC,disable=val
+        SetVariable setvar3c,win=UCALC,disable=val
         
         SetVariable setvar4a,win=UCALC,disable=val
         SetVariable setvar4b,win=UCALC,disable=val
+        SetVariable setvar4c,win=UCALC,disable=val
         
         SetVariable setvar5a,win=UCALC,disable=val
         SetVariable setvar5b,win=UCALC,disable=val
+        SetVariable setvar5c,win=UCALC,disable=val
         
         SetVariable setvar6a,win=UCALC,disable=val
         SetVariable setvar6b,win=UCALC,disable=val
-        
+        SetVariable setvar6c,win=UCALC,disable=val
+        
+        SetVariable setvar7a,win=UCALC,disable=val
+        SetVariable setvar7b,win=UCALC,disable=val
+        SetVariable setvar7c,win=UCALC,disable=val
         return(0)
 End
@@ -735 +770 @@
         SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
-        num = 6                 //# of angular ranges
+        num = 7                 //# of angular ranges
         
         // only try to plot ranges with non-zero count times
@@ -832 +867 @@
                 Imon = GetUSANSBeamIntensity()                          //based on the aperture size, select the beam intensity
                 Print "imon=",imon
+                
                 // calculate the scattering cross section simply to be able to estimate the transmission
-                
+                // unfortunately, this calculation is useless in the USANS range. So although it's calculated, the
+                // results are never reported.
+                // -- the main issue is that the integration range is optimized for SANS, and is not useful for USANS
+                // -there are only a few points in the USANS range, and extending it lower caused issues before.
                 CalculateRandomDeviate(funcUnsmeared,$coefStr,wavelength,"root:Packages:NIST:SAS:ran_dev",sig_sas)
                 
@@ -1069 +1108 @@
 // add SIM data to the graph if it exists and is not already on the graph
 //
+//
+// ** currently, I have changed the graph to not display the angle at the top. I have not yet
+// found a way to keep the scaling of the two axes in-sync when the empty cell data is added to the
+// graph (versus Q)
+//
 Function GraphSIM()
 
@@ -1090 +1134 @@
 
 // lines for the no-noise result vs angle
-                AppendToGraph/T Smeared_inten vs angle
+//              AppendToGraph/T Smeared_inten vs angle
+                AppendToGraph Smeared_inten vs Sim_USANS_q
                 ModifyGraph rgb(Smeared_inten)=(1,12815,52428)
                 ModifyGraph mode(Smeared_inten)=4,marker(Smeared_inten)=19,msize(Smeared_inten)=2
@@ -1098 +1143 @@
                 AppendToGraph Sim_USANS_i vs Sim_USANS_q
                 ModifyGraph mode(Sim_USANS_i)=3,marker(Sim_USANS_i)=19,msize(Sim_USANS_i)=4
-                ModifyGraph zColor(Sim_USANS_i)={setNumber,1,6,Rainbow,0}                       //force the colors from 1->6
+                //don't reverse the dbZ21 or the highest angle will have "invisible" light blue error bars
+                ModifyGraph zColor(Sim_USANS_i)={setNumber,1,7,dBZ21,0}                         //better for 7 colors
+//              ModifyGraph zColor(Sim_USANS_i)={setNumber,1,7,Rainbow,0}                       //force the colors from 1->7
                 ModifyGraph useMrkStrokeRGB(Sim_USANS_i)=1
                 ErrorBars/T=0 Sim_USANS_i Y,wave=(Sim_USANS_s,Sim_USANS_s)
@@ -1104 +1151 @@
                 ModifyGraph log=1
                 ModifyGraph mirror(left)=1
+                // if no top axis, then
+//              ModifyGraph mirror(bottom)=1
                 ModifyGraph grid=2
                 ModifyGraph standoff=0
                 
                 // to make sure that the scales are the same (but fails on zoom)
-//              SetAxis bottom 2e-06,0.003
-//              SetAxis top 2e-06/5.55e-5,0.003/5.55e-5
+                NewFreeAxis/O/T top_angle
+                ModifyFreeAxis/Z top_angle,master= bottom,hook= TransformAngleAxisHook
+                ModifyGraph lblPos(top_angle)=50,freePos(top_angle)=0
+                ModifyGraph log(top_angle)=1
                 
                 SetDrawEnv linefgc= (39321,1,1),dash= 3,linethick= 3
                 SetDrawEnv xcoord= bottom
                 DrawLine 3e-05,0.01,3e-05,0.99
-
-                Label top "Angle"
+                
+                Label top_angle "Angle"
                 Label bottom "Q (1/A)"
                 Label left "Counts or Count Rate"
@@ -1125 +1176 @@
 End
 
+Function TransformAngleAxisHook(s)
+        STRUCT WMAxisHookStruct &s
+
+        s.max= s.max/5.55e-5
+        s.min= s.min/5.55e-5
+        
+        return 0
+End
 
 //fakes a folder with loaded 1-d usans data, no calculation of the matrix
@@ -1283 +1342 @@
                         NVAR gIncr6 = gIncr6
                         
-                        
+                        NVAR gAngLow7 = gAngLow7
+                        NVAR gAngHigh7 = gAngHigh7
+                        NVAR gNumPts7 = gNumPts7
+                        NVAR gCtTime7 = gCtTime7
+                        NVAR gIncr7 = gIncr7
                         
                         strswitch(popStr)       // string switch
@@ -1324 +1387 @@
                                         gIncr6 = 2
                                         
+                                        gAngLow7 = 50
+                                        gAngHigh7 = 95
+                                        gNumPts7 = 10
+                                        gCtTime7 = 0
+                                        gIncr7 = 5
+                                        
                                         break                                           
                                 case "Medium Count":    
@@ -1362 +1431 @@
                                         gCtTime6 = 1200
                                         gIncr6 = 2      
-                                                                        
+                                        
+                                        gAngLow7 = 50
+                                        gAngHigh7 = 95
+                                        gNumPts7 = 10
+                                        gCtTime7 = 0
+                                        gIncr7 = 5
+                                                                
                                         break
                                 case "Long Count":      
@@ -1402 +1477 @@
                                         gIncr6 = 2
                                         
+                                        gAngLow7 = 50
+                                        gAngHigh7 = 95
+                                        gNumPts7 = 10
+                                        gCtTime7 = 3000
+                                        gIncr7 = 5
+                                        
                                         break
                                 default:                        
@@ -1453 +1534 @@
                         String baseName="SIMUL"
                         
-                        num = 6                 //# of angular ranges
+                        num = 7                 //# of angular ranges
                         
                         // only try to plot ranges with non-zero count times