Diff: GPA.h

Revision:

7:7715f92c5182

Parent:

5:d00752fcad65

Child:

12:c8ec698c53ed

--- a/GPA.h	Thu Oct 25 09:59:14 2018 +0000
+++ b/GPA.h	Mon Jan 07 13:31:38 2019 +0000
@@ -2,9 +2,9 @@
 {
 public:
 
-    GPA(float fMin, float fMax, int NfexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1);
-    GPA(float f0, float f1, float *fexcDes, int NfexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1);
-    GPA(float *fexcDes, int NfexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1);
+    GPA(float fMin, float fMax, int NfexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1, int NstartMin, int NsweepMin);
+    GPA(float f0, float f1, float *fexcDes, int NfexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1, int NstartMin, int NsweepMin);
+    GPA(float *fexcDes, int NfexcDes, int NperMin, int NmeasMin, float Ts, float Aexc0, float Aexc1, int NstartMin, int NsweepMin);
 
     float operator()(float inp, float out) {
         return update((double)inp, (double)out);
@@ -17,6 +17,7 @@
 
     void     printGPAfexcDes();
     void     printGPAmeasPara();
+    void     printFullGPAmeasPara();
     void     printGPAmeasTime();
     void     printNfexcDes();
 
@@ -34,16 +35,16 @@
     double  pi2;
     double  pi2Ts;
     double  piDiv2;
+    float   rad2deg;
 
     int     Nmeas;
     int     Nper;
+    double  dfexc;
     double  fexc;
     double  fexcPast;
-    int     ii;
-    int     jj;
+    int     i;
+    int     j;
     double  scaleG;
-    double  scaleH;
-    double  wk;
     double  cr;
     double  ci;
     double *sU;
@@ -51,11 +52,26 @@
     double  sinarg;
     int     NmeasTotal;
     double  Aexc;
+    double  AexcPast;
     double  pi2Tsfexc;
-
+    int     NstartMin;
+    int     NsweepMin;
+    int     Nsweep;
+    double  bfexc;
+    double  afexc;
+    double  aAexc;
+    double  bAexc;
+    double  AexcOut;
+    
+    void    assignParameters(int NfexcDes, int NperMin, int NmeasMin, double Ts, int NstartMin, int NsweepMin);
+    void    calculateDecreasingAmplitudeCoefficients(double Aexc0, double Aexc1);
+    void    initializeConstants(double Ts);
+    void    assignFilterStorage();
     void    fexcDesLogspace(double fMin, double fMax, int NfexcDes);
     void    calcGPAmeasPara(double fexcDes_i);
+    void    calcGPAsweepPara();
+    double  wrapAngle(double angle);
+    void    printLongLine();
     void    printLine();
-    void    calcHann();
 
 };
\ No newline at end of file