diff src/AGC.h @ 484:715fc47a965e carfac_cpp

stubbed some more, and tidying

--- a/src/AGC.h	Thu Mar 29 19:43:36 2012 +0000
+++ b/src/AGC.h	Sat Mar 31 17:24:08 2012 +0000
@@ -1,23 +1,25 @@
 #ifndef AGC_H_
 #define AGC_H_
 
-#include "CARFAC_common_typedefs.h"
+#include "CARFAC_common.h"
 
 class AGC_parameters {
 public:
-  AGC_parameters()
-  {
-    n_stages_ = 4; // redundant?
-    time_constants_ = {0.002*1, 0.002*4, 0.002*16, 0.002*64};
-    agc_stage_gain_ = 2;
-    decimation_ = {8, 2, 2, 2};
-    agc1_scales_ = {1.0, 1.4,  2.0, 2.8};
-    agc2_scales_ = {1.6, 2.25, 3.2, 4.5};
-    detect_scale_ = 0.25;
-    agc_mix_coeff_ = 0.5;
+  AGC_parameters():
+    n_stages_(4),
+    time_constants_({0.002*1, 0.002*4, 0.002*16, 0.002*64}),
+    agc_stage_gain_(2),
+    decimation_({8, 2, 2, 2}),
+    agc1_scales_({1.0, 1.4,  2.0, 2.8}),
+    agc2_scales_({1.6, 2.25, 3.2, 4.5}),
+    detect_scale_(0.25),
+    agc_mix_coeff_(0.5){
+    // do nothing more
   }
 
-  virtual ~AGC_parameters(){}
+  virtual ~AGC_parameters(){
+    // do nothing
+  }
 
   int n_stages_;
   FloatArray time_constants_;
@@ -33,8 +35,11 @@
 public:
   AGC_coefficients(AGC_parameters*, float, int);
   virtual ~AGC_coefficients();
+
+  float detect_scale_;
+  float agc_gain_;
 private:
-  AGC_coefficients(){}
+  AGC_coefficients();
 };
 
 #endif /* AGC_H_ */