BugID: 225

Changed the order in which channels appear after the PPF.  Hopefully they
are in increasing order now.

Appl/CEP/CS1/CS1_BGLProc/src/WH_BGL_Processing.cc

@@ -1164,10 +1164,10 @@ WH_BGL_Processing* WH_BGL_Processing::make(const string &name)
 void WH_BGL_Processing::preprocess()
 {
 #if defined HAVE_BGL && NR_SUBBAND_CHANNELS == 256
-  fftw_import_wisdom_from_string("(FFTW-2.1.5 (256 529 1 0 1 1 1 715 0) (128 529 1 0 1 1 0 2828 0) (64 529 1 0 1 1 0 1420 0) (32 529 1 0 1 1 0 716 0) (16 529 1 0 1 1 0 364 0) (8 529 1 0 1 1 0 188 0) (4 529 1 0 1 1 0 100 0) (2 529 1 0 1 1 0 56 0))");
-  itsFFTWPlan = fftw_create_plan(NR_SUBBAND_CHANNELS, FFTW_BACKWARD, FFTW_USE_WISDOM);
+  fftw_import_wisdom_from_string("(FFTW-2.1.5 (256 529 -1 0 1 1 1 352 0) (128 529 -1 0 1 1 0 2817 0) (64 529 -1 0 1 1 0 1409 0) (32 529 -1 0 1 1 0 705 0) (16 529 -1 0 1 1 0 353 0) (8 529 -1 0 1 1 0 177 0) (4 529 -1 0 1 1 0 89 0) (2 529 -1 0 1 1 0 45 0))");
+  itsFFTWPlan = fftw_create_plan(NR_SUBBAND_CHANNELS, FFTW_FORWARD, FFTW_USE_WISDOM);
 #else
-  itsFFTWPlan = fftw_create_plan(NR_SUBBAND_CHANNELS, FFTW_BACKWARD, FFTW_ESTIMATE);
+  itsFFTWPlan = fftw_create_plan(NR_SUBBAND_CHANNELS, FFTW_FORWARD, FFTW_ESTIMATE);
 #endif
 
   for (int i = 1; i <= NR_SAMPLES_PER_INTEGRATION; i ++) {

Appl/CEP/CS1/CS1_Interface/src/DH_FineDelay.cc

@@ -65,8 +65,8 @@ void DH_FineDelay::setTestPattern()
   memset(itsDelays, 0, sizeof(AllDelaysType));
 
 #if NR_STATIONS >= 2
-  (*itsDelays)[1].delayAtBegin  = 4.996749315e-9;
-  (*itsDelays)[1].delayAfterEnd = 4.996749315e-9;
+  (*itsDelays)[1].delayAtBegin  = -4.996749315e-9;
+  (*itsDelays)[1].delayAfterEnd = -4.996749315e-9;
 #endif
 }
 

Appl/CEP/CS1/CS1_Interface/src/DH_Subband.cc

@@ -106,7 +106,7 @@ void DH_Subband::setTestPattern(double Hz)
   for (int time = 0; time < NR_INPUT_SAMPLES; time ++) {
     double s, c, phi = 2 * M_PI * Hz * time / SAMPLE_RATE;
     sincos(phi, &s, &c);
-    i16complex sample = makei16complex((int) (32767 * s), (int) (32767 * c));
+    i16complex sample = makei16complex((int) (32767 * c), (int) (32767 * s));
 
     for (int stat = 0; stat < NR_STATIONS; stat ++) {
       for (int pol = 0; pol < NR_POLARIZATIONS; pol ++) {
@@ -115,7 +115,7 @@ void DH_Subband::setTestPattern(double Hz)
     }
 #if NR_STATIONS >= 2 && NR_POLARIZATIONS == 2
     sincos(phi + phaseShift, &s, &c);
-    (*itsSamples)[1][time][1] = makei16complex((int) (32767 * s), (int) (32767 * c));
+    (*itsSamples)[1][time][1] = makei16complex((int) (32767 * c), (int) (32767 * s));
 #endif
   }
 #else // use random samples