Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
04210771
Commit
04210771
authored
13 years ago
by
Doucet, Mathieu
Browse files
Options
Downloads
Patches
Plain Diff
Fixing warnings. Re #3316
parent
15ff4285
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Code/Mantid/Framework/MDDataObjects/test/HoraceReaderTest.h
+10
-10
10 additions, 10 deletions
Code/Mantid/Framework/MDDataObjects/test/HoraceReaderTest.h
with
10 additions
and
10 deletions
Code/Mantid/Framework/MDDataObjects/test/HoraceReaderTest.h
+
10
−
10
View file @
04210771
...
@@ -67,7 +67,7 @@ public:
...
@@ -67,7 +67,7 @@ public:
private
:
private
:
// correct data positions in the file test_horace_reader.sqw;
// correct data positions in the file test_horace_reader.sqw;
HoraceReader
::
data_positions
cdp
;
HoraceReader
::
data_positions
cdp
;
int
nTestDim
,
nTestFiles
,
nTestPixels
;
unsigned
int
nTestDim
,
nTestFiles
,
nTestPixels
;
};
};
class
HoraceReaderTest
:
public
CxxTest
::
TestSuite
class
HoraceReaderTest
:
public
CxxTest
::
TestSuite
...
@@ -169,7 +169,7 @@ public:
...
@@ -169,7 +169,7 @@ public:
MDDataPointsDescription
pd
(
horPointDescr
);
MDDataPointsDescription
pd
(
horPointDescr
);
MDDataPoints
points
(
pd
);
MDDataPoints
points
(
pd
);
points
.
initialize
(
spImg
,
spReader
);
points
.
initialize
(
spImg
,
spReader
);
bool
pix_placed_in_memory
;
bool
pix_placed_in_memory
=
true
;
TSM_ASSERT_THROWS_NOTHING
(
"Horace all pix reader should not throw"
,
pix_placed_in_memory
=
spReader
->
read_pix
(
points
,
true
));
TSM_ASSERT_THROWS_NOTHING
(
"Horace all pix reader should not throw"
,
pix_placed_in_memory
=
spReader
->
read_pix
(
points
,
true
));
if
(
pix_placed_in_memory
){
if
(
pix_placed_in_memory
){
//TSM_ASSERT_EQUALS(" All data are in memory so these values have to be equal",points.getNumPointsInMemory(),spReader->getNPix());
//TSM_ASSERT_EQUALS(" All data are in memory so these values have to be equal",points.getNumPointsInMemory(),spReader->getNPix());
...
@@ -180,14 +180,14 @@ public:
...
@@ -180,14 +180,14 @@ public:
}
}
void
testReadPixelsSelectionAll
(){
void
testReadPixelsSelectionAll
(){
// read all
// read all
in
t
nCells
=
this
->
spImg
->
get_const_MDGeometry
().
getGeometryExtend
();
size_
t
nCells
=
this
->
spImg
->
get_const_MDGeometry
().
getGeometryExtend
();
selected_cells
.
resize
(
nCells
);
selected_cells
.
resize
(
nCells
);
pix_buf
.
resize
(
spReader
->
getNConributedPixels
()
*
9
*
8
);
pix_buf
.
resize
(
spReader
->
getNConributedPixels
()
*
9
*
8
);
size_t
starting_cell
(
0
),
n_cell_read
;
size_t
starting_cell
(
0
),
n_cell_read
(
0
)
;
size_t
n_pix_in_buffer
(
0
);
size_t
n_pix_in_buffer
(
0
);
for
(
in
t
i
=
0
;
i
<
nCells
;
i
++
){
for
(
size_
t
i
=
0
;
i
<
nCells
;
i
++
){
selected_cells
[
i
]
=
i
;
selected_cells
[
i
]
=
i
;
}
}
...
@@ -201,7 +201,7 @@ public:
...
@@ -201,7 +201,7 @@ public:
void
testReadFirst2Selection
(){
void
testReadFirst2Selection
(){
// read first two (buffer is already allocated above)
// read first two (buffer is already allocated above)
size_t
starting_cell
(
0
),
n_cell_read
;
size_t
starting_cell
(
0
),
n_cell_read
(
0
)
;
size_t
n_pix_in_buffer
(
0
);
size_t
n_pix_in_buffer
(
0
);
selected_cells
.
resize
(
2
);
selected_cells
.
resize
(
2
);
...
@@ -219,7 +219,7 @@ public:
...
@@ -219,7 +219,7 @@ public:
void
testReadOneSelection
(){
void
testReadOneSelection
(){
// read one (buffer is already allocated above)
// read one (buffer is already allocated above)
size_t
starting_cell
(
0
),
n_cell_read
;
size_t
starting_cell
(
0
),
n_cell_read
(
0
)
;
size_t
n_pix_in_buffer
(
0
);
size_t
n_pix_in_buffer
(
0
);
selected_cells
.
resize
(
1
);
selected_cells
.
resize
(
1
);
...
@@ -235,7 +235,7 @@ public:
...
@@ -235,7 +235,7 @@ public:
}
}
void
testRead2Selection
(){
void
testRead2Selection
(){
// read random two (buffer is already allocated above)
// read random two (buffer is already allocated above)
size_t
starting_cell
(
0
),
n_cell_read
;
size_t
starting_cell
(
0
),
n_cell_read
(
0
)
;
size_t
n_pix_in_buffer
(
0
);
size_t
n_pix_in_buffer
(
0
);
selected_cells
.
resize
(
2
);
selected_cells
.
resize
(
2
);
...
@@ -253,7 +253,7 @@ public:
...
@@ -253,7 +253,7 @@ public:
}
}
void
testReadFirstLastSelection
(){
void
testReadFirstLastSelection
(){
size_t
starting_cell
(
0
),
n_cell_read
;
size_t
starting_cell
(
0
),
n_cell_read
(
0
)
;
size_t
n_pix_in_buffer
(
0
);
size_t
n_pix_in_buffer
(
0
);
selected_cells
[
0
]
=
0
;
selected_cells
[
0
]
=
0
;
...
@@ -269,7 +269,7 @@ public:
...
@@ -269,7 +269,7 @@ public:
void
testReadSmallBufferSelectionResized
(){
void
testReadSmallBufferSelectionResized
(){
// read random two (buffer is already allocated above)
// read random two (buffer is already allocated above)
size_t
starting_cell
(
0
),
n_cell_read
;
size_t
starting_cell
(
0
),
n_cell_read
(
0
)
;
size_t
n_pix_in_buffer
(
0
);
size_t
n_pix_in_buffer
(
0
);
selected_cells
[
0
]
=
3
;
selected_cells
[
0
]
=
3
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment