Description: fix typos found by Lintian --- a/PyHST/Cspace/CCspace.c +++ b/PyHST/Cspace/CCspace.c @@ -3032,7 +3032,7 @@ void CCspace_Sino_2_Slice( CCspace * printf(" faccio proiezione %p \n", SINOGRAMMA_LT); int dimslice= self->params.num_x ; - memset(SINOGRAMMA_LT,0,(self->params.nprojs_span) * (num_bins) *sizeof(float) ); // Larger than necessary ; it is then rebinned after projection and data substraction + memset(SINOGRAMMA_LT,0,(self->params.nprojs_span) * (num_bins) *sizeof(float) ); // Larger than necessary ; it is then rebinned after projection and data subtraction printf("LT settata memoria \n"); --- a/PyHST/Cspace/chambollepock.cu +++ b/PyHST/Cspace/chambollepock.cu @@ -229,10 +229,10 @@ __global__ void cp_kern_fourier_filter(c } /** - In-place substraction elementwise + In-place subtraction elementwise array <- array-array2 **/ -__global__ void substract_kernel(float* array, float* array2, int sizeX, int sizeY) { +__global__ void subtract_kernel(float* array, float* array2, int sizeX, int sizeY) { int gidx = threadIdx.x + blockIdx.x*blockDim.x; int gidy = threadIdx.y + blockIdx.y*blockDim.y; --- a/PyHST/Cspace/gputomo.cu +++ b/PyHST/Cspace/gputomo.cu @@ -4452,7 +4452,7 @@ __global__ static void rows_subtract_k int idoppio = gidy / nprojs_span; int iangle = gidy % nprojs_span ; if(idoppio*2>>(data, line, Nx, Ny, scale); + kern_subtract_line<<>>(data, line, Nx, Ny, scale); return 0; } @@ -504,8 +504,8 @@ int sino_normalization(float* d_sino, in cudaFree(d_sum_f); } - // Substract sum/wscaling from each sinogram line - fw_call_substract_lines(d_sino, d_sum, num_bins, num_projs, wscaling); + // Subtract sum/wscaling from each sinogram line + fw_call_subtract_lines(d_sino, d_sum, num_bins, num_projs, wscaling); cudaFree(d_sum); return 0; --- a/PyHST/Parameters_module.py +++ b/PyHST/Parameters_module.py @@ -1197,7 +1197,7 @@ Units are pixels per projection. This variable is a string and is meaningful when DO_RING_FILTER=1 * RING_FILTER = "RING_Filter" in this case the sinogram is averaged over all the projections. A high-band pass filter is applied to the average - and the result is substracted from all the projections. The details of the frequencies filtering are specified + and the result is subtracted from all the projections. The details of the frequencies filtering are specified through variable RING_FILTER_PARA * RING_FILTER = "RING_Filter_THRESHOLDED" This case is similar to the previous one. But the averaging is done not on the sinogram itself, instead @@ -1696,7 +1696,7 @@ Units are pixels per projection. """ If not null, the following process is applied on the sinogram. The sum of the sinogram along the columns is computed. - This "sum line", divided by FW_SCALING, is then substracted from each sinogram row. + This "sum line", divided by FW_SCALING, is then subtracted from each sinogram row. The Python equivalent code is: Rowsum = sino.sum(axis=0) sino -= Rowsum/FW_SCALING --- a/TEST_PYHST/INPUTS/CRAYON/TESTS/abs_solo_tutte/input.par +++ b/TEST_PYHST/INPUTS/CRAYON/TESTS/abs_solo_tutte/input.par @@ -90,7 +90,7 @@ DO_SINO_FILTER = 0 # Sinogram filter (ri SINO_FILTER = "SINO_Filter" # old option SINO_FILTER, now can be called "RING_FILTER" : in this case the sinogram is averaged over all the projections, then -# a high-band pass filter is applied to the average and the result is substracted from all the projections. +# a high-band pass filter is applied to the average and the result is subtracted from all the projections. # The details of the frequencies filtering are specified through variable RING_FILTER_PAR # More details on the manual : Ring Correction --- a/TEST_PYHST/INPUTS/CRAYON/TESTS/abs_solo_unaslice/input.par +++ b/TEST_PYHST/INPUTS/CRAYON/TESTS/abs_solo_unaslice/input.par @@ -90,7 +90,7 @@ DO_SINO_FILTER = 0 # Sinogram filter (ri SINO_FILTER = "SINO_Filter" # old option SINO_FILTER, now can be called "RING_FILTER" : in this case the sinogram is averaged over all the projections, then -# a high-band pass filter is applied to the average and the result is substracted from all the projections. +# a high-band pass filter is applied to the average and the result is subtracted from all the projections. # The details of the frequencies filtering are specified through variable RING_FILTER_PAR # More details on the manual : Ring Correction --- a/TEST_PYHST/INPUTS/CRAYON/TESTS/pag_molte_edf/input.par +++ b/TEST_PYHST/INPUTS/CRAYON/TESTS/pag_molte_edf/input.par @@ -86,7 +86,7 @@ DO_SINO_FILTER = 0 # Sinogram filter (ri SINO_FILTER = "SINO_Filter" # old option SINO_FILTER, now can be called "RING_FILTER" : in this case the sinogram is averaged over all the projections, then -# a high-band pass filter is applied to the average and the result is substracted from all the projections. +# a high-band pass filter is applied to the average and the result is subtracted from all the projections. # The details of the frequencies filtering are specified through variable RING_FILTER_PAR # More details on the manual : Ring Correction --- a/TEST_PYHST/INPUTS/CRAYON/TESTS/pag_tutte/input.par +++ b/TEST_PYHST/INPUTS/CRAYON/TESTS/pag_tutte/input.par @@ -80,7 +80,7 @@ DO_SINO_FILTER = 0 # Sinogram filter (ri SINO_FILTER = "SINO_Filter" # old option SINO_FILTER, now can be called "RING_FILTER" : in this case the sinogram is averaged over all the projections, then -# a high-band pass filter is applied to the average and the result is substracted from all the projections. +# a high-band pass filter is applied to the average and the result is subtracted from all the projections. # The details of the frequencies filtering are specified through variable RING_FILTER_PAR # More details on the manual : Ring Correction --- a/TEST_PYHST/INPUTS/CRAYON/TESTS/pag_tutte_current/input.par +++ b/TEST_PYHST/INPUTS/CRAYON/TESTS/pag_tutte_current/input.par @@ -80,7 +80,7 @@ DO_SINO_FILTER = 0 # Sinogram filter (ri SINO_FILTER = "SINO_Filter" # old option SINO_FILTER, now can be called "RING_FILTER" : in this case the sinogram is averaged over all the projections, then -# a high-band pass filter is applied to the average and the result is substracted from all the projections. +# a high-band pass filter is applied to the average and the result is subtracted from all the projections. # The details of the frequencies filtering are specified through variable RING_FILTER_PAR # More details on the manual : Ring Correction --- a/TEST_PYHST/INPUTS/CRAYON/TESTS/pag_una/input.par +++ b/TEST_PYHST/INPUTS/CRAYON/TESTS/pag_una/input.par @@ -92,7 +92,7 @@ DO_SINO_FILTER = 0 # Sinogram filter (ri SINO_FILTER = "SINO_Filter" # old option SINO_FILTER, now can be called "RING_FILTER" : in this case the sinogram is averaged over all the projections, then -# a high-band pass filter is applied to the average and the result is substracted from all the projections. +# a high-band pass filter is applied to the average and the result is subtracted from all the projections. # The details of the frequencies filtering are specified through variable RING_FILTER_PAR # More details on the manual : Ring Correction --- a/doc/datas/examples/paganin/ex_paganin.par +++ b/doc/datas/examples/paganin/ex_paganin.par @@ -61,7 +61,7 @@ CCD_FILTER_PARA = {"threshold": 0.040000 DO_SINO_FILTER = 0 # Sinogram filter (rings) SINO_FILTER = "SINO_Filter" # old option SINO_FILTER, now can be called "RING_FILTER" : in this case the sinogram is averaged over all the projections, then -# a high-band pass filter is applied to the average and the result is substracted from all the projections. +# a high-band pass filter is applied to the average and the result is subtracted from all the projections. # The details of the frequencies filtering are specified through variable RING_FILTER_PAR # More details on the manual : Ring Correction # --- a/doc/tuto_it_rings.rst +++ b/doc/tuto_it_rings.rst @@ -23,7 +23,7 @@ The parameters enabling the rings correc ITER_RING_BETA = 0.5 # Weight of the "sparsity" of the rings The parameter ``ITER_RING_HEIGHT``, when different from zero, enables the iterative rings correction. -The parameter ``ITER_RING_BETA`` weights the sparsity of the rings which are substracted to the sinogram. +The parameter ``ITER_RING_BETA`` weights the sparsity of the rings which are subtracted to the sinogram. For high values, the rings are expected to be narrow. For low values, the rings are expected to be large. The parameter ``ITER_RING_SIZE`` is only relevant for Dictionary-based reconstruction. It is the expected size of the rings. Typical values are 1 or 2.