Mercurial > hg > fxanalyse
comparison FXAnalyse.c @ 59:d0aa333e6451
Fix frequency scaling in frequency drift measurement
author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
---|---|
date | Wed, 17 Oct 2012 17:40:40 +0200 |
parents | 0e4e0d7b6a22 |
children | cd7b5903f168 |
comparison
equal
deleted
inserted
replaced
58:3a70e376f8c2 | 59:d0aa333e6451 |
---|---|
1214 switch (slopeReference) { | 1214 switch (slopeReference) { |
1215 case SLOPE_REFERENCE_MICROWAVE: | 1215 case SLOPE_REFERENCE_MICROWAVE: |
1216 currentFreq = Math2; | 1216 currentFreq = Math2; |
1217 break; | 1217 break; |
1218 case SLOPE_REFERENCE_HG_CAVITY: | 1218 case SLOPE_REFERENCE_HG_CAVITY: |
1219 currentFreq = Ch2 * 1542.2 / 1062.5; | 1219 currentFreq = Ch2 * 1062.5 / 1542.2; |
1220 break; | 1220 break; |
1221 } | 1221 } |
1222 | 1222 |
1223 // stop slope cancelling if the comb is not locked | 1223 // stop slope cancelling if the comb is not locked |
1224 if (StopSlopeCancellingOnUnlocked & (fabs(currentFreq - Math2_slope) < limitotakoff)) { | 1224 if (StopSlopeCancellingOnUnlocked & (fabs(currentFreq - Math2_slope) < limitotakoff)) { |