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
70ff568d
Commit
70ff568d
authored
8 years ago
by
David Fairbrother
Browse files
Options
Downloads
Patches
Plain Diff
Re #17949 Reverted changes to cry scripts
parent
c5a3906d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/CryPowderISIS/cry_focus.py
+1
-3
1 addition, 3 deletions
scripts/CryPowderISIS/cry_focus.py
scripts/CryPowderISIS/cry_vana.py
+1
-1
1 addition, 1 deletion
scripts/CryPowderISIS/cry_vana.py
with
2 additions
and
4 deletions
scripts/CryPowderISIS/cry_focus.py
+
1
−
3
View file @
70ff568d
...
@@ -15,15 +15,13 @@ import cry_vana
...
@@ -15,15 +15,13 @@ import cry_vana
def
focus_all
(
EXPR_FILE
,
samplelistTexte
,
scale
=
0
,
NoVabs
=
False
,
NoSAC
=
False
,
Eff
=
True
,
Norm
=
True
,
def
focus_all
(
EXPR_FILE
,
samplelistTexte
,
scale
=
0
,
NoVabs
=
False
,
NoSAC
=
False
,
Eff
=
True
,
Norm
=
True
,
Write_ExtV
=
True
):
Write_ExtV
=
True
):
import
pydevd
pydevd
.
settrace
(
'
localhost
'
,
port
=
23000
,
stdoutToServer
=
True
,
stderrToServer
=
True
)
if
scale
==
0
:
if
scale
==
0
:
scale
=
float
(
EXPR_FILE
.
scale
)
scale
=
float
(
EXPR_FILE
.
scale
)
# === Norm boolean flag used to Optionally correct to a Vana ===
# === Norm boolean flag used to Optionally correct to a Vana ===
if
Norm
:
if
Norm
:
print
'
Existing Vana Status:
'
+
EXPR_FILE
.
ExistV
print
'
Existing Vana Status:
'
+
EXPR_FILE
.
ExistV
# SAC/EFF corrections loads the Vana
# SAC/EFF corrections loads the Vana
load_sac_eff
(
EXPR_FILE
,
NoSAC
=
NoSAC
,
Eff
=
Eff
)
# Done - Loads "corr"
load_sac_eff
(
EXPR_FILE
,
NoSAC
=
NoSAC
,
Eff
=
Eff
)
if
EXPR_FILE
.
ExistV
==
"
load
"
:
if
EXPR_FILE
.
ExistV
==
"
load
"
:
for
i
in
EXPR_FILE
.
bankList
:
for
i
in
EXPR_FILE
.
bankList
:
spec
=
i
-
1
spec
=
i
-
1
...
...
This diff is collapsed.
Click to expand it.
scripts/CryPowderISIS/cry_vana.py
+
1
−
1
View file @
70ff568d
...
@@ -15,7 +15,7 @@ def create_vana(EXPR_FILE, NoAbs=False, write_existingv=True):
...
@@ -15,7 +15,7 @@ def create_vana(EXPR_FILE, NoAbs=False, write_existingv=True):
print
"
=> Substract the Empty to the Vana
"
print
"
=> Substract the Empty to the Vana
"
Minus
(
LHSWorkspace
=
"
Vanadium
"
,
RHSWorkspace
=
"
Empty
"
,
OutputWorkspace
=
"
Vanadium_align
"
)
Minus
(
LHSWorkspace
=
"
Vanadium
"
,
RHSWorkspace
=
"
Empty
"
,
OutputWorkspace
=
"
Vanadium_align
"
)
mtd
.
remove
(
"
Empty
"
)
mtd
.
remove
(
"
Empty
"
)
cry_load
.
align_fnc
(
"
Vanadium_align
"
,
EXPR_FILE
)
cry_load
.
align_fnc
(
"
Vanadium_align
"
,
EXPR_FILE
)
Divide
(
LHSWorkspace
=
"
Vanadium_align
"
,
RHSWorkspace
=
"
Corr
"
,
OutputWorkspace
=
"
Vanadium_corr
"
)
Divide
(
LHSWorkspace
=
"
Vanadium_align
"
,
RHSWorkspace
=
"
Corr
"
,
OutputWorkspace
=
"
Vanadium_corr
"
)
if
not
NoAbs
:
if
not
NoAbs
:
print
"
=> Van Absortption correction
"
print
"
=> Van Absortption correction
"
...
...
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