HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r344:547f7fbdb0d0

Bug Masque erroné en cas de bande polluée partiellement ......

paul -

r344:547f7fbdb0d0 R3++

parent child

Context file:

r344:547f7fbdb0d0

Collapse all files

header/tc_load_dump_parameters.h +1 -1

             void set_hk_lfr_sc_rw_f_flag( unsigned char wheel, unsigned char freq, float value );
             void set_hk_lfr_sc_rw_f_flags( void );
             void getReactionWheelsFrequencies( ccsdsTelecommandPacket_t *TC );
-            void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float kcoeff );
+            void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float sy_lfr_rw_k );
             void build_sy_lfr_rw_mask( unsigned int channel );
             void build_sy_lfr_rw_masks();
             void merge_fbins_masks( void );

src/tc_load_dump_parameters.c +38 -17

             }
-            void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float kcoeff )
+            void setFBinMask( unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float sy_lfr_rw_k )
             {
                 /** This function executes specific actions when a TC_LFR_UPDATE_INFO TeleCommand has been received.
                  *
                 float fi;
                 float deltaBelow;
                 float deltaAbove;
+                float freqToFilterOut;
                 int binBelow;
                 int binAbove;
                 int closestBin;
                 int selectedByte;
                 int bin;
                 int binToRemove[NB_BINS_TO_REMOVE];
-                int i;
+                int k;
+                bool filteringSet;
                 closestBin = 0;
                 whichByte = 0;
                 bin = 0;
+                filteringSet = false;
-                for (i = 0; i < NB_BINS_TO_REMOVE; i++)
+                for (k = 0; k < NB_BINS_TO_REMOVE; k++)
                 {
-                    binToRemove[i] = -1;
+                    binToRemove[k] = -1;
                 }
                 if (!isnan(rw_f))
                 {
+                    // compute the frequency range to filter [ rw_f - delta_f; rw_f + delta_f ]
+                    f_RW_min = rw_f - ((filterPar.sy_lfr_sc_rw_delta_f) * sy_lfr_rw_k);
+                    f_RW_MAX = rw_f + ((filterPar.sy_lfr_sc_rw_delta_f) * sy_lfr_rw_k);
-                    // compute the frequency range to filter [ rw_f - delta_f/2; rw_f + delta_f/2 ]
+                    freqToFilterOut = f_RW_min;
-                    f_RW_min = rw_f - ( (filterPar.sy_lfr_sc_rw_delta_f * kcoeff) / DELTAF_DIV);
+                    while ( filteringSet == false )
-                    f_RW_MAX = rw_f + ( (filterPar.sy_lfr_sc_rw_delta_f * kcoeff) / DELTAF_DIV);
                         // compute the index of the frequency bin immediately below rw_f
-                    binBelow = (int) ( floor( ((double) rw_f) / ((double) deltaFreq)) );
+                        binBelow = (int) ( floor( ((double) freqToFilterOut) / ((double) deltaFreq)) );
-                    deltaBelow = rw_f - binBelow * deltaFreq;
+                        deltaBelow = freqToFilterOut - binBelow * deltaFreq;
                         // compute the index of the frequency bin immediately above rw_f
-                    binAbove = (int) ( ceil(  ((double) rw_f) / ((double) deltaFreq)) );
+                        binAbove = (int) ( ceil(  ((double) freqToFilterOut) / ((double) deltaFreq)) );
-                    deltaAbove = binAbove * deltaFreq - rw_f;
+                        deltaAbove = binAbove * deltaFreq - freqToFilterOut;
                         // search the closest bin
                         if (deltaAbove > deltaBelow)
                         // thus, the index 0 in a mask corresponds to the bin 1 of the spectrum
                         //**************************************************************************************
-                    // 1. IF [ f_RW_min, f_RW_MAX] is included in [ fi_min; fi_MAX ]
+                        // 1. IF freqToFilterOut is included in [ fi_min; fi_MAX ]
                         // => remove f_(i), f_(i-1) and f_(i+1)
-                    if ( ( f_RW_min > fi_min ) && ( f_RW_MAX < fi_MAX ) )
+                        if ( ( freqToFilterOut > fi_min ) && ( freqToFilterOut < fi_MAX ) )
                         {
                             binToRemove[0] = (closestBin - 1) - 1;
                             binToRemove[1] = (closestBin)     - 1;
                             binToRemove[2] = (-1);
                         }
-                    for (i = 0; i < NB_BINS_TO_REMOVE; i++)
+                        for (k = 0; k < NB_BINS_TO_REMOVE; k++)
                         {
-                        bin = binToRemove[i];
+                            bin = binToRemove[k];
                             if ( (bin >= BIN_MIN) && (bin <= BIN_MAX) )
                             {
                                 whichByte = (bin >> SHIFT_3_BITS);    // division by 8
                                 selectedByte = ( 1 << (bin - (whichByte * BITS_PER_BYTE)) );
                                 fbins_mask[BYTES_PER_MASK - 1 - whichByte] =
                                         fbins_mask[BYTES_PER_MASK - 1 - whichByte] & ((unsigned char) (~selectedByte)); // bytes are ordered MSB first in the packets
+                            }
+                        }
+                        // update freqToFilterOut
+                        if ( freqToFilterOut == f_RW_MAX )
+                        {
+                            filteringSet = true;    // end of the loop
+                        }
+                        else
+                        {
+                            freqToFilterOut = freqToFilterOut + deltaFreq;
+                        }
+                        if ( freqToFilterOut > f_RW_MAX)
+                        {
+                            freqToFilterOut = f_RW_MAX;
                         }
                     }
                 }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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