COMP: fix several of the tests

Modules/CLI/DWIToDTIEstimation/Data/helix-DWI.nhdr

@@ -0,0 +1,24 @@
+NRRD0005
+# Complete NRRD file format specification at:
+# http://teem.sourceforge.net/nrrd/format.html
+type: float
+dimension: 4
+space: right-anterior-superior
+sizes: 7 64 32 16
+space directions: none (3.125,0,0) (0,6.25,0) (0,0,12.5)
+centerings: ??? cell cell cell
+kinds: list space space space
+endian: little
+encoding: gzip
+space origin: (-98.4375,-96.875,-93.75)
+measurement frame: (0.428571,0.857143,-0.285714) (-0.285714,0.428571,0.857143) (0.857143,-0.285714,0.428571)
+data file: helix-DWI.raw.gz
+modality:=DWMRI
+DWMRI_b-value:=1000
+DWMRI_gradient_0000:=0 0 0
+DWMRI_gradient_0001:=1 1 0
+DWMRI_gradient_0002:=0 1 1
+DWMRI_gradient_0003:=1 0 1
+DWMRI_gradient_0004:=0 1 -1
+DWMRI_gradient_0005:=1 -1 0
+DWMRI_gradient_0006:=-1 0 1

Modules/CLI/DWIToDTIEstimation/Testing/CMakeLists.txt

@@ -26,8 +26,8 @@ add_test(NAME ${testname} COMMAND ${SEM_LAUNCH_COMMAND} $<TARGET_FILE:${CLP}Test
   --compare ${BASELINE}/helix-Baseline.nrrd ${TEMP}/${testname}_baseline.nhdr
   --compare ${BASELINE}/helix-DTI.nhdr ${TEMP}/${testname}_dti.nhdr
     ${testname}
-    -m ${MRML_TEST_DATA}/helix-DWI-otsu-no_islands-05.nrrd
-    ${MRML_TEST_DATA}/helix-DWI.nhdr
+    -m ${DATADIR}/helix-DWI-otsu-no_islands-05.nrrd
+    ${DATADIR}/helix-DWI.nhdr
     ${TEMP}/${testname}_dti.nhdr
     ${TEMP}/${testname}_baseline.nhdr
     )

Modules/CLI/DiffusionTensorScalarMeasurements/Testing/CMakeLists.txt

@@ -12,6 +12,7 @@ set_target_properties(${CLP}Test PROPERTIES FOLDER ${${CLP}_TARGETS_FOLDER})
 
 #-----------------------------------------------------------------------------
 get_filename_component(BASELINE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline ABSOLUTE)
+get_filename_component(DATADIR ${CMAKE_CURRENT_SOURCE_DIR}/../../DWIToDTIEstimation/Data/Baseline ABSOLUTE)
 
 #-----------------------------------------------------------------------------
 # make sure the data directories exist
@@ -44,7 +45,7 @@ foreach(measure ${MeasuresToTest})
            --compare "${BASELINE}/helix-DTI-${measure}.nhdr" "${TEMP}/helix-DTI-${measure}.nhdr"
            ${CLP}Test
            --enumeration "${measure}"
-           "${MRML_TEST_DATA}/helix-DTI.nhdr"
+           "${DATADIR}/helix-DTI.nhdr"
            "${TEMP}/helix-DTI-${measure}.nhdr"
            )
   set_property(TEST ${testname} PROPERTY LABELS ${CLP})

Modules/CLI/DiffusionWeightedVolumeMasking/Testing/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 #-----------------------------------------------------------------------------
 set(BASELINE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline)
+set(DATADIR ${CMAKE_CURRENT_SOURCE_DIR}/../../DWIToDTIEstimation/Data)
 set(CLP ${MODULE_NAME})
 
 #-----------------------------------------------------------------------------
@@ -14,7 +15,7 @@ add_test(NAME ${testname} COMMAND ${SEM_LAUNCH_COMMAND} $<TARGET_FILE:${CLP}Test
   --compare ${BASELINE}/${CLP}Test_EstimatedBaseline.nhdr ${TEMP}/${CLP}Test_EstimatedBaseline.nhdr
   --compare ${BASELINE}/${CLP}Test_OtsuThresholdMask.nhdr ${TEMP}/${CLP}Test_OtsuThresholdMask.nhdr
   ${CLP}Test
-    ${MRML_TEST_DATA}/helix-DWI.nhdr
+    ${DATADIR}/helix-DWI.nhdr
     ${TEMP}/${CLP}Test_EstimatedBaseline.nhdr
     ${TEMP}/${CLP}Test_OtsuThresholdMask.nhdr
   )

Modules/CLI/TractographyLabelMapSeeding/Testing/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 #-----------------------------------------------------------------------------
 set(CLP ${MODULE_NAME})
-
+set(DATADIR ${CMAKE_CURRENT_SOURCE_DIR}/../../DWIToDTIEstimation/Data/Baseline)
 #-----------------------------------------------------------------------------
 add_executable(${CLP}Test ${CLP}Test.cxx)
 add_dependencies(${CLP}Test ${CLP})
@@ -22,7 +22,7 @@ add_test(NAME ${testname} COMMAND ${SEM_LAUNCH_COMMAND} $<TARGET_FILE:${CLP}Test
   --stoppingcurvature 0.8
   --integrationsteplength 0.5
   --label 1
-  ${MRML_TEST_DATA}/helix-DTI.nhdr
+  ${DATADIR}/helix-DTI.nhdr
   ${TEMP}/${CLP}Test_helixTracts.vtp
   )
 set_property(TEST ${testname} PROPERTY LABELS ${CLP})