Merge branch 'CrossDomain_autoencoder' of...

Merge branch 'CrossDomain_autoencoder' of git.fmrib.ox.ac.uk:aroibu/functionmapper into CrossDomain_autoencoder

utils/data_evaluation_utils.py

@@ -182,6 +182,9 @@ def evaluate_data(trained_model_path,
                                                                                                 cross_domain_x2x_flag,
                                                                                                 cross_domain_y2y_flag)
 
+                if crop_flag == True:
+                    predicted_volume = roi(Image(predicted_volume, header=header), ((-9,82),(-10,99),(0,91))).data
+
                 target_volume = _generate_target_volume(file_path,
                                                         subject,
                                                         dmri_mean_mask_path,
@@ -781,7 +784,7 @@ def _generate_target_volume(file_path,
         volume (np.array): Array containing the information regarding the target volume
     """
 
-    volume = data_utils.load_and_preprocess_targets(file_path, crop_flag, cross_domain_x2x_flag)
+    volume = data_utils.load_and_preprocess_targets(file_path, crop_flag=False, cross_domain_x2x_flag)
 
     if mean_regression_flag == True:
         volume = _regress_target(volume, subject, dmri_mean_mask_path, rsfmri_mean_mask_path, regression_factors, crop_flag, cross_domain_x2x_flag, mean_regression_all_flag)