From 28690cb381d67d657df111fe78290057b0704c08 Mon Sep 17 00:00:00 2001
From: Mark Jenkinson <mark@fmrib.ox.ac.uk>
Date: Fri, 23 Oct 2009 16:37:06 +0000
Subject: [PATCH] Change to rms_deviation to make it work with 3x3 matrices,
plus small change to read_binary_matrix
---
miscmaths.cc | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/miscmaths.cc b/miscmaths.cc
index 413eb7f..636d2c6 100644
--- a/miscmaths.cc
+++ b/miscmaths.cc
@@ -247,7 +247,7 @@ namespace MISCMATHS {
// set up and read matrix (rows fast, cols slow)
double val;
- if ( (((unsigned int) mres.Ncols())!=ny) || (((unsigned int) mres.Nrows())<nx) ) {
+ if ( (((unsigned int) mres.Ncols())<ny) || (((unsigned int) mres.Nrows())<nx) ) {
mres.ReSize(nx,ny);
}
for (unsigned int y=1; y<=ny; y++) {
@@ -1016,9 +1016,18 @@ float rms_deviation(const Matrix& affmat1, const Matrix& affmat2,
const ColumnVector& centre, const float rmax)
{
Tracer trcr("rms_deviation");
- Matrix isodiff(4,4);
+ Matrix isodiff(4,4), a1(4,4), a2(4,4);
+
+ if ((affmat1.Nrows()==4) && (affmat1.Ncols()==4)) { a1=affmat1; }
+ else if ((affmat1.Nrows()==3) && (affmat1.Ncols()==3)) { a1=Identity(4); a1.SubMatrix(1,3,1,3)=affmat1; }
+ else { cerr << "ERROR:: Can only calculate RMS deviation for 4x4 or 3x3 matrices" << endl; exit(-5); }
+
+ if ((affmat2.Nrows()==4) && (affmat2.Ncols()==4)) { a2=affmat2; }
+ else if ((affmat2.Nrows()==3) && (affmat2.Ncols()==3)) { a2=Identity(4); a2.SubMatrix(1,3,1,3)=affmat2; }
+ else { cerr << "ERROR:: Can only calculate RMS deviation for 4x4 or 3x3 matrices" << endl; exit(-5); }
+
try {
- isodiff = affmat1*affmat2.i() - IdentityMatrix(4);
+ isodiff = a1*a2.i() - IdentityMatrix(4);
} catch(...) {
cerr << "RMS_DEVIATION ERROR:: Could not invert matrix" << endl;
exit(-5);
--
GitLab