# HG changeset patch # User chust # Date 2015-06-23 08:31:40 # Node ID 172dde87836723e95b8a82f55a2f06ce47fdc823 # Parent d2dd915411c7cd1bf4405441d644c6be1cc84e7f version 2.2 : déclaration/définition de init_k_coefficients dans basic_parameters.c à la fin ... diff --git a/basic_parameters.c b/basic_parameters.c --- a/basic_parameters.c +++ b/basic_parameters.c @@ -11,47 +11,13 @@ // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 // version 2.1: 22/06/2015 (modifs de Paul) - +// version 2.2: 23/06/2015 (modifs de l'ordre de déclaration/définition de init_k_coefficients dans basic_parameters.c ...) #include #include + #include "basic_parameters_params.h" -void init_k_coefficients(float *k_coefficients, - unsigned char nb_binscompressed_matrix ) -{ - switch (nb_binscompressed_matrix) - { - case NB_BINS_COMPRESSED_MATRIX_f0: -#ifdef DEBUG_TCH - printf("F0 data: initialization of the intercalibration k-coefficients\n"); -#endif - init_k_coefficients_f0(k_coefficients, nb_binscompressed_matrix); - break; - - case NB_BINS_COMPRESSED_MATRIX_f1: -#ifdef DEBUG_TCH - printf("F1 data: initialization of the intercalibration k-coefficients\n"); -#endif - init_k_coefficients_f1(k_coefficients, nb_binscompressed_matrix); - break; - - case NB_BINS_COMPRESSED_MATRIX_f2: -#ifdef DEBUG_TCH - printf("F2 data: initialization of the intercalibration k-coefficients\n"); -#endif - init_k_coefficients_f2(k_coefficients, nb_binscompressed_matrix); - break; - - default: -#ifdef DEBUG_TCH - printf("there is a problème !!?\n"); -#endif - break; - } -} - - void init_k_coefficients_f0(float *k_coefficients, unsigned char nb_binscompressed_matrix ) { @@ -181,4 +147,37 @@ void init_k_coefficients_f2(float *k_coe } +void init_k_coefficients(float *k_coefficients, + unsigned char nb_binscompressed_matrix ) +{ + switch (nb_binscompressed_matrix) + { + case NB_BINS_COMPRESSED_MATRIX_f0: +#ifdef DEBUG_TCH + printf("F0 data: initialization of the intercalibration k-coefficients\n"); +#endif + init_k_coefficients_f0(k_coefficients, nb_binscompressed_matrix); + break; + case NB_BINS_COMPRESSED_MATRIX_f1: +#ifdef DEBUG_TCH + printf("F1 data: initialization of the intercalibration k-coefficients\n"); +#endif + init_k_coefficients_f1(k_coefficients, nb_binscompressed_matrix); + break; + + case NB_BINS_COMPRESSED_MATRIX_f2: +#ifdef DEBUG_TCH + printf("F2 data: initialization of the intercalibration k-coefficients\n"); +#endif + init_k_coefficients_f2(k_coefficients, nb_binscompressed_matrix); + break; + + default: +#ifdef DEBUG_TCH + printf("there is a problème !!?\n"); +#endif + break; + } +} + diff --git a/basic_parameters.h b/basic_parameters.h --- a/basic_parameters.h +++ b/basic_parameters.h @@ -11,7 +11,7 @@ // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 // version 2.1: 22/06/2015 (modifs de Paul) - +// version 2.2: 23/06/2015 (modifs de l'ordre de déclaration/définition de init_k_coefficients dans basic_parameters.c ...) #ifndef BASIC_PARAMETERS_H_INCLUDED #define BASIC_PARAMETERS_H_INCLUDED @@ -25,10 +25,6 @@ static inline void BP1_set(float * compressed_spec_mat, float * k_coeff_intercalib, unsigned char nb_bins_compressed_spec_mat, unsigned char * lfr_bp1); static inline void BP2_set(float * compressed_spec_mat, unsigned char nb_bins_compressed_spec_mat, unsigned char * lfr_bp2); -void init_k_coefficients_f0( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); -void init_k_coefficients_f1( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); -void init_k_coefficients_f2( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); - void init_k_coefficients( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); //*********************************** diff --git a/basic_parameters_params.h b/basic_parameters_params.h --- a/basic_parameters_params.h +++ b/basic_parameters_params.h @@ -7,7 +7,7 @@ // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 // version 2.1: 22/06/2015 (modifs de Paul) - +// version 2.2: 23/06/2015 (modifs de l'ordre de déclaration/définition de init_k_coefficients dans basic_parameters.c ...) #ifndef BASIC_PARAMETERS_PARAMS_H #define BASIC_PARAMETERS_PARAMS_H diff --git a/basic_parameters_utilities.h b/basic_parameters_utilities.h --- a/basic_parameters_utilities.h +++ b/basic_parameters_utilities.h @@ -5,6 +5,7 @@ // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 // version 2.1: 22/06/2015 (modifs de Paul) +// version 2.2: 23/06/2015 (modifs de l'ordre de déclaration/définition de init_k_coefficients dans basic_parameters.c ...) #ifndef BASIC_PARAMETERS_UTILITIES_H diff --git a/file_utilities.c b/file_utilities.c --- a/file_utilities.c +++ b/file_utilities.c @@ -11,6 +11,7 @@ // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 // version 2.1: 22/06/2015 (modifs de Paul) +// version 2.2: 23/06/2015 (modifs de l'ordre de déclaration/définition de init_k_coefficients dans basic_parameters.c ...) #include "basic_parameters_utilities.h" diff --git a/file_utilities.h b/file_utilities.h --- a/file_utilities.h +++ b/file_utilities.h @@ -11,6 +11,7 @@ // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 // version 2.1: 22/06/2015 (modifs de Paul) +// version 2.2: 23/06/2015 (modifs de l'ordre de déclaration/définition de init_k_coefficients dans basic_parameters.c ...) #ifndef FILE_UTILITIES_H diff --git a/main.c b/main.c --- a/main.c +++ b/main.c @@ -11,6 +11,7 @@ // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 // version 2.1: 22/06/2015 (modifs de Paul) +// version 2.2: 23/06/2015 (modifs de l'ordre de déclaration/définition de init_k_coefficients dans basic_parameters.c ...) #include