Skip to content

Commit b61f127

Browse files
hjmjohnsondzenanz
hjmjohnson
and
dzenanz
committed
ENH: Replace oversized C0004255.ISQ Scanco test fixture
C0004255.ISQ (107 MB) exceeded GitHub's 100 MB limit and could not live in ITKTestingData, so the ISQ-specific IOScanco tests only ran when ITK_COMPUTER_MEMORY_SIZE > 5. Sarah Manske (U Calgary McCaig Institute) provided a cropped 256x256x50 QC phantom scan (6.3 MB) with equivalent metadata coverage. All five ISQ tests now run unconditionally; expected header values in itkScancoImageIOTest2.cxx were updated from the new fixture's actual on-disk metadata. The baseline is stored zlib-compressed (594 KB rather than 6.6 MB). Co-authored-by: Dženan Zukić <dzenan.zukic@kitware.com>
1 parent efe5933 commit b61f127

6 files changed

Lines changed: 110 additions & 149 deletions

File tree

‎Modules/IO/IOScanco/test/Baseline/C0004255.mha.cid‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Modules/IO/IOScanco/test/Baseline/ScancoQCPhantomSmall.mha.cid‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bafkreiegqgr7joxq2xjut4inwkxpj7frbkt5434g2ujuplbeleulvtm4bq

‎Modules/IO/IOScanco/test/CMakeLists.txt‎

Lines changed: 65 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,19 @@ set(
88

99
createtestdriver(IOScanco "${IOScanco-Test_LIBRARIES}" "${IOScancoTests}")
1010

11-
# C0004255.ISQ is a 107 MB input + 67 MB baseline fixture hosted on
12-
# data.kitware.com via SHA512 (exceeds GitHub's 100 MB single-file limit so
13-
# cannot live in ITKTestingData). Gate on ITK_COMPUTER_MEMORY_SIZE to match
14-
# Modules/IO/TIFF/test/CMakeLists.txt itkLargeTIFFImageWriteReadTest* pattern.
15-
if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5)
16-
itk_add_test(
17-
NAME itkScancoImageIOISQConvertTest
18-
COMMAND
19-
IOScancoTestDriver
20-
--compare
21-
DATA{Baseline/C0004255.mha}
22-
${ITK_TEST_OUTPUT_DIR}/C0004255.mha
23-
itkScancoImageIOTest
24-
DATA{Input/C0004255.ISQ}
25-
${ITK_TEST_OUTPUT_DIR}/C0004255.mha
26-
ITK_REMOVE_TEMPORARY_TEST_FILES
27-
${ITK_TEST_OUTPUT_DIR}/C0004255.mha
28-
)
29-
set_tests_properties(
30-
itkScancoImageIOISQConvertTest
31-
PROPERTIES
32-
LABELS
33-
"BigIO;RUNS_LONG"
34-
)
35-
endif()
11+
itk_add_test(
12+
NAME itkScancoImageIOISQConvertTest
13+
COMMAND
14+
IOScancoTestDriver
15+
--compare
16+
DATA{Baseline/ScancoQCPhantomSmall.mha}
17+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmall.mha
18+
itkScancoImageIOTest
19+
DATA{Input/ScancoQCPhantomSmall.ISQ}
20+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmall.mha
21+
ITK_REMOVE_TEMPORARY_TEST_FILES
22+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmall.mha
23+
)
3624

3725
itk_add_test(
3826
NAME itkScancoImageIOAIMConvertTest
@@ -48,25 +36,17 @@ itk_add_test(
4836
${ITK_TEST_OUTPUT_DIR}/AIMIOTestImage.mha
4937
)
5038

51-
if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5)
52-
itk_add_test(
53-
NAME itkScancoImageIOISQHeaderCheckTest
54-
COMMAND
55-
IOScancoTestDriver
56-
itkScancoImageIOTest2
57-
DATA{Input/C0004255.ISQ}
58-
${ITK_TEST_OUTPUT_DIR}/C0003665.isq
59-
1
60-
ITK_REMOVE_TEMPORARY_TEST_FILES
61-
${ITK_TEST_OUTPUT_DIR}/C0003665.isq
62-
)
63-
set_tests_properties(
64-
itkScancoImageIOISQHeaderCheckTest
65-
PROPERTIES
66-
LABELS
67-
"BigIO;RUNS_LONG"
68-
)
69-
endif()
39+
itk_add_test(
40+
NAME itkScancoImageIOISQHeaderCheckTest
41+
COMMAND
42+
IOScancoTestDriver
43+
itkScancoImageIOTest2
44+
DATA{Input/ScancoQCPhantomSmall.ISQ}
45+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmallHeaderCheck.isq
46+
1
47+
ITK_REMOVE_TEMPORARY_TEST_FILES
48+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmallHeaderCheck.isq
49+
)
7050

