Circadian/Sleep-Wake Process curves look about right. A small adjustment...

Circadian/Sleep-Wake Process curves look about right. A small adjustment needed, but looks better qualitatively

environment/GUI/init/10-userguisettings.tcl

@@ -43,10 +43,10 @@ if {$reset_window_sizes != "yes"} {
   set changed_window_list(.bold_graphs) 1
   set window_config(.bufferstatus) 450x240+1223+277
   set changed_window_list(.bufferstatus) 1
-  set window_config(.procedural) 1469x450+1601+240
-  set changed_window_list(.procedural) 1
   set window_config(.whynot) 956x300+1620+570
   set changed_window_list(.whynot) 1
+  set window_config(.procedural) 1469x450+1601+240
+  set changed_window_list(.procedural) 1
 }
 set gui_options(p_selected) #44DA22
 set gui_options(p_matched) #FCA31D

user-loads/Structure/ACTH/ACTH.DES

@@ -41,7 +41,8 @@ By : University of Mississippi Medical Center
 <var><name> CircadianCRFEffect </name><val> 1 </val></var>
 <var><name> CircadianEffect </name><val> 1 </val></var>
 <parm><name> CircadianPhase </name><val> 0 </val></parm>
-<parm><name> CircadianAmp </name><val> 0.625 </val></parm>
+<parm><name> CircadianAmp </name><val> 0.55 </val></parm>
+<parm><name> CircadianConst </name><val> 1 </val></parm>
 	<!-- Borbély-Achermann parameters -->
 <parm><name> a1 </name><val> 0.97 </val></parm>
 <parm><name> a2 </name><val> 0.22 </val></parm>
@@ -158,7 +159,8 @@ By : University of Mississippi Medical Center
 <def>
 	<name> CircadianEffect </name>
 	<!-- Uses Borbély-Achermann equation for C process (from Thorsley, 2012) -->
-	<val> ( CircadianAmp ) * ( ( a1 * ( SIN ( ( System.Pi / 12 ) * ( SystemHour - CircadianPhase ) ) ) ) + ( a2 * ( SIN ( ( 2 * System.Pi / 12 ) * ( SystemHour - CircadianPhase ) ) ) ) + ( a3 * ( SIN ( ( 3 * System.Pi / 12 ) * ( SystemHour - CircadianPhase ) ) ) ) + ( a4 * ( SIN ( ( 4 * System.Pi / 12 ) * ( SystemHour - CircadianPhase ) ) ) ) + 1.6 ) </val>
+	<!-- To keep things reasonable, the CiradianAmp * CircadianConst shouuld roughly equal 1 -->
+	<val> ( CircadianAmp ) * ( ( a1 * ( SIN ( ( System.Pi / 12 ) * ( SystemHour - CircadianPhase ) ) ) ) + ( a2 * ( SIN ( ( 2 * System.Pi / 12 ) * ( SystemHour - CircadianPhase ) ) ) ) + ( a3 * ( SIN ( ( 3 * System.Pi / 12 ) * ( SystemHour - CircadianPhase ) ) ) ) + ( a4 * ( SIN ( ( 4 * System.Pi / 12 ) * ( SystemHour - CircadianPhase ) ) ) ) + CircadianConst ) </val>
 </def>
 
 <def>

user-loads/Structure/Cortisol/Cortisol.DES

@@ -47,7 +47,7 @@ By : University of Mississippi Medical Center
 <parm><name> Sleep-allostatic-rate </name><val> 0.92 </val></parm>
 <!-- Using mag from Thorsley paper -->
 <!-- <parm><name> Wake-allostatic-mag </name><val> 70.8 </val></parm> -->
-<parm><name> Wake-allostatic-mag </name><val> 1.1 </val></parm>
+<parm><name> Wake-allostatic-mag </name><val> 1.3 </val></parm>
 <parm><name> Wake-allostatic-rate </name><val> 0.90 </val></parm>
 <var><name> Sleep-Secretion-Sleep-Hom </name><val> 0 </val></var>
 <var><name> Wake-Secretion-Sleep-Hom </name><val> 0 </val></var>