use detp.prop and detp.unitinmm if present, similar to mcx #83

fangq · Nov 19, 2019 · 75a4844 · 75a4844
1 parent a89457a
commit 75a4844
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/matlab/mmcdettime.m b/matlab/mmcdettime.m
@@ -24,8 +24,20 @@
 
 R_C0 = 3.335640951981520e-12;	% inverse of light speed in vacuum
 
-if(nargin<=3)
-    unitinmm=1;
+if(nargin<3)
+    if(isfield(detp,'unitinmm'))
+        unitinmm=detp.unitinmm;
+    else
+        unitinmm=1;
+    end
+end
+
+if(nargin<2)
+    if(isfield(detp,'prop'))
+        prop=detp.prop;
+    else
+        error('must provide input "prop"');
+    end
 end
 
 medianum=size(prop,1);

diff --git a/matlab/mmcdetweight.m b/matlab/mmcdetweight.m
@@ -21,13 +21,25 @@
 % License: GPLv3, see http://mmc.space/ for details
 %
 
+if(nargin<2)
+    if(isfield(detp,'prop'))
+        prop=detp.prop;
+    else
+        error('must provide input "prop"');
+    end
+end
+
 medianum=size(prop,1);
 if(medianum<=1)
     error('empty property list');
 end
 
-if(nargin<=3)
-    unitinmm=1;
+if(nargin<3)
+    if(isfield(detp,'unitinmm'))
+        unitinmm=detp.unitinmm;
+    else
+        unitinmm=1;
+    end
 end
 
 if(isstruct(detp))

diff --git a/mmclab/mmclab.m b/mmclab/mmclab.m
@@ -423,6 +423,9 @@
             end
             newdetp.w0=detp(end,:)';  % last column is the initial packet weight
             newdetp.prop=cfg(i).prop;
+	    if(isfield(cfg(i),'unitinmm'))
+		newdetp.unitinmm=cfg(i).unitinmm;
+	    end
             newdetp.data=detp;      % enable this line for compatibility
             newdetpstruct(i)=newdetp;
         else