Add new feature to distinguish dadata with and without removing Globa…

…l Signal
sandywang · Apr 11, 2017 · abf41f9 · abf41f9
1 parent 2e7e1eb
commit abf41f9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/PsomGen/gretna_GEN_RegressOut.m b/PsomGen/gretna_GEN_RegressOut.m
@@ -23,8 +23,13 @@
 %   Beijing, PR China.
 
 Process.command='gretna_RUN_RegressOut(opt.InputFile, opt.GSMsk, opt.WMMsk, opt.CSFMsk, opt.HMInd, opt.HMFile)';
-OutputFile=cellfun(@(f) gretna_FUN_GetOutputFile(f, 'c'), InputFile,...
-    'UniformOutput', false);
+if ~isempty(GSMsk)
+    OutputFile=cellfun(@(f) gretna_FUN_GetOutputFile(f, 'cWGS'), InputFile,...
+        'UniformOutput', false);
+else
+    OutputFile=cellfun(@(f) gretna_FUN_GetOutputFile(f, 'cNGS'), InputFile,...
+        'UniformOutput', false);    
+end
 
 % Options
 Process.opt.InputFile=InputFile;

diff --git a/RunFun/gretna_RUN_RegressOut.m b/RunFun/gretna_RUN_RegressOut.m
@@ -20,8 +20,13 @@ function gretna_RUN_RegressOut(InputFile, GSMsk, WMMsk, CSFMsk, HMInd, HMFile)
 %   Beijing Normal University,
 %   Beijing, PR China.
 
-OutputFile=cellfun(@(f) gretna_FUN_GetOutputFile(f, 'c'), InputFile,...
-    'UniformOutput', false);
+if ~isempty(GSMsk)
+    OutputFile=cellfun(@(f) gretna_FUN_GetOutputFile(f, 'cWGS'), InputFile,...
+        'UniformOutput', false);
+else
+    OutputFile=cellfun(@(f) gretna_FUN_GetOutputFile(f, 'cNGS'), InputFile,...
+        'UniformOutput', false);    
+end
 
 FstFile=InputFile{1};
 [Path, Name, Ext]=fileparts(FstFile);