Changeset 589

Timestamp:

Nov 3, 2009 1:08:00 PM (13 years ago)

Author:

srkline

Message:

Updated the SingleModelTemplate? to be compatible with the new release

Location:

sans/Dev/trunk

Files:

• NCNR_SANS_Utilities/Single_Model_Template/MyModel_Instructn_2007.ifn (deleted)
• NCNR_SANS_Utilities/Single_Model_Template/MyModel_Instructn_2009.ifn (added)
• NCNR_SANS_Utilities/Single_Model_Template/My_Model_v40.ipf (modified) (4 diffs)
• NCNR_SANS_Utilities/Single_Model_Template/ReadMe_SingleModelTemplate.txt (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_SANS_Utilities/Single_Model_Template/My_Model_v40.ipf

@@ -30 +30 @@
 // v 2.1 -- Jul 2007 SRK
 //                              converted to use structures, AAO, like the rest of the package
+// v 2.2 -- Nov 2009 SRK
+//                              updated AddModelToStrings() for the new release
 //
 ////////////////////////////////////////////////////
@@ -48 +50 @@
         Edit parameters_MyModel, coef_MyModel
         
-        Variable/G root:g_MyModel
-        g_MyModel := MyModel(coef_MyModel, ywave_MyModel, xwave_MyModel)
+        Variable/G root:g_MyModel=0
+        root:g_MyModel := MyModel(coef_MyModel, ywave_MyModel, xwave_MyModel)
         Display ywave_MyModel vs xwave_MyModel
         ModifyGraph marker=29, msize=2, mode=4
@@ -57 +59 @@
         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)
         
-        AddModelToStrings("MyModel","coef_MyModel","MyModel")
+        AddModelToStrings("MyModel","coef_MyModel","parameters_MyModel","MyModel")
 //
 End
@@ -100 +102 @@
         
         SetDataFolder root:
-        AddModelToStrings("SmearedMyModel","smear_coef_MyModel","MyModel")
+        AddModelToStrings("SmearedMyModel","smear_coef_MyModel","smear_parameters_MyModel","MyModel")
 End
 

sans/Dev/trunk/NCNR_SANS_Utilities/Single_Model_Template/ReadMe_SingleModelTemplate.txt

@@ -8 +8 @@
 
 01 OCT 2007 SRK
+
+Updated to latest release
+
+03 NOV 2009 SRK

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

@@ -720 +720 @@
         xPixel = round(xCtr + dx/pixSize)
 
+        NVAR pixelsX = root:myGlobals:gNPixelsX
+        NVAR pixelsY = root:myGlobals:gNPixelsY
+        
         //if on detector, return xPix and yPix values, otherwise -1
-        if(yPixel > 127 || yPixel < 0)
+        if(yPixel > pixelsY || yPixel < 0)
                 yPixel = -1
         endif
-        if(xPixel > 127 || xPixel < 0)
+        if(xPixel > pixelsX || xPixel < 0)
                 xPixel = -1
         endif