Context Navigation

← Previous Change
Next Change →

ajj_23APR07

Timestamp:

Aug 28, 2007 4:30:34 PM (15 years ago)

Author:

srkline

Message:

(1) - cursors can now be used to select a subrange of USANS data to fit. This is done by th fit wrapper, assigning a subrange of resW to the struct

(2) all of the smeared model functions are now in the latest form of Smear_Model_N() that is NOT a pointwise calculation anymore, since the USANS matrix smearing in inherently not so.

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00

Files:

: 57 edited

BE_Polyelectrolyte.ipf (modified) (1 diff)
CoreShellCylinder.ipf (modified) (1 diff)
CoreShell_and_Struct.ipf (modified) (4 diffs)
CylinderForm.ipf (modified) (1 diff)
Cylinder_and_Struct.ipf (modified) (4 diffs)
DAB_model.ipf (modified) (1 diff)
HollowCylinders.ipf (modified) (1 diff)
Lorentz_model.ipf (modified) (1 diff)
NewModels_2006/Beaucage.ipf (modified) (4 diffs)
NewModels_2006/BimodalSchulzSpheres.ipf (modified) (1 diff)
NewModels_2006/BinaryHardSpheres.ipf (modified) (1 diff)
NewModels_2006/Cylinder_PolyLength.ipf (modified) (1 diff)
NewModels_2006/Cylinder_PolyRadius.ipf (modified) (1 diff)
NewModels_2006/Debye.ipf (modified) (1 diff)
NewModels_2006/EllipticalCylinder.ipf (modified) (1 diff)
NewModels_2006/FlexCyl_EllipCross.ipf (modified) (1 diff)
NewModels_2006/FlexCyl_PolyLen.ipf (modified) (1 diff)
NewModels_2006/FlexCyl_PolyRadius.ipf (modified) (1 diff)
NewModels_2006/FlexibleCylinder.ipf (modified) (1 diff)
NewModels_2006/Fractal.ipf (modified) (1 diff)
NewModels_2006/GaussSpheres.ipf (modified) (1 diff)
NewModels_2006/GaussSpheres_and_Struct.ipf (modified) (4 diffs)
NewModels_2006/LamellarFF.ipf (modified) (1 diff)
NewModels_2006/LamellarFF_HG.ipf (modified) (1 diff)
NewModels_2006/LamellarPS.ipf (modified) (1 diff)
NewModels_2006/LamellarPS_HG.ipf (modified) (1 diff)
NewModels_2006/LogNormSpheres_and_Struct.ipf (modified) (4 diffs)
NewModels_2006/LogNormalSphere.ipf (modified) (1 diff)
NewModels_2006/MultiShell.ipf (modified) (1 diff)
NewModels_2006/Parallelepiped.ipf (modified) (1 diff)
NewModels_2006/PolyCoreShellCylinder.ipf (modified) (1 diff)
NewModels_2006/SchulzSpheres_and_Struct.ipf (modified) (4 diffs)
NewModels_2006/TriaxialEllipsoid.ipf (modified) (1 diff)
NewModels_2006/Vesicle_UL.ipf (modified) (1 diff)
NewModels_2006/Vesicle_UL_and_Struct.ipf (modified) (4 diffs)
OblateCS_and_Struct.ipf (modified) (4 diffs)
OblateForm.ipf (modified) (1 diff)
Packages/SumModel/SumSANSModels.ipf (modified) (1 diff)
Packages/Wrapper.ipf (modified) (1 diff)
Peak_Gauss_model.ipf (modified) (1 diff)
Peak_Lorentz_model.ipf (modified) (1 diff)
PolyCSRatio_and_Struct.ipf (modified) (4 diffs)
PolyCore.ipf (modified) (1 diff)
PolyCoreShellRatio.ipf (modified) (1 diff)
PolyCore_and_Struct.ipf (modified) (4 diffs)
PolyHardSphereInten.ipf (modified) (1 diff)
PolyRectSphere_and_Struct.ipf (modified) (4 diffs)
Power_Law_model.ipf (modified) (1 diff)
ProlateCS_and_Struct.ipf (modified) (4 diffs)
ProlateForm.ipf (modified) (1 diff)
RectPolySpheres.ipf (modified) (1 diff)
SmearedRPA.ipf (modified) (1 diff)
Sphere_and_Struct.ipf (modified) (4 diffs)
StackedDiscs.ipf (modified) (1 diff)
Teubner.ipf (modified) (1 diff)
UnifEllipsoid_and_Struct.ipf (modified) (4 diffs)
UniformEllipsoid.ipf (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/BE_Polyelectrolyte.ipf

r131	r151
142	142
143	143	////the name of your unsmeared model is the first argument
144		~~s.yW = Smear_Model_20(BEPolyelectrolyte,s.coefW,s.x~~W,s.resW)
	144	Smear_Model_20(BEPolyelectrolyte,s.coefW,s.xW,s.yW,s.resW)
145	145
146	146	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CoreShellCylinder.ipf

r131	r151
227	227
228	228	////the name of your unsmeared model is the first argument
229		~~s.yW = Smear_Model_20(CoreShellCylinder,s.coefW,s.x~~W,s.resW)
	229	Smear_Model_20(CoreShellCylinder,s.coefW,s.xW,s.yW,s.resW)
230	230
231	231	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CoreShell_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(CoreShell_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(CoreShell_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(CoreShell_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(CoreShell_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(CoreShell_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(CoreShell_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(CoreShell_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(CoreShell_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CylinderForm.ipf

r131	r151
210	210
211	211	////the name of your unsmeared model is the first argument
212		~~s.yW = Smear_Model_20(CylinderForm,s.coefW,s.x~~W,s.resW)
	212	Smear_Model_20(CylinderForm,s.coefW,s.xW,s.yW,s.resW)
213	213
214	214	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Cylinder_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Cylinder_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Cylinder_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Cylinder_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Cylinder_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Cylinder_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Cylinder_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Cylinder_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Cylinder_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/DAB_model.ipf

r131	r151
107	107
108	108	////the name of your unsmeared model is the first argument
109		~~s.yW = Smear_Model_20(DAB_Model,s.coefW,s.x~~W,s.resW)
	109	Smear_Model_20(DAB_Model,s.coefW,s.xW,s.yW,s.resW)
110	110
111	111	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/HollowCylinders.ipf

r131	r151
212	212
213	213	////the name of your unsmeared model is the first argument
214		~~s.yW = Smear_Model_20(HollowCylinder,s.coefW,s.x~~W,s.resW)
	214	Smear_Model_20(HollowCylinder,s.coefW,s.xW,s.yW,s.resW)
215	215
216	216	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Lorentz_model.ipf

r131	r151
105	105
106	106	////the name of your unsmeared model is the first argument
107		~~s.yW = Smear_Model_20(Lorentz_model,s.coefW,s.x~~W,s.resW)
	107	Smear_Model_20(Lorentz_model,s.coefW,s.xW,s.yW,s.resW)
108	108
109	109	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Beaucage.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(OneLevel,s.coefW,s.xW,s.resW)
+        Smear_Model_20(OneLevel,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(TwoLevel,s.coefW,s.xW,s.resW)
+        Smear_Model_20(TwoLevel,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(ThreeLevel,s.coefW,s.xW,s.resW)
+        Smear_Model_20(ThreeLevel,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(FourLevel,s.coefW,s.xW,s.resW)
+        Smear_Model_20(FourLevel,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/BimodalSchulzSpheres.ipf

r131	r151
249	249
250	250	// the name of your unsmeared model (AAO) is the first argument
251		~~s.yW = Smear_Model_20(BimodalSchulzSpheres,s.coefW,s.x~~W,s.resW)
	251	Smear_Model_20(BimodalSchulzSpheres,s.coefW,s.xW,s.yW,s.resW)
252	252
253	253	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/BinaryHardSpheres.ipf

r131	r151
480	480
481	481	// the name of your unsmeared model (AAO) is the first argument
482		~~s.yW = Smear_Model_20(BinaryHS,s.coefW,s.x~~W,s.resW)
	482	Smear_Model_20(BinaryHS,s.coefW,s.xW,s.yW,s.resW)
483	483
484	484	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Cylinder_PolyLength.ipf

r131	r151
265	265
266	266	// the name of your unsmeared model (AAO) is the first argument
267		~~s.yW = Smear_Model_20(Cyl_PolyLength,s.coefW,s.x~~W,s.resW)
	267	Smear_Model_20(Cyl_PolyLength,s.coefW,s.xW,s.yW,s.resW)
268	268
269	269	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Cylinder_PolyRadius.ipf

r131	r151
267	267
268	268	// the name of your unsmeared model (AAO) is the first argument
269		~~s.yW = Smear_Model_20(Cyl_PolyRadius,s.coefW,s.x~~W,s.resW)
	269	Smear_Model_20(Cyl_PolyRadius,s.coefW,s.xW,s.yW,s.resW)
270	270
271	271	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Debye.ipf

r131	r151
133	133
134	134	// the name of your unsmeared model (AAO) is the first argument
135		~~s.yW = Smear_Model_20(Debye,s.coefW,s.x~~W,s.resW)
	135	Smear_Model_20(Debye,s.coefW,s.xW,s.yW,s.resW)
136	136
137	137	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/EllipticalCylinder.ipf

r131	r151
194	194
195	195	// the name of your unsmeared model (AAO) is the first argument
196		~~s.yW = Smear_Model_20(EllipCyl20,s.coefW,s.x~~W,s.resW)
	196	Smear_Model_20(EllipCyl20,s.coefW,s.xW,s.yW,s.resW)
197	197
198	198	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/FlexCyl_EllipCross.ipf

r131	r151
179	179
180	180	// the name of your unsmeared model (AAO) is the first argument
181		~~s.yW = Smear_Model_20(FlexCyl_Ellip,s.coefW,s.x~~W,s.resW)
	181	Smear_Model_20(FlexCyl_Ellip,s.coefW,s.xW,s.yW,s.resW)
182	182
183	183	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/FlexCyl_PolyLen.ipf

r131	r151
244	244
245	245	// the name of your unsmeared model (AAO) is the first argument
246		~~s.yW = Smear_Model_20(FlexCyl_PolyLen,s.coefW,s.x~~W,s.resW)
	246	Smear_Model_20(FlexCyl_PolyLen,s.coefW,s.xW,s.yW,s.resW)
247	247
248	248	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/FlexCyl_PolyRadius.ipf

r131	r151
262	262
263	263	// the name of your unsmeared model (AAO) is the first argument
264		~~s.yW = Smear_Model_20(FlexCyl_PolyRad,s.coefW,s.x~~W,s.resW)
	264	Smear_Model_20(FlexCyl_PolyRad,s.coefW,s.xW,s.yW,s.resW)
265	265
266	266	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/FlexibleCylinder.ipf

r131	r151
522	522
523	523	// the name of your unsmeared model (AAO) is the first argument
524		~~s.yW = Smear_Model_20(FlexExclVolCyl,s.coefW,s.x~~W,s.resW)
	524	Smear_Model_20(FlexExclVolCyl,s.coefW,s.xW,s.yW,s.resW)
525	525
526	526	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Fractal.ipf

r131	r151
171	171
172	172	// the name of your unsmeared model (AAO) is the first argument
173		~~s.yW = Smear_Model_20(Fractal,s.coefW,s.x~~W,s.resW)
	173	Smear_Model_20(Fractal,s.coefW,s.xW,s.yW,s.resW)
174	174
175	175	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/GaussSpheres.ipf

r131	r151
202	202
203	203	// the name of your unsmeared model (AAO) is the first argument
204		~~s.yW = Smear_Model_20(GaussPolySphere,s.coefW,s.x~~W,s.resW)
	204	Smear_Model_20(GaussPolySphere,s.coefW,s.xW,s.yW,s.resW)
205	205
206	206	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/GaussSpheres_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(GaussPolySphere_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(GaussPolySphere_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(GaussPolySphere_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(GaussPolySphere_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(GaussPolySphere_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(GaussPolySphere_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(GaussPolySphere_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(GaussPolySphere_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarFF.ipf

r131	r151
166	166
167	167	// the name of your unsmeared model (AAO) is the first argument
168		~~s.yW = Smear_Model_20(LamellarFF,s.coefW,s.x~~W,s.resW)
	168	Smear_Model_20(LamellarFF,s.coefW,s.xW,s.yW,s.resW)
169	169
170	170	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarFF_HG.ipf

r131	r151
174	174
175	175	// the name of your unsmeared model (AAO) is the first argument
176		~~s.yW = Smear_Model_20(LamellarFF_HG,s.coefW,s.x~~W,s.resW)
	176	Smear_Model_20(LamellarFF_HG,s.coefW,s.xW,s.yW,s.resW)
177	177
178	178	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarPS.ipf

r131	r151
242	242	//
243	243	//// the name of your unsmeared model (AAO) is the first argument
244		// ~~s.yW = Smear_Model_20(LamellarPS,s.coefW,s.x~~W,s.resW)
	244	// Smear_Model_20(LamellarPS,s.coefW,s.xW,s.yW,s.resW)
245	245	//
246	246	// return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarPS_HG.ipf

r131	r151
250	250	//
251	251	//// the name of your unsmeared model (AAO) is the first argument
252		// ~~s.yW = Smear_Model_20(LamellarPS_HG,s.coefW,s.x~~W,s.resW)
	252	// Smear_Model_20(LamellarPS_HG,s.coefW,s.xW,s.yW,s.resW)
253	253	//
254	254	// return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LogNormSpheres_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(LogNormalSphere_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(LogNormalSphere_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(LogNormalSphere_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(LogNormalSphere_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(LogNormalSphere_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(LogNormalSphere_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(LogNormalSphere_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(LogNormalSphere_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LogNormalSphere.ipf

r131	r151
210	210
211	211	// the name of your unsmeared model (AAO) is the first argument
212		~~s.yW = Smear_Model_20(LogNormalPolySphere,s.coefW,s.x~~W,s.resW)
	212	Smear_Model_20(LogNormalPolySphere,s.coefW,s.xW,s.yW,s.resW)
213	213
214	214	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/MultiShell.ipf

r131	r151
188	188
189	189	// the name of your unsmeared model (AAO) is the first argument
190		~~s.yW = Smear_Model_20(MultiShellForm,s.coefW,s.x~~W,s.resW)
	190	Smear_Model_20(MultiShellForm,s.coefW,s.xW,s.yW,s.resW)
191	191
192	192	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Parallelepiped.ipf

r131	r151
228	228
229	229	// the name of your unsmeared model (AAO) is the first argument
230		~~s.yW = Smear_Model_20(Parallelepiped,s.coefW,s.x~~W,s.resW)
	230	Smear_Model_20(Parallelepiped,s.coefW,s.xW,s.yW,s.resW)
231	231
232	232	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/PolyCoreShellCylinder.ipf

r131	r151
331	331
332	332	// the name of your unsmeared model (AAO) is the first argument
333		~~s.yW = Smear_Model_20(PolyCoShCylinder,s.coefW,s.x~~W,s.resW)
	333	Smear_Model_20(PolyCoShCylinder,s.coefW,s.xW,s.yW,s.resW)
334	334
335	335	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/SchulzSpheres_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(SchulzSpheres_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(SchulzSpheres_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(SchulzSpheres_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(SchulzSpheres_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(SchulzSpheres_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(SchulzSpheres_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(SchulzSpheres_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(SchulzSpheres_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/TriaxialEllipsoid.ipf

r131	r151
214	214
215	215	// the name of your unsmeared model (AAO) is the first argument
216		~~s.yW = Smear_Model_20(TriaxialEllipsoid,s.coefW,s.x~~W,s.resW)
	216	Smear_Model_20(TriaxialEllipsoid,s.coefW,s.xW,s.yW,s.resW)
217	217
218	218	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Vesicle_UL.ipf

r131	r151
181	181
182	182	// the name of your unsmeared model (AAO) is the first argument
183		~~s.yW = Smear_Model_20(VesicleForm,s.coefW,s.x~~W,s.resW)
	183	Smear_Model_20(VesicleForm,s.coefW,s.xW,s.yW,s.resW)
184	184
185	185	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Vesicle_UL_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(Vesicle_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Vesicle_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(Vesicle_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Vesicle_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(Vesicle_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Vesicle_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model (AAO) is the first argument
         s.yW = Smear_Model_20(Vesicle_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Vesicle_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/OblateCS_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Oblate_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Oblate_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Oblate_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Oblate_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Oblate_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Oblate_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Oblate_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Oblate_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/OblateForm.ipf

r131	r151
226	226
227	227	////the name of your unsmeared model is the first argument
228		~~s.yW = Smear_Model_20(OblateForm,s.coefW,s.x~~W,s.resW)
	228	Smear_Model_20(OblateForm,s.coefW,s.xW,s.yW,s.resW)
229	229
230	230	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/SumModel/SumSANSModels.ipf

r132	r151
311	311
312	312	// the name of your unsmeared model (AAO) is the first argument
313		~~s.yW = Smear_Model_20(Sum_Model,s.coefW,s.x~~W,s.resW)
	313	Smear_Model_20(Sum_Model,s.coefW,s.xW,s.yW,s.resW)
314	314
315	315	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf

-                      r147
+                      r151
         endif
+//      if(useCursors)
+//              Print "pcsr(A) = ",pcsr(A)
+//              Print "pcsr(B) = ",pcsr(B)
+//      endif
+        //if useCursors, and the data is USANS, need to feed a trimmed matrix to the fit
+        if(useCursors && (dimsize(resW,1) > 4) )
+                Variable pt1,pt2,newN
+                if(pcsr(A) > pcsr(B))
+                        pt1 = pcsr(B)
+                        pt2 = pcsr(A)
+                else
+                        pt1 = pcsr(A)
+                        pt2 = pcsr(B)
+                endif
+                newN = pt2 - pt1 + 1            // +1 includes both cursors in the fit
+                Make/O/D/N=(newN,newN) $(DF+"crsrResW")
+                WAVE crsrResW = $(DF+"crsrResW")
+                crsrResW = resW[p+pt1][q+pt1]
+                //assign to the struct
+                WAVE fs.resW =  crsrResW
+        endif
 ////

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Peak_Gauss_model.ipf

r131	r151
108	108
109	109	////the name of your unsmeared model is the first argument
110		~~s.yW = Smear_Model_20(Peak_Gauss_model,s.coefW,s.x~~W,s.resW)
	110	Smear_Model_20(Peak_Gauss_model,s.coefW,s.xW,s.yW,s.resW)
111	111
112	112	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Peak_Lorentz_model.ipf

r131	r151
107	107
108	108	////the name of your unsmeared model is the first argument
109		~~s.yW = Smear_Model_20(Peak_Lorentz_model,s.coefW,s.x~~W,s.resW)
	109	Smear_Model_20(Peak_Lorentz_model,s.coefW,s.xW,s.yW,s.resW)
110	110
111	111	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PolyCSRatio_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyCSRatio_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyCSRatio_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyCSRatio_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyCSRatio_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyCSRatio_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyCSRatio_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyCSRatio_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyCSRatio_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PolyCore.ipf

r131	r151
193	193
194	194	////the name of your unsmeared model is the first argument
195		~~s.yW = Smear_Model_20(PolyCoreForm,s.coefW,s.x~~W,s.resW)
	195	Smear_Model_20(PolyCoreForm,s.coefW,s.xW,s.yW,s.resW)
196	196
197	197	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PolyCoreShellRatio.ipf

r131	r151
257	257
258	258	////the name of your unsmeared model is the first argument
259		~~s.yW = Smear_Model_20(PolyCoreShellRatio,s.coefW,s.x~~W,s.resW)
	259	Smear_Model_20(PolyCoreShellRatio,s.coefW,s.xW,s.yW,s.resW)
260	260
261	261	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PolyCore_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyCore_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyCore_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyCore_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyCore_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyCore_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyCore_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyCore_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyCore_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PolyHardSphereInten.ipf

r131	r151
210	210
211	211	////the name of your unsmeared model is the first argument
212		~~s.yW = Smear_Model_20(PolyHardSphereIntensity,s.coefW,s.x~~W,s.resW)
	212	Smear_Model_20(PolyHardSphereIntensity,s.coefW,s.xW,s.yW,s.resW)
213	213
214	214	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PolyRectSphere_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyRectSphere_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyRectSphere_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyRectSphere_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyRectSphere_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyRectSphere_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyRectSphere_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(PolyRectSphere_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(PolyRectSphere_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Power_Law_model.ipf

r131	r151
107	107
108	108	////the name of your unsmeared model is the first argument
109		~~s.yW = Smear_Model_20(Power_Law_model,s.coefW,s.x~~W,s.resW)
	109	Smear_Model_20(Power_Law_model,s.coefW,s.xW,s.yW,s.resW)
110	110
111	111	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/ProlateCS_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Prolate_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Prolate_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Prolate_Sw,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Prolate_Sw,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Prolate_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Prolate_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Prolate_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Prolate_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/ProlateForm.ipf

r131	r151
231	231
232	232	////the name of your unsmeared model is the first argument
233		~~s.yW = Smear_Model_20(ProlateForm,s.coefW,s.x~~W,s.resW)
	233	Smear_Model_20(ProlateForm,s.coefW,s.xW,s.yW,s.resW)
234	234
235	235	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/RectPolySpheres.ipf

r131	r151
171	171
172	172	////the name of your unsmeared model is the first argument
173		~~s.yW = Smear_Model_20(PolyRectSpheres,s.coefW,s.x~~W,s.resW)
	173	Smear_Model_20(PolyRectSpheres,s.coefW,s.xW,s.yW,s.resW)
174	174
175	175	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/SmearedRPA.ipf

r131	r151
587	587
588	588	////the name of your unsmeared model is the first argument
589		~~s.yW = Smear_Model_20(RPAForm,s.coefW,s.x~~W,s.resW)
	589	Smear_Model_20(RPAForm,s.coefW,s.xW,s.yW,s.resW)
590	590
591	591	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Sphere_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Sphere_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Sphere_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Sphere_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Sphere_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Sphere_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Sphere_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Sphere_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Sphere_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/StackedDiscs.ipf

r137	r151
264	264
265	265	////the name of your unsmeared model is the first argument
266		~~s.yW = Smear_Model_76(StackedDiscs,s.coefW,s.x~~W,s.resW)
	266	Smear_Model_76(StackedDiscs,s.coefW,s.xW,s.yW,s.resW)
267	267
268	268	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Teubner.ipf

r131	r151
128	128
129	129	////the name of your unsmeared model is the first argument
130		~~s.yW = Smear_Model_20(TeubnerStreyModel,s.coefW,s.x~~W,s.resW)
	130	Smear_Model_20(TeubnerStreyModel,s.coefW,s.xW,s.yW,s.resW)
131	131
132	132	return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/UnifEllipsoid_and_Struct.ipf

-                      r131
+                      r151
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Ellipsoid_HS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Ellipsoid_HS,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Ellipsoid_SW,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Ellipsoid_SW,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Ellipsoid_SC,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Ellipsoid_SC,s.coefW,s.xW,s.yW,s.resW)
         return(0)
 …
 //      the name of your unsmeared model is the first argument
         s.yW = Smear_Model_20(Ellipsoid_SHS,s.coefW,s.xW,s.resW)
+        Smear_Model_20(Ellipsoid_SHS,s.coefW,s.xW,s.yW,s.resW)
         return(0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/UniformEllipsoid.ipf

r131	r151
200	200
201	201	//the name of your unsmeared model is the first argument
202		~~s.yW = Smear_Model_20(EllipsoidForm,s.coefW,s.x~~W,s.resW)
	202	Smear_Model_20(EllipsoidForm,s.coefW,s.xW,s.yW,s.resW)
203	203
204	204	return(0)

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 151 for sans/Analysis/branches/ajj_23APR07

Legend:

Download in other formats: