Révision 241 TrouNoir/TrouNoir.py
TrouNoir.py (revision 241) | ||
---|---|---|
1836 | 1836 |
numpy.float32(ExternalRadius), |
1837 | 1837 |
numpy.float32(Angle), |
1838 | 1838 |
numpy.int32(Line), |
1839 |
grid=(zImage.shape[0]/32,zImage.shape[1]/Threads),
|
|
1839 |
grid=(zImage.shape[0]/Threads,zImage.shape[1]/Threads),
|
|
1840 | 1840 |
block=(Threads,Threads,1)) |
1841 | 1841 |
elif Method=='EachCircle': |
1842 | 1842 |
EachCircleCU(zImageCU,fImageCU, |
... | ... | |
1845 | 1845 |
numpy.float32(ExternalRadius), |
1846 | 1846 |
numpy.float32(Angle), |
1847 | 1847 |
numpy.int32(Line), |
1848 |
grid=(zImage.shape[0]/Threads/2,1),
|
|
1848 |
grid=(int(zImage.shape[0]/Threads/2),1),
|
|
1849 | 1849 |
block=(Threads,1,1)) |
1850 | 1850 |
elif Method=='Original': |
1851 | 1851 |
OriginalCU(zImageCU,fImageCU, |
... | ... | |
1864 | 1864 |
numpy.float32(ExternalRadius), |
1865 | 1865 |
numpy.float32(Angle), |
1866 | 1866 |
numpy.int32(Line), |
1867 |
grid=(Trajectories.shape[0]/Threads,1),
|
|
1867 |
grid=(int(Trajectories.shape[0]/Threads),1),
|
|
1868 | 1868 |
block=(Threads,1,1)) |
1869 | 1869 |
|
1870 | 1870 |
CircleCU(TrajectoriesCU,IdLastCU,zImageCU,fImageCU, |
... | ... | |
1873 | 1873 |
numpy.float32(ExternalRadius), |
1874 | 1874 |
numpy.float32(Angle), |
1875 | 1875 |
numpy.int32(Line), |
1876 |
grid=(Trajectories.shape[0]/Threads,zImage.shape[0]*4/Threads), |
|
1876 |
grid=(int(Trajectories.shape[0]/Threads), |
|
1877 |
int(zImage.shape[0]*4/Threads)), |
|
1877 | 1878 |
block=(Threads,Threads,1)) |
1878 | 1879 |
else: |
1880 |
# Default method: TrajectoPixel |
|
1879 | 1881 |
TrajectoryCU(TrajectoriesCU,IdLastCU, |
1880 | 1882 |
numpy.float32(Mass), |
1881 | 1883 |
numpy.float32(InternalRadius), |
1882 | 1884 |
numpy.float32(ExternalRadius), |
1883 | 1885 |
numpy.float32(Angle), |
1884 | 1886 |
numpy.int32(Line), |
1885 |
grid=(Trajectories.shape[0]/Threads,1),
|
|
1887 |
grid=(int(Trajectories.shape[0]/Threads),1),
|
|
1886 | 1888 |
block=(Threads,1,1)) |
1887 | 1889 |
|
1888 | 1890 |
PixelCU(zImageCU,fImageCU,TrajectoriesCU,IdLastCU, |
... | ... | |
1892 | 1894 |
numpy.float32(ExternalRadius), |
1893 | 1895 |
numpy.float32(Angle), |
1894 | 1896 |
numpy.int32(Line), |
1895 |
grid=(zImage.shape[0]/Threads,zImage.shape[1]/Threads,1), |
|
1897 |
grid=(int(zImage.shape[0]/Threads), |
|
1898 |
int(zImage.shape[1]/Threads),1), |
|
1896 | 1899 |
block=(Threads,Threads,1)) |
1897 | 1900 |
|
1898 | 1901 |
Context.synchronize() |
Formats disponibles : Unified diff