@@ -1,2 +1,2 | |||
|
1 | 0f2eb26d750be2b6d8a3f5dee479b4575d3b93be LFR_basic-parameters | |
|
1 | cc82265fd480dbd0344bbf888476c76602b3e9c0 LFR_basic-parameters | |
|
2 | 2 | 95a8d83f1d0c59f28a679e66e23464f21c12dd8a header/lfr_common_headers |
@@ -279,7 +279,7 rtems_task prc0_task( rtems_task_argumen | |||
|
279 | 279 | NB_BINS_COMPRESSED_SM_SBM_F0, NB_BINS_TO_AVERAGE_ASM_SBM_F0, |
|
280 | 280 | ASM_F0_INDICE_START); |
|
281 | 281 | // 2) compute the BP1 set |
|
282 |
|
|
|
282 | BP1_set( compressed_sm_sbm_f0, k_coeff_intercalib_f0_sbm, NB_BINS_COMPRESSED_SM_SBM_F0, packet_sbm_bp1.data ); | |
|
283 | 283 | // 3) send the BP1 set |
|
284 | 284 | set_time( packet_sbm_bp1.time, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
|
285 | 285 | set_time( packet_sbm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeSBM ); |
@@ -313,7 +313,7 rtems_task prc0_task( rtems_task_argumen | |||
|
313 | 313 | NB_BINS_COMPRESSED_SM_F0, NB_BINS_TO_AVERAGE_ASM_F0, |
|
314 | 314 | ASM_F0_INDICE_START ); |
|
315 | 315 | // 2) compute the BP1 set |
|
316 |
|
|
|
316 | BP1_set( compressed_sm_norm_f0, k_coeff_intercalib_f0_norm, NB_BINS_COMPRESSED_SM_F0, packet_norm_bp1.data ); | |
|
317 | 317 | // 3) send the BP1 set |
|
318 | 318 | set_time( packet_norm_bp1.time, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
319 | 319 | set_time( packet_norm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
@@ -21,7 +21,10 ring_node_asm asm_ring_burst_sbm_f1 [ NB | |||
|
21 | 21 | ring_node ring_to_send_asm_f1 [ NB_RING_NODES_ASM_F1 ]; |
|
22 | 22 | int buffer_asm_f1 [ NB_RING_NODES_ASM_F1 * TOTAL_SIZE_SM ]; |
|
23 | 23 | |
|
24 |
float asm_f1_ |
|
|
24 | float asm_f1_patched_norm [ TOTAL_SIZE_SM ]; | |
|
25 | float asm_f1_patched_burst_sbm [ TOTAL_SIZE_SM ]; | |
|
26 | float asm_f1_reorganized [ TOTAL_SIZE_SM ]; | |
|
27 | ||
|
25 | 28 | char asm_f1_char [ TOTAL_SIZE_SM * 2 ]; |
|
26 | 29 | float compressed_sm_norm_f1[ TOTAL_SIZE_COMPRESSED_ASM_NORM_F1]; |
|
27 | 30 | float compressed_sm_sbm_f1 [ TOTAL_SIZE_COMPRESSED_ASM_SBM_F1 ]; |
@@ -253,6 +256,9 rtems_task prc1_task( rtems_task_argumen | |||
|
253 | 256 | |
|
254 | 257 | incomingMsg = (asm_msg*) incomingData; |
|
255 | 258 | |
|
259 | ASM_patch( incomingMsg->norm->matrix, asm_f1_patched_norm ); | |
|
260 | ASM_patch( incomingMsg->burst_sbm->matrix, asm_f1_patched_burst_sbm ); | |
|
261 | ||
|
256 | 262 | localTime = getTimeAsUnsignedLongLongInt( ); |
|
257 | 263 | //*********** |
|
258 | 264 | //*********** |
@@ -263,7 +269,7 rtems_task prc1_task( rtems_task_argumen | |||
|
263 | 269 | { |
|
264 | 270 | sid = getSID( incomingMsg->event ); |
|
265 | 271 | // 1) compress the matrix for Basic Parameters calculation |
|
266 |
ASM_compress_reorganize_and_divide( |
|
|
272 | ASM_compress_reorganize_and_divide( asm_f1_patched_burst_sbm, compressed_sm_sbm_f1, | |
|
267 | 273 | nb_sm_before_f1.burst_sbm_bp1, |
|
268 | 274 | NB_BINS_COMPRESSED_SM_SBM_F1, NB_BINS_TO_AVERAGE_ASM_SBM_F1, |
|
269 | 275 | ASM_F1_INDICE_START); |
@@ -297,12 +303,12 rtems_task prc1_task( rtems_task_argumen | |||
|
297 | 303 | if (incomingMsg->event & RTEMS_EVENT_NORM_BP1_F1) |
|
298 | 304 | { |
|
299 | 305 | // 1) compress the matrix for Basic Parameters calculation |
|
300 |
ASM_compress_reorganize_and_divide( |
|
|
306 | ASM_compress_reorganize_and_divide( asm_f1_patched_norm, compressed_sm_norm_f1, | |
|
301 | 307 | nb_sm_before_f1.norm_bp1, |
|
302 | 308 | NB_BINS_COMPRESSED_SM_F1, NB_BINS_TO_AVERAGE_ASM_F1, |
|
303 | 309 | ASM_F1_INDICE_START ); |
|
304 | 310 | // 2) compute the BP1 set |
|
305 |
|
|
|
311 | BP1_set( compressed_sm_norm_f1, k_coeff_intercalib_f1_norm, NB_BINS_COMPRESSED_SM_F1, packet_norm_bp1.data ); | |
|
306 | 312 | // 3) send the BP1 set |
|
307 | 313 | set_time( packet_norm_bp1.time, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
308 | 314 | set_time( packet_norm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
@@ -325,7 +331,7 rtems_task prc1_task( rtems_task_argumen | |||
|
325 | 331 | if (incomingMsg->event & RTEMS_EVENT_NORM_ASM_F1) |
|
326 | 332 | { |
|
327 | 333 | // 1) reorganize the ASM and divide |
|
328 |
ASM_reorganize_and_divide( |
|
|
334 | ASM_reorganize_and_divide( asm_f1_patched_norm, | |
|
329 | 335 | asm_f1_reorganized, |
|
330 | 336 | nb_sm_before_f1.norm_bp1 ); |
|
331 | 337 | // 2) convert the float array in a char array |
@@ -20,7 +20,9 ring_node_asm asm_ring_norm_f2 [ NB_ | |||
|
20 | 20 | ring_node ring_to_send_asm_f2 [ NB_RING_NODES_ASM_F2 ]; |
|
21 | 21 | int buffer_asm_f2 [ NB_RING_NODES_ASM_F2 * TOTAL_SIZE_SM ]; |
|
22 | 22 | |
|
23 |
float asm_f2_ |
|
|
23 | float asm_f2_patched_norm [ TOTAL_SIZE_SM ]; | |
|
24 | float asm_f2_reorganized [ TOTAL_SIZE_SM ]; | |
|
25 | ||
|
24 | 26 | char asm_f2_char [ TOTAL_SIZE_SM * 2 ]; |
|
25 | 27 | float compressed_sm_norm_f2[ TOTAL_SIZE_COMPRESSED_ASM_NORM_F2]; |
|
26 | 28 | |
@@ -188,6 +190,8 rtems_task prc2_task( rtems_task_argumen | |||
|
188 | 190 | |
|
189 | 191 | incomingMsg = (asm_msg*) incomingData; |
|
190 | 192 | |
|
193 | ASM_patch( incomingMsg->norm->matrix, asm_f2_patched_norm ); | |
|
194 | ||
|
191 | 195 | localTime = getTimeAsUnsignedLongLongInt( ); |
|
192 | 196 | |
|
193 | 197 | //***** |
@@ -196,7 +200,7 rtems_task prc2_task( rtems_task_argumen | |||
|
196 | 200 | //***** |
|
197 | 201 | //***** |
|
198 | 202 | // 1) compress the matrix for Basic Parameters calculation |
|
199 |
ASM_compress_reorganize_and_divide( |
|
|
203 | ASM_compress_reorganize_and_divide( asm_f2_patched_norm, compressed_sm_norm_f2, | |
|
200 | 204 | nb_sm_before_f2.norm_bp1, |
|
201 | 205 | NB_BINS_COMPRESSED_SM_F2, NB_BINS_TO_AVERAGE_ASM_F2, |
|
202 | 206 | ASM_F2_INDICE_START ); |
@@ -204,7 +208,7 rtems_task prc2_task( rtems_task_argumen | |||
|
204 | 208 | if (incomingMsg->event & RTEMS_EVENT_NORM_BP1_F2) |
|
205 | 209 | { |
|
206 | 210 | // 1) compute the BP1 set |
|
207 |
|
|
|
211 | BP1_set( compressed_sm_norm_f2, k_coeff_intercalib_f2, NB_BINS_COMPRESSED_SM_F2, packet_norm_bp1.data ); | |
|
208 | 212 | // 2) send the BP1 set |
|
209 | 213 | set_time( packet_norm_bp1.time, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
|
210 | 214 | set_time( packet_norm_bp1.acquisitionTime, (unsigned char *) &incomingMsg->coarseTimeNORM ); |
@@ -228,7 +232,7 rtems_task prc2_task( rtems_task_argumen | |||
|
228 | 232 | if (incomingMsg->event & RTEMS_EVENT_NORM_ASM_F2) |
|
229 | 233 | { |
|
230 | 234 | // 1) reorganize the ASM and divide |
|
231 |
ASM_reorganize_and_divide( |
|
|
235 | ASM_reorganize_and_divide( asm_f2_patched_norm, | |
|
232 | 236 | asm_f2_reorganized, |
|
233 | 237 | nb_sm_before_f2.norm_bp1 ); |
|
234 | 238 | // 2) convert the float array in a char array |
General Comments 0
You need to be logged in to leave comments.
Login now