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
239d43c1
Commit
239d43c1
authored
6 years ago
by
Gagik Vardanyan
Browse files
Options
Downloads
Patches
Plain Diff
Re #23344 renamed variables to camelCase
parent
e844c1f0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/Algorithms/src/Q1DWeighted.cpp
+48
-48
48 additions, 48 deletions
Framework/Algorithms/src/Q1DWeighted.cpp
with
48 additions
and
48 deletions
Framework/Algorithms/src/Q1DWeighted.cpp
+
48
−
48
View file @
239d43c1
...
...
@@ -151,23 +151,23 @@ void Q1DWeighted::exec() {
// Create wedge workspaces
std
::
vector
<
MatrixWorkspace_sptr
>
wedgeWorkspaces
;
for
(
int
iWedge
=
0
;
iWedge
<
nWedges
;
iWedge
++
)
{
double
center
_a
ngle
=
wedgeFullAngle
/
nWedges
*
iWedge
;
center
_a
ngle
+=
wedgeOffset
;
double
center
A
ngle
=
wedgeFullAngle
/
nWedges
*
iWedge
;
center
A
ngle
+=
wedgeOffset
;
MatrixWorkspace_sptr
wedge
_w
s
=
MatrixWorkspace_sptr
wedge
W
s
=
WorkspaceFactory
::
Instance
().
create
(
inputWS
,
1
,
sizeOut
,
sizeOut
-
1
);
wedge
_w
s
->
getAxis
(
0
)
->
unit
()
=
wedge
W
s
->
getAxis
(
0
)
->
unit
()
=
UnitFactory
::
Instance
().
create
(
"MomentumTransfer"
);
wedge
_w
s
->
setYUnitLabel
(
"1/cm"
);
wedge
_w
s
->
setDistribution
(
true
);
wedge
_w
s
->
setBinEdges
(
0
,
XOut
);
wedge
_w
s
->
mutableRun
().
addProperty
(
"wedge_angle"
,
center
_a
ngle
,
"degrees"
,
true
);
wedgeWorkspaces
.
push_back
(
wedge
_w
s
);
wedge
W
s
->
setYUnitLabel
(
"1/cm"
);
wedge
W
s
->
setDistribution
(
true
);
wedge
W
s
->
setBinEdges
(
0
,
XOut
);
wedge
W
s
->
mutableRun
().
addProperty
(
"wedge_angle"
,
center
A
ngle
,
"degrees"
,
true
);
wedgeWorkspaces
.
push_back
(
wedge
W
s
);
}
// Count histogram for wedge normalization
std
::
vector
<
std
::
vector
<
double
>>
wedge
_
XNormLambda
(
std
::
vector
<
std
::
vector
<
double
>>
wedgeXNormLambda
(
nWedges
,
std
::
vector
<
double
>
(
sizeOut
-
1
,
0.0
));
const
auto
&
spectrumInfo
=
inputWS
->
spectrumInfo
();
...
...
@@ -179,16 +179,16 @@ void Q1DWeighted::exec() {
for
(
int
j
=
0
;
j
<
xLength
-
1
;
j
++
)
{
PARALLEL_START_INTERUPT_REGION
std
::
vector
<
double
>
lambda
_i
q
(
sizeOut
-
1
,
0.0
);
std
::
vector
<
double
>
lambda
_iq_e
rr
(
sizeOut
-
1
,
0.0
);
std
::
vector
<
double
>
lambda
I
q
(
sizeOut
-
1
,
0.0
);
std
::
vector
<
double
>
lambda
IqE
rr
(
sizeOut
-
1
,
0.0
);
std
::
vector
<
double
>
XNorm
(
sizeOut
-
1
,
0.0
);
// Wedges
std
::
vector
<
std
::
vector
<
double
>>
wedge
_l
ambda
_i
q
(
std
::
vector
<
std
::
vector
<
double
>>
wedge
L
ambda
I
q
(
nWedges
,
std
::
vector
<
double
>
(
sizeOut
-
1
,
0.0
));
std
::
vector
<
std
::
vector
<
double
>>
wedge
_l
ambda
_iq_e
rr
(
std
::
vector
<
std
::
vector
<
double
>>
wedge
L
ambda
IqE
rr
(
nWedges
,
std
::
vector
<
double
>
(
sizeOut
-
1
,
0.0
));
std
::
vector
<
std
::
vector
<
double
>>
wedge
_
XNorm
(
std
::
vector
<
std
::
vector
<
double
>>
wedgeXNorm
(
nWedges
,
std
::
vector
<
double
>
(
sizeOut
-
1
,
0.0
));
for
(
int
i
=
0
;
i
<
numSpec
;
i
++
)
{
...
...
@@ -210,19 +210,19 @@ void Q1DWeighted::exec() {
// parameter (NPixelDivision)
for
(
int
isub
=
0
;
isub
<
nSubPixels
*
nSubPixels
;
isub
++
)
{
// Find the position offset for this sub-pixel in real space
double
sub
_y
=
pixelSizeY
*
((
isub
%
nSubPixels
)
-
(
nSubPixels
-
1.0
)
/
2.0
)
/
nSubPixels
;
double
sub
_x
=
pixelSizeX
*
(
floor
(
static_cast
<
double
>
(
isub
)
/
nSubPixels
)
-
(
nSubPixels
-
1.0
)
*
0.5
)
/
nSubPixels
;
double
sub
Y
=
pixelSizeY
*
((
isub
%
nSubPixels
)
-
(
nSubPixels
-
1.0
)
/
2.0
)
/
nSubPixels
;
double
sub
X
=
pixelSizeX
*
(
floor
(
static_cast
<
double
>
(
isub
)
/
nSubPixels
)
-
(
nSubPixels
-
1.0
)
*
0.5
)
/
nSubPixels
;
// Find the position of this sub-pixel in real space and compute Q
// For reference - in the case where we don't use sub-pixels, simply
// use:
// double sinTheta = sin( spectrumInfo.twoTheta(i)/2.0 );
V3D
pos
=
spectrumInfo
.
position
(
i
)
-
V3D
(
sub
_x
,
sub
_y
,
0.0
)
-
samplePos
;
V3D
pos
=
spectrumInfo
.
position
(
i
)
-
V3D
(
sub
X
,
sub
Y
,
0.0
)
-
samplePos
;
double
sinTheta
=
sin
(
0.5
*
pos
.
angle
(
beamLine
));
double
factor
=
fmp
*
sinTheta
;
double
q
=
factor
*
2.0
/
(
XIn
[
j
]
+
XIn
[
j
+
1
]);
...
...
@@ -238,10 +238,10 @@ void Q1DWeighted::exec() {
}
// If we got a more complicated binning, find the q bin the slow way
}
else
{
for
(
int
i
_q
bin
=
0
;
i
_q
bin
<
static_cast
<
int
>
(
XOut
.
size
())
-
1
;
i
_q
bin
++
)
{
if
(
q
>=
XOut
[
i
_q
bin
]
&&
q
<
XOut
[(
i
_q
bin
+
1
)])
{
iq
=
i
_q
bin
;
for
(
int
i
Q
bin
=
0
;
i
Q
bin
<
static_cast
<
int
>
(
XOut
.
size
())
-
1
;
i
Q
bin
++
)
{
if
(
q
>=
XOut
[
i
Q
bin
]
&&
q
<
XOut
[(
i
Q
bin
+
1
)])
{
iq
=
i
Q
bin
;
break
;
}
}
...
...
@@ -267,26 +267,26 @@ void Q1DWeighted::exec() {
PARALLEL_CRITICAL
(
iqnorm
)
/* Write to shared memory - must protect */
{
lambda
_i
q
[
iq
]
+=
YIn
[
j
]
*
w
;
lambda
_iq_e
rr
[
iq
]
+=
w
*
w
*
EIn
[
j
]
*
EIn
[
j
];
lambda
I
q
[
iq
]
+=
YIn
[
j
]
*
w
;
lambda
IqE
rr
[
iq
]
+=
w
*
w
*
EIn
[
j
]
*
EIn
[
j
];
XNorm
[
iq
]
+=
w
;
// Fill in the wedge data
for
(
int
iWedge
=
0
;
iWedge
<
nWedges
;
iWedge
++
)
{
double
center
_a
ngle
=
M_PI
/
nWedges
*
iWedge
;
double
center
A
ngle
=
M_PI
/
nWedges
*
iWedge
;
if
(
asymmWedges
)
{
center
_a
ngle
*=
2
;
center
A
ngle
*=
2
;
}
center
_a
ngle
+=
deg2rad
*
wedgeOffset
;
V3D
sub
_p
ix
=
V3D
(
pos
.
X
(),
pos
.
Y
(),
0.0
);
double
angle
=
fabs
(
sub_pix
.
angle
(
V3D
(
cos
(
center
_a
ngle
),
sin
(
center
_a
ngle
),
0.0
)));
center
A
ngle
+=
deg2rad
*
wedgeOffset
;
V3D
sub
P
ix
=
V3D
(
pos
.
X
(),
pos
.
Y
(),
0.0
);
double
angle
=
fabs
(
subPix
.
angle
(
V3D
(
cos
(
center
A
ngle
),
sin
(
center
A
ngle
),
0.0
)));
if
(
angle
<
deg2rad
*
wedgeAngle
*
0.5
||
(
!
asymmWedges
&&
fabs
(
M_PI
-
angle
)
<
deg2rad
*
wedgeAngle
*
0.5
))
{
wedge
_l
ambda
_i
q
[
iWedge
][
iq
]
+=
YIn
[
j
]
*
w
;
wedge
_l
ambda
_iq_e
rr
[
iWedge
][
iq
]
+=
w
*
w
*
EIn
[
j
]
*
EIn
[
j
];
wedge
_
XNorm
[
iWedge
][
iq
]
+=
w
;
wedge
L
ambda
I
q
[
iWedge
][
iq
]
+=
YIn
[
j
]
*
w
;
wedge
L
ambda
IqE
rr
[
iWedge
][
iq
]
+=
w
*
w
*
EIn
[
j
]
*
EIn
[
j
];
wedgeXNorm
[
iWedge
][
iq
]
+=
w
;
}
}
}
...
...
@@ -299,20 +299,20 @@ void Q1DWeighted::exec() {
{
for
(
int
k
=
0
;
k
<
sizeOut
-
1
;
k
++
)
{
if
(
XNorm
[
k
]
>
0
)
{
YOut
[
k
]
+=
lambda
_i
q
[
k
]
/
XNorm
[
k
];
EOut
[
k
]
+=
lambda
_iq_e
rr
[
k
]
/
XNorm
[
k
]
/
XNorm
[
k
];
YOut
[
k
]
+=
lambda
I
q
[
k
]
/
XNorm
[
k
];
EOut
[
k
]
+=
lambda
IqE
rr
[
k
]
/
XNorm
[
k
]
/
XNorm
[
k
];
XNormLambda
[
k
]
+=
1.0
;
}
// Normalize wedges
for
(
int
iWedge
=
0
;
iWedge
<
nWedges
;
iWedge
++
)
{
if
(
wedge
_
XNorm
[
iWedge
][
k
]
>
0
)
{
if
(
wedgeXNorm
[
iWedge
][
k
]
>
0
)
{
auto
&
wedgeYOut
=
wedgeWorkspaces
[
iWedge
]
->
mutableY
(
0
);
auto
&
wedgeEOut
=
wedgeWorkspaces
[
iWedge
]
->
mutableE
(
0
);
wedgeYOut
[
k
]
+=
wedge
_l
ambda
_i
q
[
iWedge
][
k
]
/
wedge
_
XNorm
[
iWedge
][
k
];
wedgeEOut
[
k
]
+=
wedge
_l
ambda
_iq_e
rr
[
iWedge
][
k
]
/
wedge
_
XNorm
[
iWedge
][
k
]
/
wedge
_
XNorm
[
iWedge
][
k
];
wedge
_
XNormLambda
[
iWedge
][
k
]
+=
1.0
;
wedgeYOut
[
k
]
+=
wedge
L
ambda
I
q
[
iWedge
][
k
]
/
wedgeXNorm
[
iWedge
][
k
];
wedgeEOut
[
k
]
+=
wedge
L
ambda
IqE
rr
[
iWedge
][
k
]
/
wedgeXNorm
[
iWedge
][
k
]
/
wedgeXNorm
[
iWedge
][
k
];
wedgeXNormLambda
[
iWedge
][
k
]
+=
1.0
;
}
}
}
...
...
@@ -330,8 +330,8 @@ void Q1DWeighted::exec() {
for
(
int
i
=
0
;
i
<
sizeOut
-
1
;
i
++
)
{
auto
&
wedgeYOut
=
wedgeWorkspaces
[
iWedge
]
->
mutableY
(
0
);
auto
&
wedgeEOut
=
wedgeWorkspaces
[
iWedge
]
->
mutableE
(
0
);
wedgeYOut
[
i
]
/=
wedge
_
XNormLambda
[
iWedge
][
i
];
wedgeEOut
[
i
]
=
sqrt
(
wedgeEOut
[
i
])
/
wedge
_
XNormLambda
[
iWedge
][
i
];
wedgeYOut
[
i
]
/=
wedgeXNormLambda
[
iWedge
][
i
];
wedgeEOut
[
i
]
=
sqrt
(
wedgeEOut
[
i
])
/
wedgeXNormLambda
[
iWedge
][
i
];
}
}
...
...
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