From 6aa1f18f41dd681c47b1fef3d590c40326a563d5 Mon Sep 17 00:00:00 2001 From: Thomas Tsou Date: Tue, 20 Aug 2013 18:41:50 -0400 Subject: [PATCH] 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 --- Transceiver52M/sigProcLib.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index d1865980..9ad149f0 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -22,17 +22,11 @@ */ - - -#define NDEBUG - #include "sigProcLib.h" #include "GSMCommon.h" #include "sendLPF_961.h" #include "rcvLPF_651.h" -#include - using namespace GSM; #define TABLESIZE 1024 @@ -976,8 +970,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()) @@ -994,13 +986,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); } @@ -1019,7 +1008,6 @@ bool energyDetect(signalVector &rxBurst, windowItr+=4; } if (avgPwr) *avgPwr = energy/windowLength; - LOG(DEBUG) << "detected energy: " << energy/windowLength; return (energy/windowLength > detectThreshold*detectThreshold); } @@ -1101,10 +1089,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)); @@ -1132,7 +1116,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; @@ -1178,8 +1161,6 @@ SoftVector *demodulateBurst(signalVector &rxBurst, int sps, shapedBurst = decShapedBurst; } - LOG(DEBUG) << "shapedBurst: " << *shapedBurst; - vectorSlicer(shapedBurst); SoftVector *burstBits = new SoftVector(shapedBurst->size());