HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r353:06a7ca24f3e7

begin to work on:...

paul -

r353:06a7ca24f3e7 R3++

parent child

Context file:

r353:06a7ca24f3e7

Collapse all files

.hgsubstate +1 -1

@@ -1,2 +1,2
1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters	1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
2	7ee7da2ed42fbc9cd673ae7f3a865345cea0f83f header/lfr_common_headers	2	5dfc0745a617f0b14b9b4c6d6c12d01f1fb9a801 header/lfr_common_headers

src/processing/fsw_processing.c +15 -16

             unsigned char acquisitionTimeIsValid( unsigned int coarseTime, unsigned int fineTime, unsigned char channel)
             {
-                u_int64_t acquisitionTimeStart;
+                u_int64_t acquisitionTStart;
-                u_int64_t acquisitionTimeStop;
+                u_int64_t acquisitionTStop;
                 u_int64_t timecodeReference;
                 u_int64_t offsetInFineTime;
                 u_int64_t shiftInFineTime;
                 u_int64_t tBadInFineTime;
-                u_int64_t acquisitionTimeRangeMin;
+                u_int64_t perturbationTStart;
-                u_int64_t acquisitionTimeRangeMax;
+                u_int64_t perturbationTStop;
                 unsigned char pasFilteringIsEnabled;
                 unsigned char ret;
                 ret = 1;
                 // compute acquisition time from caoarseTime and fineTime
-                acquisitionTimeStart = ( ((u_int64_t)coarseTime) <<  SHIFT_2_BYTES )
+                acquisitionTStart = ( ((u_int64_t)coarseTime) <<  SHIFT_2_BYTES )
                         + (u_int64_t) fineTime;
                 switch(channel)
                 {
                 case CHANNELF0:
-                    acquisitionTimeStop = acquisitionTimeStart + FINETIME_PER_SM_F0;
+                    acquisitionTStop = acquisitionTStart + ACQUISITION_DURATION_F0;
                     break;
                 case CHANNELF1:
-                    acquisitionTimeStop = acquisitionTimeStart + FINETIME_PER_SM_F1;
+                    acquisitionTStop = acquisitionTStart + ACQUISITION_DURATION_F1;
                     break;
                 case CHANNELF2:
-                    acquisitionTimeStop = acquisitionTimeStart + FINETIME_PER_SM_F2;
+                    acquisitionTStop = acquisitionTStart + ACQUISITION_DURATION_F2;
                     break;
                 }
                 shiftInFineTime     = ((double) filterPar.sy_lfr_pas_filter_shift)    * CONST_65536;
                 tBadInFineTime      = ((double) filterPar.sy_lfr_pas_filter_tbad)     * CONST_65536;
-                acquisitionTimeRangeMin =
+                perturbationTStart =
                         timecodeReference
                         + offsetInFineTime
-                        + shiftInFineTime
+                        + shiftInFineTime;
-                        - acquisitionDurations[channel];
-                acquisitionTimeRangeMax =
+                perturbationTStop =
                         timecodeReference
                         + offsetInFineTime
                         + shiftInFineTime
                         + tBadInFineTime;
-                if ( (acquisitionTimeStart >= acquisitionTimeRangeMin)
+                if ( (acquisitionTStart >= perturbationTStart)
-                     && (acquisitionTimeStart <= acquisitionTimeRangeMax)
+                     && (acquisitionTStart <= perturbationTStop)
                      && (pasFilteringIsEnabled == 1) )
                 {
                     ret = 0;    // the acquisition time is INSIDE the range, the matrix shall be ignored
                 // the last sample of the data used to compute the matrix shall not be INSIDE the range, test it now, it depends on the channel
                 if (ret == 1)
                 {
-                    if ( (acquisitionTimeStop >= acquisitionTimeRangeMin)
+                    if ( (acquisitionTStop >= perturbationTStart)
-                         && (acquisitionTimeStop <= acquisitionTimeRangeMax)
+                         && (acquisitionTStop <= perturbationTStop)
                          && (pasFilteringIsEnabled == 1) )
                     {
                         ret = 0;    // the acquisition time is INSIDE the range, the matrix shall be ignored

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