diff --git a/basic_parameters.c b/basic_parameters.c --- a/basic_parameters.c +++ b/basic_parameters.c @@ -3,49 +3,7 @@ // version 1.1: 02/04/2014 // version 1.2: 30/04/2014 // version 1.3: 02/05/2014 - -#include "basic_parameters.h" - -void init_k_f0( void ) -{ - uint16_t i; // 16 bits unsigned - - for(i=0; i +#include "file_utilities.h" int lecture_file_sm(const char *fileName) { @@ -63,3 +65,46 @@ int lecture_file_sm(const char *fileName return 0; } +void init_k_coefficients_f0( void ) +{ + uint16_t i; // 16 bits unsigned + + for(i=0; i #include -#include + +#include "basic_parameters.h" -extern float compressed_spectral_matrix_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_VALUES_PER_SPECTRAL_MATRIX]; +float compressed_spectral_matrix_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_VALUES_PER_SPECTRAL_MATRIX]; +float k_coefficients_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_K_COEFF_PER_BIN]; + +unsigned char LFR_BP1_f0[NB_BINS_COMPRESSED_MATRIX_f0*NB_BYTES_BP1]; +unsigned char LFR_BP2_f0[NB_BINS_COMPRESSED_MATRIX_f0*NB_BYTES_BP2]; int lecture_file_sm(const char *fileName); +void init_k_coefficients_f0( void ); + #endif // FILE_UTILITIES_H diff --git a/main.c b/main.c --- a/main.c +++ b/main.c @@ -3,15 +3,12 @@ // version 1.1: 02/04/2014 // version 1.2: 30/04/2014 // version 1.3: 02/05/2014 +// version 1.4: 16/05/2014 +// version 1.5: 20/05/2014 #include -#include -#include -float compressed_spectral_matrix_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_VALUES_PER_SPECTRAL_MATRIX]; - -unsigned char LFR_BP1_f0[NB_BINS_COMPRESSED_MATRIX_f0*NB_BYTES_BP1]; -unsigned char LFR_BP2_f0[NB_BINS_COMPRESSED_MATRIX_f0*NB_BYTES_BP2]; +#include "file_utilities.h" int main(void) { @@ -30,12 +27,13 @@ int main(void) //filename="/WIN/Users/chust/DD CHUST/Missions/Solar Orbiter/LFR/Prog C/tests bp Paul/tests2/sm_test2.dat"; filename="sm_test2.dat"; + lecture_file_sm(filename); - lecture_file_sm(filename); + init_k_coefficients_f0(); printf("\n"); - BP1_set(compressed_spectral_matrix_f0, NB_BINS_COMPRESSED_MATRIX_f0, LFR_BP1_f0); + BP1_set(compressed_spectral_matrix_f0, k_coefficients_f0, NB_BINS_COMPRESSED_MATRIX_f0, LFR_BP1_f0); printf("\n");