Mercurial > hg > aimc

diff carfac/ear_output.h @ 611:0fbaf443ec82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Carfac C++ revision 3, indluding more style improvements. The output structs are now classes again, and have separate storage methods for each output structure along with flags in the Run and RunSegment methods to allow for only storing NAPs if desired.
author alexbrandmeyer
date Fri, 17 May 2013 19:52:45 +0000
parents 01986636257a
children 586b0677aae8
line wrap: on
line diff
--- a/carfac/ear_output.h	Thu May 16 17:33:23 2013 +0000
+++ b/carfac/ear_output.h	Fri May 17 19:52:45 2013 +0000
@@ -25,11 +25,17 @@
 
 #include "carfac_common.h"
 
-struct EarOutput {
-  void InitOutput(int n_ch, long n_tp);
-  void MergeOutput(EarOutput output, long start, long length);
+class EarOutput {
+ public:
+  void InitOutput(int n_ch, int32_t n_tp);
+  void MergeOutput(EarOutput output, int32_t start, int32_t length);
+  void StoreNAPOutput(int32_t timepoint, int n_ch, FloatArray nap);
+  void StoreBMOutput(int32_t timepoint, int n_ch, FloatArray bm);
+  void StoreOHCOutput(int32_t timepoint, int n_ch, FloatArray ohc);
+  void StoreAGCOutput(int32_t timepoint, int n_ch, FloatArray agc);
+ private:
   int n_ch_;
-  long n_timepoints_;
+  int32_t n_timepoints_;
   FloatArray2d nap_;
   FloatArray2d nap_decim_;
   FloatArray2d ohc_;