changes to f2z and t2z to allow for voxel-specific dofs

f2z.cc

@@ -156,6 +156,33 @@ namespace MISCMATHS {
 	  }     
       }
   }
+   void F2z::ComputeFStats(const ColumnVector& p_fs, const ColumnVector& p_dof1, const ColumnVector& p_dof2, ColumnVector& p_zs)
+  {
+    Tracer_Plus ts("F2z::ComputeFStats");
+    
+    int numTS = p_fs.Nrows();
+
+    p_zs.ReSize(numTS);
+    F2z& f2z = F2z::getInstance();
+    
+    for(int i = 1; i <= numTS; i++)
+      {		  	
+	if (p_fs(i) > 0.0)
+	  {
+
+// 	    cerr << "i=" << i;
+// 	    cerr << ",p_fs(i)=" << p_fs(i);
+// 	    cerr << ",p_dof1=" << p_dof1;
+// 	    cerr << ",p_dof2=" << p_dof2(i) << endl;
+
+	    p_zs(i) = f2z.convert(p_fs(i),int(p_dof1(i)),int(p_dof2(i)));  
+	  }
+	else
+	  {
+	    p_zs(i) = 0.0;
+	  }     
+      }
+  }
   
 }
 

f2z.h

@@ -30,6 +30,7 @@ namespace MISCMATHS {
 
       static void ComputeFStats(const ColumnVector& p_fs, int p_dof1, int p_dof2, ColumnVector& p_zs);
       static void ComputeFStats(const ColumnVector& p_fs, int p_dof1, const ColumnVector& p_dof2, ColumnVector& p_zs);
+      static void ComputeFStats(const ColumnVector& p_fs, const ColumnVector& p_dof1, const ColumnVector& p_dof2, ColumnVector& p_zs);
 
     private:
       F2z() : Base2z()