@@ -1,2 +1,2 | |||
|
1 | 1 | 3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters |
|
2 | 7ee7da2ed42fbc9cd673ae7f3a865345cea0f83f header/lfr_common_headers | |
|
2 | 5dfc0745a617f0b14b9b4c6d6c12d01f1fb9a801 header/lfr_common_headers |
@@ -720,14 +720,14 int getFBinMask( int index, unsigned cha | |||
|
720 | 720 | |
|
721 | 721 | unsigned char acquisitionTimeIsValid( unsigned int coarseTime, unsigned int fineTime, unsigned char channel) |
|
722 | 722 | { |
|
723 |
u_int64_t acquisitionT |
|
|
724 |
u_int64_t acquisitionT |
|
|
723 | u_int64_t acquisitionTStart; | |
|
724 | u_int64_t acquisitionTStop; | |
|
725 | 725 | u_int64_t timecodeReference; |
|
726 | 726 | u_int64_t offsetInFineTime; |
|
727 | 727 | u_int64_t shiftInFineTime; |
|
728 | 728 | u_int64_t tBadInFineTime; |
|
729 |
u_int64_t |
|
|
730 |
u_int64_t |
|
|
729 | u_int64_t perturbationTStart; | |
|
730 | u_int64_t perturbationTStop; | |
|
731 | 731 | unsigned char pasFilteringIsEnabled; |
|
732 | 732 | unsigned char ret; |
|
733 | 733 | |
@@ -735,18 +735,18 unsigned char acquisitionTimeIsValid( un | |||
|
735 | 735 | ret = 1; |
|
736 | 736 | |
|
737 | 737 | // compute acquisition time from caoarseTime and fineTime |
|
738 |
acquisitionT |
|
|
738 | acquisitionTStart = ( ((u_int64_t)coarseTime) << SHIFT_2_BYTES ) | |
|
739 | 739 | + (u_int64_t) fineTime; |
|
740 | 740 | switch(channel) |
|
741 | 741 | { |
|
742 | 742 | case CHANNELF0: |
|
743 |
acquisitionT |
|
|
743 | acquisitionTStop = acquisitionTStart + ACQUISITION_DURATION_F0; | |
|
744 | 744 | break; |
|
745 | 745 | case CHANNELF1: |
|
746 |
acquisitionT |
|
|
746 | acquisitionTStop = acquisitionTStart + ACQUISITION_DURATION_F1; | |
|
747 | 747 | break; |
|
748 | 748 | case CHANNELF2: |
|
749 |
acquisitionT |
|
|
749 | acquisitionTStop = acquisitionTStart + ACQUISITION_DURATION_F2; | |
|
750 | 750 | break; |
|
751 | 751 | } |
|
752 | 752 | |
@@ -759,20 +759,19 unsigned char acquisitionTimeIsValid( un | |||
|
759 | 759 | shiftInFineTime = ((double) filterPar.sy_lfr_pas_filter_shift) * CONST_65536; |
|
760 | 760 | tBadInFineTime = ((double) filterPar.sy_lfr_pas_filter_tbad) * CONST_65536; |
|
761 | 761 | |
|
762 | acquisitionTimeRangeMin = | |
|
762 | perturbationTStart = | |
|
763 | 763 | timecodeReference |
|
764 | 764 | + offsetInFineTime |
|
765 | + shiftInFineTime | |
|
766 | - acquisitionDurations[channel]; | |
|
765 | + shiftInFineTime; | |
|
767 | 766 | |
|
768 | acquisitionTimeRangeMax = | |
|
767 | perturbationTStop = | |
|
769 | 768 | timecodeReference |
|
770 | 769 | + offsetInFineTime |
|
771 | 770 | + shiftInFineTime |
|
772 | 771 | + tBadInFineTime; |
|
773 | 772 | |
|
774 |
if ( (acquisitionT |
|
|
775 |
&& (acquisitionT |
|
|
773 | if ( (acquisitionTStart >= perturbationTStart) | |
|
774 | && (acquisitionTStart <= perturbationTStop) | |
|
776 | 775 | && (pasFilteringIsEnabled == 1) ) |
|
777 | 776 | { |
|
778 | 777 | ret = 0; // the acquisition time is INSIDE the range, the matrix shall be ignored |
@@ -785,8 +784,8 unsigned char acquisitionTimeIsValid( un | |||
|
785 | 784 | // 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 |
|
786 | 785 | if (ret == 1) |
|
787 | 786 | { |
|
788 |
if ( (acquisitionT |
|
|
789 |
&& (acquisitionT |
|
|
787 | if ( (acquisitionTStop >= perturbationTStart) | |
|
788 | && (acquisitionTStop <= perturbationTStop) | |
|
790 | 789 | && (pasFilteringIsEnabled == 1) ) |
|
791 | 790 | { |
|
792 | 791 | ret = 0; // the acquisition time is INSIDE the range, the matrix shall be ignored |
General Comments 0
You need to be logged in to leave comments.
Login now