Context Navigation

← Previous Change
Next Change →

trunk

Timestamp:

Oct 14, 2009 2:30:17 PM (13 years ago)

Author:

srkline

Message:

Change (1):
In preparation for release, updated pragma IgorVersion?=6.1 in all procedures

Change (2):
As a side benefit of requiring 6.1, we can use the MultiThread? keyword to thread any model function we like. The speed benefit is only noticeable on functions that require at least one integration and at least 100 points (resolution smearing is NOT threaded, too many threadSafe issues, too little benefit). I have chosen to use the MultiThread? only on the XOP assignment. In the Igor code there are too many functions that are not explicitly declared threadsafe, making for a mess.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

: 176 edited

Analysis/Models/BE_Polyelectrolyte_v40.ipf (modified) (1 diff)
Analysis/Models/CoreShellCylinder_v40.ipf (modified) (1 diff)
Analysis/Models/CoreShell_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/CoreShell_v40.ipf (modified) (1 diff)
Analysis/Models/Cylinder_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/Cylinder_v40.ipf (modified) (2 diffs)
Analysis/Models/DAB_model_v40.ipf (modified) (1 diff)
Analysis/Models/EffectiveDiameter_v40.ipf (modified) (1 diff)
Analysis/Models/HPMSA_v40.ipf (modified) (1 diff)
Analysis/Models/HardSphereStruct_v40.ipf (modified) (1 diff)
Analysis/Models/HollowCylinders_v40.ipf (modified) (2 diffs)
Analysis/Models/Lorentz_model_v40.ipf (modified) (1 diff)
Analysis/Models/Models_2D/CoreShellCyl2D_v40.ipf (modified) (1 diff)
Analysis/Models/Models_2D/Cylinder_2D_v40.ipf (modified) (1 diff)
Analysis/Models/Models_2D/Ellipsoid2D_v40.ipf (modified) (1 diff)
Analysis/Models/Models_2D/EllipticalCylinder2D_v40.ipf (modified) (1 diff)
Analysis/Models/Models_2D/GizmoCylinder_v40.ipf (modified) (1 diff)
Analysis/Models/Models_2D/PeakGauss2D_v40.ipf (modified) (2 diffs)
Analysis/Models/Models_2D/Sphere_2D_v40.ipf (modified) (3 diffs)
Analysis/Models/NewModels_2006/Beaucage_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/BimodalSchulzSpheres_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/BinaryHardSpheres_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/Cylinder_PolyLength_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/Cylinder_PolyRadius_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/Debye_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/EllipticalCylinder_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/FlexCyl_EllipCross_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/FlexCyl_PolyLen_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/FlexCyl_PolyRadius_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/FlexibleCylinder_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/Fractal_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/GaussSpheres_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/GaussSpheres_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/LamellarFF_HG_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/LamellarFF_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/LamellarPS_HG_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/LamellarPS_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/LogNormalSphere_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/LogNormalSphere_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/MultiShell_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/Parallelepiped_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/PolyCoreShellCylinder_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/SchulzSpheres_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/SchulzSpheres_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/StickyHardSphereStruct_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/TriaxialEllipsoid_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2006/Vesicle_UL_and_Struct_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2006/Vesicle_UL_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/BCC_ParaCrystal_v40.ipf (modified) (3 diffs)
Analysis/Models/NewModels_2008/Barbell_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2008/BroadPeak_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/CappedCylinder_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2008/ConvexLens_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2008/Core_and_NShells_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/CorrelationLengthModel_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/Dumbbell_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2008/FCC_ParaCrystal_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2008/Fractal_PolySphere_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/GaussLorentzGel_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/LamellarParacrystal_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/PolyCore_and_NShells_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/PolyGaussCoil_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/PolyGaussShell_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/SC_ParaCrystal_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2008/Spherocylinder_v40.ipf (modified) (2 diffs)
Analysis/Models/NewModels_2008/TwoLorentzian_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2008/Two_Power_Law_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2009/CSParallelepiped_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2009/Fractal_PolyCore_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2009/FuzzySpheres_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2009/FuzzySpheres_v40.ipf (modified) (1 diff)
Analysis/Models/NewModels_2009/PolyCoreBicelle_v40.ipf (modified) (1 diff)
Analysis/Models/OblateCoreShell_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/OblateCoreShell_v40.ipf (modified) (2 diffs)
Analysis/Models/Peak_Gauss_model_v40.ipf (modified) (1 diff)
Analysis/Models/Peak_Lorentz_model_v40.ipf (modified) (1 diff)
Analysis/Models/PolyCoreShellRatio_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/PolyCoreShellRatio_v40.ipf (modified) (1 diff)
Analysis/Models/PolyCore_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/PolyCore_v40.ipf (modified) (1 diff)
Analysis/Models/PolyHardSphereInten_v40.ipf (modified) (1 diff)
Analysis/Models/PolyRectSphere_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/PolyRectSphere_v40.ipf (modified) (1 diff)
Analysis/Models/Power_Law_model_v40.ipf (modified) (1 diff)
Analysis/Models/ProlateCoreShell_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/ProlateCoreShell_v40.ipf (modified) (2 diffs)
Analysis/Models/SmearedRPA_v40.ipf (modified) (1 diff)
Analysis/Models/Sphere_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/Sphere_v40.ipf (modified) (3 diffs)
Analysis/Models/SquareWellStruct_v40.ipf (modified) (1 diff)
Analysis/Models/StackedDiscs_v40.ipf (modified) (1 diff)
Analysis/Models/TestProcs_v40.ipf (modified) (1 diff)
Analysis/Models/Teubner_v40.ipf (modified) (1 diff)
Analysis/Models/UniformEllipsoid_Sq_v40.ipf (modified) (1 diff)
Analysis/Models/UniformEllipsoid_v40.ipf (modified) (2 diffs)
Analysis/Packages/GeneticOptimization/NCNR_GenFitUtils.ipf (modified) (1 diff)
Analysis/Packages/GlobalFit/GlobalFit2_NCNR_v40.ipf (modified) (1 diff)
Analysis/Packages/GlobalFit/SimpleGlobalFit_NCNR_v40.ipf (modified) (1 diff)
Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf (modified) (1 diff)
Analysis/Packages/SumModel/SumSANSModels_v40.ipf (modified) (1 diff)
Analysis/Packages/Wrapper_v40.ipf (modified) (1 diff)
Analysis/SA_includes_v400.ipf (modified) (1 diff)
Analysis/WriteModelData_v40.ipf (modified) (1 diff)
Common/GaussUtils_v40.ipf (modified) (1 diff)
Common/Installer/CheckVersionFTP.ipf (modified) (1 diff)
Common/Installer/NCNR_Install.ipf (modified) (1 diff)
Common/NCNR_Package_Loader.ipf (modified) (1 diff)
Common/NIST_XML_v40.ipf (modified) (1 diff)
Common/Packages/Invariant/Invariant_v40.ipf (modified) (1 diff)
Common/Packages/LinearizedFits/LinearizedFits_v40.ipf (modified) (1 diff)
Common/Packages/PlotManager/PlotManager_v40.ipf (modified) (1 diff)
Common/Packages/PlotManager/PlotUtils2D_v40.ipf (modified) (1 diff)
Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (1 diff)
Common/Packages/PlotManager/USANS_SlitSmearing_v40.ipf (modified) (1 diff)
Common/Smear_2D.ipf (modified) (1 diff)
Common/cansasXML_v11.ipf (modified) (1 diff)
Reduction/SANS/AvgGraphics.ipf (modified) (1 diff)
Reduction/SANS/Buttons.ipf (modified) (1 diff)
Reduction/SANS/CatVSTable.ipf (modified) (1 diff)
Reduction/SANS/CircSectAve.ipf (modified) (1 diff)
Reduction/SANS/Correct.ipf (modified) (1 diff)
Reduction/SANS/DisplayUtils.ipf (modified) (1 diff)
Reduction/SANS/FACILITY_DataReadWrite.ipf (modified) (1 diff)
Reduction/SANS/FACILITY_Utils.ipf (modified) (1 diff)
Reduction/SANS/FIT_Ops.ipf (modified) (1 diff)
Reduction/SANS/HFIR_DataReadWrite.ipf (modified) (1 diff)
Reduction/SANS/HFIR_Includes_v520.ipf (modified) (1 diff)
Reduction/SANS/HFIR_Utils.ipf (modified) (1 diff)
Reduction/SANS/ILL_DataReadWrite.ipf (modified) (1 diff)
Reduction/SANS/ILL_Utils.ipf (modified) (1 diff)
Reduction/SANS/Includes.ipf (modified) (1 diff)
Reduction/SANS/Includes_Facility.ipf (modified) (1 diff)
Reduction/SANS/Includes_ILL.ipf (modified) (1 diff)
Reduction/SANS/Includes_v510.ipf (modified) (1 diff)
Reduction/SANS/Includes_v520.ipf (modified) (1 diff)
Reduction/SANS/Includes_v520_ILL.ipf (modified) (1 diff)
Reduction/SANS/Initialize.ipf (modified) (1 diff)
Reduction/SANS/InitializeILL.ipf (modified) (1 diff)
Reduction/SANS/MainPanel.ipf (modified) (1 diff)
Reduction/SANS/Marquee.ipf (modified) (1 diff)
Reduction/SANS/MaskUtils.ipf (modified) (1 diff)
Reduction/SANS/Menu.ipf (modified) (1 diff)
Reduction/SANS/MultScatter_MonteCarlo_2D.ipf (modified) (1 diff)
Reduction/SANS/MultipleReduce.ipf (modified) (1 diff)
Reduction/SANS/NCNR_DataReadWrite.ipf (modified) (1 diff)
Reduction/SANS/NCNR_Utils.ipf (modified) (1 diff)
Reduction/SANS/NSORT.ipf (modified) (1 diff)
Reduction/SANS/PatchFiles.ipf (modified) (1 diff)
Reduction/SANS/ProDiv.ipf (modified) (1 diff)
Reduction/SANS/ProtocolAsPanel.ipf (modified) (1 diff)
Reduction/SANS/RawDataReader.ipf (modified) (1 diff)
Reduction/SANS/RawWindowHook.ipf (modified) (1 diff)
Reduction/SANS/RealTimeUpdate_RT.ipf (modified) (1 diff)
Reduction/SANS/RectAnnulAvg.ipf (modified) (1 diff)
Reduction/SANS/SANSPreferences.ipf (modified) (1 diff)
Reduction/SANS/SANS_Utilities.ipf (modified) (1 diff)
Reduction/SANS/SASCALC.ipf (modified) (1 diff)
Reduction/SANS/Schematic.ipf (modified) (1 diff)
Reduction/SANS/Subtract_1D.ipf (modified) (1 diff)
Reduction/SANS/TISANE.ipf (modified) (1 diff)
Reduction/SANS/Tile_2D.ipf (modified) (1 diff)
Reduction/SANS/Transmission.ipf (modified) (1 diff)
Reduction/SANS/VAXFileUtils.ipf (modified) (1 diff)
Reduction/SANS/WorkFileUtils.ipf (modified) (1 diff)
Reduction/SANS/WorkFileUtilsLP.ipf (modified) (1 diff)
Reduction/SANS/WriteQIS.ipf (modified) (1 diff)
Reduction/USANS/BT5_AddFiles.ipf (modified) (6 diffs)
Reduction/USANS/BT5_Loader.ipf (modified) (1 diff)
Reduction/USANS/COR_Graph.ipf (modified) (1 diff)
Reduction/USANS/LakeDesmearing_JB.ipf (modified) (1 diff)
Reduction/USANS/Main_USANS.ipf (modified) (2 diffs)
Reduction/USANS/USANSCatNotebook.ipf (modified) (1 diff)
Reduction/USANS/USANS_EmptyWaves.ipf (modified) (1 diff)
Reduction/USANS/USANS_Includes.ipf (modified) (1 diff)
Reduction/USANS/U_CALC.ipf (modified) (1 diff)
Reduction/USANS/WriteUSANSData.ipf (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/BE_Polyelectrolyte_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/CoreShellCylinder_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/CoreShell_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	//// include everything that is necessary

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/CoreShell_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Cylinder_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// be sure to include all the necessary files...

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Cylinder_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////
 …
 // AAO verison
+// even 100 points gets a 1.7x speedup from MultiThread
+// then the fit is 1.24x faster (1.25s vs 1.55s)
 Function CylinderForm(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
+//      Variable t1=StopMSTimer(-2)
 #if exists("CylinderFormX")
         yw = CylinderFormX(cw,xw)
+        MultiThread yw = CylinderFormX(cw,xw)
 #else
         yw = fCylinderForm(cw,xw)
 #endif
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
         return(0)
 End

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/DAB_model_v40.ipf

r533	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/EffectiveDiameter_v40.ipf

r358	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// these routines are used to calculate an effective spherical diameter for

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/HPMSA_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// converted from John Hayter's Fortran to Igor code by Paul Butler

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/HardSphereStruct_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/HollowCylinders_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////
 …
 #if exists("HollowCylinderX")
         yw = HollowCylinderX(cw,xw)
+        MultiThread yw = HollowCylinderX(cw,xw)
 #else
         yw = fHollowCylinder(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Lorentz_model_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/CoreShellCyl2D_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/Cylinder_2D_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/Ellipsoid2D_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/EllipticalCylinder2D_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/GizmoCylinder_v40.ipf

r472	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	Proc ShowCylinderOrientation()

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/PeakGauss2D_v40.ipf

-                      r515
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion=6.0
+#pragma IgorVersion=6.1
 //
 …
         Struct ResSmear_2D_AAOStruct &s
         Smear_2DModel_20(PeakGauss2D_noThread,s)
 //      Smear_2DModel_5(PeakGauss2D_noThread,s)
+//      Smear_2DModel_20(PeakGauss2D_noThread,s)
+        Smear_2DModel_5(PeakGauss2D_noThread,s)
         return(0)
 end

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/Sphere_2D_v40.ipf

-                      r569
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion=6.0
+#pragma IgorVersion=6.1
 //
 …
 Function Sphere2D(cw,zw,xw,yw) : FitFunc
         Wave cw,zw,xw,yw
+        Variable npt=numpnts(yw)
+        Variable i,nthreads= ThreadProcessorCount
+        variable mt= ThreadGroupCreate(nthreads)
+//      Variable t1=StopMSTimer(-2)
+        for(i=0;i<nthreads;i+=1)
+        //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+                ThreadStart mt,i,Sphere2D_T(cw,zw,xw,yw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+        endfor
+        do
+                variable tgs= ThreadGroupWait(mt,100)
+        while( tgs != 0 )
+        variable dummy= ThreadGroupRelease(mt)
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
+#if exists("Sphere_2DX")                        //to hide the function if XOP not installed
+        MultiThread     zw= Sphere_2DX(cw,xw,yw)
+#endif
+//      Variable npt=numpnts(yw)
+//      Variable i,nthreads= ThreadProcessorCount
+//      variable mt= ThreadGroupCreate(nthreads)
+//
+////    Variable t1=StopMSTimer(-2)
+//
+//      for(i=0;i<nthreads;i+=1)
+//      //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+//              ThreadStart mt,i,Sphere2D_T(cw,zw,xw,yw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+//      endfor
+//
+//      do
+//              variable tgs= ThreadGroupWait(mt,100)
+//      while( tgs != 0 )
+//
+//      variable dummy= ThreadGroupRelease(mt)
+//
+////    Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
+//
         return(0)
 End
 …
         Struct ResSmear_2D_AAOStruct &s
 //      Smear_2DModel_5(Sphere2D_noThread,s)
         Smear_2DModel_20(Sphere2D_noThread,s)
+        Smear_2DModel_5(Sphere2D_noThread,s)
+//      Smear_2DModel_20(Sphere2D_noThread,s)
         return(0)
 end

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Beaucage_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	/////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/BimodalSchulzSpheres_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/BinaryHardSpheres_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Cylinder_PolyLength_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 #include "Cylinder_v40"
 …
 #if exists("Cyl_PolyLengthX")
         yw = Cyl_PolyLengthX(cw,xw)
+        MultiThread yw = Cyl_PolyLengthX(cw,xw)
 #else
         yw = fCyl_PolyLength(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Cylinder_PolyRadius_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 #include "Cylinder_v40"
 …
 ///// THREADED VERSION NEEDS Igor 6.10B04 or higher to avoid crashes //////
 #if exists("Cyl_PolyRadiusX")
+        Variable npt=numpnts(yw)
+        Variable i,nthreads= ThreadProcessorCount
+        variable mt= ThreadGroupCreate(nthreads)
+        for(i=0;i<nthreads;i+=1)
+        //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+                ThreadStart mt,i,Cyl_PolyRadius_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+        endfor
+        do
+                variable tgs= ThreadGroupWait(mt,100)
+        while( tgs != 0 )
+        variable dummy= ThreadGroupRelease(mt)
+///////////////
+//      Variable npt=numpnts(yw)
+//      Variable i,nthreads= ThreadProcessorCount
+//      variable mt= ThreadGroupCreate(nthreads)
+//
+//      for(i=0;i<nthreads;i+=1)
+//      //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+//              ThreadStart mt,i,Cyl_PolyRadius_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+//      endfor
+//
+//      do
+//              variable tgs= ThreadGroupWait(mt,100)
+//      while( tgs != 0 )
+//
+//      variable dummy= ThreadGroupRelease(mt)
+//      /////////////
+        MultiThread     yw = Cyl_PolyRadiusX(cw,xw)
 #else
                 yw = fCyl_PolyRadius(cw,xw)             //the Igor, non-XOP, non-threaded calculation, messy to make ThreadSafe

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Debye_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// plots the Debye function for polymer scattering

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/EllipticalCylinder_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ///////////////////////////////////////////
 …
 // simply calls the original single point calculation with
 // a wave assignment (this will behave nicely if given point ranges)
+//
+// (MultiThread) yw = 0.044s (100 pts)
+// XOP alone     yw = 0.082s
+// Igor code     yw = 0.34s  (Thread = 7.4 x faster)
+//
 Function EllipticalCylinder(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
+//      Variable t1=StopMSTimer(-2)
 #if exists("EllipticalCylinderX")
         yw = EllipticalCylinderX(cw,xw)
+        MultiThread yw = EllipticalCylinderX(cw,xw)
 #else
         yw = fEllipticalCylinder(cw,xw)
 #endif
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
         return(0)
 End

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/FlexCyl_EllipCross_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	#include "FlexibleCylinder_v40"

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/FlexCyl_PolyLen_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 #include "FlexibleCylinder_v40"
 …
 #if exists("FlexCyl_PolyLenX")
         yw = FlexCyl_PolyLenX(cw,xw)
+        MultiThread yw = FlexCyl_PolyLenX(cw,xw)
 #else
         yw = fFlexCyl_PolyLen(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/FlexCyl_PolyRadius_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 #include "FlexibleCylinder_v40"
 …
 #if exists("FlexCyl_PolyRadX")
         yw = FlexCyl_PolyRadX(cw,xw)
+        MultiThread yw = FlexCyl_PolyRadX(cw,xw)
 #else
         yw = fFlexCyl_PolyRad(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/FlexibleCylinder_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	//CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Fractal_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// plots scattering from a mass fractal object

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/GaussSpheres_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/GaussSpheres_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 #include "sphere_v40"
 …
 #if exists("GaussSpheresX")
         yw = GaussSpheresX(cw,xw)
+        MultiThread yw = GaussSpheresX(cw,xw)
 #else
         yw = fGaussSpheres(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LamellarFF_HG_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LamellarFF_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LamellarPS_HG_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LamellarPS_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LogNormalSphere_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LogNormalSphere_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 #include "sphere_v40"
 …
 Function LogNormalSphere(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
+//      Variable t1=StopMSTimer(-2)
 #if exists("LogNormalSphereX")
         yw = LogNormalSphereX(cw,xw)
+        MultiThread yw = LogNormalSphereX(cw,xw)
 #else
         yw = fLogNormalSphere(cw,xw)
 #endif
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
         return(0)
 End

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/MultiShell_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 // calculates the scattering from a spherical particle made up of a core (aqueous) surrounded
 …
 #if exists("MultiShellSphereX")
         yw = MultiShellSphereX(cw,xw)
+        MultiThread yw = MultiShellSphereX(cw,xw)
 #else
         yw = fMultiShellSphere(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Parallelepiped_v40.ipf

-                      r541
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////////
 …
 #if exists("ParallelepipedX")
         yw = ParallelepipedX(cw,xw)
+        MultiThread yw = ParallelepipedX(cw,xw)
 #else
         yw = fParallelepiped(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/PolyCoreShellCylinder_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////
 …
 #if exists("PolyCoShCylinderX")
         yw = PolyCoShCylinderX(cw,xw)
+        MultiThread yw = PolyCoShCylinderX(cw,xw)
 #else
         yw = fPolyCoShCylinder(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/SchulzSpheres_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/SchulzSpheres_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	//#include "Sphere"

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/StickyHardSphereStruct_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/TriaxialEllipsoid_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 //#include "GaussUtils"
 …
 #if exists("TriaxialEllipsoidX")
         yw = TriaxialEllipsoidX(cw,xw)
+        MultiThread yw = TriaxialEllipsoidX(cw,xw)
 #else
         yw = fTriaxialEllipsoid(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Vesicle_UL_and_Struct_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Vesicle_UL_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/BCC_ParaCrystal_v40.ipf

-                      r519
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion=6.0
+#pragma IgorVersion=6.1
 //
 …
 // Threaded version
+// Threaded XOP = 2.4 s
+// non-threaded, non-XOP = 46.8 s
+// = x 19.5 speedup !
+// (manually) Threaded XOP = 2.27 s
+// (MultiThread) threaded XOP = 2.23 s
+// non-threaded, non-XOP = 45.5 s
+// = x 20.2 speedup !
 //
 Function BCC_ParaCrystal(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
+//      Variable t1=StopMSTimer(-2)
 /////// NO threading /////////
 …
 /// THREADING ///////
-//      Variable t1=StopMSTimer(-2)
 #if exists("BCC_ParaCrystalX")
+        Variable npt=numpnts(yw)
+        Variable i,nthreads= ThreadProcessorCount
+        variable mt= ThreadGroupCreate(nthreads)
+        for(i=0;i<nthreads;i+=1)
+        //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+                ThreadStart mt,i,BCC_ParaCrystal_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+        endfor
+        do
+                variable tgs= ThreadGroupWait(mt,100)
+        while( tgs != 0 )
+        variable dummy= ThreadGroupRelease(mt)
+//// manual threading
+//      Variable npt=numpnts(yw)
+//      Variable i,nthreads= ThreadProcessorCount
+//      variable mt= ThreadGroupCreate(nthreads)
+//
+//      for(i=0;i<nthreads;i+=1)
+//      //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+//              ThreadStart mt,i,BCC_ParaCrystal_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+//      endfor
+//
+//      do
+//              variable tgs= ThreadGroupWait(mt,100)
+//      while( tgs != 0 )
+//
+//      variable dummy= ThreadGroupRelease(mt)
+////
+        MultiThread yw = BCC_ParaCrystalX(cw,xw)
 #else
                 yw = fBCC_ParaCrystal(cw,xw)            //the Igor, non-XOP, non-threaded calculation, messy to make ThreadSafe

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Barbell_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////////
 …
 #if exists("BarbellX")
         yw = BarbellX(cw,xw)
+        MultiThread yw = BarbellX(cw,xw)
 #else
         yw = fBarbell(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/BroadPeak_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/CappedCylinder_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////////
 …
 #if exists("CappedCylinderX")
         yw = CappedCylinderX(cw,xw)
+        MultiThread yw = CappedCylinderX(cw,xw)
 #else
         yw = fCappedCylinder(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/ConvexLens_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////////
 …
 Function ConvexLens(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
+//      Variable t1=StopMSTimer(-2)
 #if exists("ConvexLensX")
         yw = ConvexLensX(cw,xw)
+        MultiThread yw = ConvexLensX(cw,xw)
 #else
         yw = fConvexLens(cw,xw)
 #endif
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
         return(0)
 End

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Core_and_NShells_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/CorrelationLengthModel_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Dumbbell_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////////
 …
 #if exists("DumbbellX")
         yw = DumbbellX(cw,xw)
+        MultiThread yw = DumbbellX(cw,xw)
 #else
         yw = fDumbbell(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/FCC_ParaCrystal_v40.ipf

-                      r520
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion=6.0
+#pragma IgorVersion=6.1
 //
 …
 #if exists("FCC_ParaCrystalX")
+        Variable npt=numpnts(yw)
+        Variable i,nthreads= ThreadProcessorCount
+        variable mt= ThreadGroupCreate(nthreads)
+        for(i=0;i<nthreads;i+=1)
+        //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+                ThreadStart mt,i,FCC_ParaCrystal_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+        endfor
+        do
+                variable tgs= ThreadGroupWait(mt,100)
+        while( tgs != 0 )
+        variable dummy= ThreadGroupRelease(mt)
+///////////////
+//      Variable npt=numpnts(yw)
+//      Variable i,nthreads= ThreadProcessorCount
+//      variable mt= ThreadGroupCreate(nthreads)
+//
+//      for(i=0;i<nthreads;i+=1)
+//      //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+//              ThreadStart mt,i,FCC_ParaCrystal_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+//      endfor
+//
+//      do
+//              variable tgs= ThreadGroupWait(mt,100)
+//      while( tgs != 0 )
+//
+//      variable dummy= ThreadGroupRelease(mt)
+///////////
+        MultiThread yw = FCC_ParaCrystalX(cw,xw)
 //// to return just Z(q), undo the form factor calculation

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Fractal_PolySphere_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// plots scattering from a mass fractal object

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/GaussLorentzGel_v40.ipf

r515	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
	3
2	4	////////////////////////////////////////////////////
3	5	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/LamellarParacrystal_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyCore_and_NShells_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyGaussCoil_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyGaussShell_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/SC_ParaCrystal_v40.ipf

-                      r518
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion=6.0
+#pragma IgorVersion=6.1
 //
 …
 #if exists("SC_ParaCrystalX")
+        Variable npt=numpnts(yw)
+        Variable i,nthreads= ThreadProcessorCount
+        variable mt= ThreadGroupCreate(nthreads)
+        for(i=0;i<nthreads;i+=1)
+        //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+                ThreadStart mt,i,SC_ParaCrystal_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+        endfor
+        do
+                variable tgs= ThreadGroupWait(mt,100)
+        while( tgs != 0 )
+        variable dummy= ThreadGroupRelease(mt)
+////////
+//      Variable npt=numpnts(yw)
+//      Variable i,nthreads= ThreadProcessorCount
+//      variable mt= ThreadGroupCreate(nthreads)
+//
+//      for(i=0;i<nthreads;i+=1)
+//      //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+//              ThreadStart mt,i,SC_ParaCrystal_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+//      endfor
+//
+//      do
+//              variable tgs= ThreadGroupWait(mt,100)
+//      while( tgs != 0 )
+//
+//      variable dummy= ThreadGroupRelease(mt)
+/////
+        MultiThread     yw = SC_ParaCrystalX(cw,xw)
 //// to return just Z(q), undo the form factor calculation

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Spherocylinder_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////////
 …
 #if exists("SpherocylinderX")
         yw = SpherocylinderX(cw,xw)
+        MultiThread yw = SpherocylinderX(cw,xw)
 #else
         yw = fSpherocylinder(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/TwoLorentzian_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Two_Power_Law_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/CSParallelepiped_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/Fractal_PolyCore_v40.ipf

r515	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// plots scattering from a mass fractal object

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/FuzzySpheres_Sq_v40.ipf

r522	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/FuzzySpheres_v40.ipf

r541	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/PolyCoreBicelle_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/OblateCoreShell_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// be sure to include all of the necessary files

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/OblateCoreShell_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////
 …
 #if exists("OblateFormX")
         yw = OblateFormX(cw,xw)
+        MultiThread yw = OblateFormX(cw,xw)
 #else
         yw = fOblateForm(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Peak_Gauss_model_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Peak_Lorentz_model_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyCoreShellRatio_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// be sure to include all the necessary files...

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyCoreShellRatio_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyCore_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyCore_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyHardSphereInten_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyRectSphere_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// be sure to include all the necessary files...

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyRectSphere_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Power_Law_model_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/ProlateCoreShell_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// be sure to include all the necessary files...

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/ProlateCoreShell_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////
 …
 #if exists("ProlateFormX")
         yw = ProlateFormX(cw,xw)
+        MultiThread yw = ProlateFormX(cw,xw)
 #else
         yw = fProlateForm(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/SmearedRPA_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// currently, there is NO XOP version of RPA, since there is an extra input parameter

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Sphere_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// be sure to include all the necessary files...

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Sphere_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////
 …
 // simply calls the original single point calculation with
 // a wave assignment (this will behave nicely if given point ranges)
+// Using MultiThread keyword:
+// 1.2x speedup for 1000 points (yawn)
+// !! 3.0x SLOWER for 100 points (ouch!)
 Function SphereForm(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
+//      Variable t1=StopMSTimer(-2)
 #if exists("SphereFormX")
 …
         yw = fSphereForm(cw,xw)
 #endif
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
         return(0)
 End

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/SquareWellStruct_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/StackedDiscs_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	////////////////////////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/TestProcs_v40.ipf

r325	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
2	3
3	4

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Teubner_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/UniformEllipsoid_Sq_v40.ipf

r510	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	// be sure to include all the necessary files...

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/UniformEllipsoid_v40.ipf

-                      r510
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion = 6.0
+#pragma IgorVersion=6.1
 ////////////////////////////////////////////////
 …
 #if exists("EllipsoidFormX")
         yw = EllipsoidFormX(cw,xw)
+        MultiThread yw = EllipsoidFormX(cw,xw)
 #else
         yw = fEllipsoidForm(cw,xw)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GeneticOptimization/NCNR_GenFitUtils.ipf

r568	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
2	3
3	4	// genetic optimization, uses XOP supplied by Andy Nelson, ANSTO

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit/GlobalFit2_NCNR_v40.ipf

r477	r570
1	1	#pragma rtGlobals=2 // Use modern global access method.
2	2	#pragma version = 1.11
3		#pragma IgorVersion ~~= 6.0~~
	3	#pragma IgorVersion=6.1
4	4	#pragma ModuleName= WM_NewGlobalFit1
5	5

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit/SimpleGlobalFit_NCNR_v40.ipf

r542	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
2	3
3	4

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

r523	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3	#pragma version=4.00
4	4

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/SumModel/SumSANSModels_v40.ipf

r564	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	///////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

r544	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=4.00
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//

sans/Dev/trunk/NCNR_User_Procedures/Analysis/SA_includes_v400.ipf

r497	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=4.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************

sans/Dev/trunk/NCNR_User_Procedures/Analysis/WriteModelData_v40.ipf

r498	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion ~~= 6.0~~
	2	#pragma IgorVersion=6.1
3	3
4	4	Proc WriteModelData(xwave,ywave,delim,term)

sans/Dev/trunk/NCNR_User_Procedures/Common/GaussUtils_v40.ipf

r509	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=4.00
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	// GaussUtils.ipf

sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/CheckVersionFTP.ipf

r413	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	// goes to our ftp site and downloads "CurrentVersion.txt"

sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf

r490	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
2	3
3	4

sans/Dev/trunk/NCNR_User_Procedures/Common/NCNR_Package_Loader.ipf

r558	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3	//#pragma IndependentModule=NCNRLoader //can't seem to get this to work properly...
4	4

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

r563	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=1.00
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

r480	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2		#pragma IgorVersion=6.0
	2	#pragma IgorVersion=6.1
3	3
4	4	// 07 JAN 05 SRK

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/LinearizedFits/LinearizedFits_v40.ipf

r502	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=1.2
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	///////////////////////////////

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotManager_v40.ipf

r477	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=4.00
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtils2D_v40.ipf

r515	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=4.00
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

r563	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=4.00
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	// This is to be used with the Analysis packages ONLY

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/USANS_SlitSmearing_v40.ipf

r477	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=3.00
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//Functions for doing USANS Slit smearing by method of weight matrix

sans/Dev/trunk/NCNR_User_Procedures/Common/Smear_2D.ipf

r566	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
2	3
3	4	Function TestSmear_2D()

sans/Dev/trunk/NCNR_User_Procedures/Common/cansasXML_v11.ipf

r488	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=1.10
	3	#pragma IgorVersion=6.1
	4
3	5
4	6	// file: cansasXML.ipf

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

r544	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*********************

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

r418	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//************

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//

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

r459	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*********************************************

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

r502	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//****************************

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

r429	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*********************

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion ~~= 6.0~~
	3	#pragma IgorVersion=6.1
4	4
5	5	//**************************

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	// this file contains globals and functions that are specific to a

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

r564	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//**************************

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

r537	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion ~~= 6.0~~
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************************************************************************************************

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

r526	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************

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

r536	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	// this file contains globals and functions that are specific to a

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

r448	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion ~~= 6.0~~
	3	#pragma IgorVersion=6.1
4	4
5	5	//**************************

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

r448	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	// this file contains globals and functions that are specific to a

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=1.2
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************

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

r431	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************

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

r557	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************

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

r448	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************

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

r481	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.1
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//***********************

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

r448	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.1
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//***********************

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

r502	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*********************

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

r558	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	////////////

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

r561	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*********************

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5

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

r564	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
2	3
3	4	//

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

r564	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************************

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

r557	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion ~~= 6.0~~
	3	#pragma IgorVersion=6.1
4	4
5	5	//**************************

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

r541	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	// this file contains globals and functions that are specific to a

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

r477	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//****************************

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

r565	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//**************************

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

r544	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5

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

r555	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//************************

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=~~4.0~~
	3	#pragma IgorVersion=6.1
4	4
5	5

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

r528	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*****************************

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

r564	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*****************************

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

r418	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//***********************

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5

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

r418	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion ~~= 6.0~~
	3	#pragma IgorVersion=6.1
4	4
5	5	// contains general utility procedures for:

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

r564	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=1.0
3		#pragma IgorVersion ~~= 6.0~~
	3	#pragma IgorVersion=6.1
4	4	#pragma ModuleName=SASCALC
5	5

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

r480	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//***********************

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

r562	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	///////////////////////

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
2	3
3	4

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

r418	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//***************************

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

r564	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************************

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

r412	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=~~4.0~~
	3	#pragma IgorVersion=6.1
4	4
5	5

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

r431	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*******************

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

r448	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*******************

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

r556	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=5.0
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//************************

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

-                      r569
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
+#pragma IgorVersion=6.1
 …
 //  -- but how to save the data? At this point, errCR != sqrt(CR)
 //
+// - Why can't I just use the whole set of files from the main USANS panel, and add what needs
+//   to be added? Because if there is an angle shift, I have no way of knowing which files to apply
+//   the shift to...
+//
+//
+// - need a global for the tolerance (and a good reason to use that particular value)
+//
+// - do I have anything hard-wired in the code that needs to be generalized before release?
+//
+// - add descriptions of this to the help files
+//
 …
 // - allow user to input Qpeak (maybe of no use?) If so, do it right away with a dialog
 //   if no peak was found.
+//
+Macro mShowUSANSAddPanel()
+ShowUSANSAddPanel()
+end
+Macro mSelectFilesToAdd()
+        SelectFilesToAdd()
+end
 Proc ShowUSANSAddPanel()
 …
         Prompt file2, "Second File", popup, BT5FileList("*.bt5*")
         Print file1,file2
+//      Print file1,file2
         LoadAndAddUSANS(file1,file2)
 …
         Make/O/T/N=200 tw1,tw2
         String fname="",fpath=""
+        String fname="",fpath="",fullPath=""
         Variable ctTime1,ang11,ang21
         Variable ctTime2,ang12,ang22
+        PathInfo bt5PathName
+        Variable dialog=1
+        PathInfo/S savePathName
         fpath = S_Path
+        if(strlen(S_Path)==0)
+                DoAlert 0,"You must select a Save Path... from the main USANS_Panel"
+                return(0)
+        endif
         fname = fpath + file1
 …
         // write out the final file (=tw3)
         filen = file1[0,strlen(file1)-5]+"_SUM.bt5"
+        Open refNum as filen
+        if(dialog)
+                PathInfo/S savePathName
+                fullPath = DoSaveFileDialog("Save data as",fname=filen)
+                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
+        Open refNum as fullPath
         wfprintf refnum, "%s",tw3
         Close refnum
         //killwaves/Z tw1,tw2,tw3

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

r569	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma Version=2.20
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	/////////////////////////

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

r569	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma Version=2.20
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	////////////////////////////

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

r496	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma Version=2.20
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//////////////////////////////////////////////

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

-                      r569
+                      r570
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma Version=2.21
 #pragma IgorVersion=6.0
+#pragma IgorVersion=6.1
 //********************
 …
         "Build USANS Notebook"
         "Desmear USANS Data",Desmear()
+        "Add two raw BT5 files",SelectFilesToAdd()
+        "Add two data sets",ShowUSANSAddPanel()
         "-"
         "Load USANS Data",A_LoadOneDData()

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

r496	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma Version=2.20
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//**************

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

r551	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
2	3
3	4

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

r569	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma version=2.20
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//*************

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

r569	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
	2	#pragma IgorVersion=6.1
2	3
3	4

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

r474	r570
1	1	#pragma rtGlobals=1 // Use modern global access method.
2	2	#pragma Version=2.20
3		#pragma IgorVersion=6.0
	3	#pragma IgorVersion=6.1
4	4
5	5	//////////////

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