Corrected initialization of the fixed and set phase oscillator parts. They...

Corrected initialization of the fixed and set phase oscillator parts.  They had been using a random phase when the model was restarted and frequencies were restored with the SDF safe.snap.

git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@4277 6dcd42c9-f523-4c6d-aada-af552506706e

NEWS

@@ -13,6 +13,7 @@ Changes for X.X
 - Add leap second to dataviewer for Dec. 31, 2016
 - Bug Fix (1047): EDCU code that supports dual data concentrators was modified to work 
   with new mx_stream introduced in 3.1
+- Bug Fix: Corrected initialization for fixed and set phase oscillators at model start.
 ==================================================================================================
 Changes for 3.1.1
 ==================================================================================================

src/epics/util/lib/OscFixedPhase.pm

@@ -115,8 +115,8 @@ sub frontEndInitCode {
 	$calcExp .= "FE_RATE);\n";
 	$calcExp .= "RampParamInit(&\L$::xpartName[$i]\_cosgain_state,0, ";
 	$calcExp .= "FE_RATE);\n";
-	$calcExp .= "\L$::xpartName[$i]_freq_request = \L$::xpartName[$i]_freq;\n";
-	$calcExp .= "\L$::xpartName[$i]_freq_request_limited = ((int) (\L$::xpartName[$i]_freq_request * 1000)) / 1000.0;\n";
+	$calcExp .= "\L$::xpartName[$i]_freq_request = 0.0;\n";
+	$calcExp .= "\L$::xpartName[$i]_freq_request_limited = 0;\n";
 	$calcExp .= "\L$::xpartName[$i]\_freq_cycle_count = 0;\n";
 	$calcExp .= "\L$::xpartName[$i]\_delta_freq = 0;\n";
 	$calcExp .= "\L$::xpartName[$i]\_extra_phase_shift_per_cycle = 0;\n";

src/epics/util/lib/OscSetPhase.pm

@@ -114,7 +114,7 @@ sub frontEndInitCode {
 	$calcExp .= "FE_RATE);\n";
 	$calcExp .= "RampParamInit(&\L$::xpartName[$i]\_cosgain_state,0, ";
 	$calcExp .= "FE_RATE);\n";
-	$calcExp .= "\L$::xpartName[$i]_freq_request = \L$::xpartName[$i]_freq;\n";
+	$calcExp .= "\L$::xpartName[$i]_freq_request = 0.0;\n";
 	$calcExp .= "\L$::xpartName[$i]\_freq_cycle_count = 0;\n";
 	$calcExp .= "\L$::xpartName[$i]\_delta_freq = 0;\n";
 	$calcExp .= "\L$::xpartName[$i]\_extra_phase_shift_per_cycle = 0;\n";