Skip to content
Snippets Groups Projects
Commit 70ff568d authored by David Fairbrother's avatar David Fairbrother
Browse files

Re #17949 Reverted changes to cry scripts

parent c5a3906d
No related branches found
No related tags found
No related merge requests found
...@@ -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
......
...@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment