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
4a8fefe8
Commit
4a8fefe8
authored
12 years ago
by
Roman Tolchenov
Browse files
Options
Downloads
Patches
Plain Diff
Re #5456. Clearing warnings
parent
21d133fd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Framework/DataHandling/src/FakeISISHistoDAE.cpp
+9
-9
9 additions, 9 deletions
Code/Mantid/Framework/DataHandling/src/FakeISISHistoDAE.cpp
Code/Mantid/Framework/DataHandling/src/ISISHistoDataListener.cpp
+1
-1
1 addition, 1 deletion
...ntid/Framework/DataHandling/src/ISISHistoDataListener.cpp
with
10 additions
and
10 deletions
Code/Mantid/Framework/DataHandling/src/FakeISISHistoDAE.cpp
+
9
−
9
View file @
4a8fefe8
...
...
@@ -56,7 +56,7 @@ public:
m_nBins
(
nbins
)
{
char
buffer
[
1024
];
int
n
=
socket
().
receiveBytes
(
&
buffer
,
1024
);
socket
().
receiveBytes
(
&
buffer
,
1024
);
sendOK
();
}
~
TestServerConnection
()
...
...
@@ -76,7 +76,7 @@ public:
{
isisds_command_header_t
comm
;
memset
(
&
comm
,
0
,
sizeof
(
comm
)
);
comm
.
len
=
sizeof
(
comm
)
+
(
int
)
str
.
size
();
comm
.
len
=
(
int
)
sizeof
(
comm
)
+
(
int
)
str
.
size
();
comm
.
type
=
ISISDSChar
;
comm
.
ndims
=
1
;
comm
.
dims_array
[
0
]
=
(
int
)
str
.
size
();
...
...
@@ -88,7 +88,7 @@ public:
{
isisds_command_header_t
comm
;
memset
(
&
comm
,
0
,
sizeof
(
comm
)
);
comm
.
len
=
sizeof
(
comm
)
+
sizeof
(
int
);
comm
.
len
=
(
int
)
sizeof
(
comm
)
+
sizeof
(
int
);
comm
.
type
=
ISISDSInt32
;
comm
.
ndims
=
1
;
comm
.
dims_array
[
0
]
=
1
;
...
...
@@ -113,21 +113,21 @@ public:
}
const
int
ndata
=
nos
*
nb1
;
std
::
vector
<
int
>
data
(
ndata
);
for
(
size_
t
i
=
0
;
i
<
nos
;
++
i
)
for
(
in
t
i
=
0
;
i
<
nos
;
++
i
)
{
const
int
value
=
period
*
1000
+
istart
+
(
int
)
i
;
const
int
value
=
period
*
1000
+
istart
+
i
;
std
::
fill
(
data
.
begin
()
+
i
*
nb1
,
data
.
begin
()
+
(
i
+
1
)
*
nb1
,
value
);
}
isisds_command_header_t
comm
;
memset
(
&
comm
,
0
,
sizeof
(
comm
)
);
comm
.
len
=
sizeof
(
comm
)
+
sizeof
(
int
)
*
ndata
;
comm
.
len
=
(
int
)(
sizeof
(
comm
)
+
sizeof
(
int
)
*
ndata
)
;
comm
.
type
=
ISISDSInt32
;
comm
.
ndims
=
2
;
comm
.
dims_array
[
0
]
=
nos
;
comm
.
dims_array
[
1
]
=
m_nBins
+
1
;
strncpy
(
comm
.
command
,
"OK"
,
sizeof
(
comm
.
command
));
socket
().
sendBytes
(
&
comm
,
sizeof
(
comm
));
socket
().
sendBytes
(
data
.
data
(),
sizeof
(
int
)
*
ndata
);
socket
().
sendBytes
(
data
.
data
(),
(
int
)
sizeof
(
int
)
*
ndata
);
}
void
sendFloatArray
(
const
std
::
vector
<
float
>&
arr
)
{
...
...
@@ -213,7 +213,7 @@ public:
else
if
(
command
==
"UDET"
)
{
std
::
vector
<
int
>
udet
(
m_nSpectra
);
for
(
size_
t
i
=
0
;
i
<
m_nSpectra
;
++
i
)
for
(
in
t
i
=
0
;
i
<
m_nSpectra
;
++
i
)
{
udet
[
i
]
=
(
int
)(
1000
+
i
+
1
);
}
...
...
@@ -222,7 +222,7 @@ public:
else
if
(
command
==
"SPEC"
)
{
std
::
vector
<
int
>
spec
(
m_nSpectra
);
for
(
size_
t
i
=
0
;
i
<
m_nSpectra
;
++
i
)
for
(
in
t
i
=
0
;
i
<
m_nSpectra
;
++
i
)
{
spec
[
i
]
=
(
int
)(
i
+
1
);
}
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Framework/DataHandling/src/ISISHistoDataListener.cpp
+
1
−
1
View file @
4a8fefe8
...
...
@@ -311,7 +311,7 @@ namespace DataHandling
for
(
size_t
i
=
1
;
i
<
m_specList
.
size
();
++
i
)
{
specid_t
next
=
m_specList
[
i
];
if
(
next
-
m_specList
[
i
-
1
]
>
1
||
i
-
i0
>=
maxNumberOfSpectra
)
if
(
next
-
m_specList
[
i
-
1
]
>
1
||
static_cast
<
int
>
(
i
-
i0
)
>=
maxNumberOfSpectra
)
{
index
.
push_back
(
spec
);
count
.
push_back
(
static_cast
<
int
>
(
i
-
i0
)
);
...
...
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