7151
itk_add_test(
7252
NAME itkScancoImageIOAIMHeaderCheckTest
@@ -80,41 +60,31 @@ itk_add_test(
8060
${ITK_TEST_OUTPUT_DIR}/AIMIOTestImage2.isq
8161
)
8262

83-
if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5)
84-
itk_add_test(
85-
NAME itkScancoImageIOISQHeaderCheckTest2
86-
COMMAND
87-
IOScancoTestDriver
88-
--compare
89-
DATA{Baseline/C0004255.mha}
90-
${ITK_TEST_OUTPUT_DIR}/C0004255Test2.mha
91-
itkScancoImageIOTest2
92-
DATA{Input/C0004255.ISQ}
93-
${ITK_TEST_OUTPUT_DIR}/C0004255Test2.mha
94-
ITK_REMOVE_TEMPORARY_TEST_FILES
95-
${ITK_TEST_OUTPUT_DIR}/C0004255Test2.mha
96-
)
97-
98-
itk_add_test(
99-
NAME itkScancoImageIOISQHeaderWriteTest2
100-
COMMAND
101-
IOScancoTestDriver
102-
--compare
103-
DATA{Baseline/C0004255.mha}
104-
${ITK_TEST_OUTPUT_DIR}/C0004255Test2.isq
105-
itkScancoImageIOTest2
106-
DATA{Input/C0004255.ISQ}
107-
${ITK_TEST_OUTPUT_DIR}/C0004255Test2.isq
108-
)
63+
itk_add_test(
64+
NAME itkScancoImageIOISQHeaderCheckTest2
65+
COMMAND
66+
IOScancoTestDriver
67+
--compare
68+
DATA{Baseline/ScancoQCPhantomSmall.mha}
69+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmallTest2.mha
70+
itkScancoImageIOTest2
71+
DATA{Input/ScancoQCPhantomSmall.ISQ}
72+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmallTest2.mha
73+
ITK_REMOVE_TEMPORARY_TEST_FILES
74+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmallTest2.mha
75+
)
10976

110-
set_tests_properties(
111-
itkScancoImageIOISQHeaderCheckTest2
112-
itkScancoImageIOISQHeaderWriteTest2
113-
PROPERTIES
114-
LABELS
115-
"BigIO;RUNS_LONG"
116-
)
117-
endif()
77+
itk_add_test(
78+
NAME itkScancoImageIOISQHeaderWriteTest2
79+
COMMAND
80+
IOScancoTestDriver
81+
--compare
82+
DATA{Baseline/ScancoQCPhantomSmall.mha}
83+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmallTest2.isq
84+
itkScancoImageIOTest2
85+
DATA{Input/ScancoQCPhantomSmall.ISQ}
86+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmallTest2.isq
87+
)
11888

