From 70ff568dbd94fc3ea60c2bd6988e3c6f662a38bf Mon Sep 17 00:00:00 2001
From: David Fairbrother <DavidFair@users.noreply.github.com>
Date: Tue, 8 Nov 2016 14:41:54 +0000
Subject: [PATCH] Re #17949 Reverted changes to cry scripts
---
scripts/CryPowderISIS/cry_focus.py | 4 +---
scripts/CryPowderISIS/cry_vana.py | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/scripts/CryPowderISIS/cry_focus.py b/scripts/CryPowderISIS/cry_focus.py
index fedbfe1f38a..2d9c7c13ab6 100644
--- a/scripts/CryPowderISIS/cry_focus.py
+++ b/scripts/CryPowderISIS/cry_focus.py
@@ -15,15 +15,13 @@ import cry_vana
def focus_all(EXPR_FILE, samplelistTexte, scale=0, NoVabs=False, NoSAC=False, Eff=True, Norm=True,
Write_ExtV=True):
- import pydevd
- pydevd.settrace('localhost', port=23000, stdoutToServer=True, stderrToServer=True)
if scale == 0:
scale = float(EXPR_FILE.scale)
# === Norm boolean flag used to Optionally correct to a Vana ===
if Norm:
print 'Existing Vana Status:' + EXPR_FILE.ExistV
# 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":
for i in EXPR_FILE.bankList:
spec = i - 1
diff --git a/scripts/CryPowderISIS/cry_vana.py b/scripts/CryPowderISIS/cry_vana.py
index 28106a78891..a27c5a20e14 100644
--- a/scripts/CryPowderISIS/cry_vana.py
+++ b/scripts/CryPowderISIS/cry_vana.py
@@ -15,7 +15,7 @@ def create_vana(EXPR_FILE, NoAbs=False, write_existingv=True):
print " => Substract the Empty to the Vana"
Minus(LHSWorkspace="Vanadium", RHSWorkspace="Empty", OutputWorkspace="Vanadium_align")
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")
if not NoAbs:
print " => Van Absortption correction"
--
GitLab