More EASYconsole work

workflow/apps/matlab/ezview/EZvInitLoad.m

@@ -5,6 +5,7 @@ global Expbb
 global userPars
 global usrExpJobsDir
 global zonePB
+global mpdmFile
 
 % Initialize some variables from matlab
 ezPath=which(mfilename);
@@ -22,7 +23,8 @@ end
 
 % Set scansDir (project scans directory) intelligently
 if exist('PROJECT', 'var') && ~isempty(getenv('PROJECT'))
-  scansDir=getenv('PROJECT');
+  project=getenv('PROJECT');
+
   fprintf('Using project path: %s from environment variable PROJECT\n', scansDir);
   disp('This usually indicates that we are in standalone mode');
 elseif exist('PROJECT_SCANS_DIR', 'var') && ~isempty(getenv('PROJECT_SCANS_DIR'))
@@ -76,6 +78,19 @@ else
   fprintf('Using EZview script directory: %s from hardcoded default\n', ezDir);
 end
 
+% Allow module to override hardcoded default EASY directory
+if exist('EASY_DIR','var') && ~isempty(getenv('EASY_DIR'))
+  EASY_DIR=fullfile(getenv('EASY_DIR'));
+  if ~strcmp(easyDir, EASY_DIR) % sanity check
+    disp("WARNING: EASY_DIR does not match this script's hardcoded EASY location");
+    disp("This is probably OK but if strange beahvior arises, we'll need to fix it in code");
+    easyDir=EASY_DIR;
+  end
+  fprintf('Using EASY script directory: %s from environment variable EASY_DIR\n', easyDir);
+else
+  fprintf('Using EASY script directory: %s from hardcoded default\n', easyDir);
+end
+
 userPars.BPdefault={'on','on','0.3','8','45','1000'};
 userPars.boxplotFlg=1;
 userPars.BPoutliers='On';
@@ -90,9 +105,6 @@ userPars.kfiltLim=str2double(userPars.BPdefault(6));
 
 
 
-
-
-
 % Generate the Exp arrays
 numExps=3;
 for i=1:numExps