##// END OF EJS Templates
Version 2.1: répond aux remarques de Pauls (Task 446: BP1 BP2 pour release 3)
chust -
r18:d2dd915411c7 TCH
parent child
Show More
@@ -10,35 +10,43
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
12 // version 2.0: 19/06/2015
12 // version 2.0: 19/06/2015
13 // version 2.1: 22/06/2015 (modifs de Paul)
14
13
15
14 #include <stdio.h>
16 #include <stdio.h>
15 #include <stdint.h>
17 #include <stdint.h>
16 #include "basic_parameters_params.h"
18 #include "basic_parameters_params.h"
17
19
18 void init_k_coefficients_f0( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix );
19 void init_k_coefficients_f1( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix );
20 void init_k_coefficients_f2( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix );
21
22 void init_k_coefficients(float *k_coefficients,
20 void init_k_coefficients(float *k_coefficients,
23 unsigned char nb_binscompressed_matrix )
21 unsigned char nb_binscompressed_matrix )
24 {
22 {
25
26 switch (nb_binscompressed_matrix)
23 switch (nb_binscompressed_matrix)
27 {
24 {
28 case 11:
25 case NB_BINS_COMPRESSED_MATRIX_f0:
29 puts("F0 data: initialization of the intercalibration k-coefficients");
26 #ifdef DEBUG_TCH
27 printf("F0 data: initialization of the intercalibration k-coefficients\n");
28 #endif
30 init_k_coefficients_f0(k_coefficients, nb_binscompressed_matrix);
29 init_k_coefficients_f0(k_coefficients, nb_binscompressed_matrix);
31 break;
30 break;
32 case 13:
31
33 puts("F1 data: initialization of the intercalibration k-coefficients");
32 case NB_BINS_COMPRESSED_MATRIX_f1:
33 #ifdef DEBUG_TCH
34 printf("F1 data: initialization of the intercalibration k-coefficients\n");
35 #endif
34 init_k_coefficients_f1(k_coefficients, nb_binscompressed_matrix);
36 init_k_coefficients_f1(k_coefficients, nb_binscompressed_matrix);
35 break;
37 break;
36 case 12:
38
37 printf("F2 data: initialization of the intercalibration k-coefficients");
39 case NB_BINS_COMPRESSED_MATRIX_f2:
40 #ifdef DEBUG_TCH
41 printf("F2 data: initialization of the intercalibration k-coefficients\n");
42 #endif
38 init_k_coefficients_f2(k_coefficients, nb_binscompressed_matrix);
43 init_k_coefficients_f2(k_coefficients, nb_binscompressed_matrix);
39 break;
44 break;
45
40 default:
46 default:
41 puts("there is a problème !!?");
47 #ifdef DEBUG_TCH
48 printf("there is a problème !!?\n");
49 #endif
42 break;
50 break;
43 }
51 }
44 }
52 }
@@ -10,6 +10,8
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
12 // version 2.0: 19/06/2015
12 // version 2.0: 19/06/2015
13 // version 2.1: 22/06/2015 (modifs de Paul)
14
13
15
14 #ifndef BASIC_PARAMETERS_H_INCLUDED
16 #ifndef BASIC_PARAMETERS_H_INCLUDED
15 #define BASIC_PARAMETERS_H_INCLUDED
17 #define BASIC_PARAMETERS_H_INCLUDED
@@ -23,6 +25,10
23 static inline void BP1_set(float * compressed_spec_mat, float * k_coeff_intercalib, unsigned char nb_bins_compressed_spec_mat, unsigned char * lfr_bp1);
25 static inline void BP1_set(float * compressed_spec_mat, float * k_coeff_intercalib, unsigned char nb_bins_compressed_spec_mat, unsigned char * lfr_bp1);
24 static inline void BP2_set(float * compressed_spec_mat, unsigned char nb_bins_compressed_spec_mat, unsigned char * lfr_bp2);
26 static inline void BP2_set(float * compressed_spec_mat, unsigned char nb_bins_compressed_spec_mat, unsigned char * lfr_bp2);
25
27
28 void init_k_coefficients_f0( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix );
29 void init_k_coefficients_f1( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix );
30 void init_k_coefficients_f2( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix );
31
26 void init_k_coefficients( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix );
32 void init_k_coefficients( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix );
27
33
28 //***********************************
34 //***********************************
@@ -6,12 +6,18
6 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
6 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
7 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
7 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
8 // version 2.0: 19/06/2015
8 // version 2.0: 19/06/2015
9 // version 2.1: 22/06/2015 (modifs de Paul)
10
9
11
10 #ifndef BASIC_PARAMETERS_PARAMS_H
12 #ifndef BASIC_PARAMETERS_PARAMS_H
11 #define BASIC_PARAMETERS_PARAMS_H
13 #define BASIC_PARAMETERS_PARAMS_H
12
14
13 #define NB_VALUES_PER_SPECTRAL_MATRIX 25
15 #define NB_VALUES_PER_SPECTRAL_MATRIX 25
14
16
17 #define NB_BINS_COMPRESSED_MATRIX_f0 11
18 #define NB_BINS_COMPRESSED_MATRIX_f1 13
19 #define NB_BINS_COMPRESSED_MATRIX_f2 12
20
15 #define NB_BYTES_BP1 11
21 #define NB_BYTES_BP1 11
16 #define NB_BYTES_BP2 30
22 #define NB_BYTES_BP2 30
17
23
@@ -4,6 +4,8
4 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
4 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
5 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
5 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
6 // version 2.0: 19/06/2015
6 // version 2.0: 19/06/2015
7 // version 2.1: 22/06/2015 (modifs de Paul)
8
7
9
8 #ifndef BASIC_PARAMETERS_UTILITIES_H
10 #ifndef BASIC_PARAMETERS_UTILITIES_H
9 #define BASIC_PARAMETERS_UTILITIES_H
11 #define BASIC_PARAMETERS_UTILITIES_H
@@ -13,10 +15,6
13
15
14 #include "basic_parameters_params.h"
16 #include "basic_parameters_params.h"
15
17
16 #define NB_BINS_COMPRESSED_MATRIX_f0 11
17 #define NB_BINS_COMPRESSED_MATRIX_f1 13
18 #define NB_BINS_COMPRESSED_MATRIX_f2 12
19
20 float compressed_spectral_matrix_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_VALUES_PER_SPECTRAL_MATRIX];
18 float compressed_spectral_matrix_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_VALUES_PER_SPECTRAL_MATRIX];
21 float k_coefficients_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_K_COEFF_PER_BIN];
19 float k_coefficients_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_K_COEFF_PER_BIN];
22 float k_coefficients_f1[NB_BINS_COMPRESSED_MATRIX_f1 * NB_K_COEFF_PER_BIN];
20 float k_coefficients_f1[NB_BINS_COMPRESSED_MATRIX_f1 * NB_K_COEFF_PER_BIN];
@@ -10,6 +10,8
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
12 // version 2.0: 19/06/2015
12 // version 2.0: 19/06/2015
13 // version 2.1: 22/06/2015 (modifs de Paul)
14
13
15
14 #include "basic_parameters_utilities.h"
16 #include "basic_parameters_utilities.h"
15
17
@@ -10,6 +10,8
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
12 // version 2.0: 19/06/2015
12 // version 2.0: 19/06/2015
13 // version 2.1: 22/06/2015 (modifs de Paul)
14
13
15
14 #ifndef FILE_UTILITIES_H
16 #ifndef FILE_UTILITIES_H
15 #define FILE_UTILITIES_H
17 #define FILE_UTILITIES_H
@@ -10,6 +10,7
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
10 // version 1.8: 02/02/2015 (gestion des divisions par zéro)
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
11 // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW
12 // version 2.0: 19/06/2015
12 // version 2.0: 19/06/2015
13 // version 2.1: 22/06/2015 (modifs de Paul)
13
14
14 #include <stdio.h>
15 #include <stdio.h>
15
16
General Comments 0
You need to be logged in to leave comments. Login now