Changeset 2923

Show
Ignore:
Timestamp:
09/02/10 11:52:26 (17 months ago)
Author:
farhi
Message:

samples: update call to off_intersect with support for orientation vectors, currently not used.

Location:
trunk/nlib/samples
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/nlib/samples/Incoherent.comp

    r2824 r2923  
    244244      intersect = sphere_intersect(&t0, &t3, x, y, z, vx, vy, vz, radius); 
    245245    else if (VarsInc.shape == 3) 
    246       intersect = off_intersect(&t0, &t3, x, y, z, vx, vy, vz, offdata ); 
     246      intersect = off_intersect(&t0, &t3, NULL, NULL, x, y, z, vx, vy, vz, offdata ); 
    247247    if (intersect) { 
    248248      int flag_ishollow = 0; 

  • trunk/nlib/samples/Isotropic_Sqw.comp

    r2850 r2923  
    14221422        intersect=sphere_intersect  (&t0,&t3, x,y,z,vx,vy,vz, radius); 
    14231423      else if (VarSqw.shape == 3) 
    1424         intersect=off_intersect(&t0, &t3, x, y, z, vx, vy, vz, offdata ); 
     1424        intersect=off_intersect(&t0, &t3, NULL, NULL, x, y, z, vx, vy, vz, offdata ); 
    14251425    } else { 
    14261426      if (VarSqw.shape==0) 
    … …  
    14351435        intersect=sphere_intersect  (&t0,&t3, x,y,z,vx,vy,vz, radius-thickness); 
    14361436      else if (VarSqw.shape == 3) 
    1437         intersect=off_intersect(&t0, &t3, x, y, z, vx, vy, vz, offdata ); 
     1437        intersect=off_intersect(&t0, &t3, NULL, NULL, x, y, z, vx, vy, vz, offdata ); 
    14381438    } 
    14391439  } else intersect=0; 

  • trunk/nlib/samples/PowderN.comp

    r2825 r2923  
    606606      intersecti = sphere_intersect  (&t1, &t2, x,y,z, vx,vy,vz, radius_i); 
    607607    } else if (line_info.shape == 3) { 
    608       intersect  = off_intersect  (&t0, &t3, x,y,z, vx,vy,vz, offdata); 
     608      intersect  = off_intersect  (&t0, &t3, NULL, NULL, x,y,z, vx,vy,vz, offdata); 
    609609      intersecti = 0;  
    610610    } 
    … …  
    752752            intersecti = sphere_intersect  (&t1, &t2, x,y,z, vx,vy,vz, radius_i); 
    753753          } else if (line_info.shape == 3) { 
    754             intersect  = off_intersect  (&t0, &t3, x,y,z, vx,vy,vz, offdata); 
     754            intersect  = off_intersect  (&t0, &t3, NULL, NULL, x,y,z, vx,vy,vz, offdata); 
    755755            intersecti = 0; 
    756756          } 
    … …  
    812812          intersecti = sphere_intersect  (&t1, &t2, x,y,z, vx,vy,vz, radius_i); 
    813813        } else if (line_info.shape == 3) { 
    814           intersect  = off_intersect  (&t0, &t3, x,y,z, vx,vy,vz, offdata); 
     814          intersect  = off_intersect  (&t0, &t3, NULL, NULL, x,y,z, vx,vy,vz, offdata); 
    815815          intersecti = 0; 
    816816        } 

  • trunk/nlib/samples/Single_crystal.comp

    r2837 r2923  
    807807    intersect = sphere_intersect(&t1, &t2, x, y, z, vx, vy, vz, radius); 
    808808  else if (hkl_info.shape == 3) 
    809     intersect = off_intersect(&t1, &t2, x, y, z, vx, vy, vz, offdata ); 
     809    intersect = off_intersect(&t1, &t2, NULL, NULL, x, y, z, vx, vy, vz, offdata ); 
    810810       
    811811  if (t2 < 0) intersect=0; /* we passed sample volume already */ 
    … …  
    835835        intersect = sphere_intersect(&t1, &t2, x, y, z, vx, vy, vz, radius); 
    836836      else if (hkl_info.shape == 3) 
    837         intersect = off_intersect(&t1, &t2, x, y, z, vx, vy, vz, offdata ); 
     837        intersect = off_intersect(&t1, &t2, NULL, NULL, x, y, z, vx, vy, vz, offdata ); 
    838838      if(!intersect || t2*v < -1e-9 || t1*v > 1e-9) 
    839839      {