[Loris-cvs] Loris/src phasefix.C,1.15,1.16

[Kelly F. <kf...@us...>]

Update of /cvsroot/loris/Loris/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11564

Modified Files:
	phasefix.C 
Log Message:
Removed some debugging code from phaseFix.C

Index: phasefix.C
===================================================================
RCS file: /cvsroot/loris/Loris/src/phasefix.C,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** phasefix.C	2 Jan 2010 04:55:12 -0000	1.15
--- phasefix.C	10 Jan 2010 06:26:23 -0000	1.16
***************
*** 74,96 ****
  // -- local helpers -- 
  
  // ---------------------------------------------------------------------------
! //	wrapPi
! //	Wrap an unwrapped phase value to the range (-pi,pi].
  //
  double wrapPi( double x )
  {
! 	x = std::fmod( x, 2*Pi );
! 	
! 	if ( x > Pi )
! 	{
! 		x = x - ( 2*Pi );
! 	}
! 	else if ( x < -Pi )
! 	{
! 		x = x + ( 2*Pi );
! 	}
! 	return x;
  }
  
  // ---------------------------------------------------------------------------
  //	phaseTravel
--- 74,93 ----
  // -- local helpers -- 
  
+ 
  // ---------------------------------------------------------------------------
! //  wrapPi
! //	Wrap an unwrapped phase value to the range [-pi,pi] using
! //  O'Donnell's phase wrapping function.
  //
  double wrapPi( double x )
  {
!     using namespace std; // floor should be in std
!     #define ROUND(x) (floor(.5 + (x)))
!     const double TwoPi = 2.0*Pi;
!     return x + ( TwoPi * ROUND(-x/TwoPi) );
  }
  
+ 
+ 
  // ---------------------------------------------------------------------------
  //	phaseTravel
***************
*** 291,302 ****
          double desired = travel + deviation;
          
-         /*
-         debugger << "---------- fixing breakpoint frequencies over time ( " 
-                  << b.time() << " , " << e.time() << " )" << endl;
-              
-         debugger << "desired travel: " << desired << endl;
-         debugger << "actual travel: " << travel << endl;
-         */
-         
          //	Compute the amount by which to perturb the frequencies of
          //	all the null Breakpoints between b and e.
--- 288,291 ----
***************
*** 326,355 ****
          
          //	Perturb the Breakpoint frequencies.
-         double DEBUGtravel = 0;
          next = b;
          Partial::iterator prev = next++;
          while ( next != e )
          {
-             //debugger << "changing frequency from " << next.breakpoint().frequency();
              next.breakpoint().setFrequency( next.breakpoint().frequency() + delta );
-             //debugger << " to " << next.breakpoint().frequency() << endl;
-             
-             double newtravel = phaseTravel( prev, next );
-             DEBUGtravel += newtravel;
              
!             //debugger << "changing phase from " << wrapPi( next.breakpoint().phase() );
              next.breakpoint().setPhase( wrapPi( prev.breakpoint().phase() + newtravel ) );
-             //debugger << " to " << next.breakpoint().phase() << endl;
              
              prev = next++;
          }
-         DEBUGtravel += phaseTravel( prev, next );
-         /*
-         debugger << "travel: " << DEBUGtravel << endl;
-         
-         debugger << "desired: " << e.breakpoint().phase() << endl;
-         debugger << "got: " << wrapPi( prev.breakpoint().phase() + phaseTravel( prev, next ) ) << endl;
-         debugger << "---------- done." << endl;
-         */
      }
      else
--- 315,329 ----
          
          //	Perturb the Breakpoint frequencies.
          next = b;
          Partial::iterator prev = next++;
          while ( next != e )
          {
              next.breakpoint().setFrequency( next.breakpoint().frequency() + delta );
              
!             double newtravel = phaseTravel( prev, next );            
              next.breakpoint().setPhase( wrapPi( prev.breakpoint().phase() + newtravel ) );
              
              prev = next++;
          }
      }
      else