Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

fix: correct time alignment for phasor rate calculation

Browse source
This commit is contained in:
Manuel Pitz 2022-07-06 19:14:56 +02:00
parent b94746effb
commit 6622cc8431
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/hooks/pmu.cpp
View file

@ -197,16 +197,12 @@ Hook::Reason PmuHook::process(struct Sample *smp)
phasorStatus = Status::INVALID;
}
double m = pow(10, floor(log10(phasorRate) + 1));
if (phasorRate <= 1) // For less then 1 phasor per second
m = pow(10, floor(log10(phasorRate)));
double nextRunDouble = (floor(time_to_double(&smp->ts.origin)*m)/m) + 1.0 / phasorRate;
double r = fmod(nextRunDouble, 1 / phasorRate);
if( (r > 1 / (4 * phasorRate)) && (r < 3 / (4 * phasorRate)))
nextRunDouble += (1.0 / phasorRate) - fmod(nextRunDouble, 1 / phasorRate);
nextRun = time_from_double(nextRunDouble);
// Align time tag
double currentTimeTag = time_to_double(&smp->ts.origin);
double alignedTime = currentTimeTag - fmod(currentTimeTag, 1 / phasorRate);
nextRun = time_from_double(alignedTime + 1 / phasorRate);
unsigned tsPos = 0;
size_t tsPos = 0;
if (timeAlignType == TimeAlign::RIGHT)
tsPos = windowSize;
else if (timeAlignType == TimeAlign::LEFT)