Changeset 685 for sans/Dev/trunk/NCNR_User_Procedures

Timestamp:

Apr 12, 2010 12:37:52 PM (13 years ago)

Author:

srkline

Message:

new version of the install instructions

new version of the "installedVersion" - now set to 7.0, but this is open for debate.

adjusted button and control positioning on the 2D MC control panel.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• InstalledVersion.txt (modified) (2 diffs)
• Reduction/SANS/MultScatter_MonteCarlo_2D.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/InstalledVersion.txt

@@ -1 @@
-PACKAGE_VERSION=6.100;SANS_RED_VERSION=5.2;SANS_ANA_VERSION=4.1;USANS_RED_VERSION=2.3;
+PACKAGE_VERSION=7.0;SANS_RED_VERSION=5.20;SANS_ANA_VERSION=4.10;USANS_RED_VERSION=2.3;
 
 Only the first line of the file is read in.
@@ -6 +6 @@
 
 These are the current versions as of:
-19 MAR 2010 SRK
-
+15 APR 2010 SRK

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

@@ -939 +939 @@
         DoWindow/C MC_SASCALC
         
-        SetVariable MC_setvar0,pos={28,73},size={144,15},bodyWidth=80,title="# of neutrons"
+        SetVariable MC_setvar0,pos={26,73},size={144,15},title="# of neutrons"
         SetVariable MC_setvar0,format="%5.4g"
         SetVariable MC_setvar0,limits={0,inf,100},value= root:Packages:NIST:SAS:gImon
-        SetVariable MC_setvar0_1,pos={28,119},size={131,15},bodyWidth=60,title="Thickness (cm)"
+        SetVariable MC_setvar0_1,pos={26,119},size={140,15},title="Thickness (cm)"
         SetVariable MC_setvar0_1,limits={0,inf,0.1},value= root:Packages:NIST:SAS:gThick
-        SetVariable MC_setvar0_2,pos={28,96},size={149,15},bodyWidth=60,title="Incoherent XS (1/cm)"
+        SetVariable MC_setvar0_2,pos={26,96},size={165,15},title="Incoherent XS (1/cm)"
         SetVariable MC_setvar0_2,limits={0,inf,0.1},value= root:Packages:NIST:SAS:gSig_incoh
-        SetVariable MC_setvar0_3,pos={28,142},size={150,15},bodyWidth=60,title="Sample Radius (cm)"
+        SetVariable MC_setvar0_3,pos={26,142},size={155,15},title="Sample Radius (cm)"
         SetVariable MC_setvar0_3,limits={-inf,inf,0.1},value= root:Packages:NIST:SAS:gR2
         PopupMenu MC_popup0,pos={13,13},size={165,20},proc=MC_ModelPopMenuProc,title="Model Function"
@@ -953 +953 @@
         Button MC_button0,fColor=(3,52428,1)
         Button MC_button1,pos={17,208},size={80,20},proc=MC_Display2DButtonProc,title="Show 2D"
-        Button MC_button3,pos={182,94},size={25,20},proc=showIncohXSHelp,title="?"
+        Button MC_button3,pos={210,94},size={25,20},proc=showIncohXSHelp,title="?"
         SetVariable setvar0_3,pos={105,484},size={50,20},disable=1
         GroupBox group0,pos={15,42},size={267,130},title="Monte Carlo"