Mercurial > repos > greg > multigps

changeset 35:150859e7f99b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Wed, 14 Dec 2016 09:24:00 -0500
parents 9b48edaa54f8
children 8fca5f834b15
files multigps.xml
diffstat 1 files changed, 14 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/multigps.xml	Wed Dec 14 09:03:16 2016 -0500
+++ b/multigps.xml	Wed Dec 14 09:24:00 2016 -0500
@@ -27,6 +27,7 @@
             ############################
             #set aoc = $advanced_options_cond
             #if str($aoc.advanced_options) == 'display':
+                #set bmsc = $aoc.binding_model_smoothing_cond
                 #set gmsc = $aoc.gauss_model_smoothing_cond
                 #set rbec = $aoc.report_binding_events_cond
                 #set rloc = $aoc.reads_limits_options_cond
@@ -93,10 +94,11 @@
                     --nomodelupdate
                 #end if
                 --minmodelupdateevents $aoc.minmodelupdateevents
-                #if str($aoc.nomodelsmoothing) == 'no':
+                #if str($bmsc.nomodelsmoothing) == 'no':
                     --nomodelsmoothing
+                #else:
+                    --splinesmoothparam $bmsc.splinesmoothparam
                 #end if
-                --splinesmoothparam $aoc.splinesmoothparam
                 #if str($gmsc.gaussmodelsmoothing) == 'yes':
                     --gaussmodelsmoothing
                     --gausssmoothparam $gmsc.gausssmoothparam
@@ -251,11 +253,16 @@
                     <option value="no">No</option>
                 </param>
                 <param name="minmodelupdateevents" type="integer" value="500" min="0" label="Minimum number of events to support an update of the read distribution" />
-                <param  name="nomodelsmoothing" type="select" label="Perform binding model smoothing?" help="Smoothing performed with a cubic spline.">
-                    <option value="yes" selected="True">Yes</option>
-                    <option value="no">No</option>
-                </param>
-                <param name="splinesmoothparam" type="integer" value="30" min="0" label="Spline smoothing parameter" />
+                <conditional name="binding_model_smoothing_cond">
+                    <param  name="nomodelsmoothing" type="select" label="Perform binding model smoothing?" help="Smoothing performed with a cubic spline.">
+                        <option value="yes" selected="True">Yes</option>
+                        <option value="no">No</option>
+                    </param>
+                    <when value="yes">
+                        <param name="splinesmoothparam" type="integer" value="30" min="0" label="Spline smoothing parameter" />
+                    </when>
+                    <when value="no" />
+                </conditional>
                 <conditional name="gauss_model_smoothing_cond">
                     <param  name="gaussmodelsmoothing" type="select" label="Use Gaussian model smoothing?" help="Select No to smooth with a cubic spline.">
                         <option value="no" selected="True">No</option>