From ea60321bdc414bd84fa576f4960c8d046426af4a Mon Sep 17 00:00:00 2001
From: Marina Ganeva <m.ganeva@fz-juelich.de>
Date: Wed, 14 Oct 2015 09:52:23 +0200
Subject: [PATCH] Removed unneeded comments.
---
.../plugins/algorithms/ComputeCalibrationCoefVan.py | 2 --
.../python/plugins/algorithms/ComputeCalibrationCoefVanTest.py | 2 --
2 files changed, 4 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py b/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py
index ae229ee3a59..54cc12df676 100644
--- a/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py
+++ b/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py
@@ -7,7 +7,6 @@ import scipy as sp
import mlzutils
-# Test for keyword Vanadium or vanadium in Title - compulsory entries
class ComputeCalibrationCoefVan(PythonAlgorithm):
""" Calculate coefficients to normalize by Vanadium and correct Debye Waller factor
"""
@@ -107,7 +106,6 @@ class ComputeCalibrationCoefVan(PythonAlgorithm):
fwhm = sigma*2.*np.sqrt(2.*np.log(2.))
idxmin = (np.fabs(dataX-peak_centre+3.*fwhm)).argmin()
idxmax = (np.fabs(dataX-peak_centre-3.*fwhm)).argmin()
- self.log().debug("Sigma=%f, centre=%f, fwhm=%f, idxmin=%d, idxmax=%d" % (sigma, peak_centre, fwhm, idxmin, idxmax))
coefY[idx] = dwf[idx]*sum(dataY[idxmin:idxmax+1])
coefE[idx] = dwf[idx]*sum(dataE[idxmin:idxmax+1])
else:
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py
index dd1f83133cc..cb759d479e2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py
@@ -9,7 +9,6 @@ import numpy as np
class ComputeCalibrationCoefVanTest(unittest.TestCase):
def setUp(self):
- # input_ws = Load(Filename="TOFTOFTestdata.nxs")
input_ws = CreateSampleWorkspace(Function="User Defined",
UserDefinedFunction="name=LinearBackground, A0=0.3;name=Gaussian, \
PeakCentre=5, Height=10, Sigma=0.3", NumBanks=2, BankPixelWidth=1,
@@ -65,7 +64,6 @@ class ComputeCalibrationCoefVanTest(unittest.TestCase):
# check dwf calculation
y_sum = sum(self._input_ws.readY(1)[27:75])
- # det2 = self._input_ws.getInstrument().getDetector(2)
mvan = 0.001*50.942/N_A
Bcoef = 4.736767162094296*1e+20*hbar*hbar/(2.0*mvan*k*389.0)
dwf = np.exp(-1.0*Bcoef*(4.0*np.pi*np.sin(0.5*np.radians(15.0))/4.0)**2)
--
GitLab