Added input overrides

+ww/generate.m

@@ -1,14 +1,37 @@
-function generate(force)
+function generate(nDays, varargin)
 % GENERATE Create a list of subjects and dates to be trained on weekend
+%
+%  Inputs:
+%    nDays: The number of day in the future to post water for.  If empty or
+%           not defined, the 'nDaysInFuture' parameter is used (adjusted  
+%           for bank holidays)
+%
+%  Named Parameters:
+%    force: When true the script is run regardless of the 'minLastSent' 
+%           parameter (default: false)
+%    test: When true the script is run in test mode (default: false)
+%
+%  Examples:
+%    % Run using standard defaults (2 days in future)
+%    ww.generate
+%
+%    % Post water for 3 days in future, regardless of when it was last run
+%    ww.generate(3, 'force', true)
 
 % Ensure we're on the correct branch and up-to-date
 git.runCmd({'checkout dev', 'pull'}, 'dir', getOr(dat.paths, 'rigbox'));
 
 % Load the parameters
 params = ww.Params;
-test = params.get('Mode') == 2;
 admins = strip(lower(params.get('Email_admins')));
-if nargin == 0, force = false; end
+
+% Parse input arguments (override params)
+p = inputParser;
+p.addParameter('force', false, @islogical)
+p.addParameter('test', params.get('Mode') == 2, @islogical)
+p.parse(varargin{:})
+force = p.Results.force;
+test = p.Results.test;
 
 % Get list of mice to be trained over the weekend.  These will be marked as
 % 'PIL' on the list (so long as they've been weighed)
@@ -39,12 +62,14 @@ function generate(force)
     setpref('Internet', prop, params.get(prop))
 end
 
-% use 2 for usual weekends, 3 for long weekends etc.
-[nDays, fail] = ww.getNumDays();
-if fail && ~test
-  sendmail(admins, 'Action required: Days may be incorrect',...
-    ['Weekend water script failed to determine whether there are any upcoming ',...
-    'Bank holidays.  Investigate']);
+if nargin == 0 || isempty(nDays)
+    % use 2 for usual weekends, 3 for long weekends etc.
+    [nDays, fail] = ww.getNumDays();
+    if fail && ~test
+      sendmail(admins, 'Action required: Days may be incorrect',...
+        ['Weekend water script failed to determine whether there are '...
+         'any upcoming Bank holidays.  Investigate.']);
+    end
 end
 
 % Alyx instance

+ww/getNumDays.m

@@ -4,8 +4,10 @@
 %   up-coming bank holidays.  NB: This script doesn't support
 %   non-sequential dates (e.g. Saturday, Sunday and Tuesday), or
 %   nDaysInFuture > 5.
+
 params = ww.Params;
 nDays = params.get('nDaysInFuture');
+assert(nDays < 6, 'Cannot post water for more than 5 days in the future')
 fail = false;
 if isempty(params.get('CAL_API_KEY')) || isempty(params.get('CAL_API_URL'))
     disp('Calendar API not configured; skipping')