11989
itk_add_test(
12090
NAME itkScancoImageIOAIMHeaderCheckTest2
@@ -138,32 +108,24 @@ set_property(
138108
itkScancoImageIOAIMHeaderCheckTest
139109
)
140110

141-
if("${ITK_COMPUTER_MEMORY_SIZE}" GREATER 5)
142-
itk_add_test(
143-
NAME itkScancoImageIOISQReadWritten
144-
COMMAND
145-
IOScancoTestDriver
146-
itkScancoImageIOTest2
147-
${ITK_TEST_OUTPUT_DIR}/C0004255Test2.isq
148-
${ITK_TEST_OUTPUT_DIR}/ISQWrite.ISQ
149-
ITK_REMOVE_TEMPORARY_TEST_FILES
150-
${ITK_TEST_OUTPUT_DIR}/ISQWrite.ISQ
151-
)
152-
set_property(
153-
TEST
154-
itkScancoImageIOISQReadWritten
155-
APPEND
156-
PROPERTY
157-
DEPENDS
158-
itkScancoImageIOISQHeaderWriteTest2
159-
)
160-
set_tests_properties(
111+
itk_add_test(
112+
NAME itkScancoImageIOISQReadWritten
113+
COMMAND
114+
IOScancoTestDriver
115+
itkScancoImageIOTest2
116+
${ITK_TEST_OUTPUT_DIR}/ScancoQCPhantomSmallTest2.isq
117+
${ITK_TEST_OUTPUT_DIR}/ISQWrite.ISQ
118+
ITK_REMOVE_TEMPORARY_TEST_FILES
119+
${ITK_TEST_OUTPUT_DIR}/ISQWrite.ISQ
120+
)
121+
set_property(
122+
TEST
161123
itkScancoImageIOISQReadWritten
162-
PROPERTIES
163-
LABELS
164-
"BigIO;RUNS_LONG"
165-
)
166-
endif()
124+
APPEND
125+
PROPERTY
126+
DEPENDS
127+
itkScancoImageIOISQHeaderWriteTest2
128+
)
167129

168130
itk_add_test(
169131
NAME itkScancoImageIOAIMWriteTest

‎Modules/IO/IOScanco/test/Input/C0004255.ISQ.sha512‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Modules/IO/IOScanco/test/Input/ScancoQCPhantomSmall.ISQ.cid‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bafybeicfhiwrizz6b4vy6ksjnnxhxrl2gjhbhtwfaml5d7qo3moro2eiwi

‎Modules/IO/IOScanco/test/itkScancoImageIOTest2.cxx‎

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -70,90 +70,89 @@ itkScancoImageIOTest2(int argc, char * argv[])
7070
itk::ExposeMetaData<std::string>(metaData, "Version", stringMeta);
7171
ITK_TEST_EXPECT_EQUAL(stringMeta, std::string("CTDATA-HEADER_V1"));
7272
std::cout << "PatientIndex: \t" << scancoIO->GetPatientIndex() << std::endl;
73-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetPatientIndex(), 78);
73+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetPatientIndex(), 1);
7474
int intMeta;
7575
itk::ExposeMetaData<int>(metaData, "PatientIndex", intMeta);
76-
ITK_TEST_EXPECT_EQUAL(intMeta, 78);
76+
ITK_TEST_EXPECT_EQUAL(intMeta, 1);
7777
std::cout << "ScannerID: \t\t" << scancoIO->GetScannerID() << std::endl;
78-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetScannerID(), 2135);
78+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetScannerID(), 3401);
7979
itk::ExposeMetaData<int>(metaData, "ScannerID", intMeta);
80-
ITK_TEST_EXPECT_EQUAL(intMeta, 2135);
80+
ITK_TEST_EXPECT_EQUAL(intMeta, 3401);
8181
std::cout << "SliceThickness: \t" << scancoIO->GetSliceThickness() << std::endl;
82-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetSliceThickness(), 0.036, 6, 1e-3));
82+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetSliceThickness(), 0.12138, 6, 1e-3));
8383
double doubleMeta;
8484
itk::ExposeMetaData<double>(metaData, "SliceThickness", doubleMeta);
85-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 0.036, 6, 1e-3));
85+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 0.12138, 6, 1e-3));
8686
std::cout << "SliceIncrement: \t" << scancoIO->GetSliceIncrement() << std::endl;
87-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetSliceIncrement(), 0.036, 6, 1e-3));
87+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetSliceIncrement(), 0.12138, 6, 1e-3));
8888
itk::ExposeMetaData<double>(metaData, "SliceIncrement", doubleMeta);
89-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 0.036, 6, 1e-3));
89+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 0.12138, 6, 1e-3));
9090
std::cout << "StartPosition: \t" << scancoIO->GetStartPosition() << std::endl;
91-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetStartPosition(), 75.0, 6, 1e-3));
91+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetStartPosition(), 150.0, 6, 1e-3));
9292
std::vector<double> vectorDoubleMeta;
9393
itk::ExposeMetaData<std::vector<double>>(metaData, "DataRange", vectorDoubleMeta);
9494
std::cout << "DataRange[0]: \t" << scancoIO->GetDataRange()[0] << std::endl;
95-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetDataRange()[0], -2813.0, 6, 1e-3));
96-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(vectorDoubleMeta[0], -2813.0, 6, 1e-3));
95+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetDataRange()[0], 953.0, 6, 1e-3));
96+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(vectorDoubleMeta[0], 953.0, 6, 1e-3));
9797
std::cout << "DataRange[1]: \t" << scancoIO->GetDataRange()[1] << std::endl;
98-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetDataRange()[1], 32767.0, 6, 1e-3));
99-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(vectorDoubleMeta[1], 32767.0, 6, 1e-3));
98+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetDataRange()[1], 7707.0, 6, 1e-3));
99+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(vectorDoubleMeta[1], 7707.0, 6, 1e-3));
100100
std::cout << "MuScaling: \t\t" << scancoIO->GetMuScaling() << std::endl;
101-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetMuScaling(), 4096.0, 6, 1e-3));
101+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetMuScaling(), 8192.0, 6, 1e-3));
102102
itk::ExposeMetaData<double>(metaData, "MuScaling", doubleMeta);
103-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 4096.0, 6, 1e-3));
103+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 8192.0, 6, 1e-3));
104104
std::cout << "MuWater: \t\t" << scancoIO->GetMuWater() << std::endl;
105105
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetMuWater(), 0.7033, 6, 1e-3));
106106
itk::ExposeMetaData<double>(metaData, "MuWater", doubleMeta);
107107
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 0.7033, 6, 1e-3));
108108
std::cout << "RescaleType: \t\t" << scancoIO->GetRescaleType() << std::endl;
109-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetRescaleType(), 2);
109+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetRescaleType(), 0);
110110
itk::ExposeMetaData<int>(metaData, "RescaleType", intMeta);
111-
ITK_TEST_EXPECT_EQUAL(intMeta, 2);
111+
ITK_TEST_EXPECT_EQUAL(intMeta, 0);
112112
std::cout << "RescaleSlope: \t\t" << scancoIO->GetRescaleSlope() << std::endl;
113-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetRescaleSlope(), 165.9970, 6, 1e-3));
113+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetRescaleSlope(), 1.0, 6, 1e-3));
114114
itk::ExposeMetaData<double>(metaData, "RescaleSlope", doubleMeta);
115-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 165.9970, 6, 1e-3));
115+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 1.0, 6, 1e-3));
116116
std::cout << "RescaleIntercept: \t\t" << scancoIO->GetRescaleIntercept() << std::endl;
117-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetRescaleIntercept(), -129.6810, 6, 1e-3));
117+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetRescaleIntercept(), 0.0, 6, 1e-3));
118118
itk::ExposeMetaData<double>(metaData, "RescaleIntercept", doubleMeta);
119-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, -129.6810, 6, 1e-3));
119+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 0.0, 6, 1e-3));
120120
std::cout << "RescaleUnits: \t\t" << scancoIO->GetRescaleUnits() << std::endl;
121-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetRescaleUnits(), std::string("mg HA/ccm"));
121+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetRescaleUnits(), std::string(""));
122122
itk::ExposeMetaData<std::string>(metaData, "RescaleUnits", stringMeta);
123-
ITK_TEST_EXPECT_EQUAL(stringMeta, std::string("mg HA/ccm"));
123+
ITK_TEST_EXPECT_EQUAL(stringMeta, std::string(""));
124124
std::cout << "CalibrationData: \t\t" << scancoIO->GetCalibrationData() << std::endl;
125-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetCalibrationData(),
126-
std::string("45 kVp, 0.5mm Al, BH: 1200mg HA/ccm, Scaling 4096"));
125+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetCalibrationData(), std::string(""));
127126
itk::ExposeMetaData<std::string>(metaData, "CalibrationData", stringMeta);
128-
ITK_TEST_EXPECT_EQUAL(stringMeta, std::string("45 kVp, 0.5mm Al, BH: 1200mg HA/ccm, Scaling 4096"));
127+
ITK_TEST_EXPECT_EQUAL(stringMeta, std::string(""));
129128
std::cout << "NumberOfSamples: \t" << scancoIO->GetNumberOfSamples() << std::endl;
130-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetNumberOfSamples(), 1024);
129+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetNumberOfSamples(), 1150);
131130
itk::ExposeMetaData<int>(metaData, "NumberOfSamples", intMeta);
132-
ITK_TEST_EXPECT_EQUAL(intMeta, 1024);
131+
ITK_TEST_EXPECT_EQUAL(intMeta, 1150);
133132
std::cout << "NumberOfProjections: " << scancoIO->GetNumberOfProjections() << std::endl;
134-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetNumberOfProjections(), 500);
133+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetNumberOfProjections(), 600);
135134
itk::ExposeMetaData<int>(metaData, "NumberOfProjections", intMeta);
136-
ITK_TEST_EXPECT_EQUAL(intMeta, 500);
135+
ITK_TEST_EXPECT_EQUAL(intMeta, 600);
137136
std::cout << "ScanDistance: \t" << scancoIO->GetScanDistance() << std::endl;
138-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetScanDistance(), 36.864, 6, 1e-3));
137+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetScanDistance(), 139.61, 6, 1e-3));
139138
itk::ExposeMetaData<double>(metaData, "ScanDistance", doubleMeta);
140-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 36.864, 6, 1e-3));
139+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 139.61, 6, 1e-3));
141140
std::cout << "ScannerType: \t" << scancoIO->GetScannerType() << std::endl;
142-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetScannerType(), 10);
141+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetScannerType(), 9);
143142
itk::ExposeMetaData<int>(metaData, "ScannerType", intMeta);
144-
ITK_TEST_EXPECT_EQUAL(intMeta, 10);
143+
ITK_TEST_EXPECT_EQUAL(intMeta, 9);
145144
std::cout << "SampleTime: \t\t" << scancoIO->GetSampleTime() << std::endl;
146-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetSampleTime(), 400.0, 6, 1e-3));
145+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetSampleTime(), 43.0, 6, 1e-3));
147146
itk::ExposeMetaData<double>(metaData, "SampleTime", doubleMeta);
148-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 400.0, 6, 1e-3));
147+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 43.0, 6, 1e-3));
149148
std::cout << "MeasurementIndex: \t" << scancoIO->GetMeasurementIndex() << std::endl;
150-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetMeasurementIndex(), 4937);
149+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetMeasurementIndex(), 26153);
151150
itk::ExposeMetaData<int>(metaData, "MeasurementIndex", intMeta);
152-
ITK_TEST_EXPECT_EQUAL(intMeta, 4937);
151+
ITK_TEST_EXPECT_EQUAL(intMeta, 26153);
153152
std::cout << "Site: \t\t" << scancoIO->GetSite() << std::endl;
154-
ITK_TEST_EXPECT_EQUAL(scancoIO->GetSite(), 5);
153+
ITK_TEST_EXPECT_EQUAL(scancoIO->GetSite(), 4);
155154
itk::ExposeMetaData<int>(metaData, "Site", intMeta);
156-
ITK_TEST_EXPECT_EQUAL(intMeta, 5);
155+
ITK_TEST_EXPECT_EQUAL(intMeta, 4);
157156
std::cout << "ReferenceLine: \t" << scancoIO->GetReferenceLine() << std::endl;
158157
ITK_TEST_EXPECT_EQUAL(scancoIO->GetReferenceLine(), 0);
159158
itk::ExposeMetaData<double>(metaData, "ReferenceLine", doubleMeta);
@@ -163,13 +162,13 @@ itkScancoImageIOTest2(int argc, char * argv[])
163162
itk::ExposeMetaData<int>(metaData, "ReconstructionAlg", intMeta);
164163
ITK_TEST_EXPECT_EQUAL(intMeta, 3);
165164
std::cout << "Energy: \t\t" << scancoIO->GetEnergy() << std::endl;
166-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetEnergy(), 45.0, 6, 1e-3));
165+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetEnergy(), 68.0, 6, 1e-3));
167166
itk::ExposeMetaData<double>(metaData, "Energy", doubleMeta);
168-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 45.0, 6, 1e-3));
167+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 68.0, 6, 1e-3));
169168
std::cout << "Intensity: \t\t" << scancoIO->GetIntensity() << std::endl;
170-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetIntensity(), 0.177, 6, 1e-3));
169+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetIntensity(), 1.47, 6, 1e-3));
171170
itk::ExposeMetaData<double>(metaData, "Intensity", doubleMeta);
172-
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 0.177, 6, 1e-3));
171+
ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(doubleMeta, 1.47, 6, 1e-3));
173172
std::cout << "CreationDate: \t" << scancoIO->GetCreationDate() << std::endl;
174173
std::cout << "ModificationDate: \t" << scancoIO->GetModificationDate() << std::endl;
175174

0 commit comments

Comments
 (0)