Mercurial > hg > fxanalyse

comparison FXAnalyse.c @ 140:3f7eef731ccc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust log messages
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Wed, 22 Jan 2014 14:45:22 +0100
parents e04123ab79ef
children fd085d61e4ca
comparison
equal deleted inserted replaced
139:e04123ab79ef 140:3f7eef731ccc
1340 if (dedrift.doubleslope) 1340 if (dedrift.doubleslope)
1341 DDSFox_SetSweepRate(&DDS1xAD9956, dedrift.applied * 2.0); 1341 DDSFox_SetSweepRate(&DDS1xAD9956, dedrift.applied * 2.0);
1342 else 1342 else
1343 DDSFox_SetSweepRate(&DDS1xAD9956, dedrift.applied); 1343 DDSFox_SetSweepRate(&DDS1xAD9956, dedrift.applied);
1344 1344
1345 logmsg("dedrift update (%+6g) %6g", freq.slope, dedrift.applied); 1345 logmsg("dedrift update: adjustment=%+3e slope=%+3e", freq.slope, dedrift.applied);
1346 1346
1347 stat_zero(&freq); 1347 stat_zero(&freq);
1348 dedrift.t0 = utc; 1348 dedrift.t0 = utc;
1349 } 1349 }
1350 } 1350 }
1363 double freq = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2); 1363 double freq = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2);
1364 double adj = 275000.0 - rollmean_ch4.mean; 1364 double adj = 275000.0 - rollmean_ch4.mean;
1365 freq = freq + adj; 1365 freq = freq + adj;
1366 SetCtrlVal(MainPanel, PANEL_DDS2, freq); 1366 SetCtrlVal(MainPanel, PANEL_DDS2, freq);
1367 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, freq); 1367 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, freq);
1368 logmsg("recenter ch4 to 275 kHz: DDS2 adjustment=%5e", adj); 1368 logmsg("recenter ch4 to 275 kHz: DDS2 adjustment=%+3e", adj);
1369 } 1369 }
1370 1370
1371 if (recenter.Hg) { 1371 if (recenter.Hg) {
1372 // adjust DDS3 frequency to keep Ch2 reading at 10 kHz 1372 // adjust DDS3 frequency to keep Ch2 reading at 10 kHz
1373 double freq = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3); 1373 double freq = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3);
1374 double adj = 10000 - rollmean_ch2.mean; 1374 double adj = 10000 - rollmean_ch2.mean;
1375 freq = freq + adj; 1375 freq = freq + adj;
1376 SetCtrlVal(MainPanel, PANEL_DDS3, freq); 1376 SetCtrlVal(MainPanel, PANEL_DDS3, freq);
1377 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, freq); 1377 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, freq);
1378 logmsg("recenter Hg beatnote (ch2) to 10 kHz: DDS3 adjustment=%5e", adj); 1378 logmsg("recenter Hg beatnote (ch2) to 10 kHz: DDS3 adjustment=%+3e", adj);
1379 } 1379 }
1380 1380
1381 if (recenter.Sr) { 1381 if (recenter.Sr) {
1382 // adjust DDS3 frequency to keep Ch3 reading at 10 kHz 1382 // adjust DDS3 frequency to keep Ch3 reading at 10 kHz
1383 double freq = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3); 1383 double freq = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3);
1384 double adj = 10000 - rollmean_ch3.mean; 1384 double adj = 10000 - rollmean_ch3.mean;
1385 freq = freq + adj; 1385 freq = freq + adj;
1386 SetCtrlVal(MainPanel, PANEL_DDS3, freq); 1386 SetCtrlVal(MainPanel, PANEL_DDS3, freq);
1387 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, freq); 1387 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, freq);
1388 logmsg("recenter Hg beatnote (ch3) to 10 kHz: DDS3 adjustment=%5e", adj); 1388 logmsg("recenter Hg beatnote (ch3) to 10 kHz: DDS3 adjustment=%+3e", adj);
1389 } 1389 }
1390 1390
1391 recenter.t0 = utc; 1391 recenter.t0 = utc;
1392 rollmean_zero(&rollmean_ch2); 1392 rollmean_zero(&rollmean_ch2);
1393 rollmean_zero(&rollmean_ch3); 1393 rollmean_zero(&rollmean_ch3);