Changeset 790 for sans/XOP_Dev/MonteCarlo/DebyeSpheres.c

Timestamp:

Feb 16, 2011 5:39:25 PM (12 years ago)

Author:

srkline

Message:

Adding Threadsafe declarations to Debye Sphere functions to allow binning of distances to be threaded.

File:

• sans/XOP_Dev/MonteCarlo/DebyeSpheres.c (modified) (5 diffs)

sans/XOP_Dev/MonteCarlo/DebyeSpheres.c

@@ -241 +241 @@
     int npt,numBins,binIndex;
         double grid,binWidth,val;
+        int p1,p2;
         
         
@@ -283 +284 @@
     npt = (int) WavePoints(p->xwavH);   //wavePoints returns long, number of XYZ points
     numBins = (int) WavePoints(p->bwavH);       //wavePoints returns long, number of points in bin wave
+        p1 = (int) p->p1;
+        p2 = (int) p->p2;
+        
         
         xv = WaveData(p->xwavH);                //xyz locations
@@ -293 +297 @@
         
         //do the i!=j double loop,      
-        for(i=0;i<npt;i+=1) {
+        for(i=p1;i<p2;i+=1) {
                 for(j=(i+1);j<npt;j+=1) {
                         val = XYZDistance(xv[i],xv[j],yv[i],yv[j],zv[i],zv[j])*grid;
@@ -329 +333 @@
     int npt,numBins,binIndex;
         double grid,binWidth,val,retVal;
+        int p1,p2;
+
         
 // for accessing the 2D wave data to write the results  
@@ -418 +424 @@
         PSFid = WaveData(p->PSFidH);                    //this one is 2D
         
+        p1 = (int) p->p1;
+        p2 = (int) p->p2;
+        
         grid = p->grid;
         binWidth = p->binWidth;
         
         //do the i!=j double loop,      
-        for(i=0;i<npt;i+=1) {
+        for(i=p1;i<p2;i+=1) {
                 for(j=(i+1);j<npt;j+=1) {
                         val = XYZDistance(xv[i],xv[j],yv[i],yv[j],zv[i],zv[j])*grid;