HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r355:c502a62ca98f

modulus, tbad, offset, shift are stored in finetime (uint64_t)...

paul -

r355:c502a62ca98f R3++

parent child

Context file:

r355:c502a62ca98f

Collapse all files

.hgsubstate +1 -1

@@ -1,2 +1,2
1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters	1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
2	26659466eb11170e587645c796142ac8a7fd0add header/lfr_common_headers	2	e904b329ff977514bf36af92617afefd22fd06ab header/lfr_common_headers

src/fsw_init.c +5 -3

                 // initialize filtering parameters
                 filterPar.spare_sy_lfr_pas_filter_enabled   = DEFAULT_SY_LFR_PAS_FILTER_ENABLED;
-                filterPar.sy_lfr_pas_filter_modulus         = DEFAULT_SY_LFR_PAS_FILTER_MODULUS;
+                filterPar.sy_lfr_sc_rw_delta_f              = DEFAULT_SY_LFR_SC_RW_DELTA_F;
                 filterPar.sy_lfr_pas_filter_tbad            = DEFAULT_SY_LFR_PAS_FILTER_TBAD;
-                filterPar.sy_lfr_pas_filter_offset          = DEFAULT_SY_LFR_PAS_FILTER_OFFSET;
                 filterPar.sy_lfr_pas_filter_shift           = DEFAULT_SY_LFR_PAS_FILTER_SHIFT;
-                filterPar.sy_lfr_sc_rw_delta_f              = DEFAULT_SY_LFR_SC_RW_DELTA_F;
+                filterPar.modulus_in_finetime               = DEFAULT_MODULUS;
+                filterPar.tbad_in_finetime                  = DEFAULT_TBAD;
+                filterPar.offset_in_finetime                = DEFAULT_OFFSET;
+                filterPar.shift_in_finetime                 = DEFAULT_SHIFT;
                 update_last_valid_transition_date( DEFAULT_LAST_VALID_TRANSITION_DATE  );
                 // waveform picker initialization

src/processing/fsw_processing.c +27 -17

                 unsigned char pasFilteringIsEnabled;
                 unsigned char ret;
-                pasFilteringIsEnabled = (filterPar.spare_sy_lfr_pas_filter_enabled & 1); // [0000 0001]
-                ret = MATRIX_IS_NOT_POLLUTED;
-                // compute the acquitionTime range
-                modulusInFineTime   = ((u_int64_t) filterPar.sy_lfr_pas_filter_modulus) * CONST_65536;
-                offsetInFineTime    = ((u_int64_t) filterPar.sy_lfr_pas_filter_offset)  * CONST_65536;
-                shiftInFineTime     = ((u_int64_t) filterPar.sy_lfr_pas_filter_shift)   * CONST_65536;
-                tbadInFineTime      = ((u_int64_t) filterPar.sy_lfr_pas_filter_tbad)    * CONST_65536;
                 // compute acquisition time from caoarseTime and fineTime
                 t0 = ( ((u_int64_t)coarseTime) <<  SHIFT_2_BYTES ) + (u_int64_t) fineTime;
+                t1 = t0;
+                tc = t0;
+                tbad0 = t0;
+                tbad1 = t0;
                 switch(channel)
                 {
                 case CHANNELF0:
                     t1 = t0 + ACQUISITION_DURATION_F2;
                     tc = t0 + HALF_ACQUISITION_DURATION_F2;
                     break;
+                default:
+                    break;
                 }
+                // compute the acquitionTime range
+                modulusInFineTime   = filterPar.modulus_in_finetime;
+                offsetInFineTime    = filterPar.offset_in_finetime;
+                shiftInFineTime     = filterPar.shift_in_finetime;
+                tbadInFineTime      = filterPar.tbad_in_finetime;
+                timecodeReference   = INIT_INT;
+                pasFilteringIsEnabled = (filterPar.spare_sy_lfr_pas_filter_enabled & 1); // [0000 0001]
+                ret = MATRIX_IS_NOT_POLLUTED;
+                if ( (tbadInFineTime == 0) || (pasFilteringIsEnabled == 0) )
+                {
+                    ret = MATRIX_IS_NOT_POLLUTED;
+                }
+                else
+                {
                     // INTERSECTION TEST #1
                     timecodeReference = (tc - (tc % modulusInFineTime)) - modulusInFineTime ;
                     tbad0 = timecodeReference + offsetInFineTime + shiftInFineTime;
                     ret = isPolluted( t0, t1, tbad0, tbad1 );
                     // INTERSECTION TEST #2
+                    if (ret == MATRIX_IS_NOT_POLLUTED)
+                    {
                         timecodeReference = (tc - (tc % modulusInFineTime)) ;
                         tbad0 = timecodeReference + offsetInFineTime + shiftInFineTime;
                         tbad1 = timecodeReference + offsetInFineTime + shiftInFineTime + tbadInFineTime;
-                if (ret == MATRIX_IS_NOT_POLLUTED)
                         ret = isPolluted( t0, t1, tbad0, tbad1 );
                     }
                     // INTERSECTION TEST #3
+                    if (ret == MATRIX_IS_NOT_POLLUTED)
+                    {
                         timecodeReference = (tc - (tc % modulusInFineTime)) + modulusInFineTime ;
                         tbad0 = timecodeReference + offsetInFineTime + shiftInFineTime;
                         tbad1 = timecodeReference + offsetInFineTime + shiftInFineTime + tbadInFineTime;
-                if (ret == MATRIX_IS_NOT_POLLUTED)
                         ret = isPolluted( t0, t1, tbad0, tbad1 );
                     }
-                if (pasFilteringIsEnabled == 0)
-                    ret = MATRIX_IS_NOT_POLLUTED;
                 }
                 return ret;

src/tc_load_dump_parameters.c +9 -2

                     //****************************
                     // store PAS filter parameters
                     // sy_lfr_pas_filter_enabled
                     filterPar.spare_sy_lfr_pas_filter_enabled   = parameter_dump_packet.spare_sy_lfr_pas_filter_enabled;
                     set_sy_lfr_pas_filter_enabled( parameter_dump_packet.spare_sy_lfr_pas_filter_enabled & BIT_PAS_FILTER_ENABLED );
                     // sy_lfr_pas_filter_modulus
-                    filterPar.sy_lfr_pas_filter_modulus         = parameter_dump_packet.sy_lfr_pas_filter_modulus;
+                    filterPar.modulus_in_finetime = ((uint64_t) parameter_dump_packet.sy_lfr_pas_filter_modulus) * CONST_65536;
                     // sy_lfr_pas_filter_tbad
                     copyFloatByChar( (unsigned char*) &filterPar.sy_lfr_pas_filter_tbad,
                                      parameter_dump_packet.sy_lfr_pas_filter_tbad );
+                    filterPar.tbad_in_finetime = (uint64_t) (filterPar.sy_lfr_pas_filter_tbad * CONST_65536);
                     // sy_lfr_pas_filter_offset
-                    filterPar.sy_lfr_pas_filter_offset          = parameter_dump_packet.sy_lfr_pas_filter_offset;
+                    filterPar.offset_in_finetime = ((uint64_t) parameter_dump_packet.sy_lfr_pas_filter_offset) * CONST_65536;
                     // sy_lfr_pas_filter_shift
                     copyFloatByChar( (unsigned char*) &filterPar.sy_lfr_pas_filter_shift,
                                      parameter_dump_packet.sy_lfr_pas_filter_shift );
+                    filterPar.shift_in_finetime = (uint64_t) (filterPar.sy_lfr_pas_filter_shift * CONST_65536);
                     //****************************************************
                     // store the parameter sy_lfr_sc_rw_delta_f as a float

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