HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r214:a9666078ac0b

.hgsubstate +1 -1

		@@ -1,2 +1,2
1		a586fe639ac179e95bdc150ebdbab0312f31dc30 LFR_basic-parameters
	1	b054211408845ff1f92ddeaae6e651e90d996ffb LFR_basic-parameters
2	2	bb9afa759d57093f7646d3be18f4a9923a4cbf84 header/lfr_common_headers

FSW-qt/fsw-qt.pro +1 -1

              DEFINES += SW_VERSION_N1=3 # major
              DEFINES += SW_VERSION_N2=0 # minor
              DEFINES += SW_VERSION_N3=0 # patch
-             DEFINES += SW_VERSION_N4=5 # internal
+             DEFINES += SW_VERSION_N4=6 # internal
              # <GCOV>
              #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage

header/processing/avf0_prc0.h +1 -1

              // FUNCTIONS
              void reset_nb_sm_f0( unsigned char lfrMode );
-             void init_k_coefficients_f0( void );
+             void init_k_coefficients_prc0( void );
              void test_TCH( void );
              //*******

header/processing/avf1_prc1.h +1 -1

              // FUNCTIONS
              void reset_nb_sm_f1( unsigned char lfrMode );
-             void init_k_coefficients_f1( void );
+             void init_k_coefficients_prc1( void );
              //*******
              // EXTERN

header/processing/avf2_prc2.h +1 -1

              void reset_nb_sm_f2( void );
              void SM_average_f2(float *averaged_spec_mat_f2, ring_node *ring_node, unsigned int nbAverageNormF2 , asm_msg *msgForMATR);
-             void init_k_coefficients_f2( void );
+             void init_k_coefficients_prc2( void );
              //*******
              // EXTERN

header/processing/fsw_processing.h +2 0

              int getFBinMask(int k);
+             void init_kcoeff_sbm_from_kcoeff_norm( float *input_kcoeff, float *output_kcoeff, unsigned char nb_bins_norm);
              #endif // FSW_PROCESSING_H_INCLUDED

header/tc_load_dump_parameters.h +1 0

              void init_parameter_dump( void );
              void init_kcoefficients_dump( void );
              void init_kcoefficients_dump_packet( Packet_TM_LFR_KCOEFFICIENTS_DUMP_t *kcoefficients_dump, unsigned char pkt_nr, unsigned char blk_nr );
+             void print_k_coeff();
              #endif // TC_LOAD_DUMP_PARAMETERS_H

src/fsw_init.c +3 -3

                  init_kcoefficients_dump();
                  init_local_mode_parameters();
                  init_housekeeping_parameters();
-                 init_k_coefficients_f0();
-                 init_k_coefficients_f1();
-                 init_k_coefficients_f2();
+                 init_k_coefficients_prc0();
+                 init_k_coefficients_prc1();
+                 init_k_coefficients_prc2();
                  // waveform picker initialization
                  WFP_init_rings();      // initialize the waveform rings

src/processing/avf0_prc0.c +5 -3

                  }
              }
-             void init_k_coefficients_f0( void )
+             void init_k_coefficients_prc0( void )
              {
-                 init_k_coefficients( k_coeff_intercalib_f0_norm, NB_BINS_COMPRESSED_SM_F0    );
-                 init_k_coefficients( k_coeff_intercalib_f0_sbm,  NB_BINS_COMPRESSED_SM_SBM_F0);
+                 init_k_coefficients( k_coeff_intercalib_f0_norm, NB_BINS_COMPRESSED_SM_F0 );
+                 init_kcoeff_sbm_from_kcoeff_norm( k_coeff_intercalib_f0_norm, k_coeff_intercalib_f0_sbm, NB_BINS_COMPRESSED_SM_F0);
              }

src/processing/avf1_prc1.c +4 -3

                  }
              }
-             void init_k_coefficients_f1( void )
+             void init_k_coefficients_prc1( void )
              {
-                 init_k_coefficients( k_coeff_intercalib_f1_norm, NB_BINS_COMPRESSED_SM_F1    );
-                 init_k_coefficients( k_coeff_intercalib_f1_sbm,  NB_BINS_COMPRESSED_SM_SBM_F1);
+                 init_k_coefficients( k_coeff_intercalib_f1_norm, NB_BINS_COMPRESSED_SM_F1 );
+                 init_kcoeff_sbm_from_kcoeff_norm( k_coeff_intercalib_f1_norm, k_coeff_intercalib_f1_sbm, NB_BINS_COMPRESSED_SM_F1);
              }

src/processing/avf2_prc2.c +1 -1

                  }
              }
-             void init_k_coefficients_f2( void )
+             void init_k_coefficients_prc2( void )
              {
                  init_k_coefficients( k_coeff_intercalib_f2, NB_BINS_COMPRESSED_SM_F2);
              }

src/processing/fsw_processing.c +15 0

		@@ -654,3 +654,18 int getFBinMask( int index )
654	654
655	655	return fbin;
656	656	}
	657
	658	void init_kcoeff_sbm_from_kcoeff_norm(float input_kcoeff, float output_kcoeff, unsigned char nb_bins_norm)
	659	{
	660	unsigned char bin;
	661	unsigned char kcoeff;
	662
	663	for (bin=0; bin<nb_bins_norm; bin++)
	664	{
	665	for (kcoeff=0; kcoeff<NB_K_COEFF_PER_BIN; kcoeff++)
	666	{
	667	output_kcoeff[ (binNB_K_COEFF_PER_BIN + kcoeff)2 ] = input_kcoeff[ bin*NB_K_COEFF_PER_BIN + kcoeff ];
	668	output_kcoeff[ (binNB_K_COEFF_PER_BIN + kcoeff)2 + 1 ] = input_kcoeff[ bin*NB_K_COEFF_PER_BIN + kcoeff ];
	669	}
	670	}
	671	}

src/tc_load_dump_parameters.c +38 -8

              // KCOEFFICIENTS
              int set_sy_lfr_kcoeff( ccsdsTelecommandPacket_t *TC,rtems_id queue_id )
              {
-                 unsigned int i;
+                 unsigned int kcoeff;
                  unsigned short sy_lfr_kcoeff_frequency;
                  unsigned short bin;
                  unsigned short *freqPtr;
                  if (kcoeffPtr_norm != NULL )    // update K coefficient for NORMAL data products
                  {
-                     for (i=0; i<NB_K_COEFF_PER_BIN; i++)
+                     for (kcoeff=0; kcoeff<NB_K_COEFF_PER_BIN; kcoeff++)
                      {
                          // destination
-                         kcoeffNormPtr = (unsigned char*) &kcoeffPtr_norm[   (bin * NB_K_COEFF_PER_BIN) + i          ];
+                         kcoeffNormPtr = (unsigned char*) &kcoeffPtr_norm[ (bin * NB_K_COEFF_PER_BIN) + kcoeff ];
                          // source
-                         kcoeffLoadPtr = (unsigned char*) &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_1 + NB_BYTES_PER_FLOAT * i];
+                         kcoeffLoadPtr = (unsigned char*) &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_1 + NB_BYTES_PER_FLOAT * kcoeff];
                          // copy source to destination
                          copyFloatByChar( kcoeffNormPtr,  kcoeffLoadPtr );
                      }
                  if (kcoeffPtr_sbm != NULL )     // update K coefficient for SBM data products
                  {
-                     for (i=0; i<NB_K_COEFF_PER_BIN; i++)
+                     for (kcoeff=0; kcoeff<NB_K_COEFF_PER_BIN; kcoeff++)
                      {
                          // destination
-                         kcoeffSbmPtr_a= (unsigned char*) &kcoeffPtr_sbm[  ( (bin * NB_K_COEFF_PER_BIN) + i) * 2     ];
-                         kcoeffSbmPtr_b= (unsigned char*) &kcoeffPtr_sbm[  ( (bin * NB_K_COEFF_PER_BIN) + i) * 2 + 1 ];
+                         kcoeffSbmPtr_a= (unsigned char*) &kcoeffPtr_sbm[ ( (bin * NB_K_COEFF_PER_BIN) + kcoeff) * 2     ];
+                         kcoeffSbmPtr_b= (unsigned char*) &kcoeffPtr_sbm[ ( (bin * NB_K_COEFF_PER_BIN) + kcoeff) * 2 + 1 ];
                          // source
-                         kcoeffLoadPtr = (unsigned char*) &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_1 + NB_BYTES_PER_FLOAT * i];
+                         kcoeffLoadPtr = (unsigned char*) &TC->dataAndCRC[DATAFIELD_POS_SY_LFR_KCOEFF_1 + NB_BYTES_PER_FLOAT * kcoeff];
                          // copy source to destination
                          copyFloatByChar( kcoeffSbmPtr_a, kcoeffLoadPtr );
                          copyFloatByChar( kcoeffSbmPtr_b, kcoeffLoadPtr );
                      }
                  }
+             //    print_k_coeff();
                  return status;
              }
                  }
              }
+             void print_k_coeff()
+             {
+                 unsigned int kcoeff;
+                 unsigned int bin;
+                 for (kcoeff=0; kcoeff<NB_K_COEFF_PER_BIN; kcoeff++)
+                 {
+                     printf("kcoeff = %d *** ", kcoeff);
+                     for (bin=0; bin<NB_BINS_COMPRESSED_SM_F0; bin++)
+                     {
+                         printf( "%f ", k_coeff_intercalib_f0_norm[bin*NB_K_COEFF_PER_BIN+kcoeff] );
+                     }
+                     printf("\n");
+                 }
+                 printf("\n");
+                 for (kcoeff=0; kcoeff<NB_K_COEFF_PER_BIN; kcoeff++)
+                 {
+                     printf("kcoeff = %d *** ", kcoeff);
+                     for (bin=0; bin<NB_BINS_COMPRESSED_SM_F0; bin++)
+                     {
+                         printf( "[%f, %f] ",
+                                 k_coeff_intercalib_f0_sbm[(bin*NB_K_COEFF_PER_BIN  )*2 + kcoeff],
+                                 k_coeff_intercalib_f0_sbm[(bin*NB_K_COEFF_PER_BIN+1)*2 + kcoeff]);
+                     }
+                     printf("\n");
+                 }
+             }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages