handled latest merge conflicts
63bfef8540e9
Actions

Authored by schaefer on Feb 22 2018, 13:34.

Description

handled latest merge conflicts

Committed

schaefer

Feb 22 2018, 13:34

Pushed

schaefer

Feb 22 2018, 13:34

Parents

Branches

Unknown

Tags

Unknown

References

Regor0.2

Commit	Author	Details	Committed
0171e53848a3	Christoph Schaefer	rajouté la capacité de choisir le nom et WCS fits	Feb 22 2018
6447061d834c	Christoph Schaefer	small cp error	Feb 19 2018
361b57191dc5	Christoph Schaefer	added coder addresses to files	Feb 19 2018

				Path
	M			src/gradient.cpp
	M			src/gradient.hpp
	M			src/gradient2.cpp
	M			src/gradient2.hpp
	M			src/gradient2_GPU.cu
	M			src/gradient2_GPU.cuh
	M			src/gradient_GPU.cu
	M			src/gradient_GPU.cuh
	M			src/gradient_avx.cpp
	M			src/gradient_avx.hpp
	M			src/gradient_avx512f.cpp
	M			src/gradient_avx512f.hpp
	M			src/grid_amplif_CPU.cpp
	M			src/grid_amplif_CPU.hpp
	M			src/grid_gradient2_CPU.cpp
	M			src/grid_gradient2_CPU.hpp
	M			src/grid_gradient2_GPU.cu
	M			src/grid_gradient2_GPU.cuh
	M			src/grid_gradient_CPU.cpp
	M			src/grid_gradient_CPU.hpp
	M			src/grid_gradient_GPU.cu
	M			src/grid_gradient_GPU.cuh
	M			src/grid_map_GPU.cu
	M			src/grid_map_GPU.cuh
	M			src/grid_srcplane_conversion.cpp
	M			src/grid_srcplane_conversion.hpp
	M			src/module_cosmodistances.cpp
	M			src/module_cosmodistances.hpp
	M			src/module_readParameters.cpp
	M			src/module_writeFits.cpp
	M			src/module_writeFits.hpp
	M			src/structure_hpc.hpp
	D			utils/maps/Bayesmap_GPU
	M			utils/maps/m1931.par
	M			utils/maps/main.cpp
	M			utils/maps/para.out