mirror of
https://github.com/RangeNetworks/openbts.git
synced 2025-10-23 07:42:01 +00:00
Transceiver52M: Remove logging from signal processing core
The only logging outputs in the the signal processing library are debug lines that generate copious amounts of output while providing little useful information to the user. The relevant information (time-of-arrival, channel gains, etc.) can and should be logged from transceiver instance itself. Signed-off-by: Thomas Tsou <tom@tsou.cc> git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@6730 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
@@ -22,17 +22,11 @@
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#define NDEBUG
|
||||
|
||||
#include "sigProcLib.h"
|
||||
#include "GSMCommon.h"
|
||||
#include "sendLPF_961.h"
|
||||
#include "rcvLPF_651.h"
|
||||
|
||||
#include <Logger.h>
|
||||
|
||||
#define TABLESIZE 1024
|
||||
|
||||
/** Lookup tables for trigonometric approximation */
|
||||
@@ -974,8 +968,6 @@ bool detectRACHBurst(signalVector &rxBurst,
|
||||
}
|
||||
complex *peakPtr = correlatedRACH.begin() + (int) rint(*TOA);
|
||||
|
||||
LOG(DEBUG) << "RACH corr: " << correlatedRACH;
|
||||
|
||||
float numSamples = 0.0;
|
||||
for (int i = 57 * sps; i <= 107 * sps; i++) {
|
||||
if (peakPtr+i >= correlatedRACH.end())
|
||||
@@ -992,13 +984,10 @@ bool detectRACHBurst(signalVector &rxBurst,
|
||||
float RMS = sqrtf(valleyPower/(float) numSamples)+0.00001;
|
||||
float peakToMean = peakAmpl.abs()/RMS;
|
||||
|
||||
LOG(DEBUG) << "RACH peakAmpl=" << peakAmpl << " RMS=" << RMS << " peakToMean=" << peakToMean;
|
||||
*amplitude = peakAmpl/(gRACHSequence->gain);
|
||||
|
||||
*TOA = (*TOA) - gRACHSequence->TOA - 8 * sps;
|
||||
|
||||
LOG(DEBUG) << "RACH thresh: " << peakToMean;
|
||||
|
||||
return (peakToMean > detectThreshold);
|
||||
}
|
||||
|
||||
@@ -1017,7 +1006,6 @@ bool energyDetect(signalVector &rxBurst,
|
||||
windowItr+=4;
|
||||
}
|
||||
if (avgPwr) *avgPwr = energy/windowLength;
|
||||
LOG(DEBUG) << "detected energy: " << energy/windowLength;
|
||||
return (energy/windowLength > detectThreshold*detectThreshold);
|
||||
}
|
||||
|
||||
@@ -1099,10 +1087,6 @@ bool analyzeTrafficBurst(signalVector &rxBurst,
|
||||
*amplitude = (*amplitude)/gMidambles[TSC]->gain;
|
||||
*TOA = (*TOA) - (maxTOA);
|
||||
|
||||
LOG(DEBUG) << "TCH peakAmpl=" << amplitude->abs() << " RMS=" << RMS << " peakToMean=" << peakToMean << " TOA=" << *TOA;
|
||||
|
||||
LOG(DEBUG) << "autocorr: " << correlatedBurst;
|
||||
|
||||
if (requestChannel && (peakToMean > detectThreshold)) {
|
||||
float TOAoffset = maxTOA;
|
||||
delayVector(correlatedBurst,-(*TOA));
|
||||
@@ -1130,7 +1114,6 @@ bool analyzeTrafficBurst(signalVector &rxBurst,
|
||||
(int) floor(TOAoffset + (maxI - 5) * sps),
|
||||
(*channelResponse)->size());
|
||||
scaleVector(**channelResponse, complex(1.0, 0.0) / gMidambles[TSC]->gain);
|
||||
LOG(DEBUG) << "channelResponse: " << **channelResponse;
|
||||
|
||||
if (channelResponseOffset)
|
||||
*channelResponseOffset = 5 * sps - maxI;
|
||||
@@ -1176,8 +1159,6 @@ SoftVector *demodulateBurst(signalVector &rxBurst, int sps,
|
||||
shapedBurst = decShapedBurst;
|
||||
}
|
||||
|
||||
LOG(DEBUG) << "shapedBurst: " << *shapedBurst;
|
||||
|
||||
vectorSlicer(shapedBurst);
|
||||
|
||||
SoftVector *burstBits = new SoftVector(shapedBurst->size());
|
||||
|
Reference in New Issue
Block a user