diff --git a/Framework/API/inc/MantidAPI/AlgorithmManager.h b/Framework/API/inc/MantidAPI/AlgorithmManager.h
index 3ad91d867e6d5bf6615f76b8293db63289dc8202..652795dd2ac45ca16480cbd93a7c6fd83ad1e4ce 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmManager.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmManager.h
@@ -49,7 +49,6 @@ public:
const int &version = -1) const;
std::size_t size() const;
- void setMaxAlgorithms(int n);
IAlgorithm_sptr getAlgorithm(AlgorithmID id) const;
void removeById(AlgorithmID id);
@@ -79,8 +78,9 @@ private:
/// Unimplemented assignment operator
AlgorithmManagerImpl &operator=(const AlgorithmManagerImpl &);
- /// The maximum size of the algorithm store
- int m_max_no_algs;
+ /// Removes any finished algorithms from the list of managed algorithms
+ size_t removeFinishedAlgorithms();
+
/// The list of managed algorithms
std::deque<IAlgorithm_sptr>
m_managed_algs; ///< pointers to managed algorithms [policy???]
diff --git a/Framework/API/inc/MantidAPI/IAlgorithm.h b/Framework/API/inc/MantidAPI/IAlgorithm.h
index 1baf1b5e395b57243342ca5198d9016b25b31a02..9b22aeaa403a35904c47c304c99f68b1bad32d24 100644
--- a/Framework/API/inc/MantidAPI/IAlgorithm.h
+++ b/Framework/API/inc/MantidAPI/IAlgorithm.h
@@ -122,7 +122,7 @@ public:
/// Check whether the algorithm is initialized properly
virtual bool isInitialized() const = 0;
- /// Check whether the algorithm has already been executed
+ /// Check whether the algorithm has been executed sucessfully
virtual bool isExecuted() const = 0;
/// Raises the cancel flag. interuption_point() method if called inside exec()
diff --git a/Framework/API/src/Algorithm.cpp b/Framework/API/src/Algorithm.cpp
index 8a96b5f46197db6fb9c111209e5daba26c2e241b..f76b90be2ee3db4a413cd4a91257dceb6ddbc174 100644
--- a/Framework/API/src/Algorithm.cpp
+++ b/Framework/API/src/Algorithm.cpp
@@ -142,7 +142,7 @@ bool Algorithm::isInitialized() const {
return (m_executionState != ExecutionState::Uninitialized);
}
-/// Has the Algorithm already been executed
+/// Has the Algorithm already been executed successfully
bool Algorithm::isExecuted() const {
return ((executionState() == ExecutionState::Finished) &&
(resultState() == ResultState::Success));
diff --git a/Framework/API/src/AlgorithmManager.cpp b/Framework/API/src/AlgorithmManager.cpp
index 8c2d63386975bc5e2e61b6aef3193ebec355d305..2d657d81c4ffd3abba445d1597ce12ae57755968 100644
--- a/Framework/API/src/AlgorithmManager.cpp
+++ b/Framework/API/src/AlgorithmManager.cpp
@@ -22,15 +22,6 @@ Kernel::Logger g_log("AlgorithmManager");
/// Private Constructor for singleton class
AlgorithmManagerImpl::AlgorithmManagerImpl() : m_managed_algs() {
- auto max_no_algs =
- Kernel::ConfigService::Instance().getValue<int>("algorithms.retained");
-
- m_max_no_algs = max_no_algs.get_value_or(0);
-
- if (m_max_no_algs < 1) {
- m_max_no_algs = 100; // Default to keeping 100 algorithms if not specified
- }
-
g_log.debug() << "Algorithm Manager created.\n";
}
@@ -82,39 +73,15 @@ IAlgorithm_sptr AlgorithmManagerImpl::create(const std::string &algName,
else
alg = unmanagedAlg;
- // If this takes us beyond the maximum size, then remove the oldest one(s)
- while (m_managed_algs.size() >=
- static_cast<std::deque<IAlgorithm_sptr>::size_type>(m_max_no_algs)) {
- std::deque<IAlgorithm_sptr>::iterator it;
- it = m_managed_algs.begin();
-
- // Look for the first (oldest) algo that is NOT running right now.
- while (it != m_managed_algs.end()) {
- if (!(*it)->isRunning())
- break;
- ++it;
- }
-
- if (it == m_managed_algs.end()) {
- // Unusual case where ALL algorithms are running
- g_log.warning()
- << "All algorithms in the AlgorithmManager are running. "
- << "Cannot pop oldest algorithm. "
- << "You should increase your 'algorithms.retained' value. "
- << m_managed_algs.size() << " in queue.\n";
- break;
- } else {
- // Normal; erase that algorithm
- g_log.debug() << "Popping out oldest algorithm " << (*it)->name()
- << '\n';
- m_managed_algs.erase(it);
- }
- }
+ auto count = removeFinishedAlgorithms();
+ g_log.debug()
+ << count
+ << " Finished algorithms removed from the managed algorithms list. "
+ << m_managed_algs.size() << " remaining.\n";
// Add to list of managed ones
m_managed_algs.emplace_back(alg);
alg->initialize();
-
} catch (std::runtime_error &ex) {
g_log.error() << "AlgorithmManager:: Unable to create algorithm " << algName
<< ' ' << ex.what() << '\n';
@@ -140,19 +107,6 @@ void AlgorithmManagerImpl::clear() {
std::size_t AlgorithmManagerImpl::size() const { return m_managed_algs.size(); }
-/**
- * Set new maximum number of algorithms that can be stored.
- *
- * @param n :: The new maximum.
- */
-void AlgorithmManagerImpl::setMaxAlgorithms(int n) {
- if (n < 0) {
- throw std::runtime_error("Maximum number of algorithms stored in "
- "AlgorithmManager cannot be negative.");
- }
- m_max_no_algs = n;
-}
-
/**
* Returns a shared pointer by algorithm id
* @param id :: The ID of the algorithm
@@ -241,6 +195,28 @@ void AlgorithmManagerImpl::cancelAll() {
}
}
+/// Removes all of the finished algorithms
+/// this does not lock the mutex as the locking is already assumed to be in
+/// place
+size_t AlgorithmManagerImpl::removeFinishedAlgorithms() {
+ std::vector<IAlgorithm_const_sptr> theCompletedInstances;
+ std::copy_if(
+ m_managed_algs.cbegin(), m_managed_algs.cend(),
+ std::back_inserter(theCompletedInstances), [](const auto &algorithm) {
+ return (algorithm->executionState() == ExecutionState::Finished);
+ });
+ for (auto completedAlg : theCompletedInstances) {
+ auto itend = m_managed_algs.end();
+ for (auto it = m_managed_algs.begin(); it != itend; ++it) {
+ if ((**it).getAlgorithmID() == completedAlg->getAlgorithmID()) {
+ m_managed_algs.erase(it);
+ break;
+ }
+ }
+ }
+ return theCompletedInstances.size();
+}
+
void AlgorithmManagerImpl::shutdown() { clear(); }
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/test/AlgorithmManagerTest.h b/Framework/API/test/AlgorithmManagerTest.h
index e20adb182f740bde8237960592d144271caf213a..e33bd369e99f41f277ef33a6cdebb86d6f341424 100644
--- a/Framework/API/test/AlgorithmManagerTest.h
+++ b/Framework/API/test/AlgorithmManagerTest.h
@@ -106,12 +106,6 @@ public:
}
static void destroySuite(AlgorithmManagerTest *suite) { delete suite; }
- AlgorithmManagerTest() {
- // A test fails unless algorithms.retained is big enough
- Mantid::Kernel::ConfigService::Instance().setString("algorithms.retained",
- "5");
- }
-
void testVersionFail() {
const size_t nalgs = AlgorithmFactory::Instance().getKeys().size();
TS_ASSERT_THROWS(AlgorithmFactory::Instance().subscribe<AlgTestFail>(),
@@ -217,97 +211,6 @@ public:
AlgorithmManager::Instance().notificationCenter.removeObserver(my_observer);
}
- /** Keep the right number of algorithms in the list.
- * This also tests setMaxAlgorithms().
- */
- void testDroppingOldOnes() {
- AlgorithmManager::Instance().setMaxAlgorithms(5);
- AlgorithmManager::Instance().clear();
- TS_ASSERT_EQUALS(AlgorithmManager::Instance().size(), 0);
-
- IAlgorithm_sptr first = AlgorithmManager::Instance().create("AlgTest");
- // Fill up the list
- for (size_t i = 1; i < 5; i++)
- AlgorithmManager::Instance().create("AlgTest");
- TS_ASSERT_EQUALS(AlgorithmManager::Instance().size(), 5);
-
- // The first one is still in the list
- TS_ASSERT(AlgorithmManager::Instance().getAlgorithm(
- first->getAlgorithmID()) == first);
-
- // Add one more, drops the oldest one
- AlgorithmManager::Instance().create("AlgTest");
- TS_ASSERT_EQUALS(AlgorithmManager::Instance().size(), 5);
- TS_ASSERT(
- !AlgorithmManager::Instance().getAlgorithm(first->getAlgorithmID()));
- }
-
- /** Keep one algorithm running, drop the second-oldest one etc. */
- void testDroppingOldOnes_whenAnAlgorithmIsStillRunning() {
- AlgorithmManager::Instance().clear();
- TS_ASSERT_EQUALS(AlgorithmManager::Instance().size(), 0);
-
- // Create one algorithm that appears never to stop
- IAlgorithm_sptr first =
- AlgorithmManager::Instance().create("AlgRunsForever");
-
- IAlgorithm_sptr second = AlgorithmManager::Instance().create("AlgTest");
-
- // Another long-running algo
- IAlgorithm_sptr third =
- AlgorithmManager::Instance().create("AlgRunsForever");
-
- for (size_t i = 3; i < 5; i++)
- AlgorithmManager::Instance().create("AlgTest");
- TS_ASSERT_EQUALS(AlgorithmManager::Instance().size(), 5);
-
- // The first three created are in the list
- TS_ASSERT(AlgorithmManager::Instance().getAlgorithm(
- first->getAlgorithmID()) == first);
- TS_ASSERT(AlgorithmManager::Instance().getAlgorithm(
- second->getAlgorithmID()) == second);
- TS_ASSERT(AlgorithmManager::Instance().getAlgorithm(
- third->getAlgorithmID()) == third);
-
- // Add one more, drops the SECOND oldest one
- AlgorithmManager::Instance().create("AlgTest");
- TS_ASSERT_EQUALS(AlgorithmManager::Instance().size(), 5);
-
- TSM_ASSERT("The oldest algorithm (is still running) so it is still there",
- AlgorithmManager::Instance().getAlgorithm(
- first->getAlgorithmID()) == first);
- TSM_ASSERT(
- "The second oldest was popped, so trying to get it should return null",
- !AlgorithmManager::Instance().getAlgorithm(second->getAlgorithmID()));
-
- // One more time
- AlgorithmManager::Instance().create("AlgTest");
- TS_ASSERT_EQUALS(AlgorithmManager::Instance().size(), 5);
-
- // The right ones are at the front
- TSM_ASSERT("The oldest algorithm (is still running) so it is still there",
- AlgorithmManager::Instance().getAlgorithm(
- first->getAlgorithmID()) == first);
- TSM_ASSERT("The third algorithm (is still running) so it is still there",
- AlgorithmManager::Instance().getAlgorithm(
- third->getAlgorithmID()) == third);
- AlgorithmManager::Instance().cancelAll();
- }
-
- void testDroppingOldOnes_extremeCase() {
- /** Extreme case where your queue fills up and all algos are running */
- AlgorithmManager::Instance().clear();
- for (size_t i = 0; i < 5; i++) {
- AlgorithmManager::Instance().create("AlgRunsForever");
- }
-
- TS_ASSERT_EQUALS(AlgorithmManager::Instance().size(), 5);
- // Create another that takes it past the normal max size (of 5)
- AlgorithmManager::Instance().create("AlgTest");
- TS_ASSERT_EQUALS(AlgorithmManager::Instance().size(), 6);
- AlgorithmManager::Instance().cancelAll();
- }
-
void testThreadSafety() {
PARALLEL_FOR_NO_WSP_CHECK()
for (int i = 0; i < 5000; i++) {
@@ -317,7 +220,6 @@ public:
void testRemovingByIdRemovesCorrectObject() {
auto &mgr = AlgorithmManager::Instance();
- mgr.setMaxAlgorithms(10);
const size_t initialManagerSize = mgr.size();
// 2 different ids for same named algorithm
auto alg1 = mgr.create("AlgTest");
@@ -329,8 +231,6 @@ public:
// the right one?
auto foundAlg = mgr.getAlgorithm(alg2->getAlgorithmID());
TS_ASSERT(foundAlg);
-
- mgr.setMaxAlgorithms(5);
}
void test_runningInstancesOf() {
diff --git a/Framework/Algorithms/src/SetUncertainties.cpp b/Framework/Algorithms/src/SetUncertainties.cpp
index a7aefc2ae5e3ed1903ee4146c376371aa29e472e..c652e851177251d3b3866023630a50a512c2cea8 100644
--- a/Framework/Algorithms/src/SetUncertainties.cpp
+++ b/Framework/Algorithms/src/SetUncertainties.cpp
@@ -8,6 +8,7 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/SpectrumInfo.h"
#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidDataObjects/EventWorkspace.h"
#include "MantidGeometry/IDetector.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/BoundedValidator.h"
@@ -111,6 +112,10 @@ void SetUncertainties::init() {
void SetUncertainties::exec() {
MatrixWorkspace_const_sptr inputWorkspace = getProperty("InputWorkspace");
+ auto inputEventWorkspace =
+ boost::dynamic_pointer_cast<const DataObjects::EventWorkspace>(
+ inputWorkspace);
+ MatrixWorkspace_sptr outputWorkspace = getProperty("OutputWorkspace");
std::string errorType = getProperty("SetError");
bool zeroError = (errorType == ZERO);
bool takeSqrt = ((errorType == SQRT) || (errorType == SQRT_OR_ONE));
@@ -120,32 +125,45 @@ void SetUncertainties::exec() {
double valueToSet = resetOne ? 1.0 : getProperty("SetErrorTo");
double valueToCompare = resetOne ? 0.0 : getProperty("IfEqualTo");
int precision = getProperty("Precision");
- double tolerance = resetOne ? 1E-10 : std::pow(10.0, precision * (-1));
+ double tolerance = resetOne ? 1E-10 : std::pow(10.0, -1. * precision);
// Create the output workspace. This will copy many aspects from the input
// one.
- MatrixWorkspace_sptr outputWorkspace =
- WorkspaceFactory::Instance().create(inputWorkspace);
- // ...but not the data, so do that here.
+ const int64_t numHists =
+ static_cast<int64_t>(inputWorkspace->getNumberHistograms());
+ if (inputEventWorkspace) {
+ if (inputWorkspace == outputWorkspace && errorType == SQRT &&
+ inputEventWorkspace->getEventType() == Mantid::API::EventType::TOF) {
+ // Uncertainty is already square root of the y value
+ return;
+ }
+ // Copy the histogram representation over to a Workspace2D
+ outputWorkspace = WorkspaceFactory::Instance().create(inputWorkspace);
+ PARALLEL_FOR_IF(Kernel::threadSafe(*inputWorkspace, *outputWorkspace))
+ for (int64_t i = 0; i < numHists; ++i) {
+ PARALLEL_START_INTERUPT_REGION
+ // copy X/Y/E
+ outputWorkspace->setSharedX(i, inputWorkspace->sharedX(i));
+ outputWorkspace->setSharedY(i, inputWorkspace->sharedY(i));
+ outputWorkspace->setSharedE(i, inputWorkspace->sharedE(i));
+ PARALLEL_END_INTERUPT_REGION
+ }
+ PARALLEL_CHECK_INTERUPT_REGION
+ } else if (inputWorkspace != outputWorkspace) {
+ outputWorkspace = inputWorkspace->clone();
+ }
+
const auto &spectrumInfo = inputWorkspace->spectrumInfo();
- const size_t numHists = inputWorkspace->getNumberHistograms();
Progress prog(this, 0.0, 1.0, numHists);
-
PARALLEL_FOR_IF(Kernel::threadSafe(*inputWorkspace, *outputWorkspace))
- for (int64_t i = 0; i < int64_t(numHists); ++i) {
+ for (int64_t i = 0; i < numHists; ++i) {
PARALLEL_START_INTERUPT_REGION
-
- // copy the X/Y
- outputWorkspace->setSharedX(i, inputWorkspace->sharedX(i));
- outputWorkspace->setSharedY(i, inputWorkspace->sharedY(i));
// copy the E or set to zero depending on the mode
if (errorType == ONE_IF_ZERO || customError) {
- outputWorkspace->setSharedE(i, inputWorkspace->sharedE(i));
} else {
outputWorkspace->mutableE(i) = 0.0;
}
-
// ZERO mode doesn't calculate anything further
if ((!zeroError) &&
(!(spectrumInfo.hasDetectors(i) && spectrumInfo.isMasked(i)))) {
@@ -159,13 +177,10 @@ void SetUncertainties::exec() {
SetError(valueToSet, valueToCompare, tolerance));
}
}
-
prog.report();
-
PARALLEL_END_INTERUPT_REGION
}
PARALLEL_CHECK_INTERUPT_REGION
-
setProperty("OutputWorkspace", outputWorkspace);
}
diff --git a/Framework/Algorithms/test/SetUncertaintiesTest.h b/Framework/Algorithms/test/SetUncertaintiesTest.h
index c9f1cbab774b9923156a2f35c3f4e55c35138600..02ac7f9fbac25d88d2d3f24a0727cb857d9c0b99 100644
--- a/Framework/Algorithms/test/SetUncertaintiesTest.h
+++ b/Framework/Algorithms/test/SetUncertaintiesTest.h
@@ -55,6 +55,38 @@ public:
return outWS;
}
+ /**
+ * Create and execute the algorithm in the specified mode.
+ * @param mode The name of the SetError property SetUncertainties
+ * @return The name that the output workspace will be registered as.
+ */
+ API::MatrixWorkspace_sptr runAlgInPlace(const std::string &mode) {
+ // random data mostly works
+ auto inWksp = WorkspaceCreationHelper::create1DWorkspaceRand(30, true);
+ // Ensure first elements of random workspace are zero so test don't
+ // pass randomly
+ auto &E = inWksp->mutableE(0);
+ E[0] = 0.;
+ auto &Y = inWksp->mutableY(0);
+ Y[1] = 0.; // stress sqrtOrOne
+
+ std::string outWSname = "SetUncertainties_" + mode;
+ WorkspaceCreationHelper::storeWS(outWSname, inWksp);
+ SetUncertainties alg;
+ TS_ASSERT_THROWS_NOTHING(alg.initialize());
+ alg.setProperty("InputWorkspace", inWksp);
+ alg.setProperty("SetError", mode);
+ alg.setProperty("OutputWorkspace", outWSname);
+ TS_ASSERT_THROWS_NOTHING(alg.execute());
+ TS_ASSERT(alg.isExecuted());
+
+ const auto outWS =
+ API::AnalysisDataService::Instance().retrieveWS<API::MatrixWorkspace>(
+ outWSname);
+ TS_ASSERT(bool(outWS)); // non-null pointer
+ return outWS;
+ }
+
API::MatrixWorkspace_sptr
runAlgCustom(const double toSet, const double toReplace,
const double errorVal, const int precision, const int position) {
@@ -97,6 +129,17 @@ public:
API::AnalysisDataService::Instance().remove(outWS->getName());
}
+ void test_zero_in_place() {
+ const auto outWS = runAlgInPlace("zero");
+
+ const auto &E = outWS->e(0);
+ for (const auto item : E) {
+ TS_ASSERT_EQUALS(item, 0.);
+ }
+
+ API::AnalysisDataService::Instance().remove(outWS->getName());
+ }
+
void test_sqrt() {
const auto outWS = runAlg("sqrt");
@@ -109,6 +152,18 @@ public:
API::AnalysisDataService::Instance().remove(outWS->getName());
}
+ void test_sqrt_in_place() {
+ const auto outWS = runAlgInPlace("sqrt");
+
+ const auto &E = outWS->e(0);
+ const auto &Y = outWS->y(0);
+ for (size_t i = 0; i < E.size(); ++i) {
+ TS_ASSERT_DELTA(Y[i], E[i] * E[i], .001);
+ }
+
+ API::AnalysisDataService::Instance().remove(outWS->getName());
+ }
+
void test_oneIfZero() {
const auto outWS = runAlg("oneIfZero");
@@ -119,6 +174,16 @@ public:
API::AnalysisDataService::Instance().remove(outWS->getName());
}
+ void test_oneIfZero_in_place() {
+ const auto outWS = runAlgInPlace("oneIfZero");
+
+ const auto &E = outWS->e(0);
+ for (const auto item : E) {
+ TS_ASSERT(item > 0.);
+ }
+ API::AnalysisDataService::Instance().remove(outWS->getName());
+ }
+
void test_sqrtOrOne() {
const auto outWS = runAlg("sqrtOrOne");
@@ -131,7 +196,21 @@ public:
TS_ASSERT_DELTA(Y[i], E[i] * E[i], .001);
}
}
+ API::AnalysisDataService::Instance().remove(outWS->getName());
+ }
+
+ void test_sqrtOrOne_in_place() {
+ const auto outWS = runAlgInPlace("sqrtOrOne");
+ const auto &E = outWS->e(0);
+ const auto &Y = outWS->y(0);
+ for (size_t i = 0; i < E.size(); ++i) {
+ if (Y[i] == 0.) {
+ TS_ASSERT_EQUALS(E[i], 1.);
+ } else {
+ TS_ASSERT_DELTA(Y[i], E[i] * E[i], .001);
+ }
+ }
API::AnalysisDataService::Instance().remove(outWS->getName());
}
@@ -201,6 +280,42 @@ public:
}
API::AnalysisDataService::Instance().remove(outWS->getName());
}
+
+ /**
+ * Create and execute the algorithm in the specified mode.
+ * @param mode The name of the SetError property SetUncertainties
+ * @return The name that the output workspace will be registered as.
+ */
+ void test_EventWorkspacePlace() {
+ // random data mostly works
+ auto inWksp =
+ WorkspaceCreationHelper::createEventWorkspaceWithFullInstrument2(10,
+ 10);
+ std::string outWSname = "SetUncertainties_oneIfZero";
+ WorkspaceCreationHelper::storeWS(outWSname, inWksp);
+ SetUncertainties alg;
+ TS_ASSERT_THROWS_NOTHING(alg.initialize());
+ alg.setProperty("InputWorkspace", inWksp);
+ alg.setProperty("SetError", "oneIfZero");
+ alg.setProperty("OutputWorkspace", outWSname);
+ TS_ASSERT_THROWS_NOTHING(alg.execute());
+ TS_ASSERT(alg.isExecuted());
+
+ const auto outWS =
+ API::AnalysisDataService::Instance().retrieveWS<API::MatrixWorkspace>(
+ outWSname);
+ TS_ASSERT(bool(outWS)); // non-null pointer
+
+ const auto &E = outWS->e(0);
+ const auto &Y = outWS->y(0);
+ for (size_t i = 0; i < E.size(); ++i) {
+ if (Y[i] == 0.) {
+ TS_ASSERT_EQUALS(E[i], 1.);
+ } else {
+ TS_ASSERT_DELTA(Y[i], E[i] * E[i], .001);
+ }
+ }
+ }
};
class SetUncertaintiesTestPerformance : public CxxTest::TestSuite {
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h b/Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h
index 5b9e50cf67c841f6f145b4e341906287fb627bd5..e0a893a88571fcd48451ab43b5d2e34e4286a921 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ReadMaterial.h
@@ -55,6 +55,8 @@ public:
double attenuationXSection = EMPTY_DBL();
/// The total scattering cross section to set, defaults to EMPTY_DBL()
double scatteringXSection = EMPTY_DBL();
+ /// The name or path of a file containing an attenuation profile
+ std::string attenuationProfileFileName = "";
/// A flag indicating the unit of sampleNumberDensity
Kernel::MaterialBuilder::NumberDensityUnit numberDensityUnit =
Kernel::MaterialBuilder::NumberDensityUnit::Atoms;
@@ -96,7 +98,8 @@ private:
const Kernel::MaterialBuilder::NumberDensityUnit rhoUnit,
const double zParameter, const double unitCellVolume);
void setScatteringInfo(double coherentXSection, double incoherentXSection,
- double attenuationXSection, double scatteringXSection);
+ double attenuationXSection, double scatteringXSection,
+ std::string attenuationProfileFileName);
static bool isEmpty(const double toCheck);
};
diff --git a/Framework/DataHandling/src/LoadSampleEnvironment.cpp b/Framework/DataHandling/src/LoadSampleEnvironment.cpp
index 549de4bcf968e2ff877a0f6fd910444e073089f6..db6153d6a910c06256a74e6748b3aaa9fa9cbccf 100644
--- a/Framework/DataHandling/src/LoadSampleEnvironment.cpp
+++ b/Framework/DataHandling/src/LoadSampleEnvironment.cpp
@@ -114,6 +114,11 @@ void LoadSampleEnvironment::init() {
"Optional: This total scattering cross-section (coherent + "
"incoherent) for the sample material in barns will be used "
"instead of tabulated");
+ const std::vector<std::string> attExtensions{".DAT"};
+ declareProperty(
+ std::make_unique<FileProperty>("AttenuationProfile", "",
+ FileProperty::OptionalLoad, attExtensions),
+ "The path name of the file containing the attenuation profile");
declareProperty("SampleMassDensity", EMPTY_DBL(), mustBePositive,
"Measured mass density in g/cubic cm of the sample "
"to be used to calculate the number density.");
@@ -159,6 +164,7 @@ void LoadSampleEnvironment::init() {
setPropertyGroup("IncoherentXSection", specificValuesGrp);
setPropertyGroup("AttenuationXSection", specificValuesGrp);
setPropertyGroup("ScatteringXSection", specificValuesGrp);
+ setPropertyGroup("AttenuationProfile", specificValuesGrp);
setPropertySettings("CoherentXSection", std::make_unique<EnabledWhenProperty>(
"SetMaterial", IS_NOT_DEFAULT));
setPropertySettings(
@@ -170,6 +176,9 @@ void LoadSampleEnvironment::init() {
setPropertySettings(
"ScatteringXSection",
std::make_unique<EnabledWhenProperty>("SetMaterial", IS_NOT_DEFAULT));
+ setPropertySettings(
+ "AttenuationProfile",
+ std::make_unique<EnabledWhenProperty>("SetMaterial", IS_NOT_DEFAULT));
}
std::map<std::string, std::string> LoadSampleEnvironment::validateInputs() {
@@ -235,6 +244,7 @@ void LoadSampleEnvironment::exec() {
params.incoherentXSection = getProperty("IncoherentXSection");
params.attenuationXSection = getProperty("AttenuationXSection");
params.scatteringXSection = getProperty("ScatteringXSection");
+ params.attenuationProfileFileName = getPropertyValue("AttenuationProfile");
const std::string numberDensityUnit = getProperty("NumberDensityUnit");
if (numberDensityUnit == "Atoms") {
params.numberDensityUnit = MaterialBuilder::NumberDensityUnit::Atoms;
diff --git a/Framework/DataHandling/src/ReadMaterial.cpp b/Framework/DataHandling/src/ReadMaterial.cpp
index b65fb49728f9292cc93344f159c4c3ed27d813af..a980ac163eedae10a6b9899c0af60ec85f86cd25 100644
--- a/Framework/DataHandling/src/ReadMaterial.cpp
+++ b/Framework/DataHandling/src/ReadMaterial.cpp
@@ -34,7 +34,8 @@ ReadMaterial::validateInputs(const MaterialParameters ¶ms) {
"no ChemicalFormula or AtomicNumber is "
"given.";
}
- if (isEmpty(params.attenuationXSection)) {
+ if (isEmpty(params.attenuationXSection) &&
+ params.attenuationProfileFileName.empty()) {
result["AttenuationXSection"] = "The cross section must be specified "
"when no ChemicalFormula or AtomicNumber "
"is given.";
@@ -104,7 +105,8 @@ void ReadMaterial::setMaterialParameters(const MaterialParameters ¶ms) {
params.numberDensityUnit, params.zParameter,
params.unitCellVolume);
setScatteringInfo(params.coherentXSection, params.incoherentXSection,
- params.attenuationXSection, params.scatteringXSection);
+ params.attenuationXSection, params.scatteringXSection,
+ params.attenuationProfileFileName);
}
/**
@@ -146,11 +148,13 @@ void ReadMaterial::setNumberDensity(
void ReadMaterial::setScatteringInfo(double coherentXSection,
double incoherentXSection,
double attenuationXSection,
- double scatteringXSection) {
+ double scatteringXSection,
+ std::string attenuationProfileFileName) {
builder.setCoherentXSection(coherentXSection); // in barns
builder.setIncoherentXSection(incoherentXSection); // in barns
builder.setAbsorptionXSection(attenuationXSection); // in barns
builder.setTotalScatterXSection(scatteringXSection); // in barns
+ builder.setAttenuationProfileFilename(attenuationProfileFileName);
}
bool ReadMaterial::isEmpty(const double toCheck) {
diff --git a/Framework/DataHandling/src/SampleEnvironmentSpecParser.cpp b/Framework/DataHandling/src/SampleEnvironmentSpecParser.cpp
index b3a10b949a19ce026b54559d8941e4f869a8c1d3..abd34e805106dfca274f7fd091a3d4688afdf29c 100644
--- a/Framework/DataHandling/src/SampleEnvironmentSpecParser.cpp
+++ b/Framework/DataHandling/src/SampleEnvironmentSpecParser.cpp
@@ -163,7 +163,8 @@ void SampleEnvironmentSpecParser::parseMaterials(Poco::XML::Element *element) {
Node *node = nodeIter.nextNode();
MaterialXMLParser parser;
while (node) {
- auto material = parser.parse(static_cast<Poco::XML::Element *>(node));
+ auto material =
+ parser.parse(static_cast<Poco::XML::Element *>(node), m_filepath);
m_materials.emplace(material.name(), material);
node = nodeIter.nextNode();
}
diff --git a/Framework/DataHandling/src/SetSampleMaterial.cpp b/Framework/DataHandling/src/SetSampleMaterial.cpp
index 779797198c17152c15012480860ef69a07a51339..b85c58e3c54476bcd4a62be758887a6566d0f34a 100644
--- a/Framework/DataHandling/src/SetSampleMaterial.cpp
+++ b/Framework/DataHandling/src/SetSampleMaterial.cpp
@@ -6,6 +6,7 @@
// SPDX - License - Identifier: GPL - 3.0 +
#include "MantidDataHandling/SetSampleMaterial.h"
#include "MantidAPI/ExperimentInfo.h"
+#include "MantidAPI/FileProperty.h"
#include "MantidAPI/Sample.h"
#include "MantidAPI/Workspace.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
@@ -74,6 +75,11 @@ void SetSampleMaterial::init() {
"Optional: This total scattering cross-section (coherent + "
"incoherent) for the sample material in barns will be used "
"instead of tabulated");
+ const std::vector<std::string> extensions{".DAT"};
+ declareProperty(
+ std::make_unique<FileProperty>("AttenuationProfile", "",
+ FileProperty::OptionalLoad, extensions),
+ "The path name of the file containing the attenuation profile");
declareProperty("SampleMassDensity", EMPTY_DBL(), mustBePositive,
"Measured mass density in g/cubic cm of the sample "
"to be used to calculate the number density.");
@@ -110,6 +116,7 @@ void SetSampleMaterial::init() {
setPropertyGroup("IncoherentXSection", specificValuesGrp);
setPropertyGroup("AttenuationXSection", specificValuesGrp);
setPropertyGroup("ScatteringXSection", specificValuesGrp);
+ setPropertyGroup("AttenuationProfile", specificValuesGrp);
// Extra property settings
setPropertySettings("ChemicalFormula",
@@ -140,6 +147,7 @@ std::map<std::string, std::string> SetSampleMaterial::validateInputs() {
params.incoherentXSection = getProperty("IncoherentXSection");
params.attenuationXSection = getProperty("AttenuationXSection");
params.scatteringXSection = getProperty("ScatteringXSection");
+ params.attenuationProfileFileName = getPropertyValue("AttenuationProfile");
const std::string numberDensityUnit = getProperty("NumberDensityUnit");
if (numberDensityUnit == "Atoms") {
params.numberDensityUnit = MaterialBuilder::NumberDensityUnit::Atoms;
diff --git a/Framework/DataHandling/test/LoadSampleEnvironmentTest.h b/Framework/DataHandling/test/LoadSampleEnvironmentTest.h
index 9f3280c1e9f29de527d1ccde7827774710508b1a..c7166c7618f5d2bd084a8b234d3284336d933f2c 100644
--- a/Framework/DataHandling/test/LoadSampleEnvironmentTest.h
+++ b/Framework/DataHandling/test/LoadSampleEnvironmentTest.h
@@ -35,9 +35,6 @@ public:
LoadSampleEnvironment alg;
TS_ASSERT_THROWS_NOTHING(alg.initialize());
TS_ASSERT(alg.isInitialized());
-
- TSM_ASSERT_EQUALS("should be 23 properties here", 23,
- (size_t)(alg.getProperties().size()));
}
void testSetMaterial() {
diff --git a/Framework/Doxygen/make_header.py b/Framework/Doxygen/make_header.py
index 44edaf67920aabc0cd32df85c7f3fd886f88bef7..c87976c431edb8da75b49e044f0fb59e6eb2b707 100644
--- a/Framework/Doxygen/make_header.py
+++ b/Framework/Doxygen/make_header.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range #pylint: disable=redefined-builtin
import sys
tracking = """<script>
diff --git a/Framework/Kernel/CMakeLists.txt b/Framework/Kernel/CMakeLists.txt
index 3a618773267c19dd20fbc74d6d35c70584c346f7..ecda62cd5d3b50e1bf2fa110315dca90c873ef61 100644
--- a/Framework/Kernel/CMakeLists.txt
+++ b/Framework/Kernel/CMakeLists.txt
@@ -5,6 +5,7 @@ set(SRC_FILES
src/ArrayOrderedPairsValidator.cpp
src/ArrayProperty.cpp
src/Atom.cpp
+ src/AttenuationProfile.cpp
src/BinFinder.cpp
src/BinaryStreamReader.cpp
src/BinaryStreamWriter.cpp
@@ -148,6 +149,7 @@ set(INC_FILES
inc/MantidKernel/ArrayOrderedPairsValidator.h
inc/MantidKernel/ArrayProperty.h
inc/MantidKernel/Atom.h
+ inc/MantidKernel/AttenuationProfile.h
inc/MantidKernel/BinFinder.h
inc/MantidKernel/BinaryFile.h
inc/MantidKernel/BinaryStreamReader.h
@@ -320,6 +322,7 @@ set(TEST_FILES
ArrayOrderedPairsValidatorTest.h
ArrayPropertyTest.h
AtomTest.h
+ AttenuationProfileTest.h
BinFinderTest.h
BinaryFileTest.h
BinaryStreamReaderTest.h
diff --git a/Framework/Kernel/inc/MantidKernel/AttenuationProfile.h b/Framework/Kernel/inc/MantidKernel/AttenuationProfile.h
new file mode 100644
index 0000000000000000000000000000000000000000..32b8817f2db04825255fff883de249de7798ce92
--- /dev/null
+++ b/Framework/Kernel/inc/MantidKernel/AttenuationProfile.h
@@ -0,0 +1,27 @@
+// Mantid Repository : https://github.com/mantidproject/mantid
+//
+// Copyright © 2020 ISIS Rutherford Appleton Laboratory UKRI,
+// NScD Oak Ridge National Laboratory, European Spallation Source
+// & Institut Laue - Langevin
+// SPDX - License - Identifier: GPL - 3.0 +
+#pragma once
+
+#include "MantidKernel/DllConfig.h"
+#include "MantidKernel/Interpolation.h"
+#include <vector>
+
+namespace Mantid {
+namespace Kernel {
+
+class MANTID_KERNEL_DLL AttenuationProfile {
+public:
+ AttenuationProfile(const std::string &inputFileName,
+ const std::string &searchPath);
+ double getAttenuationCoefficient(const double lambda) const;
+
+private:
+ Kernel::Interpolation m_Interpolator;
+};
+
+} // namespace Kernel
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Kernel/inc/MantidKernel/Interpolation.h b/Framework/Kernel/inc/MantidKernel/Interpolation.h
index ce1de4f07880028b002712c9fc3614cd49da15eb..e22547703ebc4f6468ac336a070d6032c50c35b1 100644
--- a/Framework/Kernel/inc/MantidKernel/Interpolation.h
+++ b/Framework/Kernel/inc/MantidKernel/Interpolation.h
@@ -18,6 +18,8 @@
namespace Mantid {
namespace Kernel {
+
+using DataXY = std::pair<double, double>;
/**
Provide interpolation over a series of points.
@@ -26,10 +28,8 @@ namespace Kernel {
*/
class MANTID_KERNEL_DLL Interpolation {
private:
- /// internal storage of x values
- std::vector<double> m_x;
- /// internal storage of y values
- std::vector<double> m_y;
+ /// internal storage of x and y values
+ std::vector<DataXY> m_data;
/// method used for doing the interpolation
std::string m_method;
@@ -41,8 +41,10 @@ private:
Unit_sptr m_yUnit;
protected:
- size_t findIndexOfNextLargerValue(const std::vector<double> &data,
- double key) const;
+ std::vector<DataXY>::const_iterator
+ findIndexOfNextLargerValue(double key) const;
+ std::vector<DataXY>::const_iterator cbegin() const;
+ std::vector<DataXY>::const_iterator cend() const;
public:
/// Constructor default to linear interpolation and x-unit set to TOF
@@ -74,7 +76,7 @@ public:
Unit_sptr getYUnit() const { return m_yUnit; };
/// return false if no data has been added
- bool containData() const { return !m_x.empty() ? true : false; }
+ bool containData() const { return !m_data.empty(); }
/// Prints object to stream
void printSelf(std::ostream &os) const;
diff --git a/Framework/Kernel/inc/MantidKernel/Material.h b/Framework/Kernel/inc/MantidKernel/Material.h
index 72cf13eac413a932bbe9d9a1a3e6d1a52ef120e9..f6e2702f76ced95cb5a7e22a52885d988130c6b9 100644
--- a/Framework/Kernel/inc/MantidKernel/Material.h
+++ b/Framework/Kernel/inc/MantidKernel/Material.h
@@ -9,8 +9,10 @@
//------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------
+#include "MantidKernel/AttenuationProfile.h"
#include "MantidKernel/NeutronAtom.h"
#include "MantidKernel/PhysicalConstants.h"
+#include <boost/optional/optional.hpp>
#include <boost/shared_ptr.hpp>
#include <string>
#include <vector>
@@ -76,6 +78,10 @@ public:
/// Virtual destructor.
virtual ~Material() = default;
+ /// Allow an explicit attenuation profile to be loaded onto the material
+ /// that overrides the standard linear absorption coefficient
+ void setAttenuationProfile(AttenuationProfile attenuationOverride);
+
/// Returns the name of the material
const std::string &name() const;
const Material::ChemicalFormula &chemicalFormula() const;
@@ -98,7 +104,7 @@ public:
double
absorbXSection(const double lambda =
PhysicalConstants::NeutronAtom::ReferenceLambda) const;
- /// Compute the attenuation at a given wavelegnth over the given distance
+ /// Compute the attenuation at a given wavelength over the given distance
double attenuation(const double distance,
const double lambda =
PhysicalConstants::NeutronAtom::ReferenceLambda) const;
@@ -203,6 +209,8 @@ private:
double m_pressure;
double m_linearAbsorpXSectionByWL;
double m_totalScatterXSection;
+
+ boost::optional<AttenuationProfile> m_attenuationOverride;
};
/// Typedef for a shared pointer
diff --git a/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h b/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h
index f8393ba5de8a84a422405def64e3f079f2fd31ec..9a4cb2e654207d0910951e66851aa927cc066ccd 100644
--- a/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h
+++ b/Framework/Kernel/inc/MantidKernel/MaterialBuilder.h
@@ -42,6 +42,9 @@ public:
MaterialBuilder &setCoherentXSection(double xsec);
MaterialBuilder &setIncoherentXSection(double xsec);
MaterialBuilder &setAbsorptionXSection(double xsec);
+ MaterialBuilder &setAttenuationProfileFilename(std::string filename);
+
+ void setAttenuationSearchPath(std::string path);
Material build() const;
@@ -64,6 +67,8 @@ private:
boost::optional<double> m_totalXSection, m_cohXSection, m_incXSection,
m_absSection;
NumberDensityUnit m_numberDensityUnit;
+ boost::optional<std::string> m_attenuationProfileFileName;
+ std::string m_attenuationFileSearchPath;
};
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/MaterialXMLParser.h b/Framework/Kernel/inc/MantidKernel/MaterialXMLParser.h
index 0929e7de98a1970cd3aedd286ff9b50dd42d11a6..927d176675e8ab58a7d917af723357532d8c46c9 100644
--- a/Framework/Kernel/inc/MantidKernel/MaterialXMLParser.h
+++ b/Framework/Kernel/inc/MantidKernel/MaterialXMLParser.h
@@ -27,7 +27,8 @@ public:
static constexpr const char *MATERIAL_TAG = "material";
Material parse(std::istream &istr) const;
- Material parse(Poco::XML::Element *node) const;
+ Material parse(Poco::XML::Element *node,
+ const std::string &XMLFilePath = "") const;
};
} // namespace Kernel
diff --git a/Framework/Kernel/src/AttenuationProfile.cpp b/Framework/Kernel/src/AttenuationProfile.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..555f10817d5ffffcdf23f45ce949f117bd0a244e
--- /dev/null
+++ b/Framework/Kernel/src/AttenuationProfile.cpp
@@ -0,0 +1,86 @@
+// Mantid Repository : https://github.com/mantidproject/mantid
+//
+// Copyright © 2020 ISIS Rutherford Appleton Laboratory UKRI,
+// NScD Oak Ridge National Laboratory, European Spallation Source
+// & Institut Laue - Langevin
+// SPDX - License - Identifier: GPL - 3.0 +
+#include "MantidKernel/AttenuationProfile.h"
+#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/Exception.h"
+#include <Poco/File.h>
+#include <Poco/Path.h>
+#include <fstream>
+
+namespace Mantid {
+namespace Kernel {
+
+/**
+ * Construct an attenuation profile object
+ * @param inputFileName :: The name of the file containing the attenuation
+ * profile data. Filename can be a full path or just file name
+ * @param searchPath :: Path to search for the input file
+ */
+AttenuationProfile::AttenuationProfile(const std::string &inputFileName,
+ const std::string &searchPath) {
+ Poco::Path suppliedFileName(inputFileName);
+ Poco::Path inputFilePath;
+ std::string fileExt = suppliedFileName.getExtension();
+ std::transform(fileExt.begin(), fileExt.end(), fileExt.begin(), toupper);
+
+ if (fileExt == "DAT") {
+ if (suppliedFileName.isRelative()) {
+ bool useSearchDirectories = true;
+
+ if (!searchPath.empty()) {
+ inputFilePath =
+ Poco::Path(Poco::Path(searchPath).parent(), inputFileName);
+ if (Poco::File(inputFilePath).exists()) {
+ useSearchDirectories = false;
+ }
+ }
+ if (useSearchDirectories) {
+ // ... and if that doesn't work look in the search directories
+ std::string foundFile =
+ Mantid::Kernel::ConfigService::Instance().getFullPath(inputFileName,
+ false, 0);
+ if (!foundFile.empty()) {
+ inputFilePath = Poco::Path(foundFile);
+ } else {
+ inputFilePath = suppliedFileName;
+ }
+ }
+ } else {
+ inputFilePath = suppliedFileName;
+ }
+ std::ifstream input(inputFilePath.toString(), std::ios_base::in);
+ if (input) {
+ std::string line;
+ while (std::getline(input, line)) {
+ double lambda, alpha, error;
+ if (std::stringstream(line) >> lambda >> alpha >> error) {
+ m_Interpolator.addPoint(lambda, 1000 * alpha);
+ }
+ }
+ input.close();
+ } else {
+ throw Exception::FileError("Error reading attenuation profile file",
+ inputFileName);
+ }
+ } else {
+ throw Exception::FileError("Attenuation profile file must be a .DAT file",
+ inputFileName);
+ }
+}
+
+/**
+ * Returns the attenuation coefficient for the supplied wavelength
+ * @param lambda The wavelength the attenuation coefficient is required for
+ * (Angstroms)
+ * @returns Attenuation coefficient ie alpha in I/I0=exp(-alpha*distance)
+ */
+double
+AttenuationProfile::getAttenuationCoefficient(const double lambda) const {
+ return m_Interpolator.value(lambda);
+}
+} // namespace Kernel
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 5e6b014115aa8b36c639bfab121eb149a1396457..fcd12bc765e9b373f7f570eb25591c7ab2bb5349 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -651,8 +651,6 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
filestr << "##\n";
filestr << "## GENERAL\n";
filestr << "##\n\n";
- filestr << "## Set the number of algorithm properties to retain\n";
- filestr << "#algorithms.retained=90\n\n";
filestr
<< "## Set the maximum number of cores used to run algorithms over\n";
filestr << "#MultiThreaded.MaxCores=4\n\n";
diff --git a/Framework/Kernel/src/Interpolation.cpp b/Framework/Kernel/src/Interpolation.cpp
index 349fc365c66db136e8c698c9eaff94a5cb7f1f85..7786c4c5b1b00028723fd61e385f331a4b0574a9 100644
--- a/Framework/Kernel/src/Interpolation.cpp
+++ b/Framework/Kernel/src/Interpolation.cpp
@@ -20,11 +20,12 @@ namespace {
Logger g_log("Interpolation");
} // namespace
-/* Functor for findIndexOfNextLargerValue, used in std::lower_bound to replicate
- the original behavior.
-*/
+/* Functor used in std::lower_bound to replicate the original behavior.
+ */
struct LessOrEqualFunctor {
- bool operator()(const double &lhs, const double &rhs) { return lhs <= rhs; }
+ bool operator()(const DataXY &lhs, const DataXY &rhs) {
+ return lhs.first <= rhs.first;
+ }
};
/** Constructor default to linear interpolation and x-unit set to TOF
@@ -34,18 +35,22 @@ Interpolation::Interpolation() : m_method("linear") {
m_yUnit = UnitFactory::Instance().create("TOF");
}
-size_t
-Interpolation::findIndexOfNextLargerValue(const std::vector<double> &data,
- double key) const {
- auto begin = data.begin();
- auto end = data.end();
- auto pos = std::lower_bound(begin, end, key, LessOrEqualFunctor());
+/** Get iterator of item that is next larger than the supplied x value
+ * @param key :: the x value to base the search on
+ * @return iterator of the next largest x value
+ */
+std::vector<DataXY>::const_iterator
+Interpolation::findIndexOfNextLargerValue(double key) const {
+ return std::lower_bound(m_data.begin(), m_data.end(), DataXY(key, 0),
+ LessOrEqualFunctor());
+}
- if (pos == end || pos == begin) {
- throw std::range_error("Value is not in the interpolation range.");
- }
+std::vector<DataXY>::const_iterator Interpolation::cbegin() const {
+ return m_data.cbegin();
+}
- return std::distance(begin, pos);
+std::vector<DataXY>::const_iterator Interpolation::cend() const {
+ return m_data.cend();
}
void Interpolation::setXUnit(const std::string &unit) {
@@ -61,7 +66,7 @@ void Interpolation::setYUnit(const std::string &unit) {
* @return the value
*/
double Interpolation::value(const double &at) const {
- size_t N = m_x.size();
+ size_t N = m_data.size();
if (N == 0) {
g_log.error() << "Need at least one value for interpolation. Return "
@@ -70,26 +75,39 @@ double Interpolation::value(const double &at) const {
}
if (N == 1) {
- return m_y[0];
+ return m_data[0].second;
}
// check first if at is within the limits of interpolation interval
- if (at < m_x[0]) {
- return m_y[0] - (m_x[0] - at) * (m_y[1] - m_y[0]) / (m_x[1] - m_x[0]);
+ if (at < m_data[0].first) {
+ return m_data[0].second - (m_data[0].first - at) *
+ (m_data[1].second - m_data[0].second) /
+ (m_data[1].first - m_data[0].first);
}
- if (at >= m_x[N - 1]) {
- return m_y[N - 1] + (at - m_x[N - 1]) * (m_y[N - 1] - m_y[N - 2]) /
- (m_x[N - 1] - m_x[N - 2]);
+ if (at > m_data[N - 1].first) {
+ return m_data[N - 1].second +
+ (at - m_data[N - 1].first) *
+ (m_data[N - 1].second - m_data[N - 2].second) /
+ (m_data[N - 1].first - m_data[N - 2].first);
}
try {
// otherwise
// General case. Find index of next largest value by std::lower_bound.
- size_t idx = findIndexOfNextLargerValue(m_x, at);
- return m_y[idx - 1] + (at - m_x[idx - 1]) * (m_y[idx] - m_y[idx - 1]) /
- (m_x[idx] - m_x[idx - 1]);
+ auto pos = findIndexOfNextLargerValue(at);
+
+ auto posBefore = std::prev(pos);
+ if (posBefore->first == at) {
+ return posBefore->second;
+ } else {
+ double interpolatedY =
+ posBefore->second + (at - posBefore->first) *
+ (pos->second - posBefore->second) /
+ (pos->first - posBefore->first);
+ return interpolatedY;
+ }
} catch (const std::range_error &) {
return 0.0;
}
@@ -101,41 +119,35 @@ double Interpolation::value(const double &at) const {
* @param yy :: y-value
*/
void Interpolation::addPoint(const double &xx, const double &yy) {
- size_t N = m_x.size();
- std::vector<double>::iterator it;
+ size_t N = m_data.size();
+ std::vector<DataXY>::const_iterator it;
if (N == 0) {
- m_x.emplace_back(xx);
- m_y.emplace_back(yy);
+ DataXY newpair(xx, yy);
+ m_data.emplace_back(newpair);
return;
}
// check first if xx is within the limits of interpolation interval
- if (xx <= m_x[0]) {
- it = m_x.begin();
- it = m_x.insert(it, xx);
- it = m_y.begin();
- it = m_y.insert(it, yy);
+ if (xx < m_data[0].first) {
+ it = m_data.begin();
+ it = m_data.insert(it, DataXY(xx, yy));
return;
}
- if (xx >= m_x[N - 1]) {
- m_x.emplace_back(xx);
- m_y.emplace_back(yy);
+ if (xx > m_data[N - 1].first) {
+ m_data.emplace_back(DataXY(xx, yy));
return;
}
// otherwise
- for (unsigned int i = 1; i < N; i++) {
- if (m_x[i] > xx) {
- it = m_x.begin();
- it = m_x.insert(it + i, xx);
- it = m_y.begin();
- it = m_y.insert(it + i, yy);
- return;
- }
+ it = findIndexOfNextLargerValue(xx);
+
+ auto posBefore = std::prev(it);
+ if (posBefore->first != xx) {
+ m_data.insert(it, DataXY(xx, yy));
}
}
@@ -146,18 +158,15 @@ void Interpolation::addPoint(const double &xx, const double &yy) {
void Interpolation::printSelf(std::ostream &os) const {
os << m_method << " ; " << m_xUnit->unitID() << " ; " << m_yUnit->unitID();
- for (unsigned int i = 0; i < m_x.size(); i++) {
- os << " ; " << m_x[i] << " " << m_y[i];
+ for (unsigned int i = 0; i < m_data.size(); i++) {
+ os << " ; " << m_data[i].first << " " << m_data[i].second;
}
}
/**
Resets interpolation data by clearing the internal storage for x- and y-values
*/
-void Interpolation::resetData() {
- m_x.clear();
- m_y.clear();
-}
+void Interpolation::resetData() { m_data.clear(); }
/**
Prints the value of parameter
diff --git a/Framework/Kernel/src/Material.cpp b/Framework/Kernel/src/Material.cpp
index 72794908c5538447e7286a980fedc430c4ce933c..caa446ea5121fab6d98fafc5ab4d2a696c3204db 100644
--- a/Framework/Kernel/src/Material.cpp
+++ b/Framework/Kernel/src/Material.cpp
@@ -180,6 +180,11 @@ void Material::calculateTotalScatterXSection() {
m_totalScatterXSection = weightedTotal;
}
}
+
+void Material::setAttenuationProfile(AttenuationProfile attenuationOverride) {
+ m_attenuationOverride = std::move(attenuationOverride);
+}
+
/**
* Returns the name
* @returns A string containing the name of the material
@@ -256,8 +261,13 @@ double Material::absorbXSection(const double lambda) const {
* @return The dimensionless attenuation coefficient
*/
double Material::attenuation(const double distance, const double lambda) const {
- return exp(-100 * numberDensity() *
- (totalScatterXSection() + absorbXSection(lambda)) * distance);
+ if (!m_attenuationOverride) {
+ return exp(-100 * numberDensity() *
+ (totalScatterXSection() + absorbXSection(lambda)) * distance);
+ } else {
+ return exp(-m_attenuationOverride->getAttenuationCoefficient(lambda) *
+ distance);
+ }
}
// NOTE: the angstrom^-2 to barns and the angstrom^-1 to cm^-1
diff --git a/Framework/Kernel/src/MaterialBuilder.cpp b/Framework/Kernel/src/MaterialBuilder.cpp
index 23be2c3e8e6a4972b59224f0c6b92b801ae5334e..cd40c87bf4ea70564bff39254b2223f4e0cae572 100644
--- a/Framework/Kernel/src/MaterialBuilder.cpp
+++ b/Framework/Kernel/src/MaterialBuilder.cpp
@@ -210,6 +210,27 @@ MaterialBuilder &MaterialBuilder::setAbsorptionXSection(double xsec) {
return *this;
}
+/**
+ * Set a value for the attenuation profile filename
+ * @param filename Name of the file containing the attenuation profile
+ * @return A reference to the this object to allow chaining
+ */
+MaterialBuilder &
+MaterialBuilder::setAttenuationProfileFilename(std::string filename) {
+ if (!filename.empty()) {
+ m_attenuationProfileFileName = filename;
+ }
+ return *this;
+}
+
+/**
+ * Set a value for the attenuation profile search path
+ * @param path Path to search
+ */
+void MaterialBuilder::setAttenuationSearchPath(std::string path) {
+ m_attenuationFileSearchPath = std::move(path);
+}
+
/**
* Build the new Material object from the current set of options
* @return A new Material object
@@ -229,12 +250,19 @@ Material MaterialBuilder::build() const {
}
const double density = getOrCalculateRho(formula);
+ std::unique_ptr<Material> material;
if (hasOverrideNeutronProperties()) {
PhysicalConstants::NeutronAtom neutron = generateCustomNeutron();
- return Material(m_name, neutron, density);
+ material = std::make_unique<Material>(m_name, neutron, density);
} else {
- return Material(m_name, formula, density);
+ material = std::make_unique<Material>(m_name, formula, density);
+ }
+ if (m_attenuationProfileFileName) {
+ AttenuationProfile materialAttenuation(m_attenuationProfileFileName.get(),
+ m_attenuationFileSearchPath);
+ material->setAttenuationProfile(materialAttenuation);
}
+ return *material;
}
/**
diff --git a/Framework/Kernel/src/MaterialXMLParser.cpp b/Framework/Kernel/src/MaterialXMLParser.cpp
index 836c124636bc885b0647e32377c774420c6630de..bebaafd01d5eccdf9ab78a6f83d14b82f3483e56 100644
--- a/Framework/Kernel/src/MaterialXMLParser.cpp
+++ b/Framework/Kernel/src/MaterialXMLParser.cpp
@@ -54,6 +54,7 @@ const char *TOTSC_ATT = "totalscatterxsec";
const char *COHSC_ATT = "cohscatterxsec";
const char *INCOHSC_ATT = "incohscatterxsec";
const char *ABSORB_ATT = "absorptionxsec";
+const char *ATTENPROF_ATT = "attenuationprofile";
// Base type to put in a hash
struct BuilderHandle {
@@ -116,6 +117,8 @@ const BuilderHandle &findHandle(const std::string &name) {
insertHandle(&handles, INCOHSC_ATT,
&MaterialBuilder::setIncoherentXSection);
insertHandle(&handles, ABSORB_ATT, &MaterialBuilder::setAbsorptionXSection);
+ insertHandle(&handles, ATTENPROF_ATT,
+ &MaterialBuilder::setAttenuationProfileFilename);
}
auto iter = handles.find(name);
if (iter != handles.end())
@@ -198,9 +201,12 @@ Material MaterialXMLParser::parse(std::istream &istr) const {
* tag.
* It reads the definition and produces a new Material object.
* @param element A pointer to an Element node that is a "material" tag
+ * @param XMLFilePath path of the sample environment file where the material
+ * specification was read from (if any)
* @return A new Material object
*/
-Material MaterialXMLParser::parse(Poco::XML::Element *element) const {
+Material MaterialXMLParser::parse(Poco::XML::Element *element,
+ const std::string &XMLFilePath) const {
using namespace Poco::XML;
using NamedNodeMapPtr = AutoPtr<NamedNodeMap>;
NamedNodeMapPtr attrs = element->attributes();
@@ -213,6 +219,7 @@ Material MaterialXMLParser::parse(Poco::XML::Element *element) const {
MaterialBuilder builder;
builder.setName(id->nodeValue());
+ builder.setAttenuationSearchPath(XMLFilePath);
const auto nattrs = attrs->length();
for (unsigned long i = 0; i < nattrs; ++i) {
Node *node = attrs->item(i);
diff --git a/Framework/Kernel/src/NeutronAtom.cpp b/Framework/Kernel/src/NeutronAtom.cpp
index 49bd2512763c196a89d61d195e3cf83789a49aa9..94531c818aaa83c7a40bd6c72f4f1e1c5d08e892 100644
--- a/Framework/Kernel/src/NeutronAtom.cpp
+++ b/Framework/Kernel/src/NeutronAtom.cpp
@@ -49,7 +49,7 @@ void calculateScatteringLengths(NeutronAtom &atom) {
* @param coh_xs :: The coherent neutron cross-section
* @param inc_xs :: The incoherent neutron cross-section
* @param tot_xs :: The total neutron cross-section
- * @param abs_xs :: The absolute neutron cross-section
+ * @param abs_xs :: The absorption neutron cross-section
*/
NeutronAtom::NeutronAtom(const uint16_t z, const double coh_b_real,
const double inc_b_real, const double coh_xs,
@@ -70,7 +70,7 @@ NeutronAtom::NeutronAtom(const uint16_t z, const double coh_b_real,
* @param coh_xs :: The coherent neutron cross-section
* @param inc_xs :: The incoherent neutron cross-section
* @param tot_xs :: The total neutron cross-section
- * @param abs_xs :: The absolute neutron cross-section
+ * @param abs_xs :: The absorption neutron cross-section
*/
NeutronAtom::NeutronAtom(const uint16_t z, const uint16_t a,
const double coh_b_real, const double inc_b_real,
diff --git a/Framework/Kernel/test/AttenuationProfileTest.h b/Framework/Kernel/test/AttenuationProfileTest.h
new file mode 100644
index 0000000000000000000000000000000000000000..05d4ad8598048c64d6fc4eb0e0b940e3837d8b78
--- /dev/null
+++ b/Framework/Kernel/test/AttenuationProfileTest.h
@@ -0,0 +1,47 @@
+// Mantid Repository : https://github.com/mantidproject/mantid
+//
+// Copyright © 2020 ISIS Rutherford Appleton Laboratory UKRI,
+// NScD Oak Ridge National Laboratory, European Spallation Source
+// & Institut Laue - Langevin
+// SPDX - License - Identifier: GPL - 3.0 +
+#pragma once
+
+#include "MantidKernel/AttenuationProfile.h"
+#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/Exception.h"
+#include <ctime>
+#include <cxxtest/TestSuite.h>
+
+using namespace Mantid::Kernel;
+
+class AttenuationProfileTest : public CxxTest::TestSuite {
+public:
+ // This means the constructor isn't called when running other tests
+ static AttenuationProfileTest *createSuite() {
+ return new AttenuationProfileTest();
+ }
+ static void destroySuite(AttenuationProfileTest *suite) { delete suite; }
+
+ AttenuationProfileTest() {}
+
+ void testLoadAttenuationFile() {
+ std::string path = Mantid::Kernel::ConfigService::Instance().getFullPath(
+ "AttenuationProfile.DAT", false, 0);
+ TS_ASSERT_THROWS_NOTHING(auto loader = AttenuationProfile(path, ""));
+ }
+
+ void testLoadInvalidAttenuationFile() {
+ std::string path = Mantid::Kernel::ConfigService::Instance().getFullPath(
+ "INVALID.DAT", false, 0);
+ TS_ASSERT_THROWS(auto loader = AttenuationProfile(path, ""),
+ Mantid::Kernel::Exception::FileError &);
+ }
+
+ void testGetAttenuationCoefficient() {
+ std::string path = Mantid::Kernel::ConfigService::Instance().getFullPath(
+ "AttenuationProfile.DAT", false, 0);
+ auto loader = AttenuationProfile(path, "");
+ TS_ASSERT_EQUALS(loader.getAttenuationCoefficient(0.10027009),
+ 1000 * 0.82631156E-01);
+ }
+};
diff --git a/Framework/Kernel/test/ConfigPropertyObserverTest.h b/Framework/Kernel/test/ConfigPropertyObserverTest.h
index 941b29a01b4eee8b48033402c2d8523df87d6185..9982dbd761b2a028d362ebf532ce475e1c2c1f2a 100644
--- a/Framework/Kernel/test/ConfigPropertyObserverTest.h
+++ b/Framework/Kernel/test/ConfigPropertyObserverTest.h
@@ -41,8 +41,6 @@ public:
ConfigService::Instance().getString("datasearch.directories");
m_defaultSaveDirectory =
ConfigService::Instance().getString("defaultsave.directory");
- m_retainedAlgorithms =
- ConfigService::Instance().getString("algorithms.retained");
}
void tearDown() override {
@@ -50,8 +48,6 @@ public:
m_searchDirectories);
ConfigService::Instance().setString("defaultsave.directory",
m_defaultSaveDirectory);
- ConfigService::Instance().setString("algorithms.retained",
- m_retainedAlgorithms);
}
void testRecievesCallbackForSearchDirectoryChange() {
@@ -96,7 +92,7 @@ public:
});
auto callCountB = 0;
auto observerB =
- makeMockObserver("algorithms.retained",
+ makeMockObserver("projectRecovery.secondsBetween",
[&callCountB](const std::string &newValue,
const std::string &prevValue) -> void {
UNUSED_ARG(newValue);
@@ -105,7 +101,8 @@ public:
});
ConfigService::Instance().setString("datasearch.directories", "/dev/null");
- ConfigService::Instance().setString("algorithms.retained", "40");
+ ConfigService::Instance().setString("projectRecovery.secondsBetween",
+ "600");
TS_ASSERT_EQUALS(1, callCountA);
TS_ASSERT_EQUALS(1, callCountB);
diff --git a/Framework/Kernel/test/ConfigServiceTest.h b/Framework/Kernel/test/ConfigServiceTest.h
index cacccda23a13172c89ef521d0821b2a2bbc7eda3..384476a09cbc3ef59b4fe75bba5527caf10e7485 100644
--- a/Framework/Kernel/test/ConfigServiceTest.h
+++ b/Framework/Kernel/test/ConfigServiceTest.h
@@ -329,21 +329,20 @@ public:
void TestCustomProperty() {
std::string countString =
- ConfigService::Instance().getString("algorithms.retained");
- TS_ASSERT_EQUALS(countString, "50");
+ ConfigService::Instance().getString("projectRecovery.secondsBetween");
+ TS_ASSERT_EQUALS(countString, "60");
}
void TestCustomPropertyAsValue() {
- // Mantid.legs is defined in the properties script as 6
int value = ConfigService::Instance()
- .getValue<int>("algorithms.retained")
+ .getValue<int>("projectRecovery.secondsBetween")
.get_value_or(0);
double dblValue = ConfigService::Instance()
- .getValue<double>("algorithms.retained")
+ .getValue<double>("projectRecovery.secondsBetween")
.get_value_or(0);
- TS_ASSERT_EQUALS(value, 50);
- TS_ASSERT_EQUALS(dblValue, 50.0);
+ TS_ASSERT_EQUALS(value, 60);
+ TS_ASSERT_EQUALS(dblValue, 60.0);
}
void TestMissingProperty() {
diff --git a/Framework/Kernel/test/InterpolationTest.h b/Framework/Kernel/test/InterpolationTest.h
index 47a491ff8b9e2a2408a0c57d3017f986be5a633e..0eb9dabb760bb2a81f428178af28808763e6280e 100644
--- a/Framework/Kernel/test/InterpolationTest.h
+++ b/Framework/Kernel/test/InterpolationTest.h
@@ -31,17 +31,11 @@ public:
*/
InterpolationTest() {
// values for setting up the interpolation
- m_tableXValues.emplace_back(200.0);
- m_tableXValues.emplace_back(201.0);
- m_tableXValues.emplace_back(202.0);
- m_tableXValues.emplace_back(203.0);
- m_tableXValues.emplace_back(204.0);
-
- m_tableYValues.emplace_back(50);
- m_tableYValues.emplace_back(60);
- m_tableYValues.emplace_back(100);
- m_tableYValues.emplace_back(300);
- m_tableYValues.emplace_back(400);
+ m_tableValues.emplace_back(DataXY(200.0, 50));
+ m_tableValues.emplace_back(DataXY(201.0, 60));
+ m_tableValues.emplace_back(DataXY(202.0, 100));
+ m_tableValues.emplace_back(DataXY(203.0, 300));
+ m_tableValues.emplace_back(DataXY(204.0, 400));
// bulk values for interpolation test
m_interpolationXValues.emplace_back(200.5);
@@ -99,9 +93,9 @@ public:
void testAddPointOrdered() {
Interpolation interpolation;
- // Add points from values in vectors in correct order.
- for (size_t i = 0; i < m_tableXValues.size(); ++i) {
- interpolation.addPoint(m_tableXValues[i], m_tableYValues[i]);
+ // Add points from values in vector in correct order.
+ for (size_t i = 0; i < m_tableValues.size(); ++i) {
+ interpolation.addPoint(m_tableValues[i].first, m_tableValues[i].second);
}
// Check correctness of interpolation for different cases
@@ -117,12 +111,25 @@ public:
for (std::vector<size_t>::const_iterator i = insertionOrder.begin();
i != insertionOrder.end(); ++i) {
- interpolation.addPoint(m_tableXValues[*i], m_tableYValues[*i]);
+ interpolation.addPoint(m_tableValues[*i].first, m_tableValues[*i].second);
}
checkInterpolationResults(interpolation);
}
+ void testAddPointDuplicates() {
+ TestableInterpolation interpolation;
+
+ // Add points from values in vector twice.
+ for (size_t i = 0; i < m_tableValues.size(); ++i) {
+ interpolation.addPoint(m_tableValues[i].first, m_tableValues[i].second);
+ interpolation.addPoint(m_tableValues[i].first, m_tableValues[i].second);
+ }
+
+ TS_ASSERT_EQUALS(
+ std::distance(interpolation.cbegin(), interpolation.cend()), 5);
+ }
+
void testEmpty() {
Interpolation interpolation;
@@ -175,39 +182,62 @@ public:
void testFindIndexOfNextLargerValue() {
TestableInterpolation interpolation;
+ // take values from constructor
+ for (size_t i = 0; i < m_tableValues.size(); ++i) {
+ interpolation.addPoint(m_tableValues[i].first, m_tableValues[i].second);
+ }
+
// lower limit - can be treated like general case
TS_ASSERT_EQUALS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 200.0), 1);
+ std::distance(interpolation.cbegin(),
+ interpolation.findIndexOfNextLargerValue(200.0)),
+ 1);
// Exact interpolation points
TS_ASSERT_EQUALS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 201.0), 2);
+ std::distance(interpolation.cbegin(),
+ interpolation.findIndexOfNextLargerValue(201.0)),
+ 2);
TS_ASSERT_EQUALS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 202.0), 3);
+ std::distance(interpolation.cbegin(),
+ interpolation.findIndexOfNextLargerValue(202.0)),
+ 3);
TS_ASSERT_EQUALS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 203.0), 4);
+ std::distance(interpolation.cbegin(),
+ interpolation.findIndexOfNextLargerValue(203.0)),
+ 4);
// Arbitrary interpolation points
TS_ASSERT_EQUALS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 200.5), 1);
+ std::distance(interpolation.cbegin(),
+ interpolation.findIndexOfNextLargerValue(200.5)),
+ 1);
TS_ASSERT_EQUALS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 201.25), 2);
+ std::distance(interpolation.cbegin(),
+ interpolation.findIndexOfNextLargerValue(201.25)),
+ 2);
TS_ASSERT_EQUALS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 203.5), 4);
-
- // upper limit - must be covered as edge case before this can ever be
- // called.
- TS_ASSERT_THROWS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 204.0),
- const std::range_error &);
-
- // outside interpolation limits - edge cases as well
- TS_ASSERT_THROWS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 199),
- const std::range_error &);
- TS_ASSERT_THROWS(
- interpolation.findIndexOfNextLargerValue(m_tableXValues, 2000.0),
- const std::range_error &);
+ std::distance(interpolation.cbegin(),
+ interpolation.findIndexOfNextLargerValue(203.5)),
+ 4);
+ }
+
+ void testCBegin() {
+ TestableInterpolation interpolation;
+ // take values from constructor
+ for (size_t i = 0; i < m_tableValues.size(); ++i) {
+ interpolation.addPoint(m_tableValues[i].first, m_tableValues[i].second);
+ }
+ TS_ASSERT_EQUALS(interpolation.cbegin()->first, 200.0)
+ }
+
+ void testCEnd() {
+ TestableInterpolation interpolation;
+ // take values from constructor
+ for (size_t i = 0; i < m_tableValues.size(); ++i) {
+ interpolation.addPoint(m_tableValues[i].first, m_tableValues[i].second);
+ }
+ TS_ASSERT_EQUALS(std::prev(interpolation.cend())->first, 204.0)
}
void testInterpolationWithTooFewValues() {
@@ -215,13 +245,13 @@ public:
Interpolation interpolationOne;
interpolationOne.addPoint(200, 2.0);
- for (double m_tableXValue : m_tableXValues) {
+ for (DataXY m_tableValue : m_tableValues) {
// When there are zero values in the interpolation, it returns 0.0
- checkValue(interpolationZero, m_tableXValue, 0.0,
+ checkValue(interpolationZero, m_tableValue.first, 0.0,
"zero interpolation values");
// With one value, it returns this one value for any x.
- checkValue(interpolationOne, m_tableXValue, 2.0,
+ checkValue(interpolationOne, m_tableValue.first, 2.0,
"one interpolation value");
}
}
@@ -232,8 +262,8 @@ private:
Interpolation interpolation;
// take values from constructor
- for (size_t i = 0; i < m_tableXValues.size(); ++i) {
- interpolation.addPoint(m_tableXValues[i], m_tableYValues[i]);
+ for (size_t i = 0; i < m_tableValues.size(); ++i) {
+ interpolation.addPoint(m_tableValues[i].first, m_tableValues[i].second);
}
interpolation.setXUnit(xUnit);
@@ -251,18 +281,18 @@ private:
}
void checkValueAtLowerLimit(const Interpolation &interpolation) {
- checkValue(interpolation, m_tableXValues.front(), m_tableYValues.front(),
- "at lower limit");
+ checkValue(interpolation, m_tableValues.front().first,
+ m_tableValues.front().second, "at lower limit");
}
void checkValueAtUpperLimit(const Interpolation &interpolation) {
- checkValue(interpolation, m_tableXValues.back(), m_tableYValues.back(),
- "at upper limit");
+ checkValue(interpolation, m_tableValues.back().first,
+ m_tableValues.back().second, "at upper limit");
}
void checkValuesAtExactBulkPoints(const Interpolation &interpolation) {
- for (size_t i = 1; i < m_tableXValues.size() - 1; ++i) {
- checkValue(interpolation, m_tableXValues[i], m_tableYValues[i],
+ for (size_t i = 1; i < m_tableValues.size() - 1; ++i) {
+ checkValue(interpolation, m_tableValues[i].first, m_tableValues[i].second,
"at interpolation point");
}
}
@@ -293,10 +323,9 @@ private:
TSM_ASSERT_EQUALS(errorString.str().c_str(), interpolation.value(x), y);
}
- // These two vectors contain the data points from which the interpolation is
+ // This vector contains the data points from which the interpolation is
// constructed
- std::vector<double> m_tableXValues;
- std::vector<double> m_tableYValues;
+ std::vector<DataXY> m_tableValues;
// Two vectors with test values for the "bulk", e.g. no values at the limits
// and
diff --git a/Framework/Properties/Mantid.properties.template b/Framework/Properties/Mantid.properties.template
index aa98016f34e54182ce72ffdff53cd35db52ca658..028a3ecc5a97239449801f6056cc479da7d51882 100644
--- a/Framework/Properties/Mantid.properties.template
+++ b/Framework/Properties/Mantid.properties.template
@@ -111,9 +111,6 @@ icatDownload.directory =
# ICat mount point. Directory where archive is mounted. See Facility.xml filelocation.
icatDownload.mountPoint =
-# The Number of algorithms properties to retain im memory for refence in scripts.
-algorithms.retained = 50
-
# Defines the maximum number of cores to use for OpenMP
# For machine default set to 0
MultiThreaded.MaxCores = 0
diff --git a/Framework/PythonInterface/mantid/__init__.py b/Framework/PythonInterface/mantid/__init__.py
index abc301bbd94be03a430f33fa67914b7c0676e686..42caea480daf7b294f3f57bd81f7ba8b9a7007b3 100644
--- a/Framework/PythonInterface/mantid/__init__.py
+++ b/Framework/PythonInterface/mantid/__init__.py
@@ -22,8 +22,7 @@ algorithms and data objects that are:
Implementing Algorithms, Virtual Instrument Geometry.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
import os
import sys
diff --git a/Framework/PythonInterface/mantid/_plugins/__init__.py b/Framework/PythonInterface/mantid/_plugins/__init__.py
index 136498795eb8b107d73b82104af24e17d8af4a81..1d7a9d6f68822d652ca724296044c840fee6f421 100644
--- a/Framework/PythonInterface/mantid/_plugins/__init__.py
+++ b/Framework/PythonInterface/mantid/_plugins/__init__.py
@@ -19,8 +19,7 @@ and so methods, such as __len__() & add() inherited from CompositeFunction are m
The names from the library are not imported by default as it is best if the interface classes
are used for checks such as isinstance()
"""
-from __future__ import (absolute_import, division,
- print_function)
+
###############################################################################
# Load the C++ library and register the C++ class exports
diff --git a/Framework/PythonInterface/mantid/api/__init__.py b/Framework/PythonInterface/mantid/api/__init__.py
index 0ec0bf31a23969d086193f1a2fd196f52491a01c..bf2877e0a6c0da28d0199d6c8a89ac860c4c8268 100644
--- a/Framework/PythonInterface/mantid/api/__init__.py
+++ b/Framework/PythonInterface/mantid/api/__init__.py
@@ -11,8 +11,6 @@ api
Defines Python objects that wrap the C++ API namespace.
"""
-from __future__ import absolute_import
-
###############################################################################
# Load the C++ library
###############################################################################
@@ -42,4 +40,3 @@ from mantid.api import _adsimports
# Make aliases accessible in this namespace
###############################################################################
from mantid.api._aliases import *
-
diff --git a/Framework/PythonInterface/mantid/api/_aliases.py b/Framework/PythonInterface/mantid/api/_aliases.py
index a5ccca32168fabb18d048e0ff7e67c2c23dfc7bb..274e005b7a7bd761e1e1c600a371425d7a4cafb0 100644
--- a/Framework/PythonInterface/mantid/api/_aliases.py
+++ b/Framework/PythonInterface/mantid/api/_aliases.py
@@ -7,8 +7,6 @@
"""
Defines a set of aliases to make accessing certain objects easier
"""
-from __future__ import absolute_import
-
from mantid.api import (AlgorithmFactoryImpl, AlgorithmManagerImpl, AnalysisDataServiceImpl, CatalogManagerImpl,
FileFinderImpl, FileLoaderRegistryImpl, FrameworkManagerImpl, FunctionFactoryImpl,
WorkspaceFactoryImpl)
diff --git a/Framework/PythonInterface/mantid/api/_workspaceops.py b/Framework/PythonInterface/mantid/api/_workspaceops.py
index f128e77c9b72314b68e64162c293529cb72b0a7e..ab1319e0608b7cca4cd5c8745ba4b5aef043064e 100644
--- a/Framework/PythonInterface/mantid/api/_workspaceops.py
+++ b/Framework/PythonInterface/mantid/api/_workspaceops.py
@@ -10,13 +10,12 @@
It is intended for internal use.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
import inspect as _inspect
import sys
-from six import Iterator, get_function_code, iteritems
+from inspect import getsource
from mantid.api import AnalysisDataServiceImpl, ITableWorkspace, Workspace, WorkspaceGroup, performBinaryOp
from mantid.kernel.funcinspect import customise_func, lhs_info
@@ -63,7 +62,7 @@ def attach_binary_operators_to_workspace():
operations["Divide"] = divops
# Loop through and add each one in turn
- for alg, attributes in iteritems(operations):
+ for alg, attributes in operations.items():
if type(attributes) == str: attributes = [attributes]
for attr in attributes:
add_operator_func(attr, alg, attr.startswith('__i'), attr.startswith('__r'))
@@ -149,7 +148,7 @@ def attach_unary_operators_to_workspace():
'NotMD': '__invert__'
}
# Loop through and add each one in turn
- for alg, attributes in iteritems(operations):
+ for alg, attributes in operations.items():
if type(attributes) == str: attributes = [attributes]
for attr in attributes:
add_operator_func(attr, alg)
@@ -204,7 +203,7 @@ def attach_tableworkspaceiterator():
"""Attaches the iterator code to a table workspace."""
def __iter_method(self):
- class ITableWorkspaceIter(Iterator):
+ class ITableWorkspaceIter(object):
def __init__(self, wksp):
self.__wksp = wksp
self.__pos = 0
@@ -254,7 +253,7 @@ def attach_func_as_method(name, func_obj, self_param_name, workspace_types=None)
signature = func_obj.__signature__.replace(parameters=func_parameters)
else:
signature = ['self']
- signature.extend(get_function_code(func_obj).co_varnames)
+ signature.extend(getsource(func_obj).co_varnames)
signature = tuple(signature)
customise_func(_method_impl, func_obj.__name__,
signature, func_obj.__doc__)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
index f851ae4a710f04aa39cb8b84c5c8474cbd03fc09..8379c24ee2b27b440da24dd697a62c41d7887d29 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
@@ -109,9 +109,6 @@ void export_AlgorithmManager() {
"Creates an unmanaged algorithm."))
.def("size", &AlgorithmManagerImpl::size, arg("self"),
"Returns the number of managed algorithms")
- .def("setMaxAlgorithms", &AlgorithmManagerImpl::setMaxAlgorithms,
- (arg("self"), arg("n")),
- "Set the maximum number of allowed managed algorithms")
.def("getAlgorithm", &getAlgorithm, (arg("self"), arg("id_holder")),
"Return the algorithm instance identified by the given id.")
.def("removeById", &removeById, (arg("self"), arg("id_holder")),
diff --git a/Framework/PythonInterface/mantid/dataobjects/__init__.py b/Framework/PythonInterface/mantid/dataobjects/__init__.py
index 5bd41720c97e3a39248657ce9315296171ab4b7f..28de58bc65e691236c35539a299fd88618310ef4 100644
--- a/Framework/PythonInterface/mantid/dataobjects/__init__.py
+++ b/Framework/PythonInterface/mantid/dataobjects/__init__.py
@@ -19,8 +19,6 @@ downcast to the correct leaf type if the export for that class exists in the reg
The names from the library are not imported by default as it is best if the interface classes
are used for checks such as isinstance()
"""
-from __future__ import absolute_import
-
###############################################################################
# Load the C++ library and register the C++ class exports
###############################################################################
diff --git a/Framework/PythonInterface/mantid/geometry/__init__.py b/Framework/PythonInterface/mantid/geometry/__init__.py
index c982060c841fd18b7e689e5ff5f944fe463e0c70..6e20006e045a3028dbd013cbe0a9a8599b4f15c2 100644
--- a/Framework/PythonInterface/mantid/geometry/__init__.py
+++ b/Framework/PythonInterface/mantid/geometry/__init__.py
@@ -11,8 +11,6 @@ mantid.geometry
Defines Python objects that wrap the C++ Geometry namespace.
"""
-from __future__ import absolute_import
-
###############################################################################
# Load the C++ library
###############################################################################
diff --git a/Framework/PythonInterface/mantid/geometry/_aliases.py b/Framework/PythonInterface/mantid/geometry/_aliases.py
index 651fc5acd8251cc618c725af435faf086b4c9057..7c0bb2d932ebd021f05b594b65c7418b7856066f 100644
--- a/Framework/PythonInterface/mantid/geometry/_aliases.py
+++ b/Framework/PythonInterface/mantid/geometry/_aliases.py
@@ -8,8 +8,7 @@
Defines a set of aliases to make accessing certain objects easier,
like in mantid.api.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
from mantid.kernel._aliases import lazy_instance_access
from mantid.geometry import (SpaceGroupFactoryImpl, SymmetryOperationFactoryImpl,
diff --git a/Framework/PythonInterface/mantid/kernel/__init__.py b/Framework/PythonInterface/mantid/kernel/__init__.py
index 888f203deab3573d6457fc826ebb5603a11f3277..47ceca9922713187f9a080aa0181defe080f7f5c 100644
--- a/Framework/PythonInterface/mantid/kernel/__init__.py
+++ b/Framework/PythonInterface/mantid/kernel/__init__.py
@@ -11,8 +11,6 @@ kernel
Defines Python objects that wrap the C++ Kernel namespace.
"""
-from __future__ import absolute_import
-
###############################################################################
# Make modules available in this namespace
###############################################################################
diff --git a/Framework/PythonInterface/mantid/kernel/_aliases.py b/Framework/PythonInterface/mantid/kernel/_aliases.py
index d4a217c0c0be6b3d519b055656227175042babfa..a12a32b7c330b79fde96b08bb467f60b51dbbc2a 100644
--- a/Framework/PythonInterface/mantid/kernel/_aliases.py
+++ b/Framework/PythonInterface/mantid/kernel/_aliases.py
@@ -8,8 +8,7 @@
Defines a set of aliases for the kernel module to make
accessing certain objects easier.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
from mantid.kernel import (ConfigServiceImpl, Logger, PropertyManagerDataServiceImpl, UnitFactoryImpl, UsageServiceImpl)
diff --git a/Framework/PythonInterface/mantid/kernel/funcinspect.py b/Framework/PythonInterface/mantid/kernel/funcinspect.py
index ce5a1611cf84d4afc07155ff123ccbe70b4a44e2..285fb8bec50ba2b4c5cafe28513ba67bc7ba9583 100644
--- a/Framework/PythonInterface/mantid/kernel/funcinspect.py
+++ b/Framework/PythonInterface/mantid/kernel/funcinspect.py
@@ -12,13 +12,11 @@
arguments that are being assigned to a function
return
"""
-from __future__ import (absolute_import, division,
- print_function)
+
import opcode
import inspect
import sys
import dis
-from six import PY3
def replace_signature(func, signature):
@@ -77,6 +75,8 @@ def customise_func(func, name, signature, docstring):
return func
#-------------------------------------------------------------------------------
+
+
def decompile(code_object):
"""
Taken from
@@ -108,45 +108,8 @@ def decompile(code_object):
ins = decompile(f.f_code)
"""
instructions = []
-
- if PY3:
- for ins in dis.get_instructions(code_object):
- instructions.append( (ins.offset, ins.opcode, ins.opname, ins.arg, ins.argval) )
- else:
- code = code_object.co_code
- variables = code_object.co_cellvars + code_object.co_freevars
- n = len(code)
- i = 0
- e = 0
- while i < n:
- i_offset = i
- i_opcode = ord(code[i])
- i = i + 1
- if i_opcode >= opcode.HAVE_ARGUMENT:
- i_argument = ord(code[i]) + (ord(code[i+1]) << (4*2)) + e
- i = i + 2
- if i_opcode == opcode.EXTENDED_ARG:
- e = i_argument << 16
- else:
- e = 0
- if i_opcode in opcode.hasconst:
- i_arg_value = repr(code_object.co_consts[i_argument])
- elif i_opcode in opcode.hasname:
- i_arg_value = code_object.co_names[i_argument]
- elif i_opcode in opcode.hasjrel:
- i_arg_value = repr(i + i_argument)
- elif i_opcode in opcode.haslocal:
- i_arg_value = code_object.co_varnames[i_argument]
- elif i_opcode in opcode.hascompare:
- i_arg_value = opcode.cmp_op[i_argument]
- elif i_opcode in opcode.hasfree:
- i_arg_value = variables[i_argument]
- else:
- i_arg_value = i_argument
- else:
- i_argument = None
- i_arg_value = None
- instructions.append( (i_offset, i_opcode, opcode.opname[i_opcode], i_argument, i_arg_value) )
+ for ins in dis.get_instructions(code_object):
+ instructions.append( (ins.offset, ins.opcode, ins.opname, ins.arg, ins.argval) )
return instructions
#-------------------------------------------------------------------------------
@@ -168,6 +131,7 @@ __operator_names = set(['CALL_FUNCTION', 'CALL_FUNCTION_VAR', 'CALL_FUNCTION_KW'
'CALL_FUNCTION_EX', 'LOAD_METHOD', 'CALL_METHOD'])
#--------------------------------------------------------------------------------------
+
def process_frame(frame):
"""Returns the number of arguments on the left of assignment along
with the names of the variables for the given frame.
@@ -256,6 +220,7 @@ def process_frame(frame):
#-------------------------------------------------------------------------------
+
def lhs_info(output_type='both', frame=None):
"""Returns the number of arguments on the left of assignment along
with the names of the variables.
diff --git a/Framework/PythonInterface/mantid/kernel/plugins.py b/Framework/PythonInterface/mantid/kernel/plugins.py
index fe28799d80d567ddf5e35e04a8146bf7c125d06f..168d84ad234d89e7602853e880085b6222611544 100644
--- a/Framework/PythonInterface/mantid/kernel/plugins.py
+++ b/Framework/PythonInterface/mantid/kernel/plugins.py
@@ -10,8 +10,7 @@ Defines functions to dynamically load Python modules.
These modules may define extensions to C++ types, e.g.
algorithms, fit functions etc.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
import os as _os
import sys as _sys
@@ -39,6 +38,7 @@ from . import logger, Logger, config
# String that separates paths (should be in the ConfigService)
PATH_SEPARATOR=";"
+
class PluginLoader(object):
extension = ".py"
@@ -69,6 +69,7 @@ class PluginLoader(object):
# High-level functions to assist with loading
#======================================================================================================================
+
def get_plugin_paths_as_set(key):
"""
Returns the value of the given key in the config service
@@ -82,6 +83,7 @@ def get_plugin_paths_as_set(key):
s.remove('')
return s
+
def check_for_plugins(top_dir):
"""
Runs a quick check to see if any plugin files exist in the given directory
@@ -120,6 +122,7 @@ def find_plugins(top_dir):
#======================================================================================================================
+
def load(path):
"""
High-level function to import the module(s) on the given path.
@@ -152,6 +155,7 @@ def load(path):
#======================================================================================================================
+
def load_from_list(paths):
"""
Load all modules in the given list
@@ -169,6 +173,7 @@ def load_from_list(paths):
#======================================================================================================================
+
def load_from_dir(directory):
"""
Load all modules in the given directory
@@ -184,6 +189,7 @@ def load_from_dir(directory):
#======================================================================================================================
+
def load_from_file(filepath):
"""
Loads the plugin file. Any code present at the top-level will
@@ -201,6 +207,7 @@ def load_from_file(filepath):
#======================================================================================================================
+
def load_plugin(plugin_path):
"""
Load a plugin and return the name & module object
@@ -216,6 +223,7 @@ def load_plugin(plugin_path):
#======================================================================================================================
+
def sync_attrs(source, attrs, clients):
"""
Syncs the attribute definitions between the
@@ -235,6 +243,7 @@ def sync_attrs(source, attrs, clients):
#======================================================================================================================
+
def contains_algorithm(filename):
"""
Inspects the file to look for an algorithm registration line
diff --git a/Framework/PythonInterface/mantid/plots/__init__.py b/Framework/PythonInterface/mantid/plots/__init__.py
index 587580b72012e24d942c9a392433d634fb7890cf..496ddae931d4594343113e46b3587fe926be1843 100644
--- a/Framework/PythonInterface/mantid/plots/__init__.py
+++ b/Framework/PythonInterface/mantid/plots/__init__.py
@@ -13,9 +13,6 @@ Functionality for unpacking mantid objects for plotting with matplotlib.
# This file should be left free of PyQt imports to allow quick importing
# of the main package.
-from __future__ import (absolute_import, division, print_function)
-
-
try:
from collections.abc import Iterable
except ImportError:
diff --git a/Framework/PythonInterface/mantid/plots/_compatability.py b/Framework/PythonInterface/mantid/plots/_compatability.py
index fb1b13958c3920b23dd2bf874bd2ff9956f4f68d..131fa3ccbf9736bcf05b2e78931eb750fff96c12 100644
--- a/Framework/PythonInterface/mantid/plots/_compatability.py
+++ b/Framework/PythonInterface/mantid/plots/_compatability.py
@@ -7,8 +7,6 @@
# This file is part of the mantid package
#
#
-from __future__ import (absolute_import, division, print_function)
-
# local imports
from mantid.kernel import Logger
from mantid.plots.utility import MantidAxType
@@ -21,6 +19,8 @@ LOGGER = Logger("mantid.plots.plotCompatability")
# ================================================
# Compatability functions
# ================================================
+
+
def plotSpectrum(workspaces, indices=None, distribution=None, error_bars=False,
type=None, window=None, clearWindow=None,
waterfall=None, spectrum_nums=None):
@@ -97,4 +97,3 @@ def _report_deprecated_parameter(param_name,param_value):
"""Logs a warning message if the parameter value is not None"""
if param_value is not None:
LOGGER.warning("The argument '{}' is not supported in workbench and has been ignored".format(param_name))
-
diff --git a/Framework/PythonInterface/mantid/plots/axesfunctions.py b/Framework/PythonInterface/mantid/plots/axesfunctions.py
index 8fc4fdd66257c37c1c6d15b3e9efca0632e262a9..e70153a4e6497b722d96aac1fab022a387df4623 100644
--- a/Framework/PythonInterface/mantid/plots/axesfunctions.py
+++ b/Framework/PythonInterface/mantid/plots/axesfunctions.py
@@ -7,8 +7,6 @@
# This file is part of the mantid package
#
#
-from __future__ import (absolute_import, division, print_function)
-
import collections
import matplotlib
import matplotlib.collections as mcoll
diff --git a/Framework/PythonInterface/mantid/plots/axesfunctions3D.py b/Framework/PythonInterface/mantid/plots/axesfunctions3D.py
index aff2d05efb079cbf52759a50751288bd7608ea14..708a48551d0bf4a470204152f8f3fef132ea5449 100644
--- a/Framework/PythonInterface/mantid/plots/axesfunctions3D.py
+++ b/Framework/PythonInterface/mantid/plots/axesfunctions3D.py
@@ -7,8 +7,6 @@
# This file is part of the mantid package
#
#
-from __future__ import (absolute_import, division, print_function)
-
import numpy
from mantid.plots.datafunctions import (get_axes_labels, get_normalization, get_distribution,
diff --git a/Framework/PythonInterface/mantid/plots/datafunctions.py b/Framework/PythonInterface/mantid/plots/datafunctions.py
index f86b46e53bd58b5f402b81860e4a79937f184a32..6d6c2b7c0985ccb8cc81b826c033538f61e98c31 100644
--- a/Framework/PythonInterface/mantid/plots/datafunctions.py
+++ b/Framework/PythonInterface/mantid/plots/datafunctions.py
@@ -7,8 +7,6 @@
# This file is part of the mantid package
#
#
-from __future__ import (absolute_import, division, print_function)
-
import datetime
import numpy as np
diff --git a/Framework/PythonInterface/mantid/plots/legend.py b/Framework/PythonInterface/mantid/plots/legend.py
index af84c91242f1b2a37b6014c36032d43d0c3dd0c0..64417338abacd60e5aa21d174c2118a197d35815 100644
--- a/Framework/PythonInterface/mantid/plots/legend.py
+++ b/Framework/PythonInterface/mantid/plots/legend.py
@@ -10,8 +10,6 @@
"""
Functionality for dealing with legends on plots
"""
-from __future__ import (absolute_import, division, print_function)
-
import sys
import matplotlib
diff --git a/Framework/PythonInterface/mantid/plots/mantidaxes.py b/Framework/PythonInterface/mantid/plots/mantidaxes.py
index a9c7f4482fa1c3e75e2000739c3f3d1b48754cc2..a0300b7205000cd410f37444deaed190afc9aac8 100644
--- a/Framework/PythonInterface/mantid/plots/mantidaxes.py
+++ b/Framework/PythonInterface/mantid/plots/mantidaxes.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid package
-from __future__ import absolute_import
-
try:
from collections.abc import Iterable
except ImportError:
@@ -37,6 +35,8 @@ WATERFALL_XOFFSET_DEFAULT, WATERFALL_YOFFSET_DEFAULT = 10, 20
# -----------------------------------------------------------------------------
# Decorators
# -----------------------------------------------------------------------------
+
+
def plot_decorator(func):
def wrapper(self, *args, **kwargs):
func_value = func(self, *args, **kwargs)
@@ -58,6 +58,8 @@ def plot_decorator(func):
# -----------------------------------------------------------------------------
# MantidAxes
# -----------------------------------------------------------------------------
+
+
class MantidAxes(Axes):
"""
This class defines the **mantid** projection for 2d plotting. One chooses
@@ -285,7 +287,7 @@ class MantidAxes(Axes):
Remove the artists reference by this workspace (if any) and return True
if the axes is then empty
:param workspace: A Workspace object
- :return: True if the axes is empty, false if artists remain or this workspace is not associated here
+ :return: True is an artist was removed False if one was not
"""
try:
# pop to ensure we don't hold onto an artist reference
@@ -296,7 +298,7 @@ class MantidAxes(Axes):
for workspace_artist in artist_info:
workspace_artist.remove(self)
- return self.is_empty(self)
+ return True
def remove_artists_if(self, unary_predicate):
"""
@@ -1103,6 +1105,8 @@ class MantidAxes(Axes):
# -----------------------------------------------------------------------------
# MantidAxes3D
# -----------------------------------------------------------------------------
+
+
class MantidAxes3D(Axes3D):
"""
This class defines the **mantid3d** projection for 3d plotting. One chooses
@@ -1375,4 +1379,4 @@ class _WorkspaceArtists(object):
if isinstance(artists, Container) or not isinstance(artists, Iterable):
self._artists = [artists]
else:
- self._artists = artists
\ No newline at end of file
+ self._artists = artists
diff --git a/Framework/PythonInterface/mantid/plots/modest_image/modest_image.py b/Framework/PythonInterface/mantid/plots/modest_image/modest_image.py
index 098610c30dd0b3c958e0299535ad312e375b8760..ca057e8caf2a95a0826f861645d63423db71e2c8 100644
--- a/Framework/PythonInterface/mantid/plots/modest_image/modest_image.py
+++ b/Framework/PythonInterface/mantid/plots/modest_image/modest_image.py
@@ -9,8 +9,6 @@
Modification of Chris Beaumont's mpl-modest-image package to allow the use of
set_extent.
"""
-from __future__ import print_function, division
-
import matplotlib
rcParams = matplotlib.rcParams
diff --git a/Framework/PythonInterface/mantid/plots/plotfunctions.py b/Framework/PythonInterface/mantid/plots/plotfunctions.py
index b69fd0eddb5ec7ad8a23704ad50542b9e302f959..e48ddff957d51e1f5bfccdf423b421395bd89cb9 100644
--- a/Framework/PythonInterface/mantid/plots/plotfunctions.py
+++ b/Framework/PythonInterface/mantid/plots/plotfunctions.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid package
-from __future__ import absolute_import
-
# std imports
import math
import numpy as np
@@ -20,7 +18,6 @@ from matplotlib.legend import Legend
from mantid.api import AnalysisDataService, MatrixWorkspace
from mantid.kernel import ConfigService
from mantid.plots import datafunctions, MantidAxes
-from mantid.py3compat import is_text_string, string_types
# -----------------------------------------------------------------------------
# Constants
@@ -43,6 +40,8 @@ MARKER_MAP = {'square': 's', 'plus (filled)': 'P', 'point': '.', 'tickdown': 3,
# -----------------------------------------------------------------------------
# Decorators
# -----------------------------------------------------------------------------
+
+
def manage_workspace_names(func):
"""
A decorator to go around plotting functions.
@@ -75,7 +74,7 @@ def figure_title(workspaces, fig_num):
def wsname(w):
return w.name() if hasattr(w, 'name') else w
- if is_text_string(workspaces) or not isinstance(workspaces, collections.Sequence):
+ if isinstance(workspaces, str) or not isinstance(workspaces, collections.Sequence):
# assume a single workspace
first = workspaces
else:
@@ -84,6 +83,7 @@ def figure_title(workspaces, fig_num):
return wsname(first) + '-' + str(fig_num)
+
@manage_workspace_names
def plot(workspaces, spectrum_nums=None, wksp_indices=None, errors=False,
overplot=False, fig=None, plot_kwargs=None, ax_properties=None,
@@ -352,7 +352,7 @@ def _validate_workspace_names(workspaces):
:return: A list of workspaces
"""
try:
- raise_if_not_sequence(workspaces, 'workspaces', string_types)
+ raise_if_not_sequence(workspaces, 'workspaces', str)
except ValueError:
return workspaces
else:
@@ -370,5 +370,3 @@ def _do_single_plot(ax, workspaces, errors, set_title, nums, kw, plot_kwargs):
if set_title:
title = workspaces[0].name()
ax.set_title(title)
-
-
diff --git a/Framework/PythonInterface/mantid/plots/scales.py b/Framework/PythonInterface/mantid/plots/scales.py
index d048f2ccbab4567f2380596d399d6c22b73be74d..1d29e53e8c3acdb3f8c0c667b76a69f5ab0552e3 100644
--- a/Framework/PythonInterface/mantid/plots/scales.py
+++ b/Framework/PythonInterface/mantid/plots/scales.py
@@ -8,8 +8,6 @@
"""
Defines a set of custom axis scales
"""
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantid.plots.utility import mpl_version_info
from matplotlib.scale import ScaleBase
from matplotlib.ticker import (AutoLocator, NullFormatter,
diff --git a/Framework/PythonInterface/mantid/plots/utility.py b/Framework/PythonInterface/mantid/plots/utility.py
index a3a4b2f6a66e90033aeb5e3c0f28c2bafa3e5438..284654faeabd72a300b18ccfd5e507efb17a988a 100644
--- a/Framework/PythonInterface/mantid/plots/utility.py
+++ b/Framework/PythonInterface/mantid/plots/utility.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid package
-from __future__ import absolute_import
-
# std imports
import math
import numpy as np
diff --git a/Framework/PythonInterface/mantid/py3compat/__init__.py b/Framework/PythonInterface/mantid/py3compat/__init__.py
deleted file mode 100644
index d27238a25eca6012f5bf9de800b8a75c2971276c..0000000000000000000000000000000000000000
--- a/Framework/PythonInterface/mantid/py3compat/__init__.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# Mantid Repository : https://github.com/mantidproject/mantid
-#
-# Copyright © 2018 ISIS Rutherford Appleton Laboratory UKRI,
-# NScD Oak Ridge National Laboratory, European Spallation Source,
-# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
-# SPDX - License - Identifier: GPL - 3.0 +
-# This file is part of the mantid workbench.
-#
-#
-"""
-mantid.py3compat
-------------------
-
-Transitional module providing compatibility functions intended to help
-migrating from Python 2 to Python 3. Mostly just wraps six but allowing
-for additional functionality of our own.
-
-This module should be fully compatible with:
- * Python >=v2.7
- * Python 3
-"""
-
-from __future__ import (absolute_import, print_function, unicode_literals)
-
-import inspect
-import six
-from six import * # noqa
-import sys
-
-# Enumerations are built in with Python 3
-try:
- from enum import Enum
-except ImportError:
- # use a compatability layer
- from mantid.py3compat.enum import Enum # noqa
-
-# -----------------------------------------------------------------------------
-# Globals and constants
-# -----------------------------------------------------------------------------
-__all__ = dir(six)
-
-
-# -----------------------------------------------------------------------------
-# Library functions
-# -----------------------------------------------------------------------------
-if six.PY2 or sys.version_info[0:2] < (3, 2):
- setswitchinterval = sys.setcheckinterval
-else:
- setswitchinterval = sys.setswitchinterval
-
-if six.PY2 or sys.version_info[0:2] < (3, 5):
- # getfullargspec deprecated up until python 3.5, so use getargspec
- getfullargspec = inspect.getargspec
-else:
- getfullargspec = inspect.getfullargspec
-
-
-# -----------------------------------------------------------------------------
-# File manipulation
-# -----------------------------------------------------------------------------
-if six.PY2:
- csv_open_type = 'wb'
-else:
- csv_open_type = 'w'
-
-
-# -----------------------------------------------------------------------------
-# Strings
-# -----------------------------------------------------------------------------
-if not hasattr(six, "ensure_str"):
- # Ubuntu 16.04, Windows, and OSX Mantid builds have a version of six which
- # doesn't include ensure_str
- # ensure_str was added in six 1.12.0
- def ensure_str(s, encoding='utf-8', errors='strict'):
- """Coerce *s* to `str`.
- For Python 2:
- - `unicode` -> encoded to `str`
- - `str` -> `str`
- For Python 3:
- - `str` -> `str`
- - `bytes` -> decoded to `str`
- """
- if not isinstance(s, (text_type, binary_type)):
- raise TypeError("not expecting type '%s'" % type(s))
- if PY2 and isinstance(s, text_type):
- s = s.encode(encoding, errors)
- elif PY3 and isinstance(s, binary_type):
- s = s.decode(encoding, errors)
- return s
-
-
-def is_text_string(obj):
- """Return True if `obj` is a text string, False if it is anything else,
- like binary data (Python 3) or QString (Python 2, PyQt API #1)"""
- return isinstance(obj, string_types)
-
-
-def to_text_string(obj, encoding=None):
- """Convert `obj` to (unicode) text string"""
-
- if PY2:
- # Python 2
- if encoding is None:
- return unicode(obj)
- else:
- return unicode(obj, encoding)
- else:
- # Python 3
- if encoding is None:
- return str(obj)
- elif isinstance(obj, str):
- # In case this function is not used properly, this could happen
- return obj
- else:
- return str(obj, encoding)
-
-
-def qbytearray_to_str(qba):
- """Convert QByteArray object to str in a way compatible with Python 2/3"""
- return str(bytes(qba.toHex().data()).decode())
diff --git a/Framework/PythonInterface/mantid/py3compat/enum.py b/Framework/PythonInterface/mantid/py3compat/enum.py
deleted file mode 100644
index d070916a6cdd0cf34a7c2dd74a5af166fdfa0dbf..0000000000000000000000000000000000000000
--- a/Framework/PythonInterface/mantid/py3compat/enum.py
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright (C) 2004-2017 Barry Warsaw
-#
-# This file is part of flufl.enum
-#
-# flufl.enum is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, version 3 of the License.
-#
-# flufl.enum is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with flufl.enum. If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Barry Warsaw <barry@python.org>
-#
-# Used to provide backwards compatability with Python 2
-"""Python enumerations.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-import re
-import sys
-import warnings
-
-from operator import itemgetter
-
-
-__metaclass__ = type
-__all__ = [
- 'Enum',
- 'EnumValue',
- 'IntEnum',
- 'make',
- ]
-
-
-COMMASPACE = ', '
-SPACE = ' '
-IDENTIFIER_RE = r'^[a-zA-Z_][a-zA-Z0-9_]*$'
-
-
-class EnumMetaclass(type):
- """Meta class for Enums."""
-
- def __init__(cls, name, bases, attributes):
- """Create an Enum class.
-
- :param cls: The class being defined.
- :param name: The name of the class.
- :param bases: The class's base classes.
- :param attributes: The class attributes.
- """
- super(EnumMetaclass, cls).__init__(name, bases, attributes)
- # Store EnumValues here for easy access.
- cls._enums = {}
- # Figure out if this class has a custom factory for building enum
- # values. The default is EnumValue, but the class (or one of its
- # bases) can declare a custom one with a special attribute.
- factory = attributes.get('__value_factory__')
- # Figure out the set of enum values on the base classes, to ensure
- # that we don't get any duplicate values. At the same time, check the
- # base classes for the special attribute.
- for basecls in cls.__mro__:
- if hasattr(basecls, '_enums'):
- cls._enums.update(basecls._enums)
- if hasattr(basecls, '__value_factory__'):
- basecls_factory = basecls.__value_factory__
- if factory is not None and basecls_factory != factory:
- raise TypeError(
- 'Conflicting enum factory in base class: {}'.format(
- basecls_factory))
- factory = basecls_factory
- # Set the factory default if necessary.
- if factory is None:
- factory = EnumValue
- # For each class attribute, create an enum value and store that back
- # on the class instead of the original value. Skip Python reserved
- # names. Also add a mapping from the original value to the enum value
- # instance so we can return the same object on conversion.
- for attr in attributes:
- if not (attr.startswith('__') and attr.endswith('__')):
- value = attributes[attr]
- enumval = factory(cls, value, attr)
- if value in cls._enums:
- other = cls._enums[value]
- # Without this, sort order is undefined and causes
- # unpredictable results for the test suite.
- first = (attr if attr < other else other)
- second = (other if attr < other else attr)
- raise ValueError("Conflicting enum value '{}' "
- "for names: '{}' and '{}'".format(
- value, first, second))
- # Store as an attribute on the class, and save the attr name.
- setattr(cls, attr, enumval)
- cls._enums[value] = attr
-
- def __dir__(cls):
- # For Python 3.2, we must explicitly convert the dict view to a list.
- # Order is not guaranteed, so don't sort it.
- return list(cls._enums.values())
-
- def __repr__(cls):
- # We want predictable reprs. Because base Enum items can have any
- # value, the only reliable way to sort the keys for the repr is based
- # on the attribute name, which must be Python identifiers.
- return '<{0} {{{1}}}>'.format(cls.__name__, COMMASPACE.join(
- '{0}: {1}'.format(value, key)
- for key, value in sorted(cls._enums.items(), key=itemgetter(1))))
-
- def __iter__(cls):
- for value in sorted(cls._enums.values()):
- yield getattr(cls, value)
-
- def __getitem__(cls, item):
- attr = cls._enums.get(item)
- if attr is None:
- # If this is an EnumValue, try it's .value attribute.
- if hasattr(item, 'value'):
- attr = cls._enums.get(item.value)
- if attr is None:
- # It wasn't value-ish -- try the attribute name. This was
- # deprecated in LP: #1167091.
- try:
- warnings.warn('Enum[item_name] is deprecated; '
- 'use getattr(Enum, item_name)',
- DeprecationWarning, 2)
- return getattr(cls, item)
- except (AttributeError, TypeError):
- raise ValueError(item)
- return getattr(cls, attr)
-
- def __call__(cls, *args):
- # One-argument calling is a deprecated synonym for getitem.
- if len(args) == 1:
- warnings.warn('MyEnum(arg) is deprecated; use MyEnum[arg]',
- DeprecationWarning, 2)
- return cls.__getitem__(args[0])
- name, source = args
- return _make(cls, name, source)
-
-
-class EnumValue:
- """Class to represent an enumeration value.
-
- EnumValue('Color', 'red', 12) prints as 'Color.red' and can be converted
- to the integer 12.
- """
- def __init__(self, enum, value, name):
- self._enum = enum
- self._value = value
- self._name = name
-
- def __repr__(self):
- return '<EnumValue: {0}.{1} [value={2}]>'.format(
- self._enum.__name__, self._name, self._value)
-
- def __str__(self):
- return '{0}.{1}'.format(self._enum.__name__, self._name)
-
- def __int__(self):
- warnings.warn('int() is deprecated; use IntEnums',
- DeprecationWarning, 2)
- return self._value
-
- def __reduce__(self):
- return getattr, (self._enum, self._name)
-
- @property
- def enum(self):
- """Return the class associated with the enum value."""
- return self._enum
-
- @property
- def name(self):
- """Return the name of the enum value."""
- return self._name
-
- @property
- def value(self):
- """Return the underlying value."""
- return self._value
-
- # Support only comparison by identity and equality. Ordered comparisions
- # are not supported.
- def __eq__(self, other):
- return self is other
-
- def __ne__(self, other):
- return self is not other
-
- def __lt__(self, other):
- # In Python 3, returning NotImplemented from an ordered comparison
- # operator will cause a TypeError to be raised. This doesn't work in
- # Python 2 though, and you'd end up with working, but incorrect,
- # ordered comparisons. In Python 2 we raise the TypeError explicitly.
- if sys.version_info[0] < 3:
- raise TypeError(
- 'unorderable types: {}() < {}()'.format(
- self.__class__.__name__, other.__class__.__name__))
- return NotImplemented
-
- def __gt__(self, other):
- if sys.version_info[0] < 3:
- raise TypeError(
- 'unorderable types: {}() > {}()'.format(
- self.__class__.__name__, other.__class__.__name__))
- return NotImplemented
-
- def __le__(self, other):
- if sys.version_info[0] < 3:
- raise TypeError(
- 'unorderable types: {}() <= {}()'.format(
- self.__class__.__name__, other.__class__.__name__))
- return NotImplemented
-
- def __ge__(self, other):
- if sys.version_info[0] < 3:
- raise TypeError(
- 'unorderable types: {}() >= {}()'.format(
- self.__class__.__name__, other.__class__.__name__))
- return NotImplemented
-
- __hash__ = object.__hash__
-
-
-# Define the Enum class using metaclass syntax compatible with both Python 2
-# and Python 3.
-Enum = EnumMetaclass(str('Enum'), (), {
- '__doc__': 'The public API Enum class.',
- })
-
-
-class IntEnumValue(int, EnumValue):
- """An EnumValue that is also an integer."""
-
- def __new__(cls, enum, value, attr):
- return super(IntEnumValue, cls).__new__(cls, value)
-
- __repr__ = EnumValue.__repr__
- __str__ = EnumValue.__str__
-
- # For Python 2 (Python 3 doesn't need this to work).
- __eq__ = int.__eq__
- __ne__ = int.__ne__
- __le__ = int.__le__
- __lt__ = int.__lt__
- __gt__ = int.__gt__
- __ge__ = int.__ge__
-
- # The non-deprecated version of this method.
- def __int__(self):
- return self._value
-
- # For slices and index().
- __index__ = __int__
-
-
-class IntEnumMetaclass(EnumMetaclass):
- # Define an iteration over the integer values instead of the attribute
- # names.
- def __iter__(cls):
- for key in sorted(cls._enums):
- yield getattr(cls, cls._enums[key])
-
-
-IntEnum = IntEnumMetaclass(str('IntEnum'), (Enum,), {
- '__doc__': 'A specialized enumeration with values that are also integers.',
- '__value_factory__': IntEnumValue,
- })
-
-
-if str is bytes:
- # Python 2
- STRING_TYPE = basestring
-else:
- # Python 3
- STRING_TYPE = str
-
-
-def _swap(sequence):
- for key, value in sequence:
- yield value, key
-
-
-def _make(enum_class, name, source):
- """The common implementation for `Enum()` and `IntEnum()`."""
- namespace = {}
- illegals = []
- have_strings = None
- # Auto-splitting of strings.
- if isinstance(source, STRING_TYPE):
- source = source.split()
- # Look for dict-like arguments. Specifically, it must have a callable
- # .items() attribute. Because of the way enumerate() works, here we have
- # to swap the key/values.
- try:
- source = _swap(source.items())
- except (TypeError, AttributeError):
- source = enumerate(source, start=1)
- for i, item in source:
- if isinstance(item, STRING_TYPE):
- if have_strings is None:
- have_strings = True
- elif not have_strings:
- raise ValueError('heterogeneous source')
- namespace[item] = i
- if re.match(IDENTIFIER_RE, item) is None:
- illegals.append(item)
- else:
- if have_strings is None:
- have_strings = False
- elif have_strings:
- raise ValueError('heterogeneous source')
- item_name, item_value = item
- namespace[item_name] = item_value
- if re.match(IDENTIFIER_RE, item_name) is None:
- illegals.append(item_name)
- if len(illegals) > 0:
- raise ValueError('non-identifiers: {0}'.format(SPACE.join(illegals)))
- return EnumMetaclass(str(name), (enum_class,), namespace)
-
-
-def make(name, source):
- """Return an Enum class from a name and source.
-
- This is a convenience function for defining a new enumeration given an
- existing sequence. When an sequence is used, it is iterated over to get
- the enumeration value items. The sequence iteration can either return
- strings or 2-tuples. When strings are used, values are automatically
- assigned starting from 1. When 2-tuples are used, the first item of the
- tuple is a string and the second item is the integer value.
-
- `source` must be homogeneous. You cannot mix string-only and 2-tuple
- items in the sequence.
-
- :param name: The resulting enum's class name.
- :type name: byte string (or ASCII-only unicode string)
- :param source: An object giving the enumeration value items.
- :type source: A sequence of strings or 2-tuples.
- :return: The new enumeration class.
- :rtype: instance of `EnumMetaClass`
- :raises ValueError: when a heterogeneous source is given, or when
- non-identifiers are used as enumeration value names.
- """
- warnings.warn('make() is deprecated; use Enum(name, source)',
- DeprecationWarning, 2)
- return _make(Enum, name, source)
diff --git a/Framework/PythonInterface/mantid/py3compat/mock.py b/Framework/PythonInterface/mantid/py3compat/mock.py
deleted file mode 100644
index 16a2c781934a1cb35f6ff1d51ff559e872821835..0000000000000000000000000000000000000000
--- a/Framework/PythonInterface/mantid/py3compat/mock.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Mantid Repository : https://github.com/mantidproject/mantid
-#
-# Copyright © 2019 ISIS Rutherford Appleton Laboratory UKRI,
-# NScD Oak Ridge National Laboratory, European Spallation Source,
-# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
-# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
-try:
- # import for python 2 and python 3 with mock package installed
- from mock import * # noqa
-except ImportError:
- # Mock is within unittest.mock with Python 3
- from unittest.mock import * # noqa
diff --git a/Framework/PythonInterface/mantid/simpleapi.py b/Framework/PythonInterface/mantid/simpleapi.py
index 1f33127f28f137289ea9a68320b809291f7dd80d..e5e50fc250b4e3e1fe62b381bceefa2bc5b8c4ef 100644
--- a/Framework/PythonInterface/mantid/simpleapi.py
+++ b/Framework/PythonInterface/mantid/simpleapi.py
@@ -26,17 +26,12 @@ and assign it to the rebinned variable.
Importing this module starts the FrameworkManager instance.
"""
-from __future__ import (absolute_import, division, print_function)
-
# std libs
from collections import OrderedDict, namedtuple
import inspect
import os
import sys
-import six
-from six import iteritems
-
import mantid
# This is a simple API so give access to the aliases by default as well
from mantid import __gui__, api as _api, kernel as _kernel, apiVersion
@@ -747,10 +742,7 @@ def _get_function_spec(func):
"""
import inspect
try:
- if six.PY2:
- argspec = inspect.getargspec(func)
- else:
- argspec = inspect.getfullargspec(func)
+ argspec = inspect.getfullargspec(func)
except TypeError:
return ''
# Algorithm functions have varargs set not args
@@ -1109,7 +1101,7 @@ def set_properties(alg_object, *args, **kwargs):
mandatory_props = []
postponed = []
- for (key, value) in iteritems(kwargs):
+ for (key, value) in kwargs.items():
if key in mandatory_props:
mandatory_props.remove(key)
if "IndexSet" in key:
@@ -1447,7 +1439,7 @@ def _translate():
algs = AlgorithmFactory.getRegisteredAlgorithms(True)
algorithm_mgr = AlgorithmManager
- for name, versions in iteritems(algs):
+ for name, versions in algs.items():
if specialization_exists(name):
continue
try:
diff --git a/Framework/PythonInterface/mantid/utils.py b/Framework/PythonInterface/mantid/utils.py
index 18394d05873ae28f0fb59c0f1fc755e145f0400d..6e3870c2ad77bbb70a222b8d789050e824587f77 100644
--- a/Framework/PythonInterface/mantid/utils.py
+++ b/Framework/PythonInterface/mantid/utils.py
@@ -70,11 +70,7 @@ def _shared_cextension():
yield
return
- import six
- if six.PY2:
- import DLFCN as dl
- else:
- import os as dl
+ import os as dl
flags_orig = sys.getdlopenflags()
sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_GLOBAL)
yield
diff --git a/Framework/PythonInterface/plugins/algorithms/Abins.py b/Framework/PythonInterface/plugins/algorithms/Abins.py
index 1fe77c6498b0772b5b25053660910f364e22133c..0fcccce1e07f9b9d6cbaa0aa11d840707fe6f79d 100644
--- a/Framework/PythonInterface/plugins/algorithms/Abins.py
+++ b/Framework/PythonInterface/plugins/algorithms/Abins.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
try:
import pathos.multiprocessing as mp
@@ -14,7 +12,6 @@ except ImportError:
PATHOS_FOUND = False
import numpy as np
-import six
import os
import re
@@ -770,7 +767,7 @@ class Abins(PythonAlgorithm):
:param message_end: closing part of the error message.
"""
optimal_size = AbinsParameters.performance['optimal_size']
- if not (isinstance(optimal_size, six.integer_types) and optimal_size > 0):
+ if not (isinstance(optimal_size, int) and optimal_size > 0):
raise RuntimeError("Invalid value of optimal_size" + message_end)
def _check_threads(self, message_end=None):
@@ -780,7 +777,7 @@ class Abins(PythonAlgorithm):
"""
if PATHOS_FOUND:
threads = AbinsModules.AbinsParameters.performance['threads']
- if not (isinstance(threads, six.integer_types) and 1 <= threads <= mp.cpu_count()):
+ if not (isinstance(threads, int) and 1 <= threads <= mp.cpu_count()):
raise RuntimeError("Invalid number of threads for parallelisation over atoms" + message_end)
def _validate_ab_initio_file_extension(self, filename_full_path=None, expected_file_extension=None):
diff --git a/Framework/PythonInterface/plugins/algorithms/AlignAndFocusPowderFromFiles.py b/Framework/PythonInterface/plugins/algorithms/AlignAndFocusPowderFromFiles.py
index 3adcc45b3829a2beac89f80bf345746698f0ed1c..dcdaf177c8c0ecf1b9a87041987c64c31aecbb84 100644
--- a/Framework/PythonInterface/plugins/algorithms/AlignAndFocusPowderFromFiles.py
+++ b/Framework/PythonInterface/plugins/algorithms/AlignAndFocusPowderFromFiles.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd, AlgorithmFactory, DistributedDataProcessorAlgorithm, ITableWorkspaceProperty, \
MatrixWorkspaceProperty, MultipleFileProperty, PropertyMode
from mantid.kernel import Direction, PropertyManagerDataService
diff --git a/Framework/PythonInterface/plugins/algorithms/AlignComponents.py b/Framework/PythonInterface/plugins/algorithms/AlignComponents.py
index 97cba2c7b03aaaab29713d0fe2430fccad25ddcb..372ff1cc1fe2d0914a3bcbcfeeb5c32a4447a302 100644
--- a/Framework/PythonInterface/plugins/algorithms/AlignComponents.py
+++ b/Framework/PythonInterface/plugins/algorithms/AlignComponents.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init, no-name-in-module
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
from scipy.stats import chisquare
diff --git a/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsSingleAxis.py b/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsSingleAxis.py
index b2f6708dbab9cb37d620333cafdee006ddcc62e5..a1bf9da02f7ee2f418a49111e3f882436e0b3adc 100644
--- a/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsSingleAxis.py
+++ b/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsSingleAxis.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches,too-many-locals, invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsTwoAxes.py b/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsTwoAxes.py
index 5b2f0bce7256d0b60137b3b55a18664aba943dc5..98956e4ae0d4cf165d265975f17a648169c40c28 100644
--- a/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsTwoAxes.py
+++ b/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsTwoAxes.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches,too-many-locals, invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ApplyDetectorScanEffCorr.py b/Framework/PythonInterface/plugins/algorithms/ApplyDetectorScanEffCorr.py
index faeeb73ad49908205cbc42aeb89b18beea0d86f0..f223cf07da637d94a64d301048c8d8460aa133ca 100644
--- a/Framework/PythonInterface/plugins/algorithms/ApplyDetectorScanEffCorr.py
+++ b/Framework/PythonInterface/plugins/algorithms/ApplyDetectorScanEffCorr.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
from mantid.simpleapi import CreateWorkspace, Transpose, Multiply, MaskDetectors
from mantid.api import AlgorithmFactory, PropertyMode, PythonAlgorithm, WorkspaceProperty
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/ApplyNegMuCorrection.py b/Framework/PythonInterface/plugins/algorithms/ApplyNegMuCorrection.py
index fc3ab839adf2fc4fd46910949c3b802474024bf8..ad9e7bb40edaba485ff95cf1d06aab17d3989c59 100644
--- a/Framework/PythonInterface/plugins/algorithms/ApplyNegMuCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/ApplyNegMuCorrection.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import * # PythonAlgorithm, registerAlgorithm, WorkspaceProperty
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py b/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py
index 27c5b797860ed8a173eb007eaae8678cda3e42ab..90291525cd1193b77c734c2b3240ffd24303dc36 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py
@@ -6,15 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
import os
import tempfile
from collections import namedtuple
from contextlib import contextmanager
import numpy as np
-from mantid.py3compat.enum import Enum
+from enum import Enum
from mantid import config as mantid_config
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, FileProperty,
WorkspaceProperty, FileAction, PropertyMode, mtd,
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISDiffraction.py b/Framework/PythonInterface/plugins/algorithms/BASISDiffraction.py
index 0bd137efa0263c1c20fa055ba864725b135535e5..298df732af179f139cb07b304b306db59925e53f 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISDiffraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISDiffraction.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
import os
import tempfile
import itertools
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py b/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py
index be7b818048810d599dda49bbf3e03d1ce41c225c..90e7185da75e36f4eb38eac63cac3a0e162eba8b 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import random
import os
import string
@@ -13,7 +11,7 @@ import numpy as np
from collections import namedtuple
from contextlib import contextmanager
-from mantid.py3compat.enum import Enum
+from enum import Enum
from mantid import config as mantid_config
from mantid.api import (AnalysisDataService, DataProcessorAlgorithm,
AlgorithmFactory, FileProperty, FileAction,
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISReduction.py b/Framework/PythonInterface/plugins/algorithms/BASISReduction.py
index f1ecf432c12c8d7010e74026aeac720404967f86..08310c4064c48db46bc6ccedbd1a05c76651f281 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISReduction.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# Mantid Repository : https://github.com/mantidproject/mantid
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import os
import re
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/BinWidthAtX.py b/Framework/PythonInterface/plugins/algorithms/BinWidthAtX.py
index 94530f3de2b9e8ecc8e6e5000c94787ecf2b8dbf..88bb7f78c28f4d0e08fc1327dbc10b0a71b30013 100644
--- a/Framework/PythonInterface/plugins/algorithms/BinWidthAtX.py
+++ b/Framework/PythonInterface/plugins/algorithms/BinWidthAtX.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AlgorithmFactory, HistogramValidator,\
MatrixWorkspaceProperty, PythonAlgorithm
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/CalculateEfficiencyCorrection.py b/Framework/PythonInterface/plugins/algorithms/CalculateEfficiencyCorrection.py
index acfc065d3e2a4a63681eaf2bde8b412782583eaf..a62ddc3e8d64ff70a984c10ee79c810e376ee206 100644
--- a/Framework/PythonInterface/plugins/algorithms/CalculateEfficiencyCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/CalculateEfficiencyCorrection.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
import numpy as np
from mantid.simpleapi import \
diff --git a/Framework/PythonInterface/plugins/algorithms/CalculateFlux.py b/Framework/PythonInterface/plugins/algorithms/CalculateFlux.py
index 4e44fe523e82b84b45f7b8f884a24bb26ddd8e3f..edf12705b6b4c17d3d1a9a24ef5f9c512d546a9b 100644
--- a/Framework/PythonInterface/plugins/algorithms/CalculateFlux.py
+++ b/Framework/PythonInterface/plugins/algorithms/CalculateFlux.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, MatrixWorkspaceProperty, WorkspaceUnitValidator, HistogramValidator, InstrumentValidator
from mantid.simpleapi import *
from mantid.kernel import Direction, FloatBoundedValidator, CompositeValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/CalculateSampleTransmission.py b/Framework/PythonInterface/plugins/algorithms/CalculateSampleTransmission.py
index 2c54044b2893e46b2b092230f6cc6b7088e29844..96e4e79089790bea8fa7fc89744921ed42a13718 100644
--- a/Framework/PythonInterface/plugins/algorithms/CalculateSampleTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/CalculateSampleTransmission.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py b/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py
index 549a16febb1780a67a5e579787d32a622185bdf7..f3f7d2eb877cf3abc18ef39d0417931104216136 100644
--- a/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py
+++ b/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/CheckForSampleLogs.py b/Framework/PythonInterface/plugins/algorithms/CheckForSampleLogs.py
index 7443fc437d4cc326bbe14aaa528233115dec9fe9..225b486e0a26321dd3603bf7b765069ee341f5f5 100644
--- a/Framework/PythonInterface/plugins/algorithms/CheckForSampleLogs.py
+++ b/Framework/PythonInterface/plugins/algorithms/CheckForSampleLogs.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name, no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty
from mantid.kernel import Direction, logger
diff --git a/Framework/PythonInterface/plugins/algorithms/CleanFileCache.py b/Framework/PythonInterface/plugins/algorithms/CleanFileCache.py
index 826c8752c40ae08a2061f9bae2595be81ac75a40..4323ad913f73abed92223a688d47effd00f2d732 100644
--- a/Framework/PythonInterface/plugins/algorithms/CleanFileCache.py
+++ b/Framework/PythonInterface/plugins/algorithms/CleanFileCache.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,bare-except,too-many-arguments,multiple-statements
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py b/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py
index f615a6faf2f3053b68894b44afb2a4ce5d85085b..ab73e17241b6b1ac93c28fe20d61740395e699fc 100644
--- a/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py
+++ b/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py
@@ -5,13 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
import mantid
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
-from six.moves import range #pylint: disable=redefined-builtin
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/CompareSampleLogs.py b/Framework/PythonInterface/plugins/algorithms/CompareSampleLogs.py
index a6c090705b7ec22257d2beb9a8ddd72483dcffa6..268774d7542de295860f81b8cd334757e4f77fa8 100644
--- a/Framework/PythonInterface/plugins/algorithms/CompareSampleLogs.py
+++ b/Framework/PythonInterface/plugins/algorithms/CompareSampleLogs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceGroup, MatrixWorkspace
from mantid.kernel import Direction, StringArrayLengthValidator, StringArrayProperty, FloatBoundedValidator
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py b/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py
index 3687c3c78d41d3c34f31b65a0baee46975b4ea8b..a8edf867245ff2f842eeeaab24449c4746c88041 100644
--- a/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py
+++ b/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
MatrixWorkspaceProperty, Progress, InstrumentValidator,
ITableWorkspaceProperty)
diff --git a/Framework/PythonInterface/plugins/algorithms/ComputeIncoherentDOS.py b/Framework/PythonInterface/plugins/algorithms/ComputeIncoherentDOS.py
index 85414aade70319356cc825da0bda55848c5f2704..cf57058ce93a25bde8e86a7d18153913621d3ad0 100644
--- a/Framework/PythonInterface/plugins/algorithms/ComputeIncoherentDOS.py
+++ b/Framework/PythonInterface/plugins/algorithms/ComputeIncoherentDOS.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable = no-init, invalid-name, line-too-long, eval-used, unused-argument, too-many-locals, too-many-branches, too-many-statements
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from scipy import constants
from mantid.kernel import CompositeValidator, Direction, FloatBoundedValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py b/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py
index 72e44169cb9168eaaa1f61f2764fbf4f9e65f166..43c0909085c90300764792b687f80b6492802fa1 100644
--- a/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py
+++ b/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ConjoinSpectra.py b/Framework/PythonInterface/plugins/algorithms/ConjoinSpectra.py
index d81bc78a591d3ebdad62e1fea088876dc77103cb..61c9d9b593f08990dc24e3f16d28b96940d077da 100644
--- a/Framework/PythonInterface/plugins/algorithms/ConjoinSpectra.py
+++ b/Framework/PythonInterface/plugins/algorithms/ConjoinSpectra.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ConvertSnsRoiFileToMask.py b/Framework/PythonInterface/plugins/algorithms/ConvertSnsRoiFileToMask.py
index 09721f7e6e355ed2a6e8ae7555154402eba85a08..c652b75f710bdceb327d738aba21c6df80b667b9 100644
--- a/Framework/PythonInterface/plugins/algorithms/ConvertSnsRoiFileToMask.py
+++ b/Framework/PythonInterface/plugins/algorithms/ConvertSnsRoiFileToMask.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as msapi
import mantid.api as api
import mantid.kernel as kernel
diff --git a/Framework/PythonInterface/plugins/algorithms/ConvertWANDSCDtoQ.py b/Framework/PythonInterface/plugins/algorithms/ConvertWANDSCDtoQ.py
index f334589ed49b30a0f725bb4e1b83ad8fc4165be5..e8a8470f1514b6ca26458b959e6098fdd27ef4ca 100644
--- a/Framework/PythonInterface/plugins/algorithms/ConvertWANDSCDtoQ.py
+++ b/Framework/PythonInterface/plugins/algorithms/ConvertWANDSCDtoQ.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
PropertyMode, WorkspaceProperty, Progress,
IMDHistoWorkspaceProperty, mtd)
diff --git a/Framework/PythonInterface/plugins/algorithms/CorrectLogTimes.py b/Framework/PythonInterface/plugins/algorithms/CorrectLogTimes.py
index 2c43988cb61a4c4dce329de162ab87949be48b3d..62f5ad71dbe4164b473510914a16f1e52477a887 100644
--- a/Framework/PythonInterface/plugins/algorithms/CorrectLogTimes.py
+++ b/Framework/PythonInterface/plugins/algorithms/CorrectLogTimes.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi
import mantid.api
import mantid.kernel
diff --git a/Framework/PythonInterface/plugins/algorithms/CorrectTOF.py b/Framework/PythonInterface/plugins/algorithms/CorrectTOF.py
index d100f99a0ab78ed902b7a91056c48dc081e6565b..9fc55f8db6b1e06c5868d9bc40aaa73c8bd21603 100644
--- a/Framework/PythonInterface/plugins/algorithms/CorrectTOF.py
+++ b/Framework/PythonInterface/plugins/algorithms/CorrectTOF.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import scipy as sp
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceUnitValidator, \
diff --git a/Framework/PythonInterface/plugins/algorithms/CreateCacheFilename.py b/Framework/PythonInterface/plugins/algorithms/CreateCacheFilename.py
index 631a90978e006b225f86beeffe3a766a99086474..1fc0e5b6095b3141bd4140dec03bf2910b76064c 100644
--- a/Framework/PythonInterface/plugins/algorithms/CreateCacheFilename.py
+++ b/Framework/PythonInterface/plugins/algorithms/CreateCacheFilename.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,bare-except,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/CreateEmptyTableWorkspace.py b/Framework/PythonInterface/plugins/algorithms/CreateEmptyTableWorkspace.py
index 4c7ed28904bd6c282109fe51e81faff87aee007d..08898762eafe381e9b676d65c842c19bfca61709 100644
--- a/Framework/PythonInterface/plugins/algorithms/CreateEmptyTableWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/CreateEmptyTableWorkspace.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty, WorkspaceFactory
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py b/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
index 178268813bcbb49d6e8ebc695dc4ea913ac62cb7..53ae6c912177b20f1c3cd58ff2ffbd1bbfaf296a 100644
--- a/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
+++ b/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
@@ -5,13 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
-from six.moves import range #pylint: disable=redefined-builtin
-
_OUTPUTLEVEL = "NOOUTPUT"
diff --git a/Framework/PythonInterface/plugins/algorithms/CropWorkspaceForMDNorm.py b/Framework/PythonInterface/plugins/algorithms/CropWorkspaceForMDNorm.py
index e3e7986d3a8f32f3d0d0012321c0ce324c021f4a..1b169df38e51009b5a6816f5db5a6ec90bb945af 100644
--- a/Framework/PythonInterface/plugins/algorithms/CropWorkspaceForMDNorm.py
+++ b/Framework/PythonInterface/plugins/algorithms/CropWorkspaceForMDNorm.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import numpy
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
WorkspaceUnitValidator,IEventWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/CropWorkspaceRagged.py b/Framework/PythonInterface/plugins/algorithms/CropWorkspaceRagged.py
index 616ffd680b5fa5df0c24db26fb50b354ee3b8c41..369d6ae36f2dad27f9589cd9317074d64a09849f 100644
--- a/Framework/PythonInterface/plugins/algorithms/CropWorkspaceRagged.py
+++ b/Framework/PythonInterface/plugins/algorithms/CropWorkspaceRagged.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.simpleapi import ConjoinWorkspaces, CropWorkspace, DeleteWorkspace
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py b/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py
index f920a78d7a530fbccb2063ae003773cbc628ece2..5062076fa29b08a0fb0bb42123221aa3478753af 100644
--- a/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py
+++ b/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-many-locals,too-many-instance-attributes,too-many-arguments,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/DNSComputeDetEffCorrCoefs.py b/Framework/PythonInterface/plugins/algorithms/DNSComputeDetEffCorrCoefs.py
index 337de47751a3a495f97fe89e7d16a09f1c2bd4dd..73987760d8852f9117ebae6b91e15880a788318e 100644
--- a/Framework/PythonInterface/plugins/algorithms/DNSComputeDetEffCorrCoefs.py
+++ b/Framework/PythonInterface/plugins/algorithms/DNSComputeDetEffCorrCoefs.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, WorkspaceGroup
from mantid.kernel import Direction, StringArrayProperty, StringArrayLengthValidator, FloatBoundedValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/DNSFlippingRatioCorr.py b/Framework/PythonInterface/plugins/algorithms/DNSFlippingRatioCorr.py
index f1c3ec437cfe5375e202d5b39ee1c61f2cab5be5..47b568b4a1458d36ef2d7ab67384da1a2c0a24ce 100644
--- a/Framework/PythonInterface/plugins/algorithms/DNSFlippingRatioCorr.py
+++ b/Framework/PythonInterface/plugins/algorithms/DNSFlippingRatioCorr.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-locals
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/DNSMergeRuns.py b/Framework/PythonInterface/plugins/algorithms/DNSMergeRuns.py
index 1f8ac0b97b4e11e4a4fc4cda832524904d752ed7..e100d28e31820d40103f6d7267fddf27aba2e76e 100644
--- a/Framework/PythonInterface/plugins/algorithms/DNSMergeRuns.py
+++ b/Framework/PythonInterface/plugins/algorithms/DNSMergeRuns.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceGroup
from mantid.kernel import Direction, StringArrayProperty, StringListValidator, V3D, StringArrayLengthValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/DPDFreduction.py b/Framework/PythonInterface/plugins/algorithms/DPDFreduction.py
index ece8f7bcf7d973a9bda1a7216f5cfaeb0629d715..e10be7abf19a36a22695877c37316b70a41ac858 100644
--- a/Framework/PythonInterface/plugins/algorithms/DPDFreduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/DPDFreduction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import numpy
import re
diff --git a/Framework/PythonInterface/plugins/algorithms/DSFinterp.py b/Framework/PythonInterface/plugins/algorithms/DSFinterp.py
index 944a78ff8d92a490c6e1a0c43af842ab60a09130..d7304b248408973458fa4a7b6424445a6856d4ef 100644
--- a/Framework/PythonInterface/plugins/algorithms/DSFinterp.py
+++ b/Framework/PythonInterface/plugins/algorithms/DSFinterp.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory
import mantid.simpleapi
from mantid.kernel import StringListValidator, FloatArrayProperty, FloatArrayMandatoryValidator,\
diff --git a/Framework/PythonInterface/plugins/algorithms/DakotaChiSquared.py b/Framework/PythonInterface/plugins/algorithms/DakotaChiSquared.py
index eaafa1e617b001b30b23407413cdd51b1d33e5d6..49470911acbbe393b32db90056d7749fb899761b 100644
--- a/Framework/PythonInterface/plugins/algorithms/DakotaChiSquared.py
+++ b/Framework/PythonInterface/plugins/algorithms/DakotaChiSquared.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory,MatrixWorkspaceProperty,PropertyMode
from mantid.kernel import Direction
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py b/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py
index 1de36ac736091d818b47ed0fea9c006644551839..4b9d67186a1e51fb1aa6c39e990cf3e63806368c 100644
--- a/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py
+++ b/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, IMDHistoWorkspaceProperty, PropertyMode, WorkspaceProperty, Progress
from mantid.kernel import (Direction, EnabledWhenProperty, PropertyCriterion, Property, StringListValidator, FloatArrayBoundedValidator,
FloatArrayProperty, FloatBoundedValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py b/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py
index c9c919f6f4d0f7cabf807a57263577ba9017a822..38d494540ba1303f0b6248adc91879c6e5618030 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
import mantid.simpleapi as mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggCalibrateFull.py b/Framework/PythonInterface/plugins/algorithms/EnggCalibrateFull.py
index 71d4e3d48fdd6e97442b6610e1e6282738da2e77..05da9f6e4b2f14fda500bc6038fdfb6dac9edd83 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggCalibrateFull.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggCalibrateFull.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggFitPeaks.py b/Framework/PythonInterface/plugins/algorithms/EnggFitPeaks.py
index badf5e32e36d2916847942f0a96060457d5b2a42..278c4d411679641490244d273cd46253ed6e68e4 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggFitPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggFitPeaks.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggFitTOFFromPeaks.py b/Framework/PythonInterface/plugins/algorithms/EnggFitTOFFromPeaks.py
index f97556daa117f029ab9b0e51568928d71061185d..b7f106ab0b68430aca9a68c1dbdffbff1facc69a 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggFitTOFFromPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggFitTOFFromPeaks.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggFocus.py b/Framework/PythonInterface/plugins/algorithms/EnggFocus.py
index 56ad9aadbf8859931260eb417d9a2aecd1c5f20c..71e025b5adb8788c8ded492ac441bc6ff7fb382a 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggFocus.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggFocus.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5.py b/Framework/PythonInterface/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5.py
index 3e64ee1c7a689dc9ad8f1932092b721d08a17aaf..39896a8c3d3f033cecfeec9b9b46624d70f7c261 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import h5py
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5.py b/Framework/PythonInterface/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5.py
index 502770be183298d432ca969ee94e511ce74b3b3b..3a298b72cf3a199715559dbd7ea1af0e7c3061af 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import h5py
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggVanadiumCorrections.py b/Framework/PythonInterface/plugins/algorithms/EnggVanadiumCorrections.py
index 34bc610f6b169ca9a280888a94fd768f326b0c41..caaed8cdb56e76629ef27d77127a2e174ded88b8 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggVanadiumCorrections.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggVanadiumCorrections.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
import mantid.simpleapi as mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py b/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
index 9e997b7a6e59ccdf573b253adf55493686727b4d..68c15ddb8cd9468f91ed10409dc01bd01968951b 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
@@ -5,13 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
-from six.moves import range
-
_OUTPUTLEVEL = "NOOUTPUT"
diff --git a/Framework/PythonInterface/plugins/algorithms/Examples/ExampleSaveAscii.py b/Framework/PythonInterface/plugins/algorithms/Examples/ExampleSaveAscii.py
index 7ea23478e5773e7c05cf7645b930f7a265762c6e..90aba83bfba64ef5ca797dabdd1599d477f2de2b 100644
--- a/Framework/PythonInterface/plugins/algorithms/Examples/ExampleSaveAscii.py
+++ b/Framework/PythonInterface/plugins/algorithms/Examples/ExampleSaveAscii.py
@@ -12,7 +12,6 @@ Note that the SaveAscii algorithm should be used instead in most cases.
"""
# This __future__ import is for Python 2/3 compatibility
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/Examples/Squares.py b/Framework/PythonInterface/plugins/algorithms/Examples/Squares.py
index 2ad3c4b09084c40eb3f13c665c49f20c1b991205..557e891f5a000ede1e1ff666ec9dfd5cc6fb5e96 100644
--- a/Framework/PythonInterface/plugins/algorithms/Examples/Squares.py
+++ b/Framework/PythonInterface/plugins/algorithms/Examples/Squares.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
# This __future__ import is for Python 2/3 compatibility
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py b/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py
index 1ce6a2fb474816d182c45a60f7df1e1aa3cea5ee..ab7d7283c7d5dd95e393f754f834980c2ceb9a36 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py
@@ -5,15 +5,12 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid
from mantid.api import *
from mantid.kernel import *
import datetime
import time
import os
-from six.moves import range
-
#pylint: disable=too-many-instance-attributes
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportGeometry.py b/Framework/PythonInterface/plugins/algorithms/ExportGeometry.py
index bd90b173e7d9c5effcf898c0c943ed388da8ef1e..fe9069f4f48657f4063ebf854e082613fc595df0 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportGeometry.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportGeometry.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, \
InstrumentValidator, FileProperty, FileAction
from mantid.kernel import Direction, StringArrayProperty, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
index 050bce2d6fc059ce1009b0388b508867b3530b5d..838f086cf36c6aa5bd9b7e55c7521ace6d667201 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
@@ -5,13 +5,11 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
from distutils.version import LooseVersion
import numpy as np
import os
-from six.moves import range # pylint: disable=redefined-builtin
class ExportSampleLogsToCSVFile(PythonAlgorithm):
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToHDF5.py b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToHDF5.py
index 990ef2361258da2e00ee8802c82bdb52422be32b..6da83c409ad4edbe81e8588d1bd7befcd8ca0412 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToHDF5.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToHDF5.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import h5py
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportSpectraMask.py b/Framework/PythonInterface/plugins/algorithms/ExportSpectraMask.py
index f3e5387b001f9c56a0796d65800804042e4d41e5..36527b0cb60bd7e54ac7962c803a88e3d46b7845 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportSpectraMask.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportSpectraMask.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name, no-init
-from __future__ import (absolute_import, division, print_function)
import os
from mantid import config
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, mtd, FileProperty, FileAction
diff --git a/Framework/PythonInterface/plugins/algorithms/ExtractMonitors.py b/Framework/PythonInterface/plugins/algorithms/ExtractMonitors.py
index c9b3e9a53d2cdcdf075b16f317def83d1ce09dd2..27e69fa123fbc443a356b9a23bf330ec060ac73a 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExtractMonitors.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExtractMonitors.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import (MatrixWorkspaceProperty, DataProcessorAlgorithm, PropertyMode)
diff --git a/Framework/PythonInterface/plugins/algorithms/FilterLogByTime.py b/Framework/PythonInterface/plugins/algorithms/FilterLogByTime.py
index ea0ec4d17c83d35ef0e85566ce0cc9cfdccb98ae..f80748fe62b15456ddaa68bfdf43db2e3151f0d0 100644
--- a/Framework/PythonInterface/plugins/algorithms/FilterLogByTime.py
+++ b/Framework/PythonInterface/plugins/algorithms/FilterLogByTime.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/FitGaussian.py b/Framework/PythonInterface/plugins/algorithms/FitGaussian.py
index ef6ce8ccbc89409cd9a4197d4afef6c5d7be4c93..e8d7999c23edf0ce87cf704ed8df9258db3a479d 100644
--- a/Framework/PythonInterface/plugins/algorithms/FitGaussian.py
+++ b/Framework/PythonInterface/plugins/algorithms/FitGaussian.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty
from mantid.kernel import Direction, IntBoundedValidator
from mantid.simpleapi import Fit
diff --git a/Framework/PythonInterface/plugins/algorithms/FitIncidentSpectrum.py b/Framework/PythonInterface/plugins/algorithms/FitIncidentSpectrum.py
index 938a60db1099154619c9990b9d4cf89432177fa7..53457a481390729260e2fe5e2585f526504b9936 100644
--- a/Framework/PythonInterface/plugins/algorithms/FitIncidentSpectrum.py
+++ b/Framework/PythonInterface/plugins/algorithms/FitIncidentSpectrum.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from copy import copy
import numpy as np
from scipy import signal, ndimage, interpolate
diff --git a/Framework/PythonInterface/plugins/algorithms/GSASIIRefineFitPeaks.py b/Framework/PythonInterface/plugins/algorithms/GSASIIRefineFitPeaks.py
index 001b551274c6820a831ad5f03956040dc19ed99c..13d3da9a786bdc3ece8f86a9751d9b9bee85bc4d 100644
--- a/Framework/PythonInterface/plugins/algorithms/GSASIIRefineFitPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/GSASIIRefineFitPeaks.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from contextlib import contextmanager
import numpy
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/GenerateGroupingSNSInelastic.py b/Framework/PythonInterface/plugins/algorithms/GenerateGroupingSNSInelastic.py
index 8748d4b7c12ab09ef66d774be28b563ca2b42512..956e0ee716b2b4510e9dc6cce9d7d53263dced9a 100644
--- a/Framework/PythonInterface/plugins/algorithms/GenerateGroupingSNSInelastic.py
+++ b/Framework/PythonInterface/plugins/algorithms/GenerateGroupingSNSInelastic.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid
import mantid.api
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/GetEiT0atSNS.py b/Framework/PythonInterface/plugins/algorithms/GetEiT0atSNS.py
index 48246f1a5e7d0eed32244905f3435b191540bc19..e2e42699f660ead6cddcabbb0eac1ccf632299d2 100644
--- a/Framework/PythonInterface/plugins/algorithms/GetEiT0atSNS.py
+++ b/Framework/PythonInterface/plugins/algorithms/GetEiT0atSNS.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid
import numpy
diff --git a/Framework/PythonInterface/plugins/algorithms/GetIPTS.py b/Framework/PythonInterface/plugins/algorithms/GetIPTS.py
index 89d49af1c7cccc22271f188402acc20e28e3ccab..98e3a99c39000caa80892333939f5fb12e3e8a5b 100644
--- a/Framework/PythonInterface/plugins/algorithms/GetIPTS.py
+++ b/Framework/PythonInterface/plugins/algorithms/GetIPTS.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import AlgorithmFactory, FileFinder, PythonAlgorithm
from mantid.kernel import ConfigService, Direction, IntBoundedValidator, \
StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/GetLiveInstrumentValue.py b/Framework/PythonInterface/plugins/algorithms/GetLiveInstrumentValue.py
index 08e1a35e0b8b1163b2726b74b581393fe6cce5a2..c1642a44637bd9366ade2f659f1d9d7ccd62688e 100644
--- a/Framework/PythonInterface/plugins/algorithms/GetLiveInstrumentValue.py
+++ b/Framework/PythonInterface/plugins/algorithms/GetLiveInstrumentValue.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/HB2AReduce.py b/Framework/PythonInterface/plugins/algorithms/HB2AReduce.py
index 7c874bc906a909716b71fd1b5b737c80a485cdca..4c728b1336eb18ecbd05af53faa42298afe3e751 100644
--- a/Framework/PythonInterface/plugins/algorithms/HB2AReduce.py
+++ b/Framework/PythonInterface/plugins/algorithms/HB2AReduce.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (PythonAlgorithm, AlgorithmFactory, PropertyMode, WorkspaceProperty, FileProperty,
FileAction, MultipleFileProperty)
from mantid.kernel import (Direction, IntArrayProperty, FloatTimeSeriesProperty, FloatBoundedValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/HFIRSANS2Wavelength.py b/Framework/PythonInterface/plugins/algorithms/HFIRSANS2Wavelength.py
index f766d6af1f685d487d741843857b4f0aa9910a69..d218b44d254dfa40e35241816c0c75c9b086ee41 100644
--- a/Framework/PythonInterface/plugins/algorithms/HFIRSANS2Wavelength.py
+++ b/Framework/PythonInterface/plugins/algorithms/HFIRSANS2Wavelength.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, PropertyMode, Progress)
from mantid.kernel import (Direction)
diff --git a/Framework/PythonInterface/plugins/algorithms/IndirectTransmission.py b/Framework/PythonInterface/plugins/algorithms/IndirectTransmission.py
index 3fa272cade206b36a024169273e8d16aed3797f9..09c79a2ab9ab2a88b30fcb59c3e9147019247387 100644
--- a/Framework/PythonInterface/plugins/algorithms/IndirectTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/IndirectTransmission.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py b/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py
index 9ca63312683914286b292aa096bf7eb19110c29c..318c8e11c8512fdc91bde8a9704a8f130c82f238 100644
--- a/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py
+++ b/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py
@@ -11,7 +11,6 @@ fitting for integrating peaks.
"""
# This __future__ import is for Python 2/3 compatibility
-from __future__ import (absolute_import, division, print_function)
import sys
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py b/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
index 9be2f10bf574390760422cd0eb741a6e98a9b30f..a7398ba6d9c864dcea538bb610ffd221169842ca 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
@@ -8,7 +8,6 @@
"""
Top-level auto-reduction algorithm for the SNS Liquids Reflectometer
"""
-from __future__ import (absolute_import, division, print_function)
import sys
import math
import re
@@ -21,7 +20,6 @@ from mantid.simpleapi import *
from mantid.kernel import *
from reduction_gui.reduction.reflectometer.refl_data_series import DataSeries
from reduction_gui.reduction.reflectometer.refl_data_script import DataSets
-from six import string_types
class LRAutoReduction(PythonAlgorithm):
@@ -444,7 +442,7 @@ class LRAutoReduction(PythonAlgorithm):
direct_beam_runs_str = self._read_property(meta_data_run, "direct_beam_runs",
_direct_beam_runs, is_string=True)
# The direct runs in the DAS logs are stored as a string
- if isinstance(direct_beam_runs_str, string_types):
+ if isinstance(direct_beam_runs_str, str):
try:
direct_beam_runs = [int(r.strip()) for r in direct_beam_runs_str.split(',')]
except ValueError:
diff --git a/Framework/PythonInterface/plugins/algorithms/LRDirectBeamSort.py b/Framework/PythonInterface/plugins/algorithms/LRDirectBeamSort.py
index d7cccf9be61f58746838c8d5c51d8546716ef6fe..961f7aeae3874fff5743d53593929138b712bc92 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRDirectBeamSort.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRDirectBeamSort.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LRPeakSelection.py b/Framework/PythonInterface/plugins/algorithms/LRPeakSelection.py
index 22054d2a6b66a7ed96e88bc61723981fb81a5e78..b2c2c9ed51d239178bd26e65bc699b122228c1b6 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRPeakSelection.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRPeakSelection.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py b/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py
index 31a072787b8d44f390b49113e97591faa848385c..5f665bbbf2d8313fd9b1297f4b21ec026b27dedd 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LRReflectivityOutput.py b/Framework/PythonInterface/plugins/algorithms/LRReflectivityOutput.py
index f49c58c0069dec3ce717d7504e10847ed9125e88..bf2c5f81f41067c7ec7d34cef11bae80b34a531c 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRReflectivityOutput.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRReflectivityOutput.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
import math
import time
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py b/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
index d474992872d890b8e62a03f2b6ba4de88145d3cb..6d4a809baa8aff88fdc493703ccdf38f82831975 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
@@ -5,13 +5,11 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name, no-init
-from __future__ import (absolute_import, division, print_function)
import os
import re
from mantid.api import *
from mantid.simpleapi import *
from mantid.kernel import *
-from six import iteritems
class LRScalingFactors(PythonAlgorithm):
@@ -402,7 +400,7 @@ class LRScalingFactors(PythonAlgorithm):
fd.write("# y=a+bx\n#\n")
fd.write("# LambdaRequested[Angstroms] S1H[mm] (S2/Si)H[mm] S1W[mm] (S2/Si)W[mm] a b error_a error_b\n#\n")
- for k, v in iteritems(scaling_file_meta):
+ for k, v in scaling_file_meta.items():
fd.write("%s\n" % v)
for item in scaling_file_content:
fd.write("IncidentMedium=%s " % item["IncidentMedium"])
diff --git a/Framework/PythonInterface/plugins/algorithms/LRSubtractAverageBackground.py b/Framework/PythonInterface/plugins/algorithms/LRSubtractAverageBackground.py
index 59330c218edca8d7dc7816c17c54ad69d49940e6..529e190a58287ffffd53f99d1d91bfe8994ab661 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRSubtractAverageBackground.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRSubtractAverageBackground.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py b/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py
index a2126f254b2f45e635ae13f5200467898edad86a..157d0bff4b9b7a20ed24411b4f113758c0ccf0f8 100644
--- a/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py
@@ -13,7 +13,6 @@
- Keep the same parameters and work as a drop-in replacement for the old algorithm.
- Reproduce the output of the old algorithm.
"""
-from __future__ import (absolute_import, division, print_function)
import time
import math
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadAndMerge.py b/Framework/PythonInterface/plugins/algorithms/LoadAndMerge.py
index dcaca149e623efa3ec3d8389bcfc5d152d78d4d4..f253e59449ff4fe5d1e398b2cfebcdfd6e665ded 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadAndMerge.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadAndMerge.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os.path
from mantid.kernel import Direction, StringContainsValidator, PropertyManagerProperty
from mantid.api import AlgorithmFactory, AlgorithmManager, MultipleFileProperty, \
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadCIF.py b/Framework/PythonInterface/plugins/algorithms/LoadCIF.py
index ce451509a5d9895ef5953774206d359300172c05..0f2814ef055103fee32d95a87cbd05f0f8e6834b 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadCIF.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadCIF.py
@@ -5,13 +5,11 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.simpleapi import *
from mantid.api import *
from mantid.geometry import SpaceGroupFactory, CrystalStructure, UnitCell
-from six import iteritems
import re
import numpy as np
@@ -251,7 +249,7 @@ class AtomListBuilder(object):
anisoLabels = self._get_ansitropic_labels(cifData)
equivalentUMap = self._getEquivalentUs(cifData, anisoLabels, unitCell)
- for key, uIso in iteritems(isotropicUMap):
+ for key, uIso in isotropicUMap.items():
if uIso is None and key in equivalentUMap:
isotropicUMap[key] = equivalentUMap[key]
@@ -268,7 +266,7 @@ class AtomListBuilder(object):
# Return U_equiv calculated according to [Fischer & Tillmanns, Acta Cryst C44, p775, 10.1107/S0108270187012745]
# in a dict like { 'label1': 'U_equiv1' ... }. Invalid matrices (containing None) are excluded.
return dict([(label, np.around(np.sum(np.multiply(uMatrix, sumWeights)) / 3., decimals=5))
- for label, uMatrix in iteritems(anisotropicParameters) if uMatrix.dtype.type != np.object_])
+ for label, uMatrix in anisotropicParameters.items() if uMatrix.dtype.type != np.object_])
def _getAnisotropicParametersU(self, cifData, labels):
# Try to extract U or if that fails, B.
@@ -280,7 +278,7 @@ class AtomListBuilder(object):
bTensors = self._getTensors(cifData, labels,
['_atom_site_aniso_b_11', '_atom_site_aniso_b_12', '_atom_site_aniso_b_13',
'_atom_site_aniso_b_22', '_atom_site_aniso_b_23', '_atom_site_aniso_b_33'])
- return dict([(label, convertBtoU(bTensor)) for label, bTensor in iteritems(bTensors)])
+ return dict([(label, convertBtoU(bTensor)) for label, bTensor in bTensors.items()])
def _get_ansitropic_labels(self, cifData):
anisoLabel = '_atom_site_aniso_label'
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py b/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py
index 1989684cc604341fa33deecc62e9d2a2659eac26..1e1f30e5d65da6dbe252be6939d1718150867533 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
import numpy as np
from scipy.constants import m_n, h, physical_constants
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadEXED.py b/Framework/PythonInterface/plugins/algorithms/LoadEXED.py
index 235c2685136caaba117faed9b7b535b10181d57b..90c491335ba952fdf74712ce0ed0a12c550df5a7 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadEXED.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadEXED.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Direction
from mantid.api import (PythonAlgorithm, AlgorithmFactory, FileAction,
FileProperty, WorkspaceProperty, MatrixWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadEmptyVesuvio.py b/Framework/PythonInterface/plugins/algorithms/LoadEmptyVesuvio.py
index 7b7e6b8d3b06bb5eefa873827182ff67072138f7..44f219a3c18b56ff7ee495df4285ff0f4d9eb822 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadEmptyVesuvio.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadEmptyVesuvio.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py b/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py
index 7d51a5d09a1d1d75cc1e0196bd670c925c7e84dc..57831f78a464830afbfb55baeb4393bc5795c509 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py
@@ -5,13 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty, WorkspaceFactory,\
FileProperty, FileAction, MatrixWorkspaceProperty
from mantid.kernel import Direction
-from six.moves import range #pylint: disable=redefined-builtin
-
_OUTPUTLEVEL = "NOOUTPUT"
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py b/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py
index ee167e499d119e3fde37c5d86f516b9e2ca45fdc..57d93a71b2d138522045e2b58db1dd9ce1afd8d0 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (FileProperty, WorkspaceProperty, PythonAlgorithm,
AlgorithmFactory, FileAction, PropertyMode)
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadLamp.py b/Framework/PythonInterface/plugins/algorithms/LoadLamp.py
index 78b8b68b7cff83167b9bb6388c31af092f3b1d47..522d828aade293742d7c63d7b9b982b394385e44 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadLamp.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadLamp.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import FileProperty, WorkspaceProperty, PythonAlgorithm, AlgorithmFactory, FileAction
from mantid.kernel import Direction
from mantid.simpleapi import CreateWorkspace, AddSampleLogMultiple
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadLogPropertyTable.py b/Framework/PythonInterface/plugins/algorithms/LoadLogPropertyTable.py
index abc6ed0c9682a51907f39e410a8dc082de9fc51d..691488d90ccc5c87edbfc2ed1da43209905d85c2 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadLogPropertyTable.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadLogPropertyTable.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import time
import datetime
import numbers
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py b/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py
index 3cb95b539e9dc0e47425671fe6fe8fc280e41cae..8cf3a15dce7295c8aae7e82f3bbb96e7f3c4c398 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py
index a8138648d023e6720ae838cde57a1d11043f6521..3bc944955a58bcce87ab9ec89d7e46f8ae856b4a 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-locals,too-many-branches
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii.py b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii.py
index 857343d6a15b0c46b5836591b2bfb798f54b36b4..0f583a62830a8518d9ce4c2058ea3d130b3d57c0 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii1D.py b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii1D.py
index 2afefea75a3892b953ab2b5e98398372754ac4b5..a47b39fe7460b2ae712bfac8a7c81b2fa3d68fb3 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii1D.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import CreateWorkspace, GroupWorkspaces
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadPreNexusLive.py b/Framework/PythonInterface/plugins/algorithms/LoadPreNexusLive.py
index 7d0aaf953c425cc101399e0818bfb74759776c2f..5b25055a3cbacbcdb93f5ca48b43c105b650ed19 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadPreNexusLive.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadPreNexusLive.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid import mtd
from mantid.api import AlgorithmFactory, DataProcessorAlgorithm, FileAction, \
FileProperty, WorkspaceProperty
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadSINQ.py b/Framework/PythonInterface/plugins/algorithms/LoadSINQ.py
index d630240588f033f3379b4697c46c1be929f7af4b..9372808fe58c9fc9ffadc828aaae051d08a25905 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadSINQ.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadSINQ.py
@@ -13,7 +13,6 @@
#
# Mark Koennecke, November 2012
#--------------------------------------------------------------
-from __future__ import (absolute_import, division, print_function)
from mantid.api import AlgorithmFactory
from mantid.api import PythonAlgorithm, WorkspaceProperty
from mantid.kernel import Direction, StringListValidator, ConfigServiceImpl
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadSINQFile.py b/Framework/PythonInterface/plugins/algorithms/LoadSINQFile.py
index 9717663c928ee1a9cef46e8bd498a1cc15251625..28686db40230728ed602c7dec62050c205c58de2 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadSINQFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadSINQFile.py
@@ -12,7 +12,6 @@
#
# Mark Koennecke, November 2012
#--------------------------------------------------------------
-from __future__ import (absolute_import, division, print_function)
from mantid.api import AlgorithmFactory
from mantid.api import PythonAlgorithm, FileProperty, FileAction, WorkspaceProperty
from mantid.kernel import Direction, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
index cc1b385463f3ae6804ae053d29a5e022b094bcce..24f212cf7760bec9a2ed0f07614a57e1ca1dbac7 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
import mantid.simpleapi as ms
@@ -15,8 +14,6 @@ import copy
import numpy as np
import os
import re
-import six
-
RUN_PROP = "Filename"
WKSP_PROP = "OutputWorkspace"
MODE_PROP = "Mode"
@@ -396,7 +393,7 @@ class LoadVesuvio(LoadEmptyVesuvio):
"""Given a string containing either a filename/partial filename or run number find the correct
file prefix"""
vesuvio = config.getInstrument("VESUVIO")
- if isinstance(run_or_filename, six.integer_types):
+ if isinstance(run_or_filename, int):
run_no = run_or_filename
return vesuvio.filePrefix(int(run_no)) + str(run_or_filename)
else:
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticBS.py b/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticBS.py
index 4a93e325df9e3547a105dc7817962f47e0ea2c1a..a0e12eb47938e29515fff186edde5824fb9fa49f 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticBS.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticBS.py
@@ -8,7 +8,6 @@
#from mantid.api import AlgorithmFactory
#from mantid.simpleapi import PythonAlgorithm, WorkspaceProperty
# from mantid.kernel import Direction
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticEQ.py b/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticEQ.py
index b12a8e508c4f9c8fae385567bb9c209ae4a74886..064ffda752e5ab5ed8e60177ef7b9dc11b03bfca 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticEQ.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticEQ.py
@@ -8,7 +8,6 @@
#from mantid.api import AlgorithmFactory
#from mantid.simpleapi import PythonAlgorithm, WorkspaceProperty
# from mantid.kernel import Direction
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVisionInelastic.py b/Framework/PythonInterface/plugins/algorithms/LoadVisionInelastic.py
index 1eeceabf0d4a63cc1f59c7e602916af3521507d1..0b0d89f46420dd930660b753c992e68251919113 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVisionInelastic.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVisionInelastic.py
@@ -8,7 +8,6 @@
#from mantid.api import AlgorithmFactory
#from mantid.simpleapi import PythonAlgorithm, WorkspaceProperty
# from mantid.kernel import Direction
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadWANDSCD.py b/Framework/PythonInterface/plugins/algorithms/LoadWANDSCD.py
index 8303c6ee52b7e88249a652b107480ee9da4ac8a4..56975dc6e177be3fbc3a39e951a488fbea0e9242 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadWANDSCD.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadWANDSCD.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, PropertyMode, WorkspaceProperty, Progress, MultipleFileProperty, FileAction, mtd
from mantid.kernel import Direction, Property, IntArrayProperty, StringListValidator
from mantid.simpleapi import LoadEventNexus, RemoveLogs, DeleteWorkspace, ConvertToMD, Rebin, CreateGroupingWorkspace, GroupDetectors, SetUB
diff --git a/Framework/PythonInterface/plugins/algorithms/MRFilterCrossSections.py b/Framework/PythonInterface/plugins/algorithms/MRFilterCrossSections.py
index 5afbd8df43fe074fac88ab3d12dca8361f1c6122..4007d78e242aed538adfa08ae764c2de209cefb8 100644
--- a/Framework/PythonInterface/plugins/algorithms/MRFilterCrossSections.py
+++ b/Framework/PythonInterface/plugins/algorithms/MRFilterCrossSections.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
from operator import itemgetter
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MRGetTheta.py b/Framework/PythonInterface/plugins/algorithms/MRGetTheta.py
index 5c22cb0a32d666e20e5b281b4d16b54573b2c4ae..76cee08884b420d889b310afc4377b0bdc8d7c11 100644
--- a/Framework/PythonInterface/plugins/algorithms/MRGetTheta.py
+++ b/Framework/PythonInterface/plugins/algorithms/MRGetTheta.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty
from mantid.kernel import Direction, FloatBoundedValidator, Property
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/MRInspectData.py b/Framework/PythonInterface/plugins/algorithms/MRInspectData.py
index df20dc64118868bcb5225d533e79e802247e5dae..a79f7e03be5d7987816dc4391afab0778f301bb4 100644
--- a/Framework/PythonInterface/plugins/algorithms/MRInspectData.py
+++ b/Framework/PythonInterface/plugins/algorithms/MRInspectData.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=bare-except,no-init,invalid-name,dangerous-default-value
-from __future__ import (absolute_import, division, print_function)
import sys
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MagnetismReflectometryReduction.py b/Framework/PythonInterface/plugins/algorithms/MagnetismReflectometryReduction.py
index 54bed65f3234eef6f87c2289db4bf6bf76ec5c8a..ca521300ca4867f5ce8cece40b121d1437c4ca98 100644
--- a/Framework/PythonInterface/plugins/algorithms/MagnetismReflectometryReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/MagnetismReflectometryReduction.py
@@ -8,7 +8,6 @@
"""
Magnetism reflectometry reduction
"""
-from __future__ import (absolute_import, division, print_function)
import sys
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/MaskAngle.py b/Framework/PythonInterface/plugins/algorithms/MaskAngle.py
index c582e5432f4373386469db1582e90c474597dcf6..8e444a5d12e83dbdce563624d2d0c8ed11112aa4 100644
--- a/Framework/PythonInterface/plugins/algorithms/MaskAngle.py
+++ b/Framework/PythonInterface/plugins/algorithms/MaskAngle.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi
import mantid.kernel
import mantid.api
diff --git a/Framework/PythonInterface/plugins/algorithms/MaskBTP.py b/Framework/PythonInterface/plugins/algorithms/MaskBTP.py
index d00a88e3827a982bd0e79fa7a3a08b90fba2dc83..7f85a18ff2cb10898093512fa9a01edea51e1a0a 100644
--- a/Framework/PythonInterface/plugins/algorithms/MaskBTP.py
+++ b/Framework/PythonInterface/plugins/algorithms/MaskBTP.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi
import mantid.api
from mantid.kernel import Direction, IntArrayProperty, StringArrayProperty, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/MaskWorkspaceToCalFile.py b/Framework/PythonInterface/plugins/algorithms/MaskWorkspaceToCalFile.py
index 3132c489f53f5233dee03081b42227e66d4b8ecc..df4eda9955f45361002268e7cf68693b07189ee2 100644
--- a/Framework/PythonInterface/plugins/algorithms/MaskWorkspaceToCalFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/MaskWorkspaceToCalFile.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name, no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MatchPeaks.py b/Framework/PythonInterface/plugins/algorithms/MatchPeaks.py
index 10ce38de7695091006a06951b7518c5ff202b59d..6dc3de89daf8a0192adbb1be7f09900973e25df2 100644
--- a/Framework/PythonInterface/plugins/algorithms/MatchPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/MatchPeaks.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, MatrixWorkspaceProperty, ITableWorkspaceProperty, PropertyMode, MatrixWorkspace
from mantid.simpleapi import *
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/MatchSpectra.py b/Framework/PythonInterface/plugins/algorithms/MatchSpectra.py
index 93037bf04dd1764406923262b2a83ff3e42962a1..40e0d1f648b884d177abb38e86d98e6fbc6583c9 100644
--- a/Framework/PythonInterface/plugins/algorithms/MatchSpectra.py
+++ b/Framework/PythonInterface/plugins/algorithms/MatchSpectra.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import AlgorithmFactory, MatrixWorkspaceProperty, PythonAlgorithm
from mantid.kernel import Direction, FloatArrayProperty
from mantid.simpleapi import ConvertToMatrixWorkspace
diff --git a/Framework/PythonInterface/plugins/algorithms/Mean.py b/Framework/PythonInterface/plugins/algorithms/Mean.py
index ce5122288333077846c53d35d380610d7d530e00..da10b76a2c93d59bfeb18d7195cc3347faf86e59 100644
--- a/Framework/PythonInterface/plugins/algorithms/Mean.py
+++ b/Framework/PythonInterface/plugins/algorithms/Mean.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import numpy
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MedianBinWidth.py b/Framework/PythonInterface/plugins/algorithms/MedianBinWidth.py
index 004edb5c7eec1b1f08514c8ccb43b083a427f912..e3146e6189700378134150fd9f348d19758e0434 100644
--- a/Framework/PythonInterface/plugins/algorithms/MedianBinWidth.py
+++ b/Framework/PythonInterface/plugins/algorithms/MedianBinWidth.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AlgorithmFactory, HistogramValidator,\
MatrixWorkspaceProperty, PythonAlgorithm
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/MergeCalFiles.py b/Framework/PythonInterface/plugins/algorithms/MergeCalFiles.py
index 938238597796b8cdbafb114f880937b4d74bd38a..173e428bee135f67ba77a63e4b4b1ac5fb6138b2 100644
--- a/Framework/PythonInterface/plugins/algorithms/MergeCalFiles.py
+++ b/Framework/PythonInterface/plugins/algorithms/MergeCalFiles.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MuonMaxent.py b/Framework/PythonInterface/plugins/algorithms/MuonMaxent.py
index 4492297d97987ffb89a34f0edae4e882104797da..2cdd2a9e4536be5e4d1cf2036562facef5f697e2 100644
--- a/Framework/PythonInterface/plugins/algorithms/MuonMaxent.py
+++ b/Framework/PythonInterface/plugins/algorithms/MuonMaxent.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import math
from Muon.MaxentTools.multimaxalpha import MULTIMAX
diff --git a/Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py b/Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py
index 5c9b53886db372b6338c98de7b4e164c1b495138..a894d539e00dbfb6bdf9e52c1ef4d49437131ecc 100644
--- a/Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py
+++ b/Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-many-instance-attributes,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty)
from mantid.kernel import (Direction, logger)
diff --git a/Framework/PythonInterface/plugins/algorithms/NMoldyn4Interpolation.py b/Framework/PythonInterface/plugins/algorithms/NMoldyn4Interpolation.py
index 6600a2f98edf27acf1f9eafcc11b414166477a1f..99b6d947ea7209c3168262408eb1de9ee055baf5 100644
--- a/Framework/PythonInterface/plugins/algorithms/NMoldyn4Interpolation.py
+++ b/Framework/PythonInterface/plugins/algorithms/NMoldyn4Interpolation.py
@@ -10,8 +10,6 @@ import math
import numpy as np
import scipy as sc
-from sys import version_info
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
@@ -48,8 +46,6 @@ class NMoldyn4Interpolation(PythonAlgorithm):
doc='Output Workspace of remapped simulation data')
def PyExec(self):
- self.validate_environment()
-
e_fixed = float(self.getPropertyValue('EFixed'))
# Loads simulated workspace
simulation = self.getPropertyValue('InputWorkspace')
@@ -80,14 +76,6 @@ class NMoldyn4Interpolation(PythonAlgorithm):
VerticalAxisValues=ref_Q, WorkspaceTitle=output_ws)
self.setProperty('OutputWorkspace', output_ws)
- def validate_environment(self):
- # RHEL 6 produces spurious results because it runs on Python 2.6.X
- # test and warn for this. When RHEL6 is no longer supported this check
- # can be removed
- python_version = version_info
- if python_version < (2, 7, 0):
- logger.warning("NMoldyn4Interpolation may not run correctly on Python 2.6 and below")
-
def validate_bounds(self, sim_X, ref_X, sim_Q, ref_Q):
if min(sim_X) > min(ref_X):
raise ValueError('Minimum simulated X value is higher than minimum '
diff --git a/Framework/PythonInterface/plugins/algorithms/NormaliseSpectra.py b/Framework/PythonInterface/plugins/algorithms/NormaliseSpectra.py
index 12a441399fb2063b219283d2c619837e86b31145..ff673ad2bf414284708468620a3fb15d9fdc19f1 100644
--- a/Framework/PythonInterface/plugins/algorithms/NormaliseSpectra.py
+++ b/Framework/PythonInterface/plugins/algorithms/NormaliseSpectra.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import (MatrixWorkspaceProperty, DataProcessorAlgorithm, AlgorithmFactory)
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/OrderWorkspaceHistory.py b/Framework/PythonInterface/plugins/algorithms/OrderWorkspaceHistory.py
index 0a652ac6aa826ca55c73b7797ef214399036a781..a3a7ca9b102a8c58d554b7e126d956120cc17b1f 100644
--- a/Framework/PythonInterface/plugins/algorithms/OrderWorkspaceHistory.py
+++ b/Framework/PythonInterface/plugins/algorithms/OrderWorkspaceHistory.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
-
import os
import tokenize
import glob
diff --git a/Framework/PythonInterface/plugins/algorithms/PDConvertRealSpace.py b/Framework/PythonInterface/plugins/algorithms/PDConvertRealSpace.py
index af20bcc293bf1887686c89318f581a6cf86acf0f..e60e2c89ca7611f6078dd3bd702a6e483b42a26a 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDConvertRealSpace.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDConvertRealSpace.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
MatrixWorkspaceProperty,
WorkspaceProperty, WorkspaceFactory)
diff --git a/Framework/PythonInterface/plugins/algorithms/PDConvertReciprocalSpace.py b/Framework/PythonInterface/plugins/algorithms/PDConvertReciprocalSpace.py
index e6c796f1b81e1a1e92372521a02ec3772ea9a0b8..a2209b5605918fc573bbc672a15f0f6ca5cc3479 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDConvertReciprocalSpace.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDConvertReciprocalSpace.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
WorkspaceUnitValidator, MatrixWorkspaceProperty,
WorkspaceProperty, WorkspaceFactory)
diff --git a/Framework/PythonInterface/plugins/algorithms/PDToGUDRUN.py b/Framework/PythonInterface/plugins/algorithms/PDToGUDRUN.py
index 5c016a408c7c3d2addc7d80370d05dd317516de3..da17a93e6d36f602aa6a4e0ec8e9ea80694a7f66 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDToGUDRUN.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDToGUDRUN.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import Direction, FloatArrayProperty, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py b/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
index 1b529a9d6ea7016339a6662e1c3d4620af315ce6..49a1356e4c8d52ec587877b3fd780709a4d517da 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import AlignAndFocusPowder, AlignAndFocusPowderFromFiles, \
NormaliseByCurrent, PDDetermineCharacterizations,PDLoadCharacterizations, \
SaveGSS, SetUncertainties
diff --git a/Framework/PythonInterface/plugins/algorithms/PearlMCAbsorption.py b/Framework/PythonInterface/plugins/algorithms/PearlMCAbsorption.py
index 83553032a2a2e0a62469676e352f9b314db9a68b..77b62ce576abaeb6e224b686f02e240f00540ff0 100644
--- a/Framework/PythonInterface/plugins/algorithms/PearlMCAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/PearlMCAbsorption.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py b/Framework/PythonInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py
index 62dfdc88e0385995b55ceaf524655722d008ec15..f776116e342156574e38d60f74291ecbb722aefc 100644
--- a/Framework/PythonInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# pylint: disable=no-init,invalid-name,too-few-public-methods,unused-import
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/PoldiLoadRuns.py b/Framework/PythonInterface/plugins/algorithms/PoldiLoadRuns.py
index aba6c8a29aae97d78f476afcd20a8d04a8d7c268..071a07d1f380823bdba4dd61f36726e61f44a05d 100644
--- a/Framework/PythonInterface/plugins/algorithms/PoldiLoadRuns.py
+++ b/Framework/PythonInterface/plugins/algorithms/PoldiLoadRuns.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# pylint: disable=no-init,invalid-name,bare-except
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/PoldiMerge.py b/Framework/PythonInterface/plugins/algorithms/PoldiMerge.py
index cbb2b0d32a57800f373cfed976e9d1565097db21..c75aaee36d43edff02b83cc18b8bca045c67f40d 100644
--- a/Framework/PythonInterface/plugins/algorithms/PoldiMerge.py
+++ b/Framework/PythonInterface/plugins/algorithms/PoldiMerge.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import StringArrayProperty, Direction
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py b/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py
index ee5baf1560dbfe9bcda19e18a0eefc34820b3452..9a73e3b29ba923fb912deee02d7aefd9c69ff709 100644
--- a/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py
+++ b/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py
@@ -5,10 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
-from six.moves import range #pylint: disable=redefined-builtin
-
from mantid.api import *
import mantid.simpleapi as api
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ReflectometryReductionOneLiveData.py b/Framework/PythonInterface/plugins/algorithms/ReflectometryReductionOneLiveData.py
index 485b7c2c9e5a3e5647fd59f3e35336e3d1ce9a18..b3aee6bf987d249e3fdf2d71e9eccd69e9313e67 100644
--- a/Framework/PythonInterface/plugins/algorithms/ReflectometryReductionOneLiveData.py
+++ b/Framework/PythonInterface/plugins/algorithms/ReflectometryReductionOneLiveData.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ReflectometrySliceEventWorkspace.py b/Framework/PythonInterface/plugins/algorithms/ReflectometrySliceEventWorkspace.py
index 65cf8ce0b25315f036f1f9aaaa07a089f4c385f3..785929f3bf13e953084b65f83035b541d34f4e66 100644
--- a/Framework/PythonInterface/plugins/algorithms/ReflectometrySliceEventWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/ReflectometrySliceEventWorkspace.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ResNorm.py b/Framework/PythonInterface/plugins/algorithms/ResNorm.py
index 3e0a41f0ed22683e78e045e9627d6dae2521f684..69d653e87e7884a074001851f57bfe10b9bd3c51 100644
--- a/Framework/PythonInterface/plugins/algorithms/ResNorm.py
+++ b/Framework/PythonInterface/plugins/algorithms/ResNorm.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import StringListValidator, StringMandatoryValidator
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
index b964d99cb5ad0f0166196f6d3e3d719d7997035b..c3f79a6f6cb5cc0bda5c71cf9654f372c20ddee6 100644
--- a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
+++ b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
@@ -5,13 +5,12 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty
from mantid.simpleapi import *
from mantid.kernel import StringMandatoryValidator, Direction
from mantid import config
import os
-from six.moves import filterfalse
+from itertools import filterfalse
class Intervals(object):
diff --git a/Framework/PythonInterface/plugins/algorithms/SANSSubtract.py b/Framework/PythonInterface/plugins/algorithms/SANSSubtract.py
index 360128e7fc25a694d04bac124b0520ccb7e14991..0507c9f139c17ae63cc215521d5ee7e32800be8e 100644
--- a/Framework/PythonInterface/plugins/algorithms/SANSSubtract.py
+++ b/Framework/PythonInterface/plugins/algorithms/SANSSubtract.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import Direction, FloatBoundedValidator
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/SANSWideAngleCorrection.py b/Framework/PythonInterface/plugins/algorithms/SANSWideAngleCorrection.py
index 7d32302fc0554d23daba58afe421c80c465834ae..1f3484d86e4990e4612de10ea16dd10a3602ddf3 100644
--- a/Framework/PythonInterface/plugins/algorithms/SANSWideAngleCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/SANSWideAngleCorrection.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import sys
diff --git a/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py b/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py
index 9209a655c97e77ae542f000b97a958c2b8a74664..c1091dae18e445348cbbaa675088974322a53a51 100644
--- a/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py
+++ b/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,no-init,too-many-lines
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Direction, FloatArrayProperty, IntArrayBoundedValidator, \
IntArrayProperty, Property, StringListValidator
from mantid.api import AlgorithmFactory, DataProcessorAlgorithm, FileAction, FileProperty, \
diff --git a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
index 3e16ac1decc25d9661b4daf9d6c8fa6c9529a8ef..ec73d3dbd4a31cc895423c3c73c8584bce325d75 100644
--- a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-lines
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import os
@@ -16,8 +15,6 @@ from mantid.api import mtd, AlgorithmFactory, AnalysisDataService, DistributedDa
from mantid.kernel import ConfigService, Direction, FloatArrayProperty, FloatBoundedValidator, \
IntArrayBoundedValidator, IntArrayProperty, Property, PropertyManagerDataService, StringListValidator
from mantid.dataobjects import SplittersWorkspace # SplittersWorkspace
-from six.moves import range #pylint: disable=redefined-builtin
-
if AlgorithmFactory.exists('GatherWorkspaces'):
HAVE_MPI = True
from mpi4py import MPI
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveGEMMAUDParamFile.py b/Framework/PythonInterface/plugins/algorithms/SaveGEMMAUDParamFile.py
index 98786ee7d66810e7046298f64737d7e17fadd1f1..62340186d56958859d9b0a9f219faf582357ed02 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveGEMMAUDParamFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveGEMMAUDParamFile.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import math
import os
import re
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py b/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py
index 9cf53e444d791ff1ef415bad5f108c63d5d6a708..77e0cd80080691487690110eec1326d9fe35f575 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py
@@ -5,13 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import mantid
import mantid.simpleapi as api
from mantid.kernel import StringListValidator
-from six.moves import range #pylint: disable=redefined-builtin
-
try:
import h5py # http://www.h5py.org/
except ImportError:
diff --git a/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py b/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
index 4fcdcd54360c963e0c19657c41ebfdb96968b566..23d30df368c05997388f9e981b38379944a2e369 100644
--- a/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
+++ b/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,unused-variable,invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveReflections.py b/Framework/PythonInterface/plugins/algorithms/SaveReflections.py
index cce52b5e21a5e34f55da4e0493fa022c1c9c5b05..a2311f7d642954ddeec7959c62fee1c4bd94788f 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveReflections.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveReflections.py
@@ -4,13 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import os.path as osp
import numpy as np
from mantid.api import (AlgorithmFactory, FileProperty, FileAction, IPeaksWorkspaceProperty, PythonAlgorithm)
from mantid.kernel import StringListValidator, Direction
-from mantid.py3compat.enum import Enum
+from enum import Enum
def num_modulation_vectors(workspace):
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveYDA.py b/Framework/PythonInterface/plugins/algorithms/SaveYDA.py
index c2fe2aa45ee3327782db27c156b4e739fe54530e..2b0f0a5ffed80970b9d66ed820613a179f835674 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveYDA.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveYDA.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceUnitValidator, \
InstrumentValidator, FileProperty, FileAction
from mantid.kernel import Direction, CompositeValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py b/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
index cb51bf58f83332ee83bad5dfcb617f7c40eb5c84..51027b1c8cc472f125a62e547bdf0b6d63344aad 100644
--- a/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
+++ b/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
@@ -5,12 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=eval-used
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
-from six import PY3
class SelectNexusFilesByMetadata(PythonAlgorithm):
@@ -108,8 +105,7 @@ class SelectNexusFilesByMetadata(PythonAlgorithm):
if str(value.dtype).startswith('|S'):
# string value, need to quote for eval
- if PY3:
- value = value.decode()
+ value = value.decode()
toeval += '\"' + value + '\"'
else:
toeval += str(value)
diff --git a/Framework/PythonInterface/plugins/algorithms/SetDetScale.py b/Framework/PythonInterface/plugins/algorithms/SetDetScale.py
index 7ab33c62646b5dc04577c99c9672d094f87d1fbc..8bd94324569c50724248f6db002f9789a84be5c1 100644
--- a/Framework/PythonInterface/plugins/algorithms/SetDetScale.py
+++ b/Framework/PythonInterface/plugins/algorithms/SetDetScale.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, InstrumentValidator, FileProperty, FileAction
from mantid.kernel import Direction, StringArrayProperty
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py b/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py
index 8a1b33421b6ae286a6b8ef908e8e992293e623d2..3db628c5aa0f07e72c0dce8c55616ae3bd99c005 100644
--- a/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py
+++ b/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import mantid.simpleapi as ms
diff --git a/Framework/PythonInterface/plugins/algorithms/SortDetectors.py b/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
index f28c2dd820f19d845ea30f058bd2e131032861ee..478365bb8231d98df83d0da083540f7653a2d5f0 100644
--- a/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
+++ b/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import Direction,IntArrayProperty, FloatArrayProperty
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py b/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
index e5b63c8879312bb695cb8359d93458111974f202..d8317f1bd4f022d5c3a405d9a1c3d800febed75c 100644
--- a/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
@@ -6,13 +6,9 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import collections
import numpy as np
-from six import iteritems
-
import mantid.simpleapi as ms
from mantid import logger, mtd
from mantid.api import AlgorithmFactory, ITableWorkspaceProperty, PythonAlgorithm
@@ -89,7 +85,7 @@ class StatisticsOfTableWorkspace(PythonAlgorithm):
except:
logger.notice('Column \'%s\' is not numerical, skipping' % column_name)
- for index, stat_name in iteritems(stats):
+ for index, stat_name in stats.items():
stat = collections.OrderedDict(stat_name)
stat['Statistic'] = index
out_ws.addRow(stat)
diff --git a/Framework/PythonInterface/plugins/algorithms/StringToPng.py b/Framework/PythonInterface/plugins/algorithms/StringToPng.py
index 9e78bbc9df0ff6277bbda20b1dfdaf389279096b..fabb831e5e8b6360a0726baec2f313df9f14284e 100644
--- a/Framework/PythonInterface/plugins/algorithms/StringToPng.py
+++ b/Framework/PythonInterface/plugins/algorithms/StringToPng.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-from six import u
import mantid
@@ -53,7 +51,7 @@ class StringToPng(mantid.api.PythonAlgorithm):
import matplotlib.pyplot as plt
fig=plt.figure(figsize=(.1,.1))
ax1=plt.axes(frameon=False)
- ax1.text(0.,1,bytearray(u(self.getProperty("String").valueAsStr), 'utf-8').decode('unicode_escape'),va="center",fontsize=16)
+ ax1.text(0.,1,bytearray(self.getProperty("String").valueAsStr, 'utf-8').decode('unicode_escape'),va="center",fontsize=16)
ax1.axes.get_xaxis().set_visible(False)
ax1.axes.get_yaxis().set_visible(False)
filename = self.getProperty("OutputFilename").value
diff --git a/Framework/PythonInterface/plugins/algorithms/SuggestTibCNCS.py b/Framework/PythonInterface/plugins/algorithms/SuggestTibCNCS.py
index cb70790b3d4f086039a18848b740122345a47c17..f5d3604781819b3419230bec8d2c3b5d533e7136 100644
--- a/Framework/PythonInterface/plugins/algorithms/SuggestTibCNCS.py
+++ b/Framework/PythonInterface/plugins/algorithms/SuggestTibCNCS.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import FloatBoundedValidator,Direction
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/SuggestTibHYSPEC.py b/Framework/PythonInterface/plugins/algorithms/SuggestTibHYSPEC.py
index 85332455c48be368836d6e4b53c011cfebd309aa..dafd7fee8df673b9c45e31f36d62805b77217026 100644
--- a/Framework/PythonInterface/plugins/algorithms/SuggestTibHYSPEC.py
+++ b/Framework/PythonInterface/plugins/algorithms/SuggestTibHYSPEC.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import FloatBoundedValidator,Direction,logger
import numpy
diff --git a/Framework/PythonInterface/plugins/algorithms/Symmetrise.py b/Framework/PythonInterface/plugins/algorithms/Symmetrise.py
index cd94eb2b70457f0a0422e0f0d5931db8b08c49ef..d9e032f0a882a5206114a9e97c82df73c38454da 100644
--- a/Framework/PythonInterface/plugins/algorithms/Symmetrise.py
+++ b/Framework/PythonInterface/plugins/algorithms/Symmetrise.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
index 03378303122d0fa42772fadafa125988136ce0bf..78cf7aa02c90150a4474ff06f4e2ec77ee51ebae 100644
--- a/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty # , WorkspaceUnitValidator
from mantid.kernel import Direction
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py b/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
index abb4c95648ad2fe839262f3af37c567430ece10a..8016ee86d7827bd083849c69a3136c80cf8b64a0 100644
--- a/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
+++ b/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import Direction, StringArrayProperty, StringArrayLengthValidator
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, WorkspaceGroup
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/plugins/algorithms/TestWorkspaceGroupProperty.py b/Framework/PythonInterface/plugins/algorithms/TestWorkspaceGroupProperty.py
index 7e29d62fd2b7a0eddc9f3007a6b4f582de35b708..23c5f2ae52b3575d8946f6af31e1472440951294 100644
--- a/Framework/PythonInterface/plugins/algorithms/TestWorkspaceGroupProperty.py
+++ b/Framework/PythonInterface/plugins/algorithms/TestWorkspaceGroupProperty.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/USANSSimulation.py b/Framework/PythonInterface/plugins/algorithms/USANSSimulation.py
index d8c47e652780fdd20e12d85fd2824ca38a559b96..9a1b3caaca4e70a2af82a2378cc1032fb7893796 100644
--- a/Framework/PythonInterface/plugins/algorithms/USANSSimulation.py
+++ b/Framework/PythonInterface/plugins/algorithms/USANSSimulation.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py b/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py
index bef0a617508de4d8eece1bdbb65f02aeadad57b5..712b49f5aae058cdafd0fd1ae1e8ba1e448294ef 100644
--- a/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py
+++ b/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
-
import mantid
import mantid.api
import mantid.kernel
diff --git a/Framework/PythonInterface/plugins/algorithms/VelocityAutoCorrelations.py b/Framework/PythonInterface/plugins/algorithms/VelocityAutoCorrelations.py
index bf67e3507a6d82e93b4cc402416e7efc6ef0ea75..4b481791eb119a6d388a654c2ec42e164f7d6810 100644
--- a/Framework/PythonInterface/plugins/algorithms/VelocityAutoCorrelations.py
+++ b/Framework/PythonInterface/plugins/algorithms/VelocityAutoCorrelations.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches,too-many-locals, invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/VelocityCrossCorrelations.py b/Framework/PythonInterface/plugins/algorithms/VelocityCrossCorrelations.py
index 053df6409699e4bee5bc7a95aa3190faec344709..bfb207631992ed3c1cfc6da62174354bcb1b17a5 100644
--- a/Framework/PythonInterface/plugins/algorithms/VelocityCrossCorrelations.py
+++ b/Framework/PythonInterface/plugins/algorithms/VelocityCrossCorrelations.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches,too-many-locals, invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py b/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py
index 2e900d72505487f0c990f04355f5547e885afe9f..068b10ae505b87277b1554c215f9194b8ee0ff62 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-from six import iteritems
-
from mantid.kernel import *
from mantid.api import *
from vesuvio.base import VesuvioBase, TableWorkspaceDictionaryFacade
@@ -418,7 +415,7 @@ class VesuvioCorrections(VesuvioBase):
for idx, wsn in enumerate(fit_workspaces):
tie = ''
- for param, value in iteritems(fixed_parameters):
+ for param, value in fixed_parameters.items():
if param in wsn:
tie = 'Scaling=%f,' % value
function_str = "name=TabulatedFunction,Workspace=%s," % wsn \
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioPreFit.py b/Framework/PythonInterface/plugins/algorithms/VesuvioPreFit.py
index 3c527fb75e7a069a41796168f22848b8b59533ba..2ac15fcb195355a1b6fa3417bf4010232f1144b6 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioPreFit.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioPreFit.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioResolution.py b/Framework/PythonInterface/plugins/algorithms/VesuvioResolution.py
index 4410508417c93016406ed41c1c275f8b6dca6885..ea1221bc71237de58076f54bfe50f0a6d97c02cf 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioResolution.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioResolution.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from vesuvio.base import VesuvioBase
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py b/Framework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py
index 2e8e283f6c2ae67511fe80581c6d4de6fdaf16a3..838497f8eaedb4c83b925f30c401acafc3e3906a 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioThickness.py b/Framework/PythonInterface/plugins/algorithms/VesuvioThickness.py
index 933fff2a076dffc0446af531f65a1fffa135d9c8..38af2e0fdd19d8ed295d2be15b92b9353ed26520 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioThickness.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioThickness.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import Direction, FloatArrayProperty
from mantid.api import (PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty)
diff --git a/Framework/PythonInterface/plugins/algorithms/ViewBOA.py b/Framework/PythonInterface/plugins/algorithms/ViewBOA.py
index e434c18f253ecf18c4f5321cbccdc2679c3406d0..8162aa958f8ee7a4110753ad8a2e0728f65ef0e8 100644
--- a/Framework/PythonInterface/plugins/algorithms/ViewBOA.py
+++ b/Framework/PythonInterface/plugins/algorithms/ViewBOA.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AlgorithmFactory
from mantid.api import PythonAlgorithm
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/VisionReduction.py b/Framework/PythonInterface/plugins/algorithms/VisionReduction.py
index 059774b2774ff020ffda57b10f34fa8d0fc5d263..331caed9313d5dd443db5ba93f17a7a3d853d332 100644
--- a/Framework/PythonInterface/plugins/algorithms/VisionReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/VisionReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
#from mantid.api import AlgorithmFactory
#from mantid.simpleapi import PythonAlgorithm, WorkspaceProperty
# from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py
index b37888685b714313c9606d78da2c476f0bb3a5d1..4af6349a0cfc922a893fbfc9b68ea5495df21d44 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
index 8dcc0bb10941d970909d919aad4112a16e744a59..e7855f92bdc1d38fd24edc1978996257bc1568e4 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceGroupProperty, \
PropertyMode, MatrixWorkspace, Progress, WorkspaceGroup
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
index 3c7fdd0f6c602c1e1ef6fe05a20fd01c4551d52b..202bb4d404a93b7bd80b8d45dae3d32cdcec0a22 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-instance-attributes,too-many-branches,no-init,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
-from six import next
import os
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py
index 699c1a4ba9bba8fb7803d9c964226335382f3894..0dfe3e5d445b18840aa8b32e94861c1ef9840057 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-instance-attributes,too-many-branches,no-init
-from __future__ import (absolute_import, division, print_function)
from IndirectImport import *
from mantid.api import (PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CalculateMonteCarloAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CalculateMonteCarloAbsorption.py
index aa6a54c5981588140a4bf90fcde78b557c3a4544..5ff2ba5032610737df92852cb1520d5fdc002058 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CalculateMonteCarloAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CalculateMonteCarloAbsorption.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, PropertyMode, WorkspaceGroupProperty,
Progress, mtd, SpectraAxis, WorkspaceGroup, WorkspaceProperty)
from mantid.kernel import (VisibleWhenProperty, PropertyCriterion, StringListValidator, IntBoundedValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ConvertMultipleRunsToSingleCrystalMD.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ConvertMultipleRunsToSingleCrystalMD.py
index f6a35cabbce59b4741134a1110aebf1a373e6268..5af04c107d5a9f1107ca120d8d873fc51732c9fa 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ConvertMultipleRunsToSingleCrystalMD.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ConvertMultipleRunsToSingleCrystalMD.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, mtd, AlgorithmFactory,
FileProperty, FileAction,
MultipleFileProperty, WorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py
index b63e2d672aaee904aa1abcef3ffaffd288bc9a29..31bca62a56d5e3a3b28782d3a3d858fd05cb5009 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceUnitValidator, \
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShielding.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShielding.py
index 8421e94002c350f5891dec86396058fc1defbda6..61c40765fbbc916b03af60ba07c0ec782d79d1ca 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShielding.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShielding.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, InstrumentValidator, MatrixWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py
index 0dedded20fe2f2fd8cf0577bdc99b05086563e31..8cf060771b82144791fa66266bcae5a1bf5f7535 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, FileAction, InstrumentValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py
index d32d5a396da370e1fbc727d722e074249a9e1845..d1be09c8be4391ac05084087a0c0412c69f64a5d 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadium.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadium.py
index 66544e3aace637a8be3caed990b6548b2605cbca..6519ee8079a89868f9ee8ded544bb3f9c2f900a8 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadium.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadium.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, InstrumentValidator, ITableWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLReduction.py
index a9407cb0633fbdb11a1b57e07046bd9e1d9e187c..c0366f02f481f4ef6f42c8829fc62e8477d4d7be 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, InstrumentValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShielding.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShielding.py
index 11b26505bff94b3a2a0605459b5e2ea574b398fd..bcf39c2890c30af479fc0f730330152bfb25a5b7 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShielding.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShielding.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, InstrumentValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILL_common.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILL_common.py
index 8e6d94ffc04610d52a50b3046d63a523fd981984..f59858b98a71091c36dae7e9e8beab0943dfb643 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILL_common.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILL_common.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
ABSOLUTE_UNITS_OFF = 'Absolute Units OFF'
ABSOLUTE_UNITS_ON = 'Absolute Units ON'
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSAzimuthalAverage1D.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSAzimuthalAverage1D.py
index 07b7f4c8035e5308d16bddf4243a91985c646431..01b62ee674204afbe30055d6f80e3df95626c843 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSAzimuthalAverage1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSAzimuthalAverage1D.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import math
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSDirectBeamTransmission.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSDirectBeamTransmission.py
index 191383701f8c11397ca33cc38a3ee05c804204d0..f2000bdb9605f0380bf8b66eaf1cab40b1c7acda 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSDirectBeamTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSDirectBeamTransmission.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#Pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSNormalise.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSNormalise.py
index ed1532d1e37a2697716bf0eb21036801bab99dfd..dbd33336ec02af08cd24bf08dbecc949dc8f9cfc 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSNormalise.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSNormalise.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py
index 34ad391e3663ddb847f7b84236946ed192aa70ef..f494bbd06b29f8ce0cd73b1b5c3e4e98de99611a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import AppendSpectra, CloneWorkspace, ElasticWindow, LoadLog, Logarithm, SortXAxis, Transpose
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FindPeaksAutomatic.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FindPeaksAutomatic.py
index 71815d40ff00dc0b2574dc1e7cb0d2b36bcec872..1017e09ec3cca82d27abf0f109842e0a52d883de 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FindPeaksAutomatic.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FindPeaksAutomatic.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantid.simpleapi import (ConvertToPointData, CreateWorkspace, DeleteWorkspace,
CreateEmptyTableWorkspace, FitGaussianPeaks)
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, WorkspaceProperty, Progress, ITableWorkspaceProperty)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaks.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaks.py
index c5f5f9c6fa8f263bc5908f9574dea5c0ee81349a..4465dd385c1f18655e0c497ebcb8077e4b1309c1 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaks.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantid.simpleapi import (CreateEmptyTableWorkspace, Fit)
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, WorkspaceProperty, ITableWorkspaceProperty)
from mantid.kernel import (Direction, FloatBoundedValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
index 5185712cfeed5775ab296aed39a10335305987ea..406d8a7c04f02da4de154b5cbf8ced2cfb29bc7d 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
@@ -6,10 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import math
-from six import iteritems
-from six import integer_types
import numpy as np
from mantid.simpleapi import *
@@ -545,10 +542,10 @@ class FlatPlatePaalmanPingsCorrection(PythonAlgorithm):
@param sample_logs Dictionary of logs to append to the workspace.
"""
- for key, value in iteritems(sample_logs):
+ for key, value in sample_logs.items():
if isinstance(value, bool):
log_type = 'String'
- elif isinstance(value, (integer_types, float)):
+ elif isinstance(value, (int, float)):
log_type = 'Number'
else:
log_type = 'String'
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/HFIRSANSReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/HFIRSANSReduction.py
index 01dcabe76d0be311856b405612cff62ac3c6a7ae..bf6218a4d2e941b142dd056242cf1241194186b2 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/HFIRSANSReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/HFIRSANSReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
import os
import mantid.simpleapi as api
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ILL_utilities.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ILL_utilities.py
index dc0c9390ee4bc5f179d93d78c8b99be7cdb8e4cb..b196bbec52de553d5ba63803e7a27994b16edd3a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ILL_utilities.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ILL_utilities.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid import mtd
from mantid.simpleapi import DeleteWorkspace
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py
index 9c7253650ce2ea640cc324445484a53d1b22281d..46c5137710295b58013c24f2ca695a437b73a71f 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
import os
from IndirectReductionCommon import load_files, load_file_ranges
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransfer.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransfer.py
index 360d2c196d454959b33d0e5cce6622db423a7669..594ee2f303a5482f1e36a0a23138817ad60f67bd 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransfer.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransfer.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-instance-attributes,too-many-branches,no-init,deprecated-module
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapper.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapper.py
index 3a17e0c6b1880e4096a7bdebc059f1b4df7a7113..386f3ca13689e66d1a0c14d4759093ec2b76abef 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapper.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapper.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-instance-attributes,too-many-branches,no-init,deprecated-module
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import (Direction, FloatArrayProperty, FloatBoundedValidator, IntArrayMandatoryValidator,
IntArrayProperty, Property, StringArrayProperty, StringListValidator)
from mantid.api import (AlgorithmFactory, AnalysisDataService, DataProcessorAlgorithm, FileAction, FileProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py
index e9897f0f21015438c8ec7c237b66b5604d0f4587..1128433da40c47f6b831b7f9369652e14d35085b 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, PropertyMode, Progress, WorkspaceGroupProperty
from mantid.kernel import (StringMandatoryValidator, Direction, logger, IntBoundedValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2.py
index 2c4c3e16b404cba9decf6933c603087e1307303d..f20f99ca995116971ffab6a464a302df61d7f647 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import SetBeam, SetSample, MonteCarloAbsorption, GroupWorkspaces
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
PropertyMode, Progress, WorkspaceGroupProperty, mtd)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCalibration.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCalibration.py
index dde63797fb7f80b6fb04e48144b11ee3a52e2857..5723cfb0b0a636682332d011f5867a162bc1f04f 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCalibration.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCalibration.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py
index ccb203631a53097551a26ce687d5bef36a30803e..6c2bd0d98b964fa8fe678149948916840f5ea56c 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceGroupProperty, PropertyMode, Progress
from mantid.kernel import (StringMandatoryValidator, Direction, logger, FloatBoundedValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2.py
index 48fda32f4803d5ce1ed10f0f061e9c40bfbd6f3b..7d7bbdfb82e7bb4a2f05ca683286eac38f631887 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import SetBeam, SetSample, MonteCarloAbsorption, GroupWorkspaces
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
WorkspaceGroupProperty, PropertyMode, Progress, mtd)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py
index 1a38968706b25f755b4e044f3ab7a3cf8e784278..19c2e796aadef4cb43377666ea066320634d98a5 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py
index ff96daf0257294493e558f574801729c3e770298..61cde324b02868af53607569e9f2d28ca843cafd 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-many-instance-attributes,too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, PropertyMode, Progress, WorkspaceGroupProperty
from mantid.kernel import StringMandatoryValidator, Direction, logger, FloatBoundedValidator, MaterialBuilder, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2.py
index 8db5610f7112ae439d9cb82ee7f6732d62ff0bd7..666e78248382a47ad579cd41c59094d14053a7b7 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import SetBeam, SetSample, MonteCarloAbsorption, GroupWorkspaces
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
PropertyMode, Progress, WorkspaceGroupProperty, mtd)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransfer.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransfer.py
index 3f601a6fa456ab98007cf6bf01e7fd7a488993c9..74807247b714867a19e6a7e2a8c6ad916b501b0a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransfer.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransfer.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py
index 14d44c754fe7d5a5f2607085bdabed558380ca8a..371f22023bb2c7c9baff559eb00754787d6193f7 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import time
from mantid import mtd
@@ -627,7 +625,7 @@ class IndirectILLReductionFWS(PythonAlgorithm):
self._set_x_label(wsname)
- for energy, ws_list in iteritems(self._all_runs[label]):
+ for energy, ws_list in self._all_runs[label].items():
for ws in ws_list:
DeleteWorkspace(ws)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py
index 8aa7953c9b5f166f409e063f314b7a8c985c5d4d..a856a1156d81fcc9459a337d249c280aa843db01 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import numpy
from mantid import mtd
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResult.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResult.py
index ace858f77ef36e13b7250e7b95ea287248797fbe..edb029673aa6189feebeb9454bd88f9e4e31fc96 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResult.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResult.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (AlgorithmFactory, AnalysisDataService, MatrixWorkspace, MatrixWorkspaceProperty,
PythonAlgorithm, PropertyMode, WorkspaceGroup)
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py
index 77c0a9b0e181096328df7a107b8e84b6ad9ed781..1f85f9d7b2a3bc049991cc1b2c983719c20f19af 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitor.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitor.py
index 9772aeeffa8dd2c91dcafe6f3670013789c98dc9..f79f718ac4ac089b04052e2c876a9e88081ee6ab 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitor.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitor.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IqtFitMultiple.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IqtFitMultiple.py
index b224bae32d1e9dc63355d5da3a0bcf2386e7bd9f..943cdb271e8a56813ed12912d96d4118729eb939 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IqtFitMultiple.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IqtFitMultiple.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid import logger, AlgorithmFactory
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py
index db0196c14bb833cf750411ceca834aa37cb372e6..ec051e4bd68dda761a5051a8fd41526667b61bb1 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MultipleFileProperty, FileAction, WorkspaceProperty
from mantid.kernel import Direction, UnitConversion, Elastic, Property, IntArrayProperty, StringListValidator
from mantid.simpleapi import (mtd, SetGoniometer, AddSampleLog, MaskBTP, RenameWorkspace, GroupWorkspaces,
CreateWorkspace, LoadNexusLogs, LoadInstrument)
-from six.moves import range
import numpy as np
import h5py
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherent.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherent.py
index c2af5e28821476a1f87202e79b98ec444a18e112..8e1e73ad498eb1693dceafa11d73c8ddd9afb98a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherent.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherent.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, mtd, AlgorithmFactory,
FileProperty, FileAction,
MultipleFileProperty, WorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
index 982335ab975e735777eb2076bd41ac818c017175..d9f1b4ee8ad0a64b0d951f3b2b16039dac27e9d1 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
-from six.moves import range # pylint: disable=redefined-builti
class MSDFit(DataProcessorAlgorithm):
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspaces.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspaces.py
index 85937583480bbee0e48cd637a3482228a8789a5e..6edbf73f9f0d2b66acf6cc020a2310574c004025 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspaces.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspaces.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import (AnalysisDataService, CloneWorkspace, ConjoinWorkspaces, CropWorkspaceRagged,
DeleteWorkspace, MatchSpectra, Rebin, SumSpectra)
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, WorkspaceProperty, WorkspaceGroup, ADSValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py
index 16a540fbf96cc3a6079cbab399ee68830f05add8..f02df5e68a16732e8a4a4f4676895aa4ee0083cf 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatData.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatData.py
index 86d9a2a703cf248675b225aca5f8af751585de2c..27f09164da4ae7537012f74534099add648c0a04 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatData.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatData.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
# Algorithm to start Bayes programs
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import StringListValidator, StringMandatoryValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatFunc.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatFunc.py
index 634b2b2ff30817874d664b26845f6cce2bda5c54..a28b8c35ea7d9d475a6ee9464ebad96b03f533b7 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatFunc.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatFunc.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
# Algorithm to start Bayes programs
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import StringListValidator, StringMandatoryValidator
from mantid.api import PythonAlgorithm, AlgorithmFactory
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/NormaliseByThickness.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/NormaliseByThickness.py
index d52c007137b7824261a98e91ec9daac4f87d0983..25b3ceb9763a69a891f79283f15a84f6749c3b57 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/NormaliseByThickness.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/NormaliseByThickness.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
index 7375fd46240ec1a29c221fc160e381889d32a6ad..fef2fcf7a79034a2a8c6443330553823edef86bc 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import itertools
from IndirectReductionCommon import load_files
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PoldiDataAnalysis.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PoldiDataAnalysis.py
index 638eeb4b6bd22fd2daf75d9778b28de459ed29c7..1a1f15dc9af55e2a590e7999d6f25ecda4c59e80 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PoldiDataAnalysis.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PoldiDataAnalysis.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,attribute-defined-outside-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScan.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScan.py
index a2cbad2b926d971973dce5ac2ae2ae65008e3c55..9617fda958a9f2ee7f5d7650e74c67b69ff2652e 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScan.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScan.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import CompositeValidator, Direction, FloatArrayLengthValidator, FloatArrayOrderedPairsValidator, \
FloatArrayProperty, StringListValidator, IntBoundedValidator
from mantid.api import DataProcessorAlgorithm, MultipleFileProperty, Progress, WorkspaceGroupProperty, FileProperty, FileAction
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py
index 8d0d28f0cef46239b0d3066505511c2b42a576d0..9ed9d96db60471f5bdf3d7015db06075a8b0f4aa 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
import numpy.ma as ma
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScan.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScan.py
index 87f40ed5fb70d02d9a96e7077516dcac2682919d..e95aefea1f785efc785bfb45da7b53615a321719 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScan.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScan.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid.kernel import StringListValidator, Direction, FloatArrayProperty, \
FloatArrayOrderedPairsValidator, VisibleWhenProperty, PropertyCriterion, FloatBoundedValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReactorSANSResolution.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReactorSANSResolution.py
index 6db1669788dab23335fe9337e6d59f3360884cb5..0b7c9647271198d364a800cd47ce375a47b25901 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReactorSANSResolution.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReactorSANSResolution.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import math
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcess.py
index cc3c087a191766a7333ec1114bd5ebd2081c9576..19dfa7de0ca870de6a5ca9d660bb303d1da339ef 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcess.py
@@ -5,11 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (
- absolute_import,
- division,
- print_function
-)
from mantid.api import (
AlgorithmFactory,
DataProcessorAlgorithm,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQ.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQ.py
index c39d017a00ee212f3807dd1f6f99aae17b6cb162..44355ca216a2fd60dfc8eb2f1363d7eea61a8192 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQ.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQ.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, MatrixWorkspaceProperty, WorkspaceUnitValidator)
from mantid.kernel import (Direction, FloatBoundedValidator, Property, StringListValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCor.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCor.py
index b2111a652f2e085e29567579d1da63e497746cac..af704621e6fae5d0c8f9819f53a62d87dfe99292 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCor.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCor.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, FileAction, FileProperty, mtd, WorkspaceGroupProperty)
from mantid.kernel import (CompositeValidator, Direction, StringArrayLengthValidator, StringArrayMandatoryValidator, StringArrayProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py
index 578d64a36b019e995044bae796daa9135690daa2..95c99e428120a7cc3f87f60d586e98871811280f 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory,
DataProcessorAlgorithm,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py
index 7f6d08dddd379db1df46f040de92819645f11745..642e3880be4299a5d82b1e773ee7e924558b4bcb 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, MatrixWorkspaceProperty, PropertyMode,
WorkspaceUnitValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_common.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_common.py
index 8bb711d0ece60e1e39eea07f30e3db9848f4870f..4edaed1f5acca985982720bab10fbd5566bb2ded 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_common.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_common.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import UnitConversion, DeltaEModeType
from mantid.simpleapi import *
import scipy.constants as constants
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py
index 332f171e74b7e5d9de4f2d28d0ee9e5354cfb64b..5ed00ee522eb770df65eba597c389eeb8ffc7367 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (AlgorithmFactory, AnalysisDataService, DataProcessorAlgorithm,
WorkspaceGroup)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ResNorm2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ResNorm2.py
index 3ae64957666e756cbac121886046e45da9580029..fa557dbd6625e412723729a6bd3b85eaae22a839 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ResNorm2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ResNorm2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
WorkspaceGroup, WorkspaceGroupProperty, ITableWorkspaceProperty,
Progress, PropertyMode)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py
index 74e2de3e859b0711b8d1ab2c0c60951d8af79e76..31586cc6b2fb44a46d78a43981e4a41d5e0df498 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py
@@ -8,8 +8,6 @@
""" Finds the beam centre for SANS"""
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid import AnalysisDataService
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py
index e4939224bf2866b0b6e43e19a608a115e056d843..1d19fa4223ea53b194f7b928bad749858b7a55a8 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py
@@ -8,8 +8,6 @@
""" Finds the beam centre."""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode, Progress,
IEventWorkspace)
from mantid.kernel import (Direction, StringListValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderMassMethod.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderMassMethod.py
index 6c75018d801990d604eff1a8c1b5699b1006de1f..899c08ad0403142d549d2690d95dd8e0cb039547 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderMassMethod.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderMassMethod.py
@@ -8,8 +8,6 @@
""" Finds the beam centre for SANS"""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode, Progress,
IEventWorkspace)
from mantid.kernel import (Direction, StringListValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSConvertToWavelengthAndRebin.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSConvertToWavelengthAndRebin.py
index 9e39f0c47c63e1ff82d0309dc6c93eecf30c201d..e72921f578207c2eceec4d41b4424050ea0707f7 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSConvertToWavelengthAndRebin.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSConvertToWavelengthAndRebin.py
@@ -8,8 +8,6 @@
""" SANSConvertToWavelengthAndRebin algorithm converts to wavelength units and performs a rebin."""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DistributedDataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
Progress)
from mantid.dataobjects import EventWorkspace
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSCreateAdjustmentWorkspaces.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSCreateAdjustmentWorkspaces.py
index f5b3d0d630c6de093d9b495cc6d77461ae01013d..ae938d523713a1f53fa9913f400fbb1869230472 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSCreateAdjustmentWorkspaces.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSCreateAdjustmentWorkspaces.py
@@ -10,8 +10,6 @@
, wavelength adjustment and pixel-and-wavelength adjustment workspaces.
"""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DistributedDataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
WorkspaceUnitValidator)
from mantid.kernel import (Direction, StringListValidator, CompositeValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py
index 63355d2d456af8c0b9c4adcfba3d3e0cc5d2abc0..cb46677d5f2737e13ea32b3f684491154ebd58c9 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py
@@ -8,8 +8,6 @@
""" SANSLoad algorithm which handles loading SANS files"""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (ParallelDataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
Progress, WorkspaceProperty)
from mantid.kernel import (Direction, FloatArrayProperty)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py
index 71fccf9bbba5e29c9718cd97d7647579239750e9..963a6a692b991ebbfe4ade61469b2d9a6a354ba7 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py
@@ -8,8 +8,6 @@
""" SANSReductionCore algorithm runs the sequence of reduction steps which are necessary to reduce a data set."""
-from __future__ import (absolute_import, division, print_function)
-
from SANSReductionCoreBase import SANSReductionCoreBase
from mantid.api import AlgorithmFactory, Progress
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreBase.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreBase.py
index fc4da011268d735052bb852b7a600e90c771ce9d..7d12afe5e1d4472aeea538006c3307061e5d0103 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreBase.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreBase.py
@@ -8,8 +8,6 @@
"""A base class to share functionality between SANSReductionCore algorithms."""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DistributedDataProcessorAlgorithm, MatrixWorkspaceProperty, PropertyMode, IEventWorkspace)
from mantid.kernel import (Direction, StringListValidator)
from sans.algorithm_detail.CreateSANSAdjustmentWorkspaces import CreateSANSAdjustmentWorkspaces
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py
index 2bcf3a126137bf2e706da23f0b9c7551a138385c..f2a29a7ffda4e9e626f96cecaf6591f81eea4902 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py
@@ -9,8 +9,6 @@
""" SANSReductionCoreEventSlice algorithm runs the sequence of reduction steps which are necessary to reduce a data set,
for which data must be event sliced. These steps are: slicing, adjustment, convert to q."""
-from __future__ import (absolute_import, division, print_function)
-
from SANSReductionCoreBase import SANSReductionCoreBase
from mantid.api import (MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py
index a885277ff7cd75424b7697474bd35fdd6ed39053..9b1a359a364f6615f7d27f3bc80afba9900ea553 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py
@@ -9,8 +9,6 @@
""" SANSReductionCorePreprocess algorithm runs the sequence of reduction steps which are necessary to reduce a data set,
which can be performed before event slicing."""
-from __future__ import (absolute_import, division, print_function)
-
from SANSReductionCoreBase import SANSReductionCoreBase
from mantid.api import MatrixWorkspaceProperty, AlgorithmFactory, Progress
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py
index 01b6b8383ad4440fdeea54ec67b2652ad3b69840..afc584d96c6081c5543f7babd13c0b2529981714 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py
@@ -8,8 +8,6 @@
""" SANSSave algorithm performs saving of SANS reduction data."""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
FileProperty, FileAction, Progress)
from mantid.kernel import (Direction)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction.py
index 67b78d9247f79c333c010533605f637dec0a8bb9..32115667a40cd473743831e6f2ecfa09bb31e938 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction.py
@@ -8,8 +8,6 @@
""" SANSSingleReduction algorithm performs a single reduction."""
-from __future__ import (absolute_import, division, print_function)
-
from SANSSingleReductionBase import SANSSingleReductionBase
from mantid.api import (MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction2.py
index 2a115e7037cb3962e181e7c0f7639700550caab6..c8c6c726ec10e7abe5e774e8a81faf802f419c71 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction2.py
@@ -8,8 +8,6 @@
""" SANSSingleReduction version 2 algorithm performs a single reduction on event sliced data."""
-from __future__ import (absolute_import, division, print_function)
-
from copy import deepcopy
from SANSSingleReductionBase import SANSSingleReductionBase
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReductionBase.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReductionBase.py
index ccabfaddb94010222cda9e74d2b44503204d87cc..090b74d875a3bea43c65720e9363d86d6a2da109 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReductionBase.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReductionBase.py
@@ -8,8 +8,6 @@
"""A base class to share functionality between SANSSingleReduction versions."""
-from __future__ import (absolute_import, division, print_function)
-
from collections import defaultdict
from mantid.api import (DistributedDataProcessorAlgorithm,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAbsoluteScale.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAbsoluteScale.py
index c743c02c47dc69dc6a7d3d72889b53ec43f5f785..6900bfa404ca72b4221d22712618bae170cbfc8b 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAbsoluteScale.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAbsoluteScale.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAzimuthalAverage1D.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAzimuthalAverage1D.py
index 855ce3a734ed287efce9218c5a60d94ff8c5c11a..3370b85556888e176b01bfe5ad3f52e64c23899b 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAzimuthalAverage1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAzimuthalAverage1D.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-locals,too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import math
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py
index 5f21b10360452e895bfc70035b80b6ce73225001..da697dea30245e8647fef3f2b4283570254d59c2 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py
index 74bcc04f28c0a030ad7e7e1de8ee0fdb30727316..3babd3e2768a59ed7f1a6142e24d4595e47852fa 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-locals,too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDirectBeamTransmission.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDirectBeamTransmission.py
index e5b2a5f9b121cf91bb3dbb21d34c372636809ae4..8e5f354a2cd8b5990bf4e43ec73885e8ce4ab373 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDirectBeamTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDirectBeamTransmission.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py
index 5379df9e28bfbb0bf7fe9f10c0593b67cbba2bc9..b582ea326add8e9a46b8f458137c592c5a9e97b3 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-arguments,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import ParallelDataProcessorAlgorithm, MatrixWorkspaceProperty, PropertyMode, AnalysisDataService
from mantid.kernel import Direction, Property, StringListValidator, UnitFactory
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLAutoProcess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLAutoProcess.py
index 5c8313556a7478deebe91a08f35d8ad7e3f5e626..94dcd52dbbede41875402079e48870c7f5bcfe58 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLAutoProcess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLAutoProcess.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegration.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegration.py
index fc8c647dd238f8f188241f62f6b448507e5602ba..d7743fc1f02cc7ca5e6078f063652d2c343e5cfe 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegration.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegration.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, MatrixWorkspaceProperty, WorkspaceUnitValidator, WorkspaceGroupProperty, \
PropertyMode, MatrixWorkspace, NumericAxis
from mantid.kernel import EnabledWhenProperty, FloatArrayProperty, Direction, StringListValidator, \
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLReduction.py
index 33d6147704d0d815a38cecc8659b951f76e6b066..a79426fe3935c645492132e4069f4009d7637bbd 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLReduction.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, MatrixWorkspaceProperty, MultipleFileProperty, PropertyMode, Progress, WorkspaceGroup
from mantid.kernel import Direction, EnabledWhenProperty, FloatBoundedValidator, LogicOperator, PropertyCriterion, StringListValidator
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSMask.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSMask.py
index c4518727a29ea98764a37c56474eb54bc51b4722..45a434f702535029904a960e42c03f16ef4d9ae4 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSMask.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSMask.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSPatchSensitivity.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSPatchSensitivity.py
index d33421d93dab907c93404325a56972470c5af29d..e743400ce2a9d11da33526f469e49c5501bf3bb8 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSPatchSensitivity.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSPatchSensitivity.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSReduction.py
index f220b7cc99b4c57c9108d31ac5906bdc26eaf696..654964f43e0bbfebf8da74aca861a1201cbd4950 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSStitch.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSStitch.py
index cbf1d41da560311f8265926d1aa2908e0b5ff7d0..336cb75fcc3682f3b2d4b7b08cb90bff2a34ea59 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSStitch.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSStitch.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-arguments,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import ParallelDataProcessorAlgorithm, MatrixWorkspaceProperty, PropertyMode
from mantid.kernel import Direction, Property, StringListValidator, UnitFactory, \
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
index 59274dec950043eddb302180328584efe6e81133..5991a861ea3fc9785c0d670396eb24ab78a68fb8 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
-
import mantid
from mantid.kernel import Direction, IntArrayProperty, StringArrayProperty, StringListValidator
import sys
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py
index 6308e7f50b0bf2546ccba9e473bc1047a71532d7..e69393c63de008f11bcfd7553a3e1d49cb8fbd12 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range #pylint: disable=redefined-builtin
import mantid.simpleapi as api
from mantid.api import AnalysisDataService
from mantid.api import MatrixWorkspaceProperty, PropertyMode, PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorption.py
index 2d7ad054ffbffc283798a18b6554bec43b60bd09..9b09faea7279255d9816a9ec6b1c56336b831088 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorption.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, Progress)
from mantid.kernel import (VisibleWhenProperty, EnabledWhenProperty, Property, PropertyCriterion,
StringListValidator, IntBoundedValidator, FloatBoundedValidator, Direction)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py
index 2f39927da802f56905163f84e2b321543d44d6d6..1edc446ec7d568b051535201c4f61031e83c010c 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-locals,too-many-lines, redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
-
import numpy as np
import re
import os.path
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SingleCrystalDiffuseReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SingleCrystalDiffuseReduction.py
index 309bbb32905c81d24f9efb9f8ac949209079bcfa..32a26f794528c981ce26a8bd24bf1a6c0fbf0a45 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SingleCrystalDiffuseReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SingleCrystalDiffuseReduction.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, mtd, AlgorithmFactory,
FileProperty, FileAction,
MultipleFileProperty, WorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SwapWidths.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SwapWidths.py
index 0a6994d6c286d7e5a3e94994f2edc4e634dfc29f..a20647f2383e028561b9c834ee83da8374d5a497 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SwapWidths.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SwapWidths.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import (WorkspaceProperty,DataProcessorAlgorithm, AlgorithmFactory,
mtd, Progress)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrection.py
index 2cc4e2d362fc578ee63089dbdcb3656a05401b2a..56176e796e886d4ce69bca09f8079973416e09b6 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrection.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TimeSlice.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TimeSlice.py
index 77fa091a73b1187d44dfbe57a9cf7a1b11136b70..75cc3740606b48483146e51e9f6e36e968402a1d 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TimeSlice.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TimeSlice.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScattering.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScattering.py
index c56274516f63d9dfe40b79edb95f3b900e759309..3f898ea64625991cde2e48e15bf3aa01e5634349 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScattering.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScattering.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import (CalculatePlaczekSelfScattering, ConvertToDistribution, ConvertUnits, CreateWorkspace,
DeleteWorkspace, DiffractionFocussing, Divide, ExtractSpectra, FitIncidentSpectrum,
LoadCalFile, SetSample)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py
index 9b2dfbc6379deae009051248d1ec7d49ffc6393e..94ad6afa49d56da8d6b4a9e8dc4eb70de3880f96 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import (PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
ITableWorkspaceProperty, PropertyMode, Progress)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
index 1da362a7952a988c9858a628ead9af6a3fa5c59b..483ad5a0619ecdf877ddef028ae11943b1f0082a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
@@ -5,12 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import os
import sys
-from six import iteritems
def simple_algorithm(algorithm_str, parameters):
@@ -24,7 +22,7 @@ def _execute(algorithm_str, parameters, is_name=True):
alg = Algorithm.fromString(algorithm_str)
alg.initialize()
alg.setChild(True)
- for key, value in iteritems(parameters):
+ for key, value in parameters.items():
if value is None:
Logger("TransmissionUtils").error("Trying to set %s=None" % key)
if alg.existsProperty(key):
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
index bd1d0b0661087099416a3e37d4283def9a0ccaff..3d51e45d14fdae343c96c6da70e13aa85e3bcd65 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
@@ -14,7 +13,6 @@ import numpy
import sys
import os
import json
-from six import iteritems
class USANSReduction(PythonAlgorithm):
@@ -320,7 +318,7 @@ def _execute(algorithm_name, **parameters):
alg = AlgorithmManager.create(algorithm_name)
alg.initialize()
alg.setChild(True)
- for key, value in iteritems(parameters):
+ for key, value in parameters.items():
if value is None:
Logger("USANSReduction").error("Trying to set %s=None" % key)
if alg.existsProperty(key):
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReduction.py
index 88051eb83797393ee85559f889232f578d9fc409..2ce441e98286c909718e3143bbe84ec03a7194e9 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReduction.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/WANDPowderReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/WANDPowderReduction.py
index 9e23a4bec0986a3494c9b4694e8d96426e4ed959..b15030885571a78124ce711ec4332c76ba5d6938 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/WANDPowderReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/WANDPowderReduction.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory,
MatrixWorkspaceProperty, PropertyMode,
IEventWorkspace)
diff --git a/Framework/PythonInterface/plugins/algorithms/dnsdata.py b/Framework/PythonInterface/plugins/algorithms/dnsdata.py
index 78b63467e9a6f32538eb6fff13a36026f8af1b11..6e79a62c3fb6814f568df10387bc6bd94a4613bb 100644
--- a/Framework/PythonInterface/plugins/algorithms/dnsdata.py
+++ b/Framework/PythonInterface/plugins/algorithms/dnsdata.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-instance-attributes,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import re
from dateutil.parser import parse
diff --git a/Framework/PythonInterface/plugins/algorithms/roundinghelper.py b/Framework/PythonInterface/plugins/algorithms/roundinghelper.py
index c993044234a93b781c1104621d8fdf2ba639a8c1..73c421e677963f3e44d7c515b7beb5e0bea5aa4a 100644
--- a/Framework/PythonInterface/plugins/algorithms/roundinghelper.py
+++ b/Framework/PythonInterface/plugins/algorithms/roundinghelper.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Direction, StringListValidator
import numpy
diff --git a/Framework/PythonInterface/plugins/functions/BivariateGaussian.py b/Framework/PythonInterface/plugins/functions/BivariateGaussian.py
index 1184c1e5a54370423c6246b862034fe2451bf283..bc23e7dd44b3e63c59eebe5f68815bf13efd63e6 100644
--- a/Framework/PythonInterface/plugins/functions/BivariateGaussian.py
+++ b/Framework/PythonInterface/plugins/functions/BivariateGaussian.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/ChudleyElliot.py b/Framework/PythonInterface/plugins/functions/ChudleyElliot.py
index bba99c455898516613bfe2364431a05d610a19f9..b75d8a8c6d3732e2fb6fe9356a0e119f3d387c4e 100644
--- a/Framework/PythonInterface/plugins/functions/ChudleyElliot.py
+++ b/Framework/PythonInterface/plugins/functions/ChudleyElliot.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/functions/DSFinterp1DFit.py b/Framework/PythonInterface/plugins/functions/DSFinterp1DFit.py
index 7a2fee15b140a246565cf4a7cbfbb64864230c8e..b4fb6f52a4d3ba2f00331f0657061ce02ef91d05 100644
--- a/Framework/PythonInterface/plugins/functions/DSFinterp1DFit.py
+++ b/Framework/PythonInterface/plugins/functions/DSFinterp1DFit.py
@@ -9,7 +9,6 @@
@author Jose Borreguero, NScD
@date October 06, 2013
'''
-from __future__ import (absolute_import, division, print_function)
import numpy
import scipy.interpolate
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/EISFDiffCylinder.py b/Framework/PythonInterface/plugins/functions/EISFDiffCylinder.py
index 65293a4c5f0c03a593ea554e86376540628174de..c058cd15140db88e8aa3fa135604190d723475cb 100644
--- a/Framework/PythonInterface/plugins/functions/EISFDiffCylinder.py
+++ b/Framework/PythonInterface/plugins/functions/EISFDiffCylinder.py
@@ -9,8 +9,6 @@
@author Jose Borreguero, ORNL
@date December 07, 2017
"""
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/EISFDiffSphere.py b/Framework/PythonInterface/plugins/functions/EISFDiffSphere.py
index a8ad8207e851569153e7a0650ee07a452416d769..bfe5bed44fbe6a7e7c980a8657f12d4947cc658a 100644
--- a/Framework/PythonInterface/plugins/functions/EISFDiffSphere.py
+++ b/Framework/PythonInterface/plugins/functions/EISFDiffSphere.py
@@ -9,8 +9,6 @@
@author Jose Borreguero, ORNL
@date December 05, 2017
"""
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
try:
from scipy.special import spherical_jn
diff --git a/Framework/PythonInterface/plugins/functions/EISFDiffSphereAlkyl.py b/Framework/PythonInterface/plugins/functions/EISFDiffSphereAlkyl.py
index 5d9c7afe4d9ca3d2b8541677f6f1cd5df80421ed..2ea46cb95368cfaaf093e63d2d52598259eff91a 100644
--- a/Framework/PythonInterface/plugins/functions/EISFDiffSphereAlkyl.py
+++ b/Framework/PythonInterface/plugins/functions/EISFDiffSphereAlkyl.py
@@ -9,8 +9,6 @@
@author Jose Borreguero, ORNL
@date December 06, 2017
"""
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
try:
from scipy.special import spherical_jn
diff --git a/Framework/PythonInterface/plugins/functions/Examples/Example1DFunction.py b/Framework/PythonInterface/plugins/functions/Examples/Example1DFunction.py
index 40f9024e0d6edc077907baa5a18028d77451dad5..f0c0f120944af2f21d650e3cbe9dd13bc8666377 100644
--- a/Framework/PythonInterface/plugins/functions/Examples/Example1DFunction.py
+++ b/Framework/PythonInterface/plugins/functions/Examples/Example1DFunction.py
@@ -15,7 +15,6 @@ to have meaningful concepts such as this then see ExamplePeakFunction.
1D functions do not have to have a derivative defined, if they do not then they will use a numerical
derivative
"""
-from __future__ import (absolute_import, division, print_function)
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/Examples/ExamplePeakFunction.py b/Framework/PythonInterface/plugins/functions/Examples/ExamplePeakFunction.py
index 430587e7e37ce4e203b4199fb08eb72e9b31d5a9..a44eead5d7cdc9aaba912322af603e7d38ae3f74 100644
--- a/Framework/PythonInterface/plugins/functions/Examples/ExamplePeakFunction.py
+++ b/Framework/PythonInterface/plugins/functions/Examples/ExamplePeakFunction.py
@@ -14,7 +14,6 @@ It uses the so-called IPeakFunction that should be used when there is a sensible
calculate the centre, height & fwhm of the function. If it does not make sense, for example a in linear background,
where does not give a peak shape, then see the more general Example1DFunction that does not require these concepts.
"""
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IPeakFunction, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/FickDiffusion.py b/Framework/PythonInterface/plugins/functions/FickDiffusion.py
index bc599951d58342c6d1cc9255a4f77e7025f614c2..11591fbdafd486f2adb27be9536762cc42dc95e9 100644
--- a/Framework/PythonInterface/plugins/functions/FickDiffusion.py
+++ b/Framework/PythonInterface/plugins/functions/FickDiffusion.py
@@ -10,7 +10,6 @@
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/Guinier.py b/Framework/PythonInterface/plugins/functions/Guinier.py
index 46f8ae86e17ddb89224ae0f61bd989cbb8e223ce..6f0e49bc6fe866fc1072d48ec148510613abaf7f 100644
--- a/Framework/PythonInterface/plugins/functions/Guinier.py
+++ b/Framework/PythonInterface/plugins/functions/Guinier.py
@@ -9,7 +9,6 @@
@author Mathieu Doucet, ORNL
@date Oct 10, 2014
'''
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/GuinierPorod.py b/Framework/PythonInterface/plugins/functions/GuinierPorod.py
index 4146d630c7e575c7afdc5e34b46a73fb9095179b..25e7a5da67d98f21fc1b726bad0c2cfd6e5fdb2f 100644
--- a/Framework/PythonInterface/plugins/functions/GuinierPorod.py
+++ b/Framework/PythonInterface/plugins/functions/GuinierPorod.py
@@ -9,7 +9,6 @@
@author Mathieu Doucet, ORNL
@date Oct 13, 2014
'''
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/HallRoss.py b/Framework/PythonInterface/plugins/functions/HallRoss.py
index df80753cdeac871a8f4bfb38bac654e2b67aac02..32ff6f09f62418901fcc35678fcde3d95542e505 100644
--- a/Framework/PythonInterface/plugins/functions/HallRoss.py
+++ b/Framework/PythonInterface/plugins/functions/HallRoss.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/functions/ICConvoluted.py b/Framework/PythonInterface/plugins/functions/ICConvoluted.py
index 97fc3e7263f7962fcaada0dc33d263d807bafc0f..b44e9952f56286c24647147f6a19bc535c7ae8fa 100644
--- a/Framework/PythonInterface/plugins/functions/ICConvoluted.py
+++ b/Framework/PythonInterface/plugins/functions/ICConvoluted.py
@@ -11,7 +11,6 @@
# a square wave and a Gaussian.
#
#
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/Lorentz.py b/Framework/PythonInterface/plugins/functions/Lorentz.py
index 7ec0240cdedecd58f3fce17a5ef08cf9759b24a8..9c0b62f7706b52c6577ccb9ca51e773b36ecdf5a 100644
--- a/Framework/PythonInterface/plugins/functions/Lorentz.py
+++ b/Framework/PythonInterface/plugins/functions/Lorentz.py
@@ -9,7 +9,6 @@
@author Mathieu Doucet, ORNL
@date Oct 13, 2014
'''
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/MsdGauss.py b/Framework/PythonInterface/plugins/functions/MsdGauss.py
index 41c38ec0d560db0002fe903a4cd1556a1ea02d81..e442427688d9b364a8e41367b1c708b1957abe8c 100644
--- a/Framework/PythonInterface/plugins/functions/MsdGauss.py
+++ b/Framework/PythonInterface/plugins/functions/MsdGauss.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/functions/MsdPeters.py b/Framework/PythonInterface/plugins/functions/MsdPeters.py
index 62ab90e01b11d307487a5cb9883b65c73b4ea1ed..272de8b49740c1c9f22df51e84a80284706d22eb 100644
--- a/Framework/PythonInterface/plugins/functions/MsdPeters.py
+++ b/Framework/PythonInterface/plugins/functions/MsdPeters.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/functions/MsdYi.py b/Framework/PythonInterface/plugins/functions/MsdYi.py
index 137eaea4417026cbe4ec5ed9796a6596e6bc722d..e773b625605eec91cb80a905faebb6f7a50d0135 100644
--- a/Framework/PythonInterface/plugins/functions/MsdYi.py
+++ b/Framework/PythonInterface/plugins/functions/MsdYi.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/Porod.py b/Framework/PythonInterface/plugins/functions/Porod.py
index e29a5c975791f7d67fd871dbf4de821c1b4ab388..762aff10511f921501c537ca9d68bc266cef3104 100644
--- a/Framework/PythonInterface/plugins/functions/Porod.py
+++ b/Framework/PythonInterface/plugins/functions/Porod.py
@@ -9,7 +9,6 @@
@author Mathieu Doucet, ORNL
@date Oct 13, 2014
'''
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/PrimStretchedExpFT.py b/Framework/PythonInterface/plugins/functions/PrimStretchedExpFT.py
index 6b173fda85b551d42072ca678f8e2ce360dcb443..d27c30e2bc5190889af2f63e45ad571e8eaa0f1a 100644
--- a/Framework/PythonInterface/plugins/functions/PrimStretchedExpFT.py
+++ b/Framework/PythonInterface/plugins/functions/PrimStretchedExpFT.py
@@ -11,7 +11,6 @@
@date June 01, 2017
"""
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/StretchedExpFT.py b/Framework/PythonInterface/plugins/functions/StretchedExpFT.py
index 3def86307f0d831cbe0e732330a9b01fd95fcc3e..4c2675f9d08cee0c6780d5fef6c092629fb10396 100644
--- a/Framework/PythonInterface/plugins/functions/StretchedExpFT.py
+++ b/Framework/PythonInterface/plugins/functions/StretchedExpFT.py
@@ -11,7 +11,6 @@
@date October 06, 2013
"""
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/StretchedExpFTHelper.py b/Framework/PythonInterface/plugins/functions/StretchedExpFTHelper.py
index 9d9280e2a2f395367ad7bfc6a54447b3c39eb87c..b2d18abb952429df3cc018ff8136d6e3ff7f43e0 100644
--- a/Framework/PythonInterface/plugins/functions/StretchedExpFTHelper.py
+++ b/Framework/PythonInterface/plugins/functions/StretchedExpFTHelper.py
@@ -13,7 +13,6 @@
This module provides functionality common to classes StretchedExpFT and PrimStretchedExpFT
"""
-from __future__ import (absolute_import, division, print_function)
import copy
from scipy.fftpack import fft, fftfreq
from scipy.special import gamma
diff --git a/Framework/PythonInterface/plugins/functions/TeixeiraWater.py b/Framework/PythonInterface/plugins/functions/TeixeiraWater.py
index f047c648243d1a700f74a07d12474846f877c0c8..72f8d7fc042711aa79be085dfa0a29a1490ab7c9 100644
--- a/Framework/PythonInterface/plugins/functions/TeixeiraWater.py
+++ b/Framework/PythonInterface/plugins/functions/TeixeiraWater.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py b/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py
index 8616c4eb5fd89fac58fce104e6ad673dda5eda68..5946b9240dfde16910e0ca92fcb06c0a46d79d4f 100644
--- a/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py
@@ -7,8 +7,6 @@
"""
Test of fitfunctions.py and related classes
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
import platform
diff --git a/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py b/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py
index 79b98ee28707d9b555f60dffe82d87d9b3c73ea2..edc6ef04ab75746d644ac59e5d289135a2334be5 100644
--- a/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py
+++ b/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmFactory
+
class ImportModuleTest(unittest.TestCase):
def test_import_succeeds(self):
diff --git a/Framework/PythonInterface/test/python/mantid/PVPythonTest.py b/Framework/PythonInterface/test/python/mantid/PVPythonTest.py
index 2549fdcb8826e3b5f4740eab8f4d85e8b3e2ff87..7b8e006086c78d8b116e5b7dbcae343341160065 100644
--- a/Framework/PythonInterface/test/python/mantid/PVPythonTest.py
+++ b/Framework/PythonInterface/test/python/mantid/PVPythonTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from paraview.simple import *
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
index e759c2a3f66710d56bbba454fb794373cdff03b3..229b6646acd8006971f0ff2399fa0a4694faeba0 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
@@ -7,8 +7,6 @@
"""
Specifically tests the Fit function in the simple API
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
import platform
@@ -20,6 +18,7 @@ from mantid.api import mtd, MatrixWorkspace, ITableWorkspace, IFunction
import numpy as np
from testhelpers import run_algorithm
+
class SimpleAPIFitTest(unittest.TestCase):
_raw_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py
index 5c23b5ce43fa6ec149df619848363a1749931a23..9a6b71ad7162a468ec11e74281cebc84f35f9cb5 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py
@@ -7,12 +7,11 @@
"""
Specifically tests the Load function in the simple API
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import Load, LoadDialog
from mantid.api import mtd, MatrixWorkspace, WorkspaceGroup
+
class SimpleAPILoadTest(unittest.TestCase):
def tearDown(self):
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py
index 992ff4e7fa35e6b612427ba40b7d9ce99eba0adb..56796257609db29707d46b36da8d7120a214e46c 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py
@@ -7,14 +7,13 @@
"""
Specifically tests the RenameWorkspace algorithm in the simple API
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
import platform
from mantid.api import mtd
from mantid.simpleapi import CreateSampleWorkspace,RenameWorkspace
+
class SimpleAPIRenameWorkspaceTest(unittest.TestCase):
_raw_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
index e35c8fa0360cbad29f730e3bdaef9c8093a3113e..06328a0c5a03cc8e1f68fe62ecdcff306737acc7 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import inspect
import unittest
@@ -13,7 +11,6 @@ from mantid.api import (AlgorithmFactory, AlgorithmProxy, IAlgorithm, IEventWork
PythonAlgorithm, MatrixWorkspace, mtd)
import mantid.simpleapi as simpleapi
import numpy
-import six
class SimpleAPITest(unittest.TestCase):
@@ -193,10 +190,10 @@ class SimpleAPITest(unittest.TestCase):
self.assertEqual(method_parameters[1:],
list(simpleapi.rebin.__signature__.parameters))
else:
- freefunction_sig = six.get_function_code(simpleapi.rebin).co_varnames
+ freefunction_sig = inspect.getsource(simpleapi.rebin).co_varnames
expected_method_sig = ['self']
expected_method_sig.extend(freefunction_sig)
- self.assertEqual(six.get_function_code(MatrixWorkspace.rebin).co_varnames, tuple(expected_method_sig))
+ self.assertEqual(inspect.getsource(MatrixWorkspace.rebin).co_varnames, tuple(expected_method_sig))
def test_function_attached_as_workpace_method_does_the_same_as_the_free_function(self):
# Use Rebin as a test
diff --git a/Framework/PythonInterface/test/python/mantid/_plugins/ProductFunctionTest.py b/Framework/PythonInterface/test/python/mantid/_plugins/ProductFunctionTest.py
index 7cf1b0b6cd016bd934512b2dfd87f81ffdc9c06f..04e5f7f1d9f6e8afa34ab93b630925d638f904ea 100644
--- a/Framework/PythonInterface/test/python/mantid/_plugins/ProductFunctionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/_plugins/ProductFunctionTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
# from mantid.kernel import DateAndTime
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryObserverTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryObserverTest.py
index 67b6c5e9f34a0a82178e0726d23fda73e48f14be..62979372eefdaafe1596039b2bcc4bb7bbf9ebdf 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryObserverTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryObserverTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
import sys
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryTest.py
index 0af3a2b856edd463156985ecc009399a4a666c1d..5612e88b0390e58fc4ad3b037f0e7425de35d7da 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
index 30c8f8e6960e49932a0eb127c56ac59d2895e9d8..75119671ac1cb9206a659980801cd24934a38b78 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
@@ -4,14 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateWorkspace, set_properties
from mantid.api import (MatrixWorkspaceProperty, AlgorithmFactory, AlgorithmManager,
DataProcessorAlgorithm, PythonAlgorithm)
from mantid.kernel import Direction
-from six import iteritems
+
class ChildAlg(PythonAlgorithm):
@@ -91,7 +89,7 @@ class AlgorithmHistoryTest(unittest.TestCase):
alg.initialize()
alg.setChild(child_algorithm)
alg.enableHistoryRecordingForChild(record_history)
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
alg.execute()
return alg
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmManagerTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmManagerTest.py
index 9fa5ca60cbcb86f2e1f49fae6ec40ec803af1ba6..666e691de96e155be73ddb3ebdf55e391717db6b 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmManagerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.api import (AlgorithmManager, Algorithm, AlgorithmProxy,
@@ -44,10 +42,11 @@ class AlgorithmManagerTest(unittest.TestCase):
self.assertTrue(isinstance(alg, Algorithm))
def test_size_reports_number_of_managed_algorithms(self):
- old_size = AlgorithmManager.size()
- new_alg = AlgorithmManager.create("ConvertUnits")
- new_size = AlgorithmManager.size()
- self.assertEqual(new_size, old_size + 1)
+ # no longer deterministically possible to have a correct answer for size
+ # if test are run multi threaded
+ # just check we got an integer back
+ size = AlgorithmManager.size()
+ self.assertTrue(isinstance(size, int))
def test_getAlgorithm_returns_correct_instance(self):
returned_instance = AlgorithmManager.create("ConvertUnits")
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmPropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmPropertyTest.py
index 9452ae0ccbd9a0c827a3124380020ead5eb2f9fb..016b7886a91c77ff498ee426cf251894ee6ace20 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmProperty, FrameworkManagerImpl, IAlgorithm
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
index f0b0ef308011d938c23423698259edcc61fb02c8..8d1a2fe044a06a64680299ae492a451db87928b0 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-import six
import unittest
import json
from mantid.api import AlgorithmID, AlgorithmManager, FrameworkManagerImpl
from testhelpers import run_algorithm
+
class AlgorithmTest(unittest.TestCase):
_load = None
@@ -67,12 +66,7 @@ class AlgorithmTest(unittest.TestCase):
data = [1.5,2.5,3.5]
kwargs = {'child':True}
unitx = 'Wavelength'
- if six.PY2:
- # force a property value to be unicode to assert conversion happens correctly
- # this is only an issue in python2
- kwargs[unicode('UnitX')] = unicode(unitx)
- else:
- kwargs['UnitX'] = unitx
+ kwargs['UnitX'] = unitx
alg = run_algorithm('CreateWorkspace',DataX=data,DataY=data,NSpec=1,**kwargs)
diff --git a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py
index 90c0e5f4a8f069440fbe5674c471207fb2390bdd..30a151f1892bcafc8b0782b7710f60390861d6ce 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py
@@ -6,13 +6,11 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantid.api import AnalysisDataService as ADS, AnalysisDataServiceObserver
from mantid.simpleapi import CreateSampleWorkspace, RenameWorkspace, GroupWorkspaces, UnGroupWorkspace, DeleteWorkspace
-from mantid.py3compat import mock
+from unittest import mock
class FakeADSObserver(AnalysisDataServiceObserver):
diff --git a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
index 3ecb6b16a715705d6ffd983983c19edc20ed9249..0cc5122f2a09a27c44900f7533025d4fb1ed50a0 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-import six
import unittest
from testhelpers import run_algorithm
from mantid.api import (AnalysisDataService, AnalysisDataServiceImpl,
@@ -179,7 +176,7 @@ class AnalysisDataServiceTest(unittest.TestCase):
group = mtd['NewGroup']
self.assertEqual(group.size(), 3)
- six.assertCountEqual(self, group.getNames(), ["ws1", "ws2", "ws3"])
+ self.assertCountEqual(group.getNames(), ["ws1", "ws2", "ws3"])
def test_removeFromGroup_removes_workspace_from_group(self):
from mantid.simpleapi import CreateSampleWorkspace, GroupWorkspaces
@@ -193,7 +190,7 @@ class AnalysisDataServiceTest(unittest.TestCase):
group = mtd['NewGroup']
self.assertEqual(group.size(), 2)
- six.assertCountEqual(self, group.getNames(), ["ws1", "ws2"])
+ self.assertCountEqual(group.getNames(), ["ws1", "ws2"])
if __name__ == '__main__':
diff --git a/Framework/PythonInterface/test/python/mantid/api/AxisTest.py b/Framework/PythonInterface/test/python/mantid/api/AxisTest.py
index 1a69080a3ddcc371acc303c0ae1b3c3371295700..e1da231febfb313bb2202e79de570c106346d255 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AxisTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AxisTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import NumericAxis, SpectraAxis, TextAxis, mtd
import numpy as np
+
class AxisTest(unittest.TestCase):
_test_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/CatalogManagerTest.py b/Framework/PythonInterface/test/python/mantid/api/CatalogManagerTest.py
index a0496c6c1b26fe48fb633e686f78e807dfc0bcd1..aba7fe1721628b937ab5b954b8632d6af50f0af2 100644
--- a/Framework/PythonInterface/test/python/mantid/api/CatalogManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/CatalogManagerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/api/CompositeFunctionTest.py b/Framework/PythonInterface/test/python/mantid/api/CompositeFunctionTest.py
index 16b78067c6b7d8ad00bddbead4bd6ec2adbf6e16..87a4a93eba16e4f6378aaf63a738cc94c0ecc993 100644
--- a/Framework/PythonInterface/test/python/mantid/api/CompositeFunctionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/CompositeFunctionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import FrameworkManagerImpl, FunctionFactory, CompositeFunction, IFunction1D
diff --git a/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py b/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py
index 31bee3311c5ca7f52bc0758bd95554fe7699522b..e71bc88579fd81c4b376eb95f9740ed82437c416 100644
--- a/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import assertRaisesNothing
from mantid.api import (Algorithm, DataProcessorAlgorithm, AlgorithmFactory,
AlgorithmManager, WorkspaceProperty)
from mantid.kernel import Direction
+
class TestDataProcessor(DataProcessorAlgorithm):
def PyInit(self):
pass
@@ -19,6 +18,7 @@ class TestDataProcessor(DataProcessorAlgorithm):
pass
# end v1 alg
+
class DataProcessorAlgorithmTest(unittest.TestCase):
def test_DataProcessorAlgorithm_instance_inherits_Algorithm(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/DeprecatedAlgorithmCheckerTest.py b/Framework/PythonInterface/test/python/mantid/api/DeprecatedAlgorithmCheckerTest.py
index 3b835a41fd3abb857d44b34c7ec66f81232847d2..ca0919e86c8c156572d4fcec61280d41392cc001 100644
--- a/Framework/PythonInterface/test/python/mantid/api/DeprecatedAlgorithmCheckerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/DeprecatedAlgorithmCheckerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import DeprecatedAlgorithmChecker, FrameworkManagerImpl
diff --git a/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py b/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py
index c97d362966ff2af67dbafce1b4c83753e3a3d55b..f6156e22315892190d49831d684ed2a4d2c19605 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
###############################################################################
# This has to be tested through a workspace as it cannot be created in
@@ -16,6 +14,7 @@ from mantid.geometry import Instrument
from mantid.api import Sample, Run
from math import pi
+
class ExperimentInfoTest(unittest.TestCase):
_expt_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/FileFinderTest.py b/Framework/PythonInterface/test/python/mantid/api/FileFinderTest.py
index cab2bb7ae26410d3961e3c9c5fb19546b143183f..0eadff0be57820031889a6ba4cf2e00ecf38b5e3 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FileFinderTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FileFinderTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/api/FilePropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/FilePropertyTest.py
index cc7459dbac368bc023f502f334ff26c1cd928c47..b0fcf620873698112c8cf4aa9013a6003263b4c6 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FilePropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FilePropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, FileProperty, FileAction, FrameworkManagerImpl
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py b/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py
index add99b12ca7bcb783318dd20ca27d2605e1bb18c..31072941983f5083975ec03d5394103eee60f641 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.api import FrameworkManager, FrameworkManagerImpl, IAlgorithm, AlgorithmProxy
+
class FrameworkManagerTest(unittest.TestCase):
def test_clear_functions_do_not_throw(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/FunctionFactoryTest.py b/Framework/PythonInterface/test/python/mantid/api/FunctionFactoryTest.py
index 12e0f1a50fdbc28520e5dccca302b3bbbacb69cb..d6c7a5da7e7c32c39a632f5143de6e393cc3dd35 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FunctionFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FunctionFactoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import FrameworkManagerImpl, IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/test/python/mantid/api/FunctionPropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/FunctionPropertyTest.py
index 9d9b20383e9ba0b649715e9bb38904ed9cdfb877..044c9d7e5dc1022a8019673d1c519faff67c32fc 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FunctionPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FunctionPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import FrameworkManagerImpl, FunctionProperty, PythonAlgorithm, IFunction
from testhelpers import assertRaisesNothing
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py
index fe8f99db7b03104e375783bf26bd8841e30a6e52..37a340132f1250bc8aad3128d48e08853a42d326 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm, can_be_instantiated, WorkspaceCreationHelper
@@ -13,6 +11,7 @@ from testhelpers import run_algorithm, can_be_instantiated, WorkspaceCreationHel
from mantid.api import (IEventWorkspace, IEventList, IWorkspaceProperty,
AlgorithmManager)
+
class IEventWorkspaceTest(unittest.TestCase):
_test_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/IFunction1DTest.py b/Framework/PythonInterface/test/python/mantid/api/IFunction1DTest.py
index 7519e19df1482c25208435f6b6783495c63d4e7c..66424bd6e0fa5c024e39f9f9c2dcc124420ce436 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IFunction1DTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IFunction1DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import IFunction1D, IFunction, FunctionFactory
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py
index 21d07404733f433ea53995e64bde9e0fa3149b69..6b5b35fda0625ba5aeb0ebfbde4ba62a1c9bec9e 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AnalysisDataService, IMaskWorkspace
from testhelpers import run_algorithm, WorkspaceCreationHelper
+
class IMaskWorkspaceTest(unittest.TestCase):
def test_MaskWorkspace_Is_Retrievable(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py b/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py
index 5e35f5b4cc9bf5c1cccaefd0736116e3f1d97614..f19141d09cce7b55dadaa23c25fb1fcc15b67420 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import *
import numpy as np
+
class MyPeak(IPeakFunction):
def init(self):
@@ -20,6 +19,7 @@ class MyPeak(IPeakFunction):
def functionLocal(self, xvals):
return 5*xvals
+
class RectangularFunction(IPeakFunction):
def init(self):
self.declareParameter("Height")
@@ -55,6 +55,7 @@ class RectangularFunction(IPeakFunction):
return values
+
class IPeakFunctionTest(unittest.TestCase):
def test_instance_can_be_created_standalone(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py
index b70d165782384ce1daacfe1484b28dce6313edff..fe696ac183217719d05277319eff3ef733ef77cc 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm, WorkspaceCreationHelper
from mantid.kernel import V3D
@@ -141,5 +139,3 @@ class IPeaksWorkspaceTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
-
diff --git a/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py
index 46a88016621e2166061c8174a3f1a3987efce6c9..558c691e4d42a92d610a207d9069b6e23bf1ffcc 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.kernel import std_vector_str
@@ -13,6 +11,7 @@ from mantid.api import AnalysisDataService, ITableWorkspace, WorkspaceFactory
from mantid.dataobjects import TableWorkspace
import numpy
+
class ITableWorkspaceTest(unittest.TestCase):
_test_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py b/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py
index e9b23083f73ab669dd27d9caaa2d72e340880a0c..bcc8bdc8c36179f67ca3b37ab805ea8836d60f42 100644
--- a/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import Jacobian
+
class JacobianTest(unittest.TestCase):
def test_class_has_expected_attrs(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
index 192106176893e2c2f449b73a9b11f398d04f153b..e62584c56aac24e83e14497e422e11930d227c9b 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid import mtd
import mantid
+
class MDEventWorkspaceTest(unittest.TestCase):
"""
Test the interface to MDEventWorkspaces
@@ -35,4 +34,3 @@ class MDEventWorkspaceTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py b/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py
index 2347b99b8b7be4800e97fed343d7a1febedbfe17..56c9285e83fb307a81d3e76ea247eed87af63596 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid
from mantid.kernel import VMD
from mantid.geometry import IMDDimension
@@ -15,6 +13,7 @@ import unittest
from testhelpers import WorkspaceCreationHelper
+
class MDGeometryTest(unittest.TestCase):
_test_ndims = 4
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py
index b15eb400f70322eb855b36000f813f2bf2c2010c..e39be7385fedc8ab1e9217916f428546b85718c9 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid import mtd
@@ -277,5 +275,3 @@ class MDHistoWorkspaceTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
-
diff --git a/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
index 57dfbf4b1c8a743c26c2ab03c6a226dfa779ab0a..dbb44943d45f84a86a9f231eaa85e39430bbdf54 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
import sys
import math
@@ -16,7 +14,6 @@ from mantid.geometry import Detector
from mantid.kernel import Direction, V3D
from mantid.simpleapi import CreateSampleWorkspace, Rebin
import numpy as np
-from six.moves import range
class MatrixWorkspaceTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py b/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py
index 585a0a7d2de0eb4b5d4a1d558026409786df9c55..c69b7180bd86481cbb16402744c0be17243091e3 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import WorkspaceCreationHelper
from mantid.api import ExperimentInfo
+
class MultipleExperimentInfoTest(unittest.TestCase):
def test_information_access(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py
index dc0408a761c1775d1bd5075004e72f6b7b175900..84e0d8135dd6d7ede2f82c74d61e7f752825e8f8 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MultipleFileProperty, mtd
from testhelpers import create_algorithm
+
class MultipleFilePropertyTest(unittest.TestCase):
def tearDown(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py b/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py
index ef8ee10371476038ab4524b77b7929e74a454fd5..95837d03cbd4150a8a926425495a398d5861d8c3 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import Progress,PythonAlgorithm
from mantid.kernel import ProgressBase
+
class ProgressTest(unittest.TestCase):
def test_class_inherits_ProgressBase(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py b/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
index cef2eb0f3f1b4747e65e6acf226477701549df6b..63c0c8dff746247c0f36563c374f2108ddf00bda 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import Projection
from mantid.kernel import V3D
from mantid.simpleapi import mtd
import numpy as np
+
class ProjectionTest(unittest.TestCase):
def test_constructors(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmChildAlgCallTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmChildAlgCallTest.py
index af4b2eb404f6e95ee62064a65514cea4ac185650..95fa9b8ecbb22b2eb205e36e82a71bee5c45bdb4 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmChildAlgCallTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmChildAlgCallTest.py
@@ -7,8 +7,6 @@
"""A test for the simple API dedicated to Python algorithms. Checks
things like Child Algorithm calls
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmPropertiesTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmPropertiesTest.py
index 8267e70957b64563a29d1ca7796c70976935a9f2..76cee5b4136d3d5a3db74474647f8c7b174bf714 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmPropertiesTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmPropertiesTest.py
@@ -7,8 +7,6 @@
"""Defines tests for the simple property declarations types within
Python algorithms
"""
-from __future__ import (absolute_import, division, print_function)
-
import sys
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py
index 79a5f4df635ce2f7bef6329d7bdd5e9ae24fabf0..055237ecdf101d2bf64483f1db89ec0be4997d12 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py
@@ -7,8 +7,6 @@
"""Defines tests for the traits within Python algorithms
such as name, version etc.
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
@@ -17,6 +15,7 @@ from mantid.api import (PythonAlgorithm, AlgorithmProxy, Algorithm, IAlgorithm,
########################### Test classes #####################################
+
class TestPyAlgDefaultAttrs(PythonAlgorithm):
def PyInit(self):
pass
@@ -24,6 +23,7 @@ class TestPyAlgDefaultAttrs(PythonAlgorithm):
def PyExec(self):
pass
+
class TestPyAlgOverriddenAttrs(PythonAlgorithm):
def version(self):
@@ -44,6 +44,7 @@ class TestPyAlgOverriddenAttrs(PythonAlgorithm):
def PyExec(self):
pass
+
class TestPyAlgIsRunningReturnsNonBool(PythonAlgorithm):
def isRunning(self):
@@ -55,6 +56,7 @@ class TestPyAlgIsRunningReturnsNonBool(PythonAlgorithm):
def PyExec(self):
pass
+
class CancellableAlg(PythonAlgorithm):
is_running = True
@@ -73,6 +75,7 @@ class CancellableAlg(PythonAlgorithm):
###############################################################################
+
class PythonAlgorithmTest(unittest.TestCase):
_registered = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py
index b2b502da7f0e2f138229e27ac1b3281ed9690adc..cab633f7aa6db1753baea575b7e7d90cf63aa284 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py
@@ -7,12 +7,11 @@
"""Defines tests for the WorkspaceProperty types within
Python algorithms
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import PythonAlgorithm, WorkspaceProperty
from mantid.kernel import Direction
+
class PythonAlgorithmWorkspacePropertyTest(unittest.TestCase):
def _do_test(self, classtype):
diff --git a/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py b/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py
index 39dfe76c7c9367fdf860f7858410362ea2ed477d..9b2ef32e9ae1db4a331069bde0fa0d8a53ad36ff 100644
--- a/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
@@ -15,6 +13,7 @@ from mantid.simpleapi import *
from testhelpers import WorkspaceCreationHelper
+
class RunPythonScriptTest(unittest.TestCase):
"""
Try out RunPythonScript
diff --git a/Framework/PythonInterface/test/python/mantid/api/RunTest.py b/Framework/PythonInterface/test/python/mantid/api/RunTest.py
index 4361d892741343dd36b3d24df7c782694977e759..1bbe8fedc23479111aca600e8b12f713f1bce65d 100644
--- a/Framework/PythonInterface/test/python/mantid/api/RunTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/RunTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import copy
from mantid.geometry import Goniometer
@@ -13,6 +11,7 @@ from mantid.kernel import DateAndTime, FloatTimeSeriesProperty
from mantid.api import Run
import numpy as np
+
class RunTest(unittest.TestCase):
_expt_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/SampleTest.py b/Framework/PythonInterface/test/python/mantid/api/SampleTest.py
index 8f7bde6ded04ab2e63fa50f8a14856bb213c94a0..845075019e5fab9405f5bdd69b095495f9483a27 100644
--- a/Framework/PythonInterface/test/python/mantid/api/SampleTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/SampleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace, CreatePeaksWorkspace, CreateWorkspace, SetSampleMaterial, SetUB
from mantid.geometry import CrystalStructure, CSGObject, OrientedLattice
diff --git a/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py b/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py
index bcaee8d1ab35ec74ff46275f60457a9a5e5723c7..7c3fc864518f4a0f3a7f44d401f4454cd11f73d7 100644
--- a/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import WorkspaceCreationHelper
from mantid.kernel import V3D
from mantid.api import SpectrumDefinition
+
class SpectrumInfoTest(unittest.TestCase):
_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceBinaryOpsTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceBinaryOpsTest.py
index 210adde80d7c04f906fb605c1cd075ab6799a1b7..b7f101a17266e803229ab59a677fd54b6bf260b5 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceBinaryOpsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceBinaryOpsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from mantid.simpleapi import CreateSampleWorkspace
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py
index f992cf33bcacc76d112f3e7a8e1ea57a48d15ffa..8e164f9d5e3202c8af10e5436bc49ed3fb24602d 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import (WorkspaceFactory, WorkspaceFactoryImpl, MatrixWorkspace,
ITableWorkspace, IPeaksWorkspace)
+
class WorkspaceFactoryTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
index 49c0a47581902bfd1c61f3616c1de0aa9347166f..be9255a49e987c65ce04716e36a609dd28901747 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-import six
import unittest
from testhelpers import run_algorithm
from mantid.api import mtd, WorkspaceGroup, MatrixWorkspace, AnalysisDataService, WorkspaceFactory
@@ -88,7 +85,7 @@ class WorkspaceGroupTest(unittest.TestCase):
group = self.create_group_via_GroupWorkspace_algorithm()
names = group.getNames()
- six.assertCountEqual(self, names, ["First", "Second"])
+ self.assertCountEqual(names, ["First", "Second"])
def test_that_a_group_is_invalidated_if_ADS_is_cleared_and_RuntimeError_raised(self):
group = self.create_group_via_GroupWorkspace_algorithm()
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceHistoryTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceHistoryTest.py
index 9dbfa8f5a29a6e8cdcba912cf95326aa63890b0c..5d5c5f4776ea2852779b7b47a66f943a475ca9b6 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceHistoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceHistoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import Load
from mantid import mtd, FileFinder
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
index 10be3193855f5dab68467edc8185b648c79f881a..29f03aa73da8ee9766c67ec1fd3fca13fde70b8c 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
@@ -7,8 +7,6 @@
"""Tests the construction of the various workspace
property types
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.api import (WorkspaceProperty, WorkspaceGroupProperty, MatrixWorkspaceProperty,
@@ -17,6 +15,7 @@ from mantid.api import (WorkspaceProperty, WorkspaceGroupProperty, MatrixWorkspa
PropertyMode, LockMode)
from mantid.kernel import Direction, Property
+
class WorkspacePropertiesTest(unittest.TestCase):
def _do_test(self, classtype):
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py
index 8e4a42b6d8456e032f959c736825d8119179dc67..6a074e903a94a2d6a1a21d896adf298f09cfbe42 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import Workspace
+
class WorkspaceTest(unittest.TestCase):
def test_that_one_cannot_be_instantiated(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceUnaryOpsTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceUnaryOpsTest.py
index 6ffb7d71c1bb09b9767db81a85e91d131f4af789..992863aad49478d5219f35d0159a6304889c6bd0 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceUnaryOpsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceUnaryOpsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from mantid.simpleapi import CreateMDHistoWorkspace
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py
index e3020a432e25572cc8e2e419cd1e32f1b7f699e3..41838c08107e06ba2ca938af13a917e9c106270f 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py
@@ -7,8 +7,6 @@
"""
Test construction of the WorkspaceValidators
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import IValidator
@@ -18,6 +16,7 @@ from mantid.api import (WorkspaceUnitValidator, HistogramValidator,
InstrumentValidator, MDFrameValidator,
OrientedLatticeValidator)
+
class WorkspaceValidatorsTest(unittest.TestCase):
def test_WorkspaceUnitValidator_construction(self):
diff --git a/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py b/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py
index ee3c635b5f7153ed6068357800a11c1cb42174f7..d54bb2774a505bbe256c3d1dd2e975bfca3e3d26 100644
--- a/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py
+++ b/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
@@ -16,6 +14,7 @@ from mantid.dataobjects import EventList
gps_epoch_plus_42_nanoseconds = np.datetime64('1990-01-01T00:00:00.000000042Z', 'ns')
+
class EventListTest(unittest.TestCase):
def createRandomEventList(self, length):
diff --git a/Framework/PythonInterface/test/python/mantid/dataobjects/Workspace2DPickleTest.py b/Framework/PythonInterface/test/python/mantid/dataobjects/Workspace2DPickleTest.py
index 5657c4dc616a64764d74342002c0a57274dbb3df..116919be86b4c0b7b5ffc3cfbc6f7d25952983f1 100644
--- a/Framework/PythonInterface/test/python/mantid/dataobjects/Workspace2DPickleTest.py
+++ b/Framework/PythonInterface/test/python/mantid/dataobjects/Workspace2DPickleTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
try:
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py b/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py
index de7d689c6c70ddf33547bf8278c98248588c9605..f4c046865ec0429b6301db89fa92887ceb3a684a 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import BoundingBox
from mantid.kernel import V3D
+
class BoundingBoxTest(unittest.TestCase):
def test_default_construction_is_allowed(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/CSGObjectTest.py b/Framework/PythonInterface/test/python/mantid/geometry/CSGObjectTest.py
index 9c97836f048e2e5693242140c8e5cd121b0f84a5..20b5d0877512af3dc76b3fb2dcca9b3696ecb3e5 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/CSGObjectTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/CSGObjectTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import BoundingBox, CSGObject
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py b/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
index 3cb254ff671f0dd3d4d2f806b3897c58b04e15eb..dc6e29377151f3c87862d9b84699df947ee67a47 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import argparse
import numpy as np
@@ -16,6 +14,7 @@ from mantid.geometry import CSGObject
from mantid.simpleapi import *
from itertools import islice
+
class ComponentInfoTest(unittest.TestCase):
_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/CrystalStructureTest.py b/Framework/PythonInterface/test/python/mantid/geometry/CrystalStructureTest.py
index f66b1a93d8bc34549c5de3ee197bc2b903cc9d42..ab8ed7a3fe368f3e96c0339e360d9643244d03fd 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/CrystalStructureTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/CrystalStructureTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods,broad-except
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import CrystalStructure
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py b/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
index f9377c7ab4b0643dbd62b20f0c5a3b3f609f2fd0..ea97f1618a2ba390b39b8b77ba6d3d51189695d8 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from testhelpers import WorkspaceCreationHelper
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py b/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
index ae195e5f6244ed1dd55b070e0175b97d0173273b..9ee6ccc306f8e050d3972d06a388f21b85a6a43c 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
from mantid.geometry import Goniometer
@@ -13,6 +11,7 @@ from testhelpers import can_be_instantiated
from testhelpers import run_algorithm
import numpy as np
+
class GoniometerTest(unittest.TestCase):
def test_Goniometer_can_be_instantiated(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/GroupTest.py b/Framework/PythonInterface/test/python/mantid/geometry/GroupTest.py
index 106f95593f67d8451cdbe2d2c3cac8c76f185f94..7d267bc5220cbc4ca2e258619110b6c46f3ffb35 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/GroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/GroupTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import Group, SpaceGroupFactory, PointGroupFactory, UnitCell
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py b/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py
index 020fd91b00e462f6f1df157140d115ef348436a6..32232d4495bb67589437fd544d8eb67efb1dd950 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import can_be_instantiated
from mantid.geometry import IComponent
+
class IComponentTest(unittest.TestCase):
def test_IComponent_cannot_be_instantiated(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/InstrumentTest.py b/Framework/PythonInterface/test/python/mantid/geometry/InstrumentTest.py
index 12be77ca21e95515cec931ccc48bf95aa4f45cb3..d5cb00f72052dc82826ada95a89e1c4ed291cc64 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/InstrumentTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/InstrumentTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
from mantid.geometry import(Detector, Instrument, ObjComponent, ReferenceFrame)
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py b/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
index 31a56890a34b0dfdf14e22dbbe9e980f1e6c8c29..1398d38b4baaa45a7c290824b7f662b9a4d14bcf 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.geometry import OrientedLattice, UnitCell
from mantid.kernel import V3D
import numpy as np
+
class OrientedLatticeTest(unittest.TestCase):
def test_OrientedLattice_is_subclass_of_UnitCell(self):
@@ -87,4 +86,4 @@ class OrientedLatticeTest(unittest.TestCase):
self.assertTrue(isinstance( ol.hklFromQ(np.array([1,1,1])), V3D), "Should work with numpy array input" )
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
index 8cf57179d18c67e6569ec8603491f3f4f8f09773..8beaea9efd91d15377665172c97d0ff274e02e01 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreatePeaksWorkspace, CreateSampleWorkspace
from mantid.geometry import PeakShape
+
class PeakShapeTest(unittest.TestCase):
def test_basic_access(self):
@@ -22,4 +21,4 @@ class PeakShapeTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/PointGroupTest.py b/Framework/PythonInterface/test/python/mantid/geometry/PointGroupTest.py
index 37c84b401b023e44157f20ab1c531df5bc2246a0..15e3038504e28aa8aedc18f0f37b58a48fbe907b 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/PointGroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/PointGroupTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import PointGroup, PointGroupFactory
from mantid.kernel import V3D
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py b/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py
index d6f141e338e10455da4a4690d7c8f41ee0ad78e1..72fd241dfe63bb43294649e05667358fee2f9b17 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import *
from testhelpers import can_be_instantiated, WorkspaceCreationHelper
+
class RectangularDetectorTest(unittest.TestCase):
def test_RectangularDetector_cannot_be_instantiated(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py b/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py
index 0c7d23661c0cfa898ff48b84ff6e1e3eab1c5f2b..f9c09cd02d0ba3766c1df5f578f0a2aaa8497b2a 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import ReferenceFrame
+
class ReferenceFrameTest(object):
def test_ReferenceFrame_cannot_be_instantiated(self):
self.assertFalse(can_be_instantiated(Instrument))
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/ReflectionGeneratorTest.py b/Framework/PythonInterface/test/python/mantid/geometry/ReflectionGeneratorTest.py
index 21521d5192859421ed6e005e8b811ad53e8a2741..19d2f8ae3687c0731810950e1ee9235a1a5bf8f3 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/ReflectionGeneratorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/ReflectionGeneratorTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import CrystalStructure, ReflectionGenerator, ReflectionConditionFilter
from mantid.kernel import V3D
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/SpaceGroupTest.py b/Framework/PythonInterface/test/python/mantid/geometry/SpaceGroupTest.py
index 54c8eb51bb6af3a59238eaeae51ac1eabcc44451..78379abdc7b37fece96d998336883e56dd616900 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/SpaceGroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/SpaceGroupTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import SpaceGroupFactory, UnitCell
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py
index 2454749ea78157e9f5feb7b56c4f9888622fefbf..010c64ab613131877a4a44ae25ac67195452677c 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import SymmetryOperation, SymmetryOperationFactory
from mantid.geometry import SymmetryElement, SymmetryElementFactory
from mantid.kernel import V3D
+
class SymmetryElementTest(unittest.TestCase):
def test_creation_axis(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
index ba0e3d53035768a57ebdb9af9245a32c57cfa866..953363a063238469635c4b7534efaa00c01a0c74 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import SymmetryOperation, SymmetryOperationFactory
from mantid.kernel import V3D
+
class SymmetryOperationTest(unittest.TestCase):
def test_creation(self):
@@ -33,4 +32,4 @@ class SymmetryOperationTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py b/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py
index 98fcf086ba3b4beb1d5d548041af8a6536e8d128..4b30d412833eca13920e6ff4cff77cc084500231 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.geometry import UnitCell, AngleUnits
from mantid.kernel import V3D
import numpy as np
+
class UnitCellTest(unittest.TestCase):
def test_invalid_parameters_throw(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py
index 6b850963a4bc1b69ee7d3e8a87d34a7231af18cf..b938bf4d5906624a7a564dba6fefa5d2a2e9acc1 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import FloatArrayBoundedValidator, FloatArrayProperty
from mantid.api import PythonAlgorithm
+
class ArrayBoundedValidatorTest(unittest.TestCase):
def test_empty_constructor_gives_no_lower_upper_bound_set(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py
index e771606e3340e1af27bd15b35419cd865f83c051..16016c114b70b9fa3a46f2a04adb42ac92d7bfe4 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import FloatArrayLengthValidator, FloatArrayProperty
from mantid.api import PythonAlgorithm
+
class ArrayLengthValidatorTest(unittest.TestCase):
def test_empty_constructor_has_no_lengths_set(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayOrderedPairsValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayOrderedPairsValidatorTest.py
index 3e12f5ec7bfefb38f3ddc60c72830e090a4f2af1..645ca5f61b5b6a25518e23c548fe73a1ec49771f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayOrderedPairsValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayOrderedPairsValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py
index 38b53f8bf1305bb97f5c5ae69231d230d0d84ca2..2ec4f20472fec98f2452f25bbe1506238f14fbd9 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Test the exposed ArrayProperty
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import (FloatArrayProperty, StringArrayProperty, IntArrayProperty, Direction,
NullValidator)
@@ -15,6 +13,7 @@ from mantid.api import PythonAlgorithm
import numpy as np
import sys
+
class ArrayPropertyTest(unittest.TestCase):
def test_default_constructor_raises_an_exception(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py
index bcd2bc121f6edbb795c9892b7accf747fbe82b19..0e5c9088ec3a52899d3efa0db0a55aacb4122520 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import FloatBoundedValidator, IntBoundedValidator
+
class BoundedValidatorTest(unittest.TestCase):
def test_construction_does_not_raise_error_when_both_are_floats(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
index 84f8ad1d83b9ed18fe8c20000e8d501ac7469ecc..9369302d9c61b20b4738231f37fcd006614b70d0 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import CompositeValidator, CompositeRelation, FloatBoundedValidator
from mantid.api import PythonAlgorithm
+
class CompositeValidatorTest(unittest.TestCase):
def test_creation_with_add_succeeds_correctly_in_algorithm(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigObserverTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigObserverTest.py
index 9b966b335f133901ee44c9e73990551d4f4b7659..8244e002766bdc74d77f7058c31c0eff08d5ca76 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigObserverTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigObserverTest.py
@@ -7,7 +7,7 @@
import unittest
from mantid.kernel import ConfigService, ConfigObserver
-from mantid.py3compat import mock
+from unittest import mock
class ConfigObserverTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigPropertyObserverTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigPropertyObserverTest.py
index 809f334830acb3b69787f52d73ea28c8f013e609..105cb78b4f348dc2c31d49fc55bb2143d47a3c21 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigPropertyObserverTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigPropertyObserverTest.py
@@ -7,7 +7,7 @@
import unittest
from mantid.kernel import ConfigService, ConfigPropertyObserver
-from mantid.py3compat import mock
+from unittest import mock
class ConfigObserverTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
index fbeb78d81a9979656937f3dfc2ce47249d629dc5..d298f37f2203b9e7aaa2d975acd96cb3e30890ec 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import inspect
import os
import testhelpers
@@ -13,7 +11,7 @@ import unittest
from mantid.kernel import (ConfigService, ConfigServiceImpl, config,
std_vector_str, FacilityInfo, InstrumentInfo)
-import six
+
class ConfigServiceTest(unittest.TestCase):
@@ -65,7 +63,7 @@ class ConfigServiceTest(unittest.TestCase):
self.assertRaises(RuntimeError, config.getInstrument, "MadeUpInstrument")
def test_service_acts_like_dictionary(self):
- test_prop = "algorithms.retained"
+ test_prop = "projectRecovery.secondsBetween"
self.assertTrue(config.hasProperty(test_prop))
dictcall = config[test_prop]
fncall = config.getString(test_prop)
@@ -111,7 +109,7 @@ class ConfigServiceTest(unittest.TestCase):
def test_appending_paths(self):
new_path_list = self._setup_test_areas()
try:
- config.appendDataSearchDir(six.text_type(new_path_list[0]))
+ config.appendDataSearchDir(str(new_path_list[0]))
updated_paths = config.getDataSearchDirs()
finally:
self._clean_up_test_areas()
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/DateAndTimeTest.py b/Framework/PythonInterface/test/python/mantid/kernel/DateAndTimeTest.py
index 7affe0c954887ceabdd03f4ac2263ae2c7ee3525..03e70b9b8597fccd19e4c7130e80e34f21b334d0 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/DateAndTimeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/DateAndTimeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
import numpy
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py b/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py
index d0216dff6d6eec7496ddd86baea5cc147782244f..b87521d9d39e9715bb56b053f8eb726d494cae13 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DeltaEMode, DeltaEModeType
+
class DeltaEModeTest(unittest.TestCase):
def test_availableTypes_contains_three_modes(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/EnabledWhenPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/EnabledWhenPropertyTest.py
index 2b64b8987f5783855f504d866d29124c55e1289a..e267c4b312ff52ae527cc4437b04126f20a7730f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/EnabledWhenPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/EnabledWhenPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import EnabledWhenProperty, PropertyCriterion, LogicOperator
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py b/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py
index 61e4f5fec6d92fd52b078ba73c81b87121593a2d..94407c955978e34b6a09ad469f9f4cc252c8fd5f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import FacilityInfo, InstrumentInfo, ConfigService
import pytz
+
class FacilityInfoTest(unittest.TestCase):
def test_construction_raies_an_error(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py
index dd1b037e587b9850e233bcd8c6712fc63caedcd6..aeb5508666bd65729b708d0c71cd37399e171495 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import BoolTimeSeriesProperty, FloatTimeSeriesProperty, FloatFilteredTimeSeriesProperty
+
class FilteredTimeSeriesPropertyTest(unittest.TestCase):
_source = None
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py
index be7226f80e60dc1f99f7581653c85eaabd4376a3..d77d507d229bd343de876c212d2d36042aa19f3e 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import IPropertySettings
+
class IPropertySettingsTest(unittest.TestCase):
def test_construction_raises_an_exception(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py b/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py
index 973f0146c1d1b0ec9e81f807ade988e2bebe53c8..aac1df11cb7274c2a8c17d96edc2048c58d41057 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import InstrumentInfo, ConfigService
@@ -44,4 +42,3 @@ class InstrumentInfoTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py
index 2ee79e9f85c5114b377bf587266313d180002890..dca07e07a7fa20dd02ae4944e356f86a6f5d6117 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import StringListValidator, Direction
from mantid.api import PythonAlgorithm
+
class ListValidatorTest(unittest.TestCase):
def test_empty_ListValidator_allows_nothing(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py b/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py
index 8a3c3686c62e03a11eed328589aa843f8a79606e..cd17f67543a608cd91b3764d33f37b31130441bb 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import LiveListenerInfo, ConfigService
@@ -29,4 +27,3 @@ class LiveListenerInfoTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/LogFilterTest.py b/Framework/PythonInterface/test/python/mantid/kernel/LogFilterTest.py
index f94c213dc9a5a13a77a059477b8a4eeeb09d8193..3244e5bc631a9e829996c85ac2a05b6d3e2f6f2c 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/LogFilterTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/LogFilterTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import LogFilter, FloatTimeSeriesProperty, BoolTimeSeriesProperty
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/LoggerTest.py b/Framework/PythonInterface/test/python/mantid/kernel/LoggerTest.py
index 20fc806ed96d8c0fe7bc3e5d62ea21aa860cf529..a18627236d17ea82f4c330a3b32dd9d365134b25 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/LoggerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/LoggerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantid.kernel import Logger
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py
index 05bfebbd433e8f81ac3ec2efbfcd004e36cacd4d..6e25b79daf530c02b5ef86d85569387a90237596 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import FloatArrayProperty, StringMandatoryValidator, FloatArrayMandatoryValidator
from mantid.api import PythonAlgorithm
+
class MandatoryValidatorTest(unittest.TestCase):
def test_constructor_does_not_raise_error(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/MaterialBuilderTest.py b/Framework/PythonInterface/test/python/mantid/kernel/MaterialBuilderTest.py
index 9183dc6933297215ccde7c3dc7235abf08f10a31..b22b66147838a4fba8d647ce374f5c957e77ea3f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/MaterialBuilderTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/MaterialBuilderTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import MaterialBuilder, NumberDensityUnit
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py
index 573f2115729145ae07e47101b3c9bf46638e7096..4e8063d6fefde826c5a08aaeb8e0213e37453250 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import MemoryStats
import sys
+
class MemoryStatsTest(unittest.TestCase):
def test_values_are_all_greater_than_zero(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py
index c8c45bf9f54855ed60bd7d74f2f6a384650c09b9..ffcf7430416a38952ea40485e0156d460717df7d 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import NullValidator
+
class NullValidatorTest(unittest.TestCase):
def test_NullValidator_can_be_default_constructed(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py b/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
index 629c0fa81de4806f03e3f4d2a8fa0afffd5ebded..da4483b9a3bfb15f0d36d4cb5964b1e9fb895a4b 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import Direction, OptionalBool, OptionalBoolValue, OptionalBoolPropertyWithValue
+
class OptionalBoolTest(unittest.TestCase):
@@ -31,4 +30,3 @@ class OptionalBoolTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py
index 28f345745a7699c912597fe320971e4a25ec99c5..e6cf41d6e146f576926b89517790a3bf72165e0a 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import ProgressBase
+
class ProgressBaseTest(unittest.TestCase):
def test_class_has_expected_attributes(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyHistoryTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyHistoryTest.py
index 3b838d84f29444475b985e3c2e600cc322155efb..0a4322f584f774e4828d40712e734d06ab62f8f8 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyHistoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyHistoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import PropertyHistory
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py
index 52867a8457967b92ee5124ed4fb1c1bb430b8d83..e9d6118870734b425464c42e9361804b91e01262 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantid.kernel import PropertyManager, PropertyManagerDataService
+
class PropertyManagerDataServiceTest(unittest.TestCase):
def test_add_existing_mgr_object(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
index 60f2c35bc4639bfd43ac69c9769cf9030f09e06b..99404299d89c9af98e444ae0e6821baca3497200 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
@@ -6,13 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Test the exposed PropertyManagerProperty
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import PropertyManagerProperty, Direction, PropertyManager
from mantid.api import Algorithm
import numpy as np
+
class FakeAlgorithm(Algorithm):
def PyInit(self):
self.declareProperty(PropertyManagerProperty("Args"))
@@ -20,6 +19,7 @@ class FakeAlgorithm(Algorithm):
def PyExec(self):
pass
+
class PropertyManagerPropertyTest(unittest.TestCase):
def test_default_constructor_raises_an_exception(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py
index ebd111a872161523b61668f45be00652dc1f6908..49a0f11ee75344928642362f9487c6570c315076 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import PropertyManager, IPropertyManager
+
class PropertyManagerTest(unittest.TestCase):
def test_propertymanager_population(self):
manager = PropertyManager()
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyWithValueTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyWithValueTest.py
index d4ee387013b8cf843c9e048436220cf509af7e03..07c0135aaaa435d87a1222884dc7563645ef8519 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyWithValueTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyWithValueTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, MatrixWorkspace
from mantid.kernel import Property, StringPropertyWithValue
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py
index 4ee81cc12af48fd53b3186168035b31b8230e13d..ae9f82ac3721323c513dae4c8531ad2ecc46891d 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
import shutil
@@ -28,6 +26,7 @@ class TestPyAlg(PythonAlgorithm):
AlgorithmFactory.subscribe(TestPyAlg)
"""
+
class PythonPluginsTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py b/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
index 917a9e4997c6caca113d6cf6f6a74a8ebb9fa026..de4f77a37b02bdf753ad08c6a7bd6f0f0f11d5a6 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import math
from mantid.kernel import Quat, V3D
+
class QuatTest(unittest.TestCase):
def test_empty_constructor(self):
@@ -74,4 +73,4 @@ class QuatTest(unittest.TestCase):
self.assertEqual(v, V3D(a, a, 0))
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/RebinParamsValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/RebinParamsValidatorTest.py
index 6100b3d83f8662ba456a3f681ff7e56ddb644423..7707ac5e587609f893cae348f56b3665df532a40 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/RebinParamsValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/RebinParamsValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py
index 33bfd035d73a7dbc60fec2349aeb5751a0e1eb3d..94365725dfe2a836968977ab96717bfea8e0de94 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import Stats
import math
@@ -13,6 +11,7 @@ import numpy
DELTA_PLACES = 10
+
class StatisticsTest(unittest.TestCase):
def test_getStatistics_with_floats(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
index 19467543e8c9579ebeab30b6f5119d8e990c3bcd..279c9eb4f37b019b8f4a796719e79869721ba180 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import StringContainsValidator
from mantid.api import PythonAlgorithm
+
class StringContainsValidatorTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py
index 8050d3ca3c810a9e0017d4b25bd4f082a3a27e1f..24012d36d8d1aa71992c86c3721a98770252e9a5 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
@@ -13,6 +11,7 @@ from mantid.kernel import (DateAndTime, BoolTimeSeriesProperty, FloatTimeSeriesP
StringTimeSeriesProperty)
from testhelpers import run_algorithm
+
class TimeSeriesPropertyTest(unittest.TestCase):
_test_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py
index c17e14382c27e9cca08bd94cff33cbc0083a2a3f..4b8ebf717e17d93ffc7e8b02b577491f31b43ffe 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import UnitConversion, DeltaEModeType
import math
+
class UnitConversionTest(unittest.TestCase):
def test_run_accepts_string_units(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py
index 155d5eb0cc84148ce0d547efb910a085496d815e..6480972de6f69ad5d6378a0659a28998c42af6c5 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import UnitFactory, UnitFactoryImpl, Unit
+
class UnitFactoryTest(unittest.TestCase):
def test_alias_is_of_type_UnitFactoryImpl(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
index 620f1318740ef0e630b1fec99a9c7dac16d46f0f..4f8e3e39d1cd192b9eba5bebf99257ad7c1fd522 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
@@ -4,13 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import UnitFactory, UnitLabel
-import six
import sys
+
class UnitLabelTest(unittest.TestCase):
def test_UnitLabel_can_be_built_from_simple_string(self):
@@ -26,19 +24,19 @@ class UnitLabelTest(unittest.TestCase):
def test_utf8_is_converted_to_unicode_object(self):
tof = UnitFactory.Instance().create("TOF")
unit_lbl = tof.symbol()
- self.assertTrue(isinstance(unit_lbl.utf8(), six.text_type))
+ self.assertTrue(isinstance(unit_lbl.utf8(), str))
self.assertEqual(u"\u03bcs", unit_lbl.utf8())
self.assertEqual("\mu s", unit_lbl.latex())
def test_str_function_produces_ascii_string_from_label(self):
label = UnitLabel("MyLabel", u"\u03bcs","\mu s")
- self.assertTrue(isinstance(str(label), six.string_types))
+ self.assertTrue(isinstance(str(label), str))
self.assertEqual("MyLabel", str(label))
def test_unicode_function_produces_unicode_string_from_label_py2(self):
if sys.version_info[0] < 3:
label = UnitLabel("MyLabel", u"\u03bcs","\mu s")
- self.assertTrue(isinstance(unicode(label), six.text_type))
+ self.assertTrue(isinstance(unicode(label), str))
self.assertEqual(u"\u03bcs", unicode(label))
else:
pass
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py
index 763649525f09efa8bc2dc6abca31763d5cff4385..644688af6a359695f874a4f28bfeb2bd5ec03f60 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import UnitFactory, Unit, Label, UnitLabel
import types
+
class UnitsTest(unittest.TestCase):
def test_Label_is_returned_from_Factory(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UsageServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UsageServiceTest.py
index 20d142b19544526173aad163a5b93dba56da47ef..667fc2d32d89ef1fadd11c1d44afd2a7b0b4b979 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UsageServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UsageServiceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantid.kernel import (UsageService, UsageServiceImpl, FeatureType)
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/V3DTest.py b/Framework/PythonInterface/test/python/mantid/kernel/V3DTest.py
index 7d244e58a71dead0bfe58c1627bbe39ceefe5150..8d832124986cb93c862e973779796aee63a362f3 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/V3DTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/V3DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import math
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py b/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py
index 08a119434520c3d536945b958770ec29b3c1e2ff..6e349ee3458cf2b85ad060fc645d8d98d6eafe07 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
from mantid.kernel import VMD
import math
import unittest
+
class VMDTest(unittest.TestCase):
def test_default_construction_gives_object_with_single_dimension(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/VisibleWhenPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/VisibleWhenPropertyTest.py
index 6ffd0a876be1c0a68fc6d2f10d910e40f08460a0..7b5905815589c757caff50b49c626b00300601d5 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/VisibleWhenPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/VisibleWhenPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import VisibleWhenProperty, PropertyCriterion, LogicOperator
diff --git a/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py b/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py
index 7e283244c046731b8eaed16fb3680974904b0748..417ed116c12bfd541c7dc90ddbb5bb7fbfaafb87 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py
@@ -11,8 +11,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from matplotlib.scale import scale_factory
@@ -20,6 +18,7 @@ from mantid.plots.scales import PowerScale, SquareScale
import numpy as np
import testhelpers
+
class ScalesTest(unittest.TestCase):
def test_power_scale_registered_in_factory(self):
diff --git a/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py b/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py
index 83d65de0799c3521db24e6b6c380f953609a253e..21b6a88fd6b2bab2b0f555ece213f70a0f902aaf 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py
@@ -11,12 +11,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division
-
import unittest
from mantid.plots.utility import legend_set_draggable
-from mantid.py3compat.mock import create_autospec
+from unittest.mock import create_autospec
from matplotlib.legend import Legend
diff --git a/Framework/PythonInterface/test/python/mantid/plots/__init__.py b/Framework/PythonInterface/test/python/mantid/plots/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/__init__.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/Framework/PythonInterface/test/python/mantid/plots/axesfunctions3DTest.py b/Framework/PythonInterface/test/python/mantid/plots/axesfunctions3DTest.py
index 2701d1a1f81e5b6161bc7c3ff4d91037bf882156..01f4a653f2f5cf15a5023e7feb2ff3f31216f66b 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/axesfunctions3DTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/axesfunctions3DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import matplotlib
matplotlib.use('AGG')
diff --git a/Framework/PythonInterface/test/python/mantid/plots/axesfunctionsTest.py b/Framework/PythonInterface/test/python/mantid/plots/axesfunctionsTest.py
index c5be1f8b4384142d4d9345dc0e627f9d38b54574..686fcd37ba3d7d3b5779187de55d26a98b8249d7 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/axesfunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/axesfunctionsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import matplotlib
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py b/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
index 6c0affbfce8355e28fa1d491d78047051bd72595..95e932e02830075c510491e73110900fdb852435 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
import unittest
@@ -19,10 +17,11 @@ matplotlib.use('AGG') # noqa
# local imports
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantid.plots._compatability import plotSpectrum, plotBin
from mantid.plots.utility import MantidAxType
+
class compatabilityTest(unittest.TestCase):
@patch('mantid.plots._compatability.plot')
diff --git a/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py b/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py
index 0a1bd9c1fb68505333c4388b08286db256241f60..45a5e6638d69c54f0c46c3da271594c50300d46a 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#
-from __future__ import (absolute_import, division, print_function)
-
import datetime
import unittest
@@ -17,7 +15,7 @@ import numpy as np
import mantid.api
import mantid.plots.datafunctions as funcs
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantid.kernel import config
from mantid.plots.utility import MantidAxType
from mantid.simpleapi import (AddSampleLog, AddTimeSeriesLog, ConjoinWorkspaces,
diff --git a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py
index c32a344fb4ce360a3a7b9d039d7c10c982f7f321..d087c00db418e058618c69e04c8bc19c3c4c5404 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, division
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_modest_image.py b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_modest_image.py
index e3c98982cf0c3eca19a37dcbe1419a91a7526f1d..a8b8b6c7b3a2e8d1831a1dd89337ad3b6c18a7d9 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_modest_image.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_modest_image.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, division
import itertools
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_speed.py b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_speed.py
index 927381b902ab662f4d57af84767815a817a6df71..363afcedad1e4b9700c25d63bef22ed157d1337f 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_speed.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_speed.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, division
from time import time
diff --git a/Framework/PythonInterface/test/python/mantid/plots/plotfunctionsTest.py b/Framework/PythonInterface/test/python/mantid/plots/plotfunctionsTest.py
index 569619dd069620936e3727d5cb85939e9e024bcb..e227c0cc7b06472bc122be53a2168c700c00097f 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/plotfunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/plotfunctionsTest.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py b/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
index 781ba2262e2c42f1ff9e52d726b1bfc7ec751dd7..465d62df5185a47c24a4ea95a131dc121bcc70d1 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import matplotlib
matplotlib.use('AGG') # noqa
@@ -20,7 +18,7 @@ from mantid.plots import datafunctions
from mantid.plots.legend import convert_color_to_hex
from mantid.plots.utility import MantidAxType
from mantid.plots.axesfunctions import get_colorplot_extents
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantid.simpleapi import (CreateWorkspace, CreateSampleWorkspace, DeleteWorkspace,
RemoveSpectra, AnalysisDataService as ADS)
from mantidqt.plotting.markers import SingleMarker
@@ -76,14 +74,15 @@ class Plots__init__Test(unittest.TestCase):
def test_remove_workspace_artist_for_known_workspace_removes_plot(self):
self.ax.plot(self.ws2d_histo, specNum=2, linewidth=6)
- is_empty = self.ax.remove_workspace_artists(self.ws2d_histo)
- self.assertEqual(True, is_empty)
+ workspace_removed = self.ax.remove_workspace_artists(self.ws2d_histo)
+ self.assertEqual(True, workspace_removed)
self.assertEqual(0, len(self.ax.lines))
def test_remove_workspace_artist_for_unknown_workspace_does_nothing(self):
self.ax.plot(self.ws2d_histo, specNum=2, linewidth=6)
unknown_ws = CreateSampleWorkspace()
- self.ax.remove_workspace_artists(unknown_ws)
+ workspace_removed = self.ax.remove_workspace_artists(unknown_ws)
+ self.assertEqual(False, workspace_removed)
self.assertEqual(1, len(self.ax.lines))
def test_remove_workspace_artist_for_removes_only_specified_workspace(self):
@@ -92,7 +91,8 @@ class Plots__init__Test(unittest.TestCase):
line_second_ws = self.ax.plot(second_ws, specNum=5)[0]
self.assertEqual(2, len(self.ax.lines))
- self.ax.remove_workspace_artists(self.ws2d_histo)
+ workspace_removed = self.ax.remove_workspace_artists(self.ws2d_histo)
+ self.assertEqual(True, workspace_removed)
self.assertEqual(1, len(self.ax.lines))
self.assertTrue(line_ws2d_histo not in self.ax.lines)
self.assertTrue(line_second_ws in self.ax.lines)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsAdvancedParametersTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsAdvancedParametersTest.py
index c353487052fa2333a83f8cb122a1b63b11babcf5..b20621e7ac6b3ff7c20f6b3be789ccbf6573f168 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsAdvancedParametersTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsAdvancedParametersTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import Abins, DeleteWorkspace, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py
index b948729aff214cd1eedb451f99b76786e9fbf9df..ccae62072b529b765a244b941f1afa83117ea220 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid import logger
# noinspection PyUnresolvedReferences
@@ -13,6 +12,7 @@ from AbinsModules import AbinsConstants, AbinsTestHelpers
import numpy as np
from numpy.testing import assert_array_almost_equal
+
class AbinsBasicTest(unittest.TestCase):
_si2 = "Si2-sc_Abins"
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py
index e8a8ad6cd3886254d8d092050718a5ef8f6855f4..ec7e8d91237f599d773d4cfaa86857e4f737f31c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import AlignComponents, CreateSampleWorkspace, MoveInstrumentComponent, CreateEmptyTableWorkspace, mtd, RotateInstrumentComponent
from mantid.api import AlgorithmFactory
+
class AlignComponentsTest(unittest.TestCase):
def testAlignComponentsPositionXY(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
index a64f1c5ac83e466c4cda1b0b4bfb662f7215c5a1..466e2c22ac7e4be78d52e31177c3f321973ec696 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import AngularAutoCorrelationsSingleAxis
+
class AngularAutoCorrelationsSingleAxisTest(unittest.TestCase):
def test_simple(self):
@@ -28,4 +27,4 @@ class AngularAutoCorrelationsSingleAxisTest(unittest.TestCase):
self.assertAlmostEqual(output_ws.blocksize(), 501)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
index c6e3af1188fc0a4ea412d781ba64bc109d5291f7..72703e5025554db4af8fd1df41521049c0e921a2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import AngularAutoCorrelationsTwoAxes
+
class AngularAutoCorrelationsTwoAxesTest(unittest.TestCase):
def test_simple(self):
@@ -28,4 +27,4 @@ class AngularAutoCorrelationsTwoAxesTest(unittest.TestCase):
self.assertAlmostEqual(output_ws.blocksize(), 501)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py
index 0cf1087c7dc588da82c44cfcbae0a075f1e47f06..5dd6948528cc7de9ab153402a7c7bebbd7f3c01f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/BinWidthAtXTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/BinWidthAtXTest.py
index 097cb6c6a70489293be9bd28cd7ea39c6e879d63..8931ae384ac290bfb9c6a5910dc3c26307aa344e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/BinWidthAtXTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/BinWidthAtXTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateWorkspace, DeleteWorkspace
import numpy
import sys
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateEfficiencyCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateEfficiencyCorrectionTest.py
index 539754e91864e5cdba78d19fb34dcc3841ac2c3c..b9c9435d1d50298b59aebcc1299d9aad10302f6a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateEfficiencyCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateEfficiencyCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import \
CalculateEfficiencyCorrection, CloneWorkspace, ConvertToPointData, \
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py
index d6e15113af17d7ff889a878df452904a43126867..8ad3693d017b6e426ef12ae44dd7ea062efd4fa9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CalculateFlux, CreateSampleWorkspace, FindDetectorsInShape, mtd
import numpy as np
import testhelpers
+
class CalculateFluxTest(unittest.TestCase):
pixels_in_shape = 0
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateSampleTransmissionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateSampleTransmissionTest.py
index c0477f6a42f10d002f566e2c9c6a3282bb834e28..f95dd132fed09681179b89790280cabaed88b49d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateSampleTransmissionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateSampleTransmissionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import CalculateSampleTransmission
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CheckForSampleLogsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CheckForSampleLogsTest.py
index 71884672bb0f757e7f7d54785ba78142ff331efd..991853836c20f6f085148c1388c6fc8892d03cfa 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CheckForSampleLogsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CheckForSampleLogsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py
index b7627588e10141c72e25862297afe8db17395360..06bd6b9594b109859e02767f652cbc2e288c6727 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments,multiple-statements
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
@@ -16,6 +14,7 @@ from mantid.simpleapi import CreateCacheFilename
import os, sys, hashlib, tempfile, glob, shutil, time
+
class CleanFileCache(unittest.TestCase):
def test1(self):
@@ -165,6 +164,7 @@ def computeTime(daysbefore):
"compute time as float of the time at n=daysbefore days before today"
return time.time() - daysbefore * 24*60*60
+
def touch(f):
with open(f, 'w') as stream:
stream.write('\n')
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CompareSampleLogsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CompareSampleLogsTest.py
index 4a3eb111852c90e962e8ca278dba0f4c81a5c3d7..605cfc6ea8c1d53499c3cd21cea16744a2a6200c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CompareSampleLogsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CompareSampleLogsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py
index 55e35b84207211e9e396016535199914669dcd84..94c1c51f055c3857f69d7ca5b0ebf2d3b4a82b81 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import FloatTimeSeriesProperty
from mantid.simpleapi import (DeleteWorkspace, CreateSampleWorkspace,
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py
index d4b47cb288fb9d7ec912b600334639b2fa856bf8..50436957cb9a17d0e27da7b1ce89480751ff2652 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (AddSampleLog, ComputeIncoherentDOS, CreateSampleWorkspace, CreateWorkspace, LoadInstrument, ScaleX, Scale,
SetInstrumentParameter, SetSampleMaterial, SofQW3, Transpose)
@@ -14,6 +12,7 @@ from numpy import testing
from scipy import constants
import testhelpers
+
class ComputeIncoherentDOSTest(unittest.TestCase):
def createPhononWS(self, T, en, e_units):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py
index 23c7375ce2ddcea0663f6a77bc0ec044b90f6280..3e209e54c2df96cc027f727e9ae974b4f3ea6211 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
from testhelpers import run_algorithm
+
class ConjoinSpectraTest(unittest.TestCase):
_aWS= None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ConvertWANDSCDtoQTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ConvertWANDSCDtoQTest.py
index 91912d78993c6500d35774bc3083d1701b387fd8..2d0d21bdb7c43111f54b890dae2225651ad3343c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ConvertWANDSCDtoQTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ConvertWANDSCDtoQTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import ConvertWANDSCDtoQ, CreateMDHistoWorkspace, CreateSingleValuedWorkspace, SetUB, mtd
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py
index 56ed13a02d074a2b758df89e2f9fd74227be3e08..a22b14b094bd397188ede1a661fb686a418fde9d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
from testhelpers import *
from numpy import *
+
class CorrectLogTimesTest(unittest.TestCase):
def testCLTWrongLog(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py
index 277ad2d115e9f0d3aa0aa43214dab37d67302f91..566afbe387719e61539dbb9cde3b4660f2c4e25c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace, CloneWorkspace, GroupWorkspaces, AddSampleLogMultiple, CreateEmptyTableWorkspace
from testhelpers import run_algorithm
@@ -13,6 +11,7 @@ from mantid.api import AnalysisDataService, WorkspaceGroup
from scipy.constants import h, m_n, eV
import numpy as np
+
class CorrectTOFTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py
index b2bb855087182534fcf96894e0c8ab3e88f4460f..76f09c16e4f288fa7f0aa60bdfd2afa93df6390e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
@@ -14,6 +12,7 @@ from testhelpers import run_algorithm
import os, mantid, hashlib
+
class CreateCacheFilename(unittest.TestCase):
def test1(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
index 4aa8f1d5e070ac193d94554dda2a4191f7e38511..844b28d2d1e45f700509cbbed0401bd3560c25dc 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
@@ -4,17 +4,15 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
from mantid.api import *
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
-from six.moves import range
import os
+
class CreateLeBailFitInputTest(unittest.TestCase):
def test_LoadHKLFile(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py
index d7a48126f7dba2467eedf9b48304fcf99fa96d11..a4e3e58d1ba196486349631156d1fa6cb7a8207a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, AnalysisDataService
from mantid.simpleapi import CreateWorkspace
from testhelpers import run_algorithm
import numpy as np
+
class CreateWorkspaceTest(unittest.TestCase):
def test_create_with_1D_numpy_array(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
index d1fdbd1e591ae08603026c22667cdb827dd8c548..f0535ac98869e8dae08cdae7633c6759e6a51c9e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest,os
from mantid.simpleapi import CreateSampleWorkspace, CropWorkspaceForMDNorm
+
class CropWorkspaceForMDNormTest(unittest.TestCase):
def test_simple(self):
ws_in = CreateSampleWorkspace(WorkspaceType='Event',
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceRaggedTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceRaggedTest.py
index e5349805653aff481a818fc8fd21497858b4300e..7908d145c6ce367076fba416a1b6f9675041110b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceRaggedTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceRaggedTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid.simpleapi as api
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CylinderPaalmanPingsCorrection2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/CylinderPaalmanPingsCorrection2Test.py
index 0d5452bfbb95aae9df2b0c49bfe1b6ae8e0ec4f8..4cd372d7b43b6956adae71a1d663cca2712b9062 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CylinderPaalmanPingsCorrection2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CylinderPaalmanPingsCorrection2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import mtd, config
from mantid.simpleapi import (CreateSampleWorkspace, Scale, DeleteWorkspace, ConvertToPointData,
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DNSComputeDetEffCorrCoefsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DNSComputeDetEffCorrCoefsTest.py
index 5644a024a4b98f7a02f0f7fec4a048d0a006ca06..bd3f37012cf8f24ac61594fa51190a0dc1d97c9f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DNSComputeDetEffCorrCoefsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DNSComputeDetEffCorrCoefsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from testhelpers.mlzhelpers import create_fake_dns_workspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DNSFlippingRatioCorrTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DNSFlippingRatioCorrTest.py
index 5a09f871aa75c66ccdc7726d4a58b31f9428c72d..4d8179e9fe5b22b9686a50fa6c63c36662064f7f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DNSFlippingRatioCorrTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DNSFlippingRatioCorrTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
from testhelpers import run_algorithm
from testhelpers.mlzhelpers import create_fake_dns_workspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DNSMergeRunsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DNSMergeRunsTest.py
index fe6299dba2ae10030c0931ca6083143ace97dc5a..79a618546754fccbcaeaa5347ccce6ec928c8df6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DNSMergeRunsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DNSMergeRunsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from testhelpers.mlzhelpers import create_fake_dns_workspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py
index 4dc898534b52393f75ee6ae0eca6fa24a5afb743..49566067fd47d793fa4117a2c82d2e487661ce26 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest,os
import mantid
import numpy
import pdb
from mantid.kernel import logger
+
class DSFinterpTest(unittest.TestCase):
def generateWorkspaces(self, nf):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DakotaChiSquaredTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DakotaChiSquaredTest.py
index d73496d8e70f7f1391530439fffef676efde73c3..15d749d9c025ba0cf9ec80d29b993edadb2a39a4 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DakotaChiSquaredTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DakotaChiSquaredTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest, os
from mantid import AnalysisDataServiceImpl, config, simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DeltaPDF3DTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DeltaPDF3DTest.py
index b69569c2b58010931f57b1e016e162102622e830..e6aa4308ec57e8a11bbfe476aa9f3cc445e3e738 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DeltaPDF3DTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DeltaPDF3DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import DeltaPDF3D, CreateMDWorkspace, FakeMDEventData, BinMD, mtd
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py
index 3ac664875eeb1df92949918215d94d72721d8de0..b31dcd8801dea0cdb7026481952ca2781a6bdcb1 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class EnggCalibrateFullTest(unittest.TestCase):
_data_ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py
index 8b74419fce5573b3733d8668468f456b50189a59..637e3f816b03d948611fe9efc3e0d2ae1a3d76ad 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import sys
import unittest
from mantid.api import *
import mantid.simpleapi as sapi
+
class EnggCalibrateTest(unittest.TestCase):
_data_ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitPeaksTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitPeaksTest.py
index a535fc9f41409eac7fdc0d636991671188ecfb36..ef03a9c67ebd3940ff9b5d5bdf33eeac8993d7ca 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitPeaksTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitPeaksTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitTOFFromPeaksTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitTOFFromPeaksTest.py
index b6c8ada02ef0fe1895f99c13452a783be8ada646..cba5e65da666fbe94dd7f3229890719e5e25f506 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitTOFFromPeaksTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitTOFFromPeaksTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFocusTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFocusTest.py
index c5fbd57010f110afb0c8e76c426f400480d23d83..db2b740c7576398280977e8b1b857cdb4541c850 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFocusTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFocusTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5Test.py
index 9c6cc4ede04e7acba1a6655c8e670f2d7a9b599a..df3004094ea5a6338bee8b87273f2dbdf724f811 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import h5py
import os
import random
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5Test.py
index b01576d645b3f2155afaee2dff8c0d1c04e4851a..7cc81ccc111974ace0a75f92b787884ff58505a3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import h5py
import os
import random
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py
index 24f6b2bd1e8c58078bf422cd15d7d83daa5ff1b5..59ae09c40f5cccba2baa9e54327ce3dbf8a5c840 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import *
import mantid.simpleapi as sapi
+
class EnggVanadiumCorrectionsTest(unittest.TestCase):
_data_ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
index 6ae58e9127ce25d5cea72ea03e1c9b94cfe1f794..120605c129acf9e11b7d2a2ccbf4f433906dbd35 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from numpy import *
@@ -15,7 +13,7 @@ import mantid.kernel as kernel
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
import os
-from six.moves import range
+
class ExportExperimentLogTest(unittest.TestCase):
@@ -743,4 +741,3 @@ class ExportExperimentLogTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
index f103669dcfaef807b4e522e38c65c768b40c36fa..01d691884871b3d753e1c0c911a05e24e5c50d27 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
import mantid.kernel as kernel
@@ -13,7 +11,6 @@ from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
import os
from distutils.version import LooseVersion
-from six.moves import range
class ExportVulcanSampleLogTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToHDF5Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToHDF5Test.py
index 480e8a94f9c92a1d85416e4a4562366dcf17710a..96685ce7b0b60e1c088cdbe574445b582277b076 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToHDF5Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToHDF5Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import h5py
import numpy as np
import os
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
index e89707adee82eca03d5f20282f7632dc9564ddfb..c8ea94f83ad54d2f82fac7a11920a56977286bab 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
@@ -4,15 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import sys
import numpy as np
import unittest
import mantid
from mantid.simpleapi import ExportSpectraMask,DeleteWorkspace
-from six.moves import range
+
class ExportSpectraMaskTest(unittest.TestCase):
def __init__(self,method_name):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py
index bfd2ffac5e307f01236dcd07bd860a9b3238f6a3..829f6cfb49807ef80463f52d1490420b9a719307 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
+
class ExtractMonitorsTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
index d5fa9a181e94b7eff57f119ddf361d916c39bcef..d47004e7a84ce943b2994ebce153c2ff0d339b38 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
+
class FilterLogByTimeTest(unittest.TestCase):
__ws = None
@@ -131,4 +130,4 @@ class FilterLogByTimeTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py
index 27cdc9c6ef097959366a013914e564412d3b21be..2f2841fda03c801e4d5822a0c5024e097eeaec5e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import FitGaussian, CreateSampleWorkspace, DeleteWorkspace
import logging
+
class FitGaussianTest(unittest.TestCase):
def setUp(self):
self.ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/FitIncidentSpectrumTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/FitIncidentSpectrumTest.py
index 2dfa372c376849794ac1073fcf31a0ecda6cc224..63ed99d7a7d2da014f5d7bc1c7bea6a2ea7ca783 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/FitIncidentSpectrumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/FitIncidentSpectrumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import AnalysisDataService, FitIncidentSpectrum, CalculateEfficiencyCorrection, CloneWorkspace, ConvertToPointData, \
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/GetEiT0atSNSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/GetEiT0atSNSTest.py
index 6bee61f04d81606ff5da949bd8a6ec50f43675f0..dc1a69dd3731098684879dc5550664a42ba4ff9e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/GetEiT0atSNSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/GetEiT0atSNSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/HB2AReduceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/HB2AReduceTest.py
index 9989f4830765fcc0f8134c6919df1079140ec3db..85624f22198348244ba7231409e8f625d3dd37ae 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/HB2AReduceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/HB2AReduceTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import HB2AReduce
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/HFIRSANS2WavelengthTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/HFIRSANS2WavelengthTest.py
index cb40e25fd0bdfb2395da7a90dd7a2230971f6e30..374d4328b580c943e1df6333de9795c25f4e95df 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/HFIRSANS2WavelengthTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/HFIRSANS2WavelengthTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import HFIRSANS2Wavelength, CreateWorkspace, AddSampleLog, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/IndirectTransmissionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/IndirectTransmissionTest.py
index 3bf384766c40f3516764ea28a1a607c2d0301d3c..6a40bcf13d379e280f2200f32cd1404a1e775e2c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/IndirectTransmissionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/IndirectTransmissionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import IndirectTransmission
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py
index 9d646a83107bce90245ba205444af0cbf6bd1459..74b7773f1a61eef4f74fbbb8f592e64e3ee0ad55 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LRPeakSelection, CreateSampleWorkspace, DeleteWorkspace
import logging
+
class LRPeakSelectionTest(unittest.TestCase):
def setUp(self):
self.ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadAndMergeTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadAndMergeTest.py
index 7bb064bb6efda948ca28f607d029520ad91f0543..4403c6bd24e2cc4371b48533e403bb641c3d4bad 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadAndMergeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadAndMergeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, WorkspaceGroup
from mantid.simpleapi import LoadAndMerge, config, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py
index 981f28b4233d7c2616bbcb62b1732afac1789e58..7196b488d5469f848707fa43ea90f4fe6d14abc0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-public-methods,invalid-name,protected-access
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import assertRaisesNothing
@@ -15,7 +13,6 @@ from LoadCIF import SpaceGroupBuilder, UnitCellBuilder, AtomListBuilder, UBMatri
from mantid.api import AlgorithmFactory
from mantid.geometry import UnitCell
-from six import iteritems
import numpy as np
import sys
@@ -208,7 +205,7 @@ class AtomListBuilderTest(unittest.TestCase):
uElements = {'11': [u'0.01', u'0.02'], '12': [u'0.0', u'0.0'], '13': [u'0.0', u'0.0'], '22': [u'0.01', u'0.02'],
'23': [u'0.0', u'0.0'], '33': [u'0.04', u'0.05']}
- uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in iteritems(uElements)])
+ uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in uElements.items()])
uDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Si', u'Al'])
]))
@@ -225,7 +222,7 @@ class AtomListBuilderTest(unittest.TestCase):
'22': [u'0.01', u'0.02'],
'23': [u'0.0', u'0.0'], '33': [u'0.04', u'0.05']}
- uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in iteritems(uElements)])
+ uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in uElements.items()])
uDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Si', u'Al'])
]))
@@ -241,7 +238,7 @@ class AtomListBuilderTest(unittest.TestCase):
bElements = {'11': [u'1.0', u'2.0'], '12': [u'0.0', u'0.0'], '13': [u'0.0', u'0.0'],
'22': [u'1.0', u'2.0'], '23': [u'0.0', u'0.0'], '33': [u'4.0', u'5.0']}
- bDict = dict([(u'_atom_site_aniso_b_{0}'.format(key), value) for key, value in iteritems(bElements)])
+ bDict = dict([(u'_atom_site_aniso_b_{0}'.format(key), value) for key, value in bElements.items()])
bDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Si', u'Al'])
]))
@@ -256,7 +253,7 @@ class AtomListBuilderTest(unittest.TestCase):
uElements = {'11': [u'0.01'], '12': [u'0.0'], '13': [u'0.0'], '22': [u'0.01'],
'23': [u'0.0'], '33': [u'0.04']}
- uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in iteritems(uElements)])
+ uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in uElements.items()])
uDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Al']),
(u'_atom_site_u_iso_or_equiv', [u'0.01', u'invalid'])
@@ -272,7 +269,7 @@ class AtomListBuilderTest(unittest.TestCase):
uElements = {'11': [u'0.01', u'0.02'], '12': [u'0.0', u'0.0'], '13': [u'0.0', u'0.0'],
'22': [u'0.01', u'0.02'], '23': [u'0.0', u'0.0'], '33': [u'0.04', u'0.05']}
- uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in iteritems(uElements)])
+ uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in uElements.items()])
uDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Si', u'Al']),
(u'_atom_site_u_iso_or_equiv', [u'0.01', u'0.02'])
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py
index d0eea6fad53217ed659067a03e09ad89290048e0..83711289974cf3fc79f342bc724c3929518d972f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py
index 660f72f8b83d7e211881c60767bb05bc8a4616fd..de38ee79e0868f52f17eded528a253bb6d3f305c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class LoadEmptyVesuvioTest(unittest.TestCase):
def test_load_empty_no_par_file(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py
index 4aaa8668203ea7b3ccb05d5a73f3173f9e19108e..bd21c998489fa2383d372ed9aa1fda0d978d6420 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
@@ -15,6 +13,7 @@ from mantid.api import AnalysisDataService
import os
+
class LoadFullprofFileTest(unittest.TestCase):
def test_LoadHKLFile(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py
index f5be53822bd61d5f140fb3bff36d6ed6116f0373..71be425e6efd2758d1393d413d3acee8375b620a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import LoadGudrunOutput, Workspace
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLampTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLampTest.py
index ed8a24d0d86f5ee362f35ee83fca4e51a75b4c8d..dce1e20a1d914af70235b9fd27d1f8625acdee30 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLampTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLampTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import config, mtd, LoadLamp
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py
index 1bfb77979e3c337573f98484155aafe00f7fd979..fca072b42a825f77f6d4f25fb18611d1e7817161 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py
index 6c65286de65f20d418245d84d5b79c332d305c04..594dbdf5954471c0ac25437fb4cbc6ea133ec103 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
@@ -15,6 +13,7 @@ from mantid.api import AnalysisDataService
import os
+
class LoadLogPropertyTableTest(unittest.TestCase):
def test_LoadValidFilesComments(self):
outputWorskapceName = "LoadLogPropertyTableTest_Test1"
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py
index 5569ed64e9c4d203d5bb9c5413ede21b4fb9fe50..47d81ca3dd4325b9af9f5bd03006320e18e5af76 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
+
class LoadMultipleGSSTest(unittest.TestCase):
def test_LoadMultipleGSSTest(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py
index d06a22c30618c0c42d3506c960b40deff678aaee..abef8c1f4a9741ac7bb8500b5352dc32e8f25be3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py
@@ -5,12 +5,11 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class LoadNMoldyn3AsciiTest(unittest.TestCase):
_cdl_filename = 'NaF_DISF.cdl'
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
index 78a68b5cf79e6a1df2bd8e2faa3a96fad63cd49e..7f63c04302c54370de6621ac89a87abc28eea93b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNMoldyn4Ascii1D, config
from mantid.api import *
import os
import math
+
class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
def setUp(self):
data_dirs = config['datasearch.directories'].split(';')
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py
index 54c6c43507f2fa15d1048fae06b21545b2de961f..eaec78aaf98ce2c2e44b8b6da69ebd69105f523b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py
@@ -5,14 +5,13 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
import os
+
class LoadNMoldyn4AsciiTest(unittest.TestCase):
"""
Note that the test files used here are not axactly in the same format as
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadWANDSCDTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadWANDSCDTest.py
index cda4f1f4a2516b2992c95f4553be9de7442eb30f..d46aa9a755652b67f2fd9f62d51a3921abc51c82 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadWANDSCDTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadWANDSCDTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import LoadWANDSCD
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MaskAngleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MaskAngleTest.py
index 93b53b25af814ace97e5e70acdaa8dc8528e077a..873d9b3cf96974ac061a24bafd15424fc3fb62a9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MaskAngleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MaskAngleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MaskBTPTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MaskBTPTest.py
index 4cbeac2717c3cae643c4795a29af8ab0bd1a23a9..5fe8932a89dd72a29205de3328952e2d35bf7138 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MaskBTPTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MaskBTPTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
index 88a362c3db2dfb04aff33460eeecc557db31d339..82caa0f6013587d0333f6eb5984f1b4c9ab1a0b0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
from mantid.kernel import *
@@ -13,6 +11,7 @@ from mantid.api import *
from mantid.simpleapi import *
from testhelpers import run_algorithm
+
class MaskWorkspaceToCalFileTest(unittest.TestCase):
def get_masking_for_index(self, cal_file, requested_index):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MatchPeaksTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MatchPeaksTest.py
index 7d13a6a4d196e1dae1487c56b814409bc43e2607..c9f360be90ef4c9c181d7a213b3325d3d2f029e7 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MatchPeaksTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MatchPeaksTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import sys
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MatchSpectraTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MatchSpectraTest.py
index ecc460b8a18c416563f13339babe572110bfb198..5f3bc5c1c1a9e132da694f0183aa5fd33dbb13e2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MatchSpectraTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MatchSpectraTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateWorkspace, DeleteWorkspace, DeleteWorkspaces, MatchSpectra, mtd
import numpy as np
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py
index aa891036ce8fe24d598b8b1223b22ac964d5a501..1ab04ccc7589367becb3ee7822320e847c0b9011 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class MeanTest(unittest.TestCase):
def test_throws_if_non_existing_names(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MedianBinWidthTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MedianBinWidthTest.py
index d9f6792bdd02bb80a36ca37244f6b04c01664489..1eb15383c71cafb794eebcb1e4b41298e77f5ade 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MedianBinWidthTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MedianBinWidthTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateWorkspace, DeleteWorkspace
import numpy
import testhelpers
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
index d122ea39de7f288db2171ab0a6b329cb8f0aa5c5..9a5624ca5e4972a177b6e89de63b3d21056473a8 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
import tempfile
@@ -18,6 +16,8 @@ from testhelpers import run_algorithm
'''
Helper type to represent an entry in a cal file
'''
+
+
class CalFileLine:
_number = None
@@ -51,6 +51,8 @@ class CalFileLine:
'''
A helper resource managing wrapper over a new calfile object. Creates cal file and allows writing to it.
'''
+
+
class DisposableCalFileObject:
_fullpath = None
@@ -77,6 +79,8 @@ class DisposableCalFileObject:
'''
A helper resource managing wrapper over an existing cal file for reading. Disposes of it after reading.
'''
+
+
class ReadableCalFileObject:
_fullpath = None
@@ -197,4 +201,4 @@ class MergeCalFilesTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MuonMaxEntTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MuonMaxEntTest.py
index 1ff9fd20a37f228705952b5f75c8356c1465d126..8f69594236fb141450317bfeec4f6cf0c3fcae0c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MuonMaxEntTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MuonMaxEntTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import numpy as np
import math
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py
index 965e28ee9fb463cc778d0b925a944519985f2435..1693e2aab99a297dfdcbf7fd431fd9f5ee332850 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class MuscatSofQWTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/NMoldyn4InterpolationTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/NMoldyn4InterpolationTest.py
index f69e5edadcc76abec0b52db041a9c4f52803c109..c875ef038b9acc51feafc431e3be4be65d1eb2dd 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/NMoldyn4InterpolationTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/NMoldyn4InterpolationTest.py
@@ -110,9 +110,4 @@ class NMoldyn4InterpolationTest(unittest.TestCase):
if __name__ == "__main__":
- python_version = version_info
- if python_version < (2, 7, 0):
- logger.warning("Not running this test as it requires Python >= 2.7. Version found: {0}".
- format(python_version))
- else:
- unittest.main()
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py
index 6b2d8713e8f4fef7ed73a7fcdc7905e5a227a17f..53b883d4c0530a294bddcb81c4eb65caab3e61ce 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import platform
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup
+
class NormaliseSpectraTest(unittest.TestCase):
_positive ='1,2,3,4,5'
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/OptimizeCrystalPlacementByRunTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/OptimizeCrystalPlacementByRunTest.py
index f37ab7d447a59d5732a270d81b7529b13c97ad5d..e1083e952658e729d42422c05cdfc39a1a7b6b97 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/OptimizeCrystalPlacementByRunTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/OptimizeCrystalPlacementByRunTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadIsawPeaks, FindUBUsingFFT, IndexPeaks, OptimizeCrystalPlacementByRun
from mantid.api import mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertRealSpaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertRealSpaceTest.py
index 6d42d188aa4bc7bffe5e98297dda5f920f53701f..da90581aed283bef39037b2ce3a593d5cba77b50 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertRealSpaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertRealSpaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CreateWorkspace,
SetSampleMaterial,
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertReciprocalSpaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertReciprocalSpaceTest.py
index b2bbf15c40637836bb762540318a104c01828d84..c9434f3233d768c5300c2aab645321883becb85f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertReciprocalSpaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertReciprocalSpaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CreateWorkspace,
SetSampleMaterial,
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiCreatePeaksFromFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiCreatePeaksFromFileTest.py
index 2bfa2f5f42ae82b960e4fc5403c0f31170dc594d..f98ad8e228d9e8387be498f33de4840c625e4f89 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiCreatePeaksFromFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiCreatePeaksFromFileTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import assertRaisesNothing
from testhelpers.tempfile_wrapper import TemporaryFileHelper
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py
index 0d88c34962fb498d2ff8afdfefb73d9fa6f689c2..fa1622d8c1c55ee2ff318ed84950e34d6979d180 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
@@ -103,4 +101,4 @@ class PoldiMergeTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometryReductionOneLiveDataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometryReductionOneLiveDataTest.py
index 88de096dec18816daa50cf3502f46199167c0b15..f27f5bf5d6cb3746625dea672faff481bf0a18e5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometryReductionOneLiveDataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometryReductionOneLiveDataTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometrySliceEventWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometrySliceEventWorkspaceTest.py
index 09dc3aeb62297d259e88f46bad16e0f56eee8542..1e0a1d4192f8a41970c939730770f211702a5710 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometrySliceEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometrySliceEventWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py
index 76ac755af646b34c99184d252adec8fa74ceded0..aa9d7bc465b0990a085dc9b30662734654dc90dc 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
@@ -14,6 +12,7 @@ from mantid import config
from mantid.simpleapi import *
from testhelpers import run_algorithm
+
class RetrieveRunInfoTest(unittest.TestCase):
class_has_been_set_up = False
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
index d7e2b738dff045e685230e4d28cc457361d0c4de..4d4a24d31ad0e9b09476a806bb6772be679a7fb5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
@@ -14,6 +12,7 @@ from mantid.api import *
from mantid import config
from testhelpers import run_algorithm
+
class SANSSubtractTest(unittest.TestCase):
def setUp(self):
@@ -43,4 +42,4 @@ class SANSSubtractTest(unittest.TestCase):
self.assertAlmostEqual(value, 0, 2)
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
index b1e18b13c15490db50224e1722763571fc7b41b8..a6f7feeb7b3ceec0bc05f5966801400e3bfe07ad 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
@@ -14,6 +12,8 @@ from mantid.simpleapi import (CreateWorkspace, LoadInstrument,
MoveInstrumentComponent, CropWorkspace,
SANSWideAngleCorrection, Min, Max, Transpose,
Multiply)
+
+
class SANSWideAngleCorrectionTest(unittest.TestCase):
_sample = None
_trans = None
@@ -66,4 +66,3 @@ class SANSWideAngleCorrectionTest(unittest.TestCase):
if __name__ == "__main__":
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SaveGEMMAUDParamFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SaveGEMMAUDParamFileTest.py
index 7417e5168f652347aab86c085cbd5f2a184b3f33..1513beb712934532ce50c06d14d5c24bbbed60fb 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SaveGEMMAUDParamFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SaveGEMMAUDParamFileTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py
index 343a56aa487309a63afe712fbc9d9f3e17325588..f3e5cba6b2c2aefca906406f5beff17b0162fd47 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import mantid
from mantid.api import AnalysisDataService
from mantid.simpleapi import CreateWorkspace, SaveNexusPD
@@ -21,6 +19,7 @@ try:
except ImportError:
runTests = False
+
class SaveNexusPDTest(unittest.TestCase):
def saveFilePath(self, wkspname):
dataDir = mantid.config.getString('defaultsave.directory')
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
index 19f6604db164d59a24012427f3b0b0f30602a0be..d26707d62d9d2a50a166d568136f941fa987dc25 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
import mantid.simpleapi as api
@@ -17,6 +15,7 @@ from mantid.api import AnalysisDataService
import os, json
+
class SavePlot1DAsJsonTest(unittest.TestCase):
def test_save_one_curve(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SaveYDATest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SaveYDATest.py
index 07e92a131c32c79c55aaa4a0f7613d48c6ae3625..064be1122afcf5c17ef360840d5009cb071b49a2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SaveYDATest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SaveYDATest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid
from mantid.api import mtd
from mantid.simpleapi import CreateWorkspace, CreateSampleWorkspace, SaveYDA, ConvertSpectrumAxis, \
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
index 15626706d52c4907a43c9f14db05fe95913538ac..ea3cafdadee5f25cc89760fd1b48812f6e4d2a4f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
@@ -5,11 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=unused-import
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
+
class SelectNexusFilesByMetadataTest(unittest.TestCase):
_fileslist = 'INTER00013460,13463,13464.nxs'
@@ -78,4 +77,3 @@ if __name__=="__main__":
unittest.main()
except ImportError:
pass
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py
index df82657a0a2e5cdd91f6ebb49f15befd67c74cc2..ed984813e6ecc3a57dfe4a9df05bed4648a1cce4 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SortByQVectorsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SortByQVectorsTest.py
index 0f3f2d420f56eaf127db4bf04df55a676951d401..52162c418c5fbac24bad748dea4bed9a48d960f7 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SortByQVectorsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SortByQVectorsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import AnalysisDataServiceImpl, simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SortDetectorsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SortDetectorsTest.py
index 55dad04901464a3c4e9c8f015a3bf1a0506ab2b4..f2cb0b3c37207ea24ea68eab38d0ee0347128137 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SortDetectorsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SortDetectorsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/StatisticsOfTableWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/StatisticsOfTableWorkspaceTest.py
index 90d127dcb1fd720d16a9d8c6e7f30b8e56def8b6..84a29c44d496f813b93e3196c1f321bbf4deff21 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/StatisticsOfTableWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/StatisticsOfTableWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/StringToPngTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/StringToPngTest.py
index e426fbe4aafe78d3b6646db40fd7188f01b0a136..3f7eb6fd0f7e5bb1861824e641af469b1f9f1304 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/StringToPngTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/StringToPngTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest, os
from mantid import AnalysisDataServiceImpl, config, simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibCNCSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibCNCSTest.py
index 52288a25abd908227887428c068eec752d221890..aee0e8598697aa7412cc25d236063187e22a6897 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibCNCSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibCNCSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import simpleapi
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibHYSPECTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibHYSPECTest.py
index 65e8b7b023e40b8d2064f2547e57ff3f1466f1ca..dc67530277e843eb1c8b137434d15dce14b68d1c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibHYSPECTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibHYSPECTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py
index 3e4bd6c2a9f32831f1e6cbd8358d649e752b59f8..04ce1c5dcad6c2cd3227a95a2a318c8f24ac7d76 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py
@@ -5,13 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import unittest
-from six.moves import range
-
from mantid.api import *
from mantid.simpleapi import CreateWorkspace, ScaleX, Symmetrise
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py
index f06b7d4f40c5053ceec72defc82f6f500a2166af..1a1ae707c82441ff04488137c74a1806345adb99 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import Load, DeleteWorkspace, GroupWorkspaces, TOFTOFCropWorkspace
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py
index 92f0bca8ea4fe0a78ce7b06923759b265ccc622e..8cf974ac209b424c9558ce1d2af238137edc3373 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import Load, DeleteWorkspace, AddSampleLogMultiple, \
DeleteLog
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py
index 58bb7741446a4a86dc52d005e379734ebf3c4722..004979312f783654875355dff98b4c324c6c9410 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
@@ -13,6 +11,7 @@ from mantid.api import *
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
+
class UpdatePeakParameterTableValueTest(unittest.TestCase):
def test_updateDouble(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
index 42c65df7669025a3002ce7e0fa37cd15cf839b86..a645fbbebb400e441f31a4e726c0487e0fcd02cc 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import VelocityAutoCorrelations
+
class VelocityAutoCorrelationsTest(unittest.TestCase):
def test_simple(self):
@@ -24,4 +23,4 @@ class VelocityAutoCorrelationsTest(unittest.TestCase):
self.assertAlmostEqual(data_y[0], 0.000247266521347895)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
index 5fc2f0268c892674f0a19f2d3ca407d7db60c293..c3e6afa6a10077c39e2061e1ecd79a862bd60258 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import VelocityCrossCorrelations
+
class VelocityCrossCorrelationsTest(unittest.TestCase):
def test_simple(self):
@@ -26,4 +25,4 @@ class VelocityCrossCorrelationsTest(unittest.TestCase):
self.assertAlmostEqual(data_y[0], -8.76322385197998e-05)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
index 354f44d5cf3684a7d2180fa80f13b5c75d3f2e9b..6e1a574f3ecd109e33f29a2c638833824688e1d6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
@@ -11,9 +11,6 @@ Assumes that mantid can be imported and the data paths
are configured to find the Vesuvio data
"""
-from __future__ import (absolute_import, division, print_function)
-from six import iteritems
-
from mantid.api import AlgorithmManager
import numpy as np
@@ -114,7 +111,7 @@ class VesuvioPreFitTest(unittest.TestCase):
alg.initialize()
alg.setChild(True)
alg.setProperty("OutputWorkspace", "__unused")
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
return alg
@@ -134,4 +131,3 @@ class VesuvioPreFitTest(unittest.TestCase):
if __name__ == "__main__":
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py
index a3998c9cdde2788a21ec06af261c715c8df153d4..36d08de9c644aeca920660ddb02b96e804eec0a6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py
@@ -4,13 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
import vesuvio.testing as testing
+
class VesuvioResolutionTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
index a6cf2e405ac6dfd5c26277f7d96bfdb4a9477b41..45a3a0504b286133038c98d4367433936cbb415a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
@@ -10,9 +10,6 @@ Unit test for Vesuvio reduction
Assumes that mantid can be imported and the data paths
are configured to find the Vesuvio data
"""
-from __future__ import (absolute_import, division, print_function)
-from six import iteritems
-
import unittest
import numpy as np
import sys
@@ -188,7 +185,7 @@ class VesuvioTOFFitTest(unittest.TestCase):
alg.setChild(True)
alg.setProperty("OutputWorkspace", "__unused")
alg.setProperty("FitParameters", "__unused")
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
return alg
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioThicknessTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioThicknessTest.py
index 0a42d1bbf180f58e6a8c9cd73e97d884362e586e..e203cef5460ca8f35a32cb59eef98ec5d74c7686 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioThicknessTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioThicknessTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import platform
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
index 19883d21d72024c356ab4b534989ca3a7977c1bd..fcd8dd014df06ca17cae6fb9f5e4cbaf7bf11d93 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrectionTest.py
index 313324a48e293778097971f24a4b7c04d459447b..265790cace6b3dcbaa8ba5c95d45b0f47f848755 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesQuasiTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesQuasiTest.py
index 1641351d7791a044875e1f1023b8f970ec57a5fb..f2dc01ae919b2d77fca27b121b7993b43e20954a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesQuasiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesQuasiTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import platform
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py
index 658ba4be7c3e5b976932a0679e7a59d5be22df15..d00a4118d5525ba28844523f722af20389355311 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import platform
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py
index 75eec44d2c3300298635453cdb72e9c1ba5f7417..6b0f3df608ff9f43e5689991d2a525f94b5a3a63 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager
from mantid.simpleapi import CreateSampleWorkspace, DeleteWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShieldingTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShieldingTest.py
index 7403e418018bbfc41cd46e5701554d61e6148578..0363e53e16328f1d8c64cb289197a08a5590719e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShieldingTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShieldingTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (mtd)
from mantid.simpleapi import (CloneWorkspace)
import numpy.testing
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectDataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectDataTest.py
index e53a69d7816294dc7667731111d442acdc7d6822..547eba76e850f1ab0b2fa0b6c846c463e4d4b312 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectDataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectDataTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
import numpy.testing
from testhelpers import assert_almost_equal, illhelpers, run_algorithm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py
index f21b83c6787d344dcc4988717e3bcfd031bc74c8..f6e604117ef917d5465b524ac638bc801f55c2ef 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from testhelpers import illhelpers, run_algorithm
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadiumTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadiumTest.py
index 15da84bc444a85d2b32d1416439b574a90e5de23..8409007852976667985ba7d11ffb3ea252841b63 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadiumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadiumTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid import mtd
from mantid.simpleapi import (CloneWorkspace, FindEPP)
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLReductionTest.py
index 01685333b1c5c9224d4f29cc31508797db0df627..5c61da56e7d1940657f8fd081883637e65c564b3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLReductionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import collections
from mantid.api import mtd
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShieldingTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShieldingTest.py
index 39ed6f27d65e08548d80f79a85bf4b24f92c8437..8b798131b0c2b1f15dd7ae8117ee1745e6526017 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShieldingTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShieldingTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from testhelpers import assert_almost_equal, illhelpers, run_algorithm
from mantid.api import mtd
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/EnergyWindowScanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/EnergyWindowScanTest.py
index 8b66a39092b22ec20b02bc747e8641df28cce95a..d7f3b11e22c09f092653da2e483ceacc14ecf850 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/EnergyWindowScanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/EnergyWindowScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import EnergyWindowScan
from mantid.api import mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FindPeakAutomaticTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FindPeakAutomaticTest.py
index 632f183057f5a08624641fcdad5de7dda10638ec..995bf0769872359b295e40e48c438dcbd6b016cb 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FindPeakAutomaticTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FindPeakAutomaticTest.py
@@ -9,7 +9,7 @@ import numpy as np
from mantid.simpleapi import CreateEmptyTableWorkspace, CreateWorkspace, DeleteWorkspace, FindPeaksAutomatic
from mantid.api import mtd
-from mantid.py3compat import mock
+from unittest import mock
import plugins.algorithms.WorkflowAlgorithms.FindPeaksAutomatic as _FindPeaksAutomatic
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py
index 7f43c96386fbbc6b783f2a8b2efbbac07b0f12b8..bc47006834698f18fa4ce1c17ffa5765451a6260 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py
@@ -4,14 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import numpy as np
import unittest
from mantid.simpleapi import CreateEmptyTableWorkspace, CreateWorkspace, DeleteWorkspace, FitGaussianPeaks
from mantid.api import *
-from mantid.py3compat import mock
+from unittest import mock
import plugins.algorithms.WorkflowAlgorithms.FitGaussianPeaks as _FitGaussianPeaks
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrectionTest.py
index 14084604e463de9e221e2105b37af2010a6fce0a..868d33483b5485431968688be9ccf230bf4ecd74 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import mtd, config
from mantid.simpleapi import CreateSampleWorkspace, Scale, DeleteWorkspace, ConvertToPointData, \
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReductionTest.py
index d447069f410b078e4dcee36db449c41173c19027..6b8b5118fa9c5dc2bd8fea0279607fb72ab779ed 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReductionTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferTest.py
index 452a02eb9f8fd46ee82299c5a759ad33d30ef9d8..cfea3948b804a03cb5814fd5af6c0006d3aa6e68 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapperTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapperTest.py
index ec9ce0787a9e02ec57961f47b1039ca96d8b2f5b..4da20de2abfb9e12f8226ebfed6c5c833b7e4c0d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapperTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapperTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CreateSimulationWorkspace, CreateWorkspace, CompareWorkspaces, DeleteWorkspace,
ISISIndirectEnergyTransfer, ISISIndirectEnergyTransferWrapper)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2Test.py
index ce39323af56c4bf8598e33cf42f1f9e0ef377697..58caaf2a6c0f553c84835dd62655a41dfae73b4d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectAnnulusAbsorption, DeleteWorkspace
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorptionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorptionTest.py
index 654ba6c2ad2abf38405f5369a4407f30ec5b74e1..edbccbaf8ba60722b92d16dee237a410d044b607 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorptionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorptionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectAnnulusAbsorption
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py
index 209eed919cb4bf5d9c797ab1360583f6398e891f..ce9388e5131dfa1c955a68c4e40b818b8878f874 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import IndirectCalibration
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2Test.py
index f4eb642c1f01aa0641510ec363e2d3898acd8bda..56aae7ec227738f611be9593805218d4cad83ebe 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectCylinderAbsorption, DeleteWorkspace
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorptionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorptionTest.py
index 89b3877877bbb24c847276b80e9620c992b72172..92e9933deb1a5ab20afc587ea7afd1ff261ce03f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorptionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorptionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectCylinderAbsorption
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScanTest.py
index e4c297774fc285e9e4cd94a8e01e069a6af40516..e4dcb2d6f69d6a04c3f1b37329289b07cf7c1a6b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2Test.py
index b8acb73891538103143f4b3afc6f7db259590dad..e9f9ded90e4b2895acf99432419cd3ba632cf656 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectFlatPlateAbsorption, DeleteWorkspace
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorptionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorptionTest.py
index d69e5744354b809f6de0245261bcc3599f7da6c0..7a46c20d0385824d7e6b2db97503de4df58ae0df 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorptionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorptionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectFlatPlateAbsorption
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransferTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransferTest.py
index 6013f355ccbc27af640c352cfa2c546e2048ffbb..1815ac0eb3d18730b08cbb92675bf32314cf5c52 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransferTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransferTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWSTest.py
index e4f640d65012b3f2e6b108c5861dd60b9a63f235..9fa3f1d4cdfcd1fd81f7d4e4f9b014d6b5228f09 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import mtd
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENSTest.py
index 3a5f5529ca8e78de8d542b46f640e8cb2026f6de..d92d0dc8524a67b3ff08a66d2f0ac5fe8e5aaf94 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResultTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResultTest.py
index 59aeda0b3746c04d9adc08de02b9e9038f4dffc2..7bfe6e60a728cbcc691602b0587a4568d419575c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResultTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResultTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CompareWorkspaces, ConvolutionFitSequential, ConvolutionFitSimultaneous, LoadNexus,
IndirectReplaceFitResult, RenameWorkspace)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
index 03302ce561fb85dcf67ab7724ac4463a08745d23..34fee500d84fee43d10e02505baf3cb2efa14dad 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import IndirectResolution
+
class IndirectResolutionTest(unittest.TestCase):
def test_simple(self):
@@ -58,4 +57,4 @@ class IndirectResolutionTest(unittest.TestCase):
self.assertTrue(res_ws.run().getProperty('current_period').value, 1)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectSampleChangerTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectSampleChangerTest.py
index fffa277cbafeedae3916157bf456c2ace5c6a602..e08fdb0504bb9338f94741ff5b2d06221e66b5e9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectSampleChangerTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectSampleChangerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AnalysisDataService
from mantid.simpleapi import IndirectSampleChanger
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitorTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitorTest.py
index 380b11019905879b6a4eda540bdcd49b180133af..b1a7596dc88592309921a653cff8e60699ebdaf0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitorTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
import mantid
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTwoPeakFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTwoPeakFitTest.py
index 6612f157f2e1ec786bbcc590f9dd3a50bb7162d7..43497782708c0176e257069ee4039ffce8ab072b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTwoPeakFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTwoPeakFitTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (AnalysisDataService, MatrixWorkspace, WorkspaceGroup)
from mantid.simpleapi import (CompareWorkspaces, EnergyWindowScan, IndirectTwoPeakFit, LoadNexus)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitMultipleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitMultipleTest.py
index 7c1a82a555ef5e25c1386cf56a1fb6e7c31c5a4f..8bf64c2262993d85e785b2c93222832aaafe3b90 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitMultipleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitMultipleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup, ITableWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitSequentialTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitSequentialTest.py
index 731bb44d8cb334cbbd193ad458ba9d6152f5080b..29d716a276383eebdd7d1aab38e20757f322c075 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitSequentialTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitSequentialTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup, ITableWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/LoadWANDTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/LoadWANDTest.py
index 2b4a59942f1cb624448f4bedd966598a40a05fdd..8e7c10fad6f6c3b935077f3c1ab8ce4604773851 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/LoadWANDTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/LoadWANDTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import LoadWAND
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherentTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherentTest.py
index db0ae9ce85ec7edd151478dfe63d44d4267469e1..2ffd887eed855ccfa3a6d2087c2dabc2d73167ff 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherentTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherentTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
from mantid.simpleapi import MDNormSCDPreprocessIncoherent
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MSDFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MSDFitTest.py
index b01d906598ff87486303ad9b6785160e47213b4f..3080ba107dfabbb051d93b61cfd913e2522c39fe 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MSDFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MSDFitTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace, MSDFit
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspacesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspacesTest.py
index 744f4b4eb62c7a907b0dccd128b41fffc019b428..f9131a1b5f6a8ea2fc22a7d1ab986e8d69650d7e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspacesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspacesTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.api import MatrixWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MolDynTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MolDynTest.py
index f4ee79bc32021e0a0a4d6d70fa5c7586aa18736f..afcfc967c226c924b6b0abb35a531834db5ee50d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MolDynTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MolDynTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReductionTest.py
index f7daafc8d893b16b31f6e3615e4f468f1c1a4631..addef04b82fda999fb2aa9afae8122845deac508 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReductionTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScanTest.py
index f7d28e0ef179c023b938f7efdbb7119e0f7ea485..64f38c9ab2e05952b995a0f53b5e29bb61394dc0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, WorkspaceGroup
from mantid.simpleapi import PowderILLDetectorScan, config, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScanTest.py
index bf3871fb6e5627c31ade4ac145cb4346d039fa90..f8081333ca551674ea2a9d7d02415edf3b25b272 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import PowderILLParameterScan
from mantid import config, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcessTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcessTest.py
index b4a46c03afc56919b411db74c68874cf436c26b4..e41823baf1a40e732816c4aeac5597b167e16771 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcessTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcessTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (MatrixWorkspace, WorkspaceGroup)
from mantid.simpleapi import (mtd, config)
from testhelpers import (assertRaisesNothing, create_algorithm)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQTest.py
index 34cd61ca6a82def52a6f5d516593f13f1fa056f1..fe62f9001a61ea784d745af02d28b6ebf53a7df3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from testhelpers import (assertRaisesNothing, create_algorithm, illhelpers)
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCorTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCorTest.py
index ee35dd6bb5029d7cb51e451b55b5ebe54a15ef89..0e604ce85962a895bb0a23e04885daa111a7d33b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCorTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCorTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from testhelpers import (assertRaisesNothing, create_algorithm, illhelpers)
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocessTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocessTest.py
index b25f2fa7844bd65dc0a2505619132d41705afdd2..3649601f938ee7da84902eab9e53ebff96a0e64c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocessTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocessTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from mantid.simpleapi import ReflectometryILLPreprocess
import numpy.testing
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py
index e1611f96baae2a0d6de5ea07d61cb3c796a77e15..b9248af301e253988b333b0f0d847d2faa1423a5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from testhelpers import (assertRaisesNothing, create_algorithm, illhelpers)
import numpy
@@ -217,7 +215,7 @@ class ReflectometryILLSumForegroundTest(unittest.TestCase):
'child': True
}
alg = create_algorithm('ReflectometryILLSumForeground', **args)
- self.assertRaisesRegexp(RuntimeError, 'Some invalid Properties found', alg.execute)
+ self.assertRaisesRegex(RuntimeError, 'Some invalid Properties found', alg.execute)
self.assertTrue(alg.isExecuted)
def testNotSummedDirectForegroundRaises(self):
@@ -233,7 +231,7 @@ class ReflectometryILLSumForegroundTest(unittest.TestCase):
'child': True
}
alg = create_algorithm('ReflectometryILLSumForeground', **args)
- self.assertRaisesRegexp(RuntimeError, 'Some invalid Properties found', alg.execute)
+ self.assertRaisesRegex(RuntimeError, 'Some invalid Properties found', alg.execute)
self.assertTrue(alg.isExecuted)
def testReflectedBeamSumInLambdaNoRotation(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py
index cae3ad8bf6c4bbc209ac1209518e04c880fc3876..406bf6ac49f049abfd7e82d9e454f3042e60112e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import mtd
from testhelpers import (assertRaisesNothing, create_algorithm, illhelpers)
import unittest
@@ -33,4 +31,4 @@ class ReflectometryILL_commonTest(unittest.TestCase):
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcessTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcessTest.py
index 6a93cf1ecf0bdf2662b4e937e8a2408e7fb1fb6d..79d257d75436a74349d6be20a428fe0199115e15 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcessTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcessTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import config
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ResNorm2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ResNorm2Test.py
index b62879a4d176ee59e20cb3a931a9010f43bddbbe..5f9c4d5b7a39069af576ea9349db559623ae48a7 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ResNorm2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ResNorm2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
index 6a571d7acfafbe120b4ee17b733928b48cd92866..e3496c858e09cd1ab4f74b55a8f063369d562a35 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
@@ -14,7 +12,6 @@ from testhelpers import run_algorithm
import numpy as np
from SANSDarkRunBackgroundCorrection import DarkRunMonitorAndDetectorRemover
from SANSDarkRunBackgroundCorrection import SANSDarkRunBackgroundCorrection
-from six.moves import range
class SANSDarkRunBackgroundCorrectionTest(unittest.TestCase):
@@ -561,6 +558,7 @@ class SANSDarkRunBackgroundCorrectionTest(unittest.TestCase):
return ws
+
class DarkRunMonitorAndDetectorRemoverTest(unittest.TestCase):
def test_finds_all_monitor_indices_when_monitor_is_present(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py
index 3a23be12413dc858598bf1a382cccd1ea281ce59..d730c8be291e1f646a468ad0702521469462cd42 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegrationTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegrationTest.py
index 7e4aaf58870e2b7dc38fcb81eac1bf3363082c61..aac43a2b0c226bbe8aa0c51c5390f4018b4619ca 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegrationTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegrationTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, WorkspaceGroup
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLReductionTest.py
index 23700e030f1b08355cd53669e09aca6342a79ff1..a39643002514a200de1a4e50b39d05e19a8d02c4 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLReductionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, Run
from mantid.simpleapi import SANSILLReduction, config, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSMaskTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSMaskTest.py
index 49edeef4e42a831056f6a302fbec71a8fa6e7349..bcb6848d86c6ed8e648b88fe845541f2deff7dc5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSMaskTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSMaskTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import SANSMask, SetInstrumentParameter, MaskDetectors, CreateSampleWorkspace, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
index c3a37ecd5d42f71c9441365673bfac7c6370e5bf..9dc6e56a07905b81a4a1d84dfbaca730163a9154 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, MatrixWorkspace
import numpy as np
from SANSStitch import QErrorCorrectionForMergedWorkspaces
+
class SANSStitchTest(unittest.TestCase):
def test_initalize(self):
alg = AlgorithmManager.create('SANSStitch')
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SavePlot1DTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SavePlot1DTest.py
index ec6d9ea160ef6d7cf4f82ae3de2c59dab7e4f3ab..0553495575ace3342d98274b2b39fbcd6fa5a8c1 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SavePlot1DTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SavePlot1DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest, os
from mantid import AnalysisDataServiceImpl, config, simpleapi
try:
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py
index 23ec76dc102c9a7d39d1bf13b2595f42e4dc7276..0507536309a133f7c789038a9c23be4ed3b9ce43 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
-
import unittest
import math
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorptionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorptionTest.py
index 7d427b698e7e08611e12496054c2bea8161ac1a6..cd07d7c0fade17232062d1131cd91d74c261310b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorptionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorptionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import (SimpleShapeMonteCarloAbsorption, Load, ConvertUnits,
CompareWorkspaces, SetSampleMaterial,
DeleteWorkspace)
@@ -13,7 +11,8 @@ import unittest
class SimpleShapeMonteCarloAbsorptionTest(unittest.TestCase):
- def setUp(self):
+ @classmethod
+ def setUpClass(self):
red_ws = Load('irs26176_graphite002_red.nxs')
red_ws = ConvertUnits(
InputWorkspace=red_ws,
@@ -38,7 +37,7 @@ class SimpleShapeMonteCarloAbsorptionTest(unittest.TestCase):
'OuterRadius': 2.0
})
- corrected = SimpleShapeMonteCarloAbsorption(InputWorkspace=self._red_ws,
+ __corrected_flat_plate = SimpleShapeMonteCarloAbsorption(InputWorkspace=self._red_ws,
Shape='FlatPlate',
Width=2.0,
Thickness=2.0,
@@ -46,7 +45,12 @@ class SimpleShapeMonteCarloAbsorptionTest(unittest.TestCase):
# store the basic flat plate workspace so it can be compared with
# others
- self._corrected_flat_plate = corrected
+ self._corrected_flat_plate = __corrected_flat_plate
+
+ @classmethod
+ def tearDownClass(self):
+ DeleteWorkspace(self._red_ws)
+ DeleteWorkspace(self._corrected_flat_plate)
def _test_corrections_workspace(self, corr_ws):
x_unit = corr_ws.getAxis(0).getUnit().unitID()
@@ -61,10 +65,6 @@ class SimpleShapeMonteCarloAbsorptionTest(unittest.TestCase):
blocksize = corr_ws.blocksize()
self.assertEqual(blocksize, 1905)
- def tearDown(self):
- DeleteWorkspace(self._red_ws)
- DeleteWorkspace(self._corrected_flat_plate)
-
def test_flat_plate(self):
# Test flat plate shape
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py
index 24f0e382956459c60b425ad653385890d54d709c..9cae636351e53f6c42edfbbb04f627fd382583e0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import logger
from mantid.api import ITableWorkspace
@@ -320,6 +318,7 @@ def _is_name_in_group(wks_group, name_to_find):
else:
return True
+
def _perform_group_name_search(wks_group, name_to_find):
"""
Performs the search for a name in a group and returns
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsTest.py
index 54706645e981b7ee528487ff1b8f2ab1d376c5da..db47c530f9c3f47dd6e2350a0b0fbe2e53c2c41d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CompareWorkspaces, CreateSampleWorkspace, Load, LoadInstrument, RenameWorkspace, ScaleX,
SofQW, SofQWMoments)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py
index 2ef022800bb53a73cb2062109ca4f90fbf06c270..9815a16b792ad45ba6b6aa76d5268d738350e180 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup
+
class SwapWidthsTest(unittest.TestCase):
_input_ws = 'IN16B_125878_QLd_Result'
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrectionTest.py
index d04df142373988618dfd3e3dbf9df3c4c6894732..e7a7b1507f88936844c0fe016230c04ac8d31cf9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py
index 04a406b7e928dac66d1b1ccac5bd87bdd904c090..51f614d54debf9c593059c9c3318173201df55d3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py
@@ -4,12 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class TimeSliceTest(unittest.TestCase):
def test_basic(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScatteringTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScatteringTest.py
index 23af31f7d27a6e69911a6631b3ca6dafa4fdbf9f..8d2efb6546607bbf794595464c5758af66959060 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScatteringTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScatteringTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import TotScatCalculateSelfScattering, Load
from isis_powder import SampleDetails
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TransformToIqtTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TransformToIqtTest.py
index 4b1b92903bb349f492e757f23c2c78d26795e724..53c37f775c94aad33f8d7a8df9f8e932cf0838a9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TransformToIqtTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TransformToIqtTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReductionTest.py
index 1f9f240d66d0082aa0ce530e12a02379e917d673..ffcdb38ac744eeb1efb4de60a85be26ebd7837de 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReductionTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/WANDPowderReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/WANDPowderReductionTest.py
index 8ade53fe51cfb3c455fa124ff0a09e1662437756..50adc5288334de288b8db3bf4ba0731496abddbe 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/WANDPowderReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/WANDPowderReductionTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import (WANDPowderReduction,
CreateSampleWorkspace, RotateInstrumentComponent,
MoveInstrumentComponent, CloneWorkspace, AddSampleLog)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSBeamCentreFinderTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSBeamCentreFinderTest.py
index faa755c4ec0ba75156c63be70c9f61e03548dd2a..d57d5e4fc18f56da426d29dc92389a7c85f7d442 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSBeamCentreFinderTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSBeamCentreFinderTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from plugins.algorithms.WorkflowAlgorithms.SANS.SANSBeamCentreFinder import SANSBeamCentreFinder, _ResidualsDetails
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSConvertToWavelengthAndRebinTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSConvertToWavelengthAndRebinTest.py
index 735aa2ec17bac347b719b77e2588cb45964f9912..9be374252a0a36d8d2db5d2760cc8e6f77a30b1e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSConvertToWavelengthAndRebinTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSConvertToWavelengthAndRebinTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.api import FrameworkManager
diff --git a/Framework/PythonInterface/test/python/plugins/functions/AFM_LFTest.py b/Framework/PythonInterface/test/python/plugins/functions/AFM_LFTest.py
index 89ffdd5f068783d5b38f8ef2b14d548f30e3f96c..98d5cdbf1f6fec3d7459335d320e86067eeda86e 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/AFM_LFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/AFM_LFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/AFM_ZFTest.py b/Framework/PythonInterface/test/python/plugins/functions/AFM_ZFTest.py
index 94077cd13c1711db69d828c0dcdca0e8ff71c896..f7e658c41c578d344fa2016f3c676b87efc30ee4 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/AFM_ZFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/AFM_ZFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py b/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
index bf5784336d5b461943454c983f0af39e70aac4c5..470690b168fd24fa99185af61228f093f63e77df 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
@@ -13,6 +11,7 @@ from mantid.simpleapi import Fit
import testhelpers
import numpy
+
class AttributeExample(IFunction1D):
def init(self):
@@ -39,6 +38,7 @@ class AttributeExample(IFunction1D):
FunctionFactory.subscribe(AttributeExample)
+
class AttributeTest(unittest.TestCase):
def test_setAttributeValue_called_on_declaration(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/BesselTest.py b/Framework/PythonInterface/test/python/plugins/functions/BesselTest.py
index 27de45812ee827c086c65bfb8b40c09739f93452..48e0b13b2a4aea840f2c4de409bdf11f869f3ccc 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/BesselTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/BesselTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ChudleyElliotTest.py b/Framework/PythonInterface/test/python/plugins/functions/ChudleyElliotTest.py
index 14e4835f19d9c7547e2141dc69b27f7045490c1d..db95a1b47c69417bec39d6d5b733e3a8eef6611c 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ChudleyElliotTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ChudleyElliotTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/CombGaussLorentzKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/CombGaussLorentzKTTest.py
index b1671db7a0d1b0aafabfb32c5745dde2abe38697..6ff0372f7c840948941306506d14d5ad10affa98 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/CombGaussLorentzKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/CombGaussLorentzKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/CompositePCRmagnetTest.py b/Framework/PythonInterface/test/python/plugins/functions/CompositePCRmagnetTest.py
index ea61f944e5f175186e4ca58618d0a0dea907467a..c237bf4161a14435e0d1b4f4021b883b642317b3 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/CompositePCRmagnetTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/CompositePCRmagnetTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py b/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py
index d23bb7cbd33b81e6c24c57da41195f62def1e21d..4dba5fb1fb6f8a903330aa52d15f1bb39cd65152 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
@@ -14,6 +12,7 @@ from mantid.simpleapi import CreateWorkspace, Fit, mtd, SaveNexus
from mantid.api import AnalysisDataService
import sys
+
class DSFinterp1DTestTest(unittest.TestCase):
def generateWorkspaces(self, nf, startf, df, e=False, seed=10):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/DampedBesselTest.py b/Framework/PythonInterface/test/python/plugins/functions/DampedBesselTest.py
index 8535ecfa86a9e1ba3009f088e0a80f87d023dc2e..4cda05c2b260eef354a594daa4bd6dc75c595589 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/DampedBesselTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/DampedBesselTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py
index b6929e36e5daa795d267ffa236f54c8f98f6036a..152ba9d4d1cfdcefb25ebb7b86c5dee120331bb1 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py
@@ -4,12 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
-from six.moves import zip
-
from MsdTestHelper import (is_registered, check_output, do_a_fit)
diff --git a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereAlkylTest.py b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereAlkylTest.py
index 262de3c569c8cfdd533b3a68286d3f724373f433..194c4acb8b73c0577ebb9aee822a2744054a3e8a 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereAlkylTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereAlkylTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereTest.py b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereTest.py
index 03986189c426297e8e819a69d4d141e57d7fc941..1b196f520ac07d1d6671196e3a486f6f93176d53 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py b/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py
index 14a7748598ed17590df3d30aaad7c74e15e682ba..b132abd3da9c49389fd14fd2bf20d4d8b103917f 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import Fit
import testhelpers
+
class _InternalMakeLinear(PythonAlgorithm):
def PyInit(self):
@@ -45,6 +44,7 @@ class _InternalMakeLinear(PythonAlgorithm):
self.setProperty("OutputWorkspace", wspace) # Stores the workspace as the given name
+
class Example1DFunctionTest(unittest.TestCase):
def test_function_has_been_registered(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py b/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py
index 65e1eb08faaaebd366bf7c0d9b8d2e990540c11e..07e09153278e16e4c63d9aeaeba5780d010009e3 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import Fit
import testhelpers
+
class _InternalMakeGaussian(PythonAlgorithm):
def PyInit(self):
@@ -45,6 +44,7 @@ class _InternalMakeGaussian(PythonAlgorithm):
self.setProperty("OutputWorkspace", wspace) # Stores the workspace as the given name
+
class ExamplePeakFunctionTest(unittest.TestCase):
def test_function_has_been_registered(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/FmuFTest.py b/Framework/PythonInterface/test/python/plugins/functions/FmuFTest.py
index 719205a4d91c7853d0c5bbca3ae332a68a1f8566..08e4e7eb4b18677ed954dd1e15dbef22bf447f50 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/FmuFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/FmuFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/GauBroadGauKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/GauBroadGauKTTest.py
index 85e4daf4e2f9d4a58f2390a1cabf42edc2055a5b..73b6105d63632ddcc3e4c8df2975032370ee4009 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/GauBroadGauKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/GauBroadGauKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/GaussBesselTest.py b/Framework/PythonInterface/test/python/plugins/functions/GaussBesselTest.py
index ec53472438f802640b5906f3082f9e648cd2e8c8..0bf121b6499c3779eafc7c9f19d619b44346dfe1 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/GaussBesselTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/GaussBesselTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/HighTFMuoniumTest.py b/Framework/PythonInterface/test/python/plugins/functions/HighTFMuoniumTest.py
index 820d22a23f797dffd6a1cfa285f71d5acf39b17d..0991cb3f98e7982839885d577950d6c444792059 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/HighTFMuoniumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/HighTFMuoniumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/LowTFMuoniumTest.py b/Framework/PythonInterface/test/python/plugins/functions/LowTFMuoniumTest.py
index 5605e9b2f151da24e0963d12155dab14e6f241ab..8ca806cdb45be03d486c3b5cea729faeb5b6c913 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/LowTFMuoniumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/LowTFMuoniumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MeierTest.py b/Framework/PythonInterface/test/python/plugins/functions/MeierTest.py
index 2cb2b8785a9fca19f16832ebc8e92d27d126520a..d62ceb69f5c084d18d0a2134a4855e203803123c 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MeierTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MeierTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ModOscTest.py b/Framework/PythonInterface/test/python/plugins/functions/ModOscTest.py
index 0d54f46e08bb03b30723bb71e7d265cb3ab22661..d5df125c5c1512d5d2e547785feda06a18a5657b 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ModOscTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ModOscTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MsdGaussTest.py b/Framework/PythonInterface/test/python/plugins/functions/MsdGaussTest.py
index f8da7ed228a19213d5317856576483c4ba714607..d43c279c333cb8ac78baf1de8386191c48f93cc9 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MsdGaussTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MsdGaussTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MsdPetersTest.py b/Framework/PythonInterface/test/python/plugins/functions/MsdPetersTest.py
index 8115e580174eb3236d57f0de7659386278bfd632..1b13a9705b49792dbbde0ef6d2844ef96d9faab4 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MsdPetersTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MsdPetersTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MsdYiTest.py b/Framework/PythonInterface/test/python/plugins/functions/MsdYiTest.py
index 1df748c01b15a6a06de40333d2b6fe43b012c616..450bca6f3240b4c5300ede2eddc85e30d8ed8097 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MsdYiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MsdYiTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MuHTest.py b/Framework/PythonInterface/test/python/plugins/functions/MuHTest.py
index 8af4bf30017ffd7daf337aeecfec0c9452a6d6fa..6cbc40dd7fa03c5b516108828cfb45aa8537291b 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MuHTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MuHTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MuMinusExpTFTest.py b/Framework/PythonInterface/test/python/plugins/functions/MuMinusExpTFTest.py
index fa6f95ad6e05849b9e48771568db6c5e970317b8..5cb47329e9ed9c7d571b65d08ac3979254896f6b 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MuMinusExpTFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MuMinusExpTFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetRedfieldTest.py b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetRedfieldTest.py
index 458842e126040f89b58cd48e51458d157f76f571..5060ff0a066a451762dd88c64e7e69510bb88c8e 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetRedfieldTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetRedfieldTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetTest.py b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetTest.py
index 4e8eea6d347e035b7672b4df84f8ed6c340369aa..7b1522c647da673fa4bfa8ecf5fa6237c7a30f2f 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetZFKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetZFKTTest.py
index b925f5fa25cb19dc1abf1682c2856ad9493ccfeb..cb67f49eaa8d0356488edffcd136221d0cbeea53 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetZFKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetZFKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetfnormTest.py b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetfnormTest.py
index 91a9f620cb7a81daa79311d0e192eddb770bb853..b826758d3767ceeab034beabcb15233198f3b613 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetfnormTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetfnormTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py b/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py
index 01bcd3335f4fbc5c294c54dd9890edd773b33785..2b77243966eddece330b11dd01c7cfcc58841c48 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py
@@ -4,11 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from StretchedExpFTTestHelper import isregistered, do_fit
+
class PrimStretchedExpFTTest(unittest.TestCase):
def testRegistered(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/RFresonanceTest.py b/Framework/PythonInterface/test/python/plugins/functions/RFresonanceTest.py
index eaf5f700e7d9b8bfdb5834f7f47a54d78d31d4ce..84af981f7ea1f7f506127f9df59283de8d971fb8 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/RFresonanceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/RFresonanceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/RedfieldTest.py b/Framework/PythonInterface/test/python/plugins/functions/RedfieldTest.py
index 52bc64a9ccbd9772d039d55f6b97e28e2f31e1ac..bd62d69edc7d0e8267ae293a2f3f8db32934385e 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/RedfieldTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/RedfieldTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/SpinGlassTest.py b/Framework/PythonInterface/test/python/plugins/functions/SpinGlassTest.py
index 7b771e4c5cce3d097fc09d496224dc9149014dd4..fff1f524acc26d51e5762afdcfbb8b8618876a20 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/SpinGlassTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/SpinGlassTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StandardSCTest.py b/Framework/PythonInterface/test/python/plugins/functions/StandardSCTest.py
index 537ee0f870478ad2f67b779ab5a7a010f2757a53..580ab7395f853c2c2c8a556574092b2dd9b36a31 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StandardSCTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StandardSCTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StaticLorentzianKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/StaticLorentzianKTTest.py
index d996f040ac99edf341af0e78d60523d31f79f8e3..f134da94febc121961c45d0e0b0f5bc3a24ccc6f 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StaticLorentzianKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StaticLorentzianKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
index b3e5c68766644596e3e0efb48afa1c1685d75bef..1b507010c98d1c7654c437fbee1672f439f6807f 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
@@ -4,11 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from StretchedExpFTTestHelper import isregistered, do_fit
+
class StretchedExpFTTest(unittest.TestCase):
def testRegistered(self):
@@ -43,4 +43,3 @@ class StretchedExpFTTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py
index 991c49ece8a3b10b3435fd038c72b4a113a592e4..dcfe97a4ed35482aab5b29b98b3be2f628dc1015 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from scipy import constants
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StretchedKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/StretchedKTTest.py
index 5cbbb673aa82290cacf71dcd126d4fa295334e6d..ed227f8d6f718756af2830d8af604f265a01599c 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StretchedKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StretchedKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/TFMuoniumTest.py b/Framework/PythonInterface/test/python/plugins/functions/TFMuoniumTest.py
index e78ad616f88ef3969c6c91e5cfcd7b3ea70ccbcc..cad50d027636dc35921bcafa0edd28152f3801e1 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/TFMuoniumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/TFMuoniumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/TeixeiraWaterTest.py b/Framework/PythonInterface/test/python/plugins/functions/TeixeiraWaterTest.py
index a26a3f56c567b1e0c4bc2768d3b2c48a617920f2..ed4fabcc316816977774f646aaaf49a141ebb65b 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/TeixeiraWaterTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/TeixeiraWaterTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ZFMuoniumTest.py b/Framework/PythonInterface/test/python/plugins/functions/ZFMuoniumTest.py
index 74633aeacf70f9864e07013b5e84692fa1fc781f..22e399f6330190dabd390a53e572a8d2850f7da1 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ZFMuoniumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ZFMuoniumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ZFdipoleTest.py b/Framework/PythonInterface/test/python/plugins/functions/ZFdipoleTest.py
index ffe8d0db6c7eb3a27e85b1e1d474d0ad206dea2f..cd190e70fd2c7a5656a6b1f0a9e7c71a6f2ee6cc 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ZFdipoleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ZFdipoleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ZFelectronDipoleTest.py b/Framework/PythonInterface/test/python/plugins/functions/ZFelectronDipoleTest.py
index f6702b678300c69c362f61fefbc3cbf910289670..783cf238387f7dec295af3dcd35869f3dc3f87fe 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ZFelectronDipoleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ZFelectronDipoleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ZFprotonDipoleTest.py b/Framework/PythonInterface/test/python/plugins/functions/ZFprotonDipoleTest.py
index 6aea67e457bfc8fbdd7dcf7881c796700b9defbc..a53cf428821c9e74c00b5ab5e70de7ba0f02b3bc 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ZFprotonDipoleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ZFprotonDipoleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelper/__init__.py b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelper/__init__.py
index e263aa0814864f68a91009f8e92fc68210d1d643..6052818231ac71a4c29b2442836185b3f0cb0dd6 100644
--- a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelper/__init__.py
+++ b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelper/__init__.py
@@ -4,6 +4,4 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from _WorkspaceCreationHelper import *
diff --git a/Framework/PythonInterface/test/testhelpers/__init__.py b/Framework/PythonInterface/test/testhelpers/__init__.py
index 395d69af206a21f9a5c01e9d2e36ce5218a1d88f..820dce2e78fd62385033feb37cc37c2df1840391 100644
--- a/Framework/PythonInterface/test/testhelpers/__init__.py
+++ b/Framework/PythonInterface/test/testhelpers/__init__.py
@@ -7,8 +7,7 @@
"""Defines a set of helpers wrapped around the C++ TestHelpers package that
are for use in unit tests only!
"""
-from __future__ import (absolute_import, division,
- print_function)
+
from distutils.version import LooseVersion
@@ -19,6 +18,7 @@ import numpy
# Define some pure-Python functions to add to the mix
+
def run_algorithm(name, **kwargs):
"""Run a named algorithm and return the
algorithm handle
diff --git a/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py b/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py
index 9bb863b56fbef9794da4a632029d71d5e3ba2355..cee854f4e7e61dd3394f8b582515d5027fa104b8 100644
--- a/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py
+++ b/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py
@@ -4,11 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import inspect
import re
+
def make_decorator(algorithm_to_decorate):
"""
Dynamically create a builder pattern style decorator around a Mantid algorithm.
diff --git a/Framework/PythonInterface/test/testhelpers/illhelpers.py b/Framework/PythonInterface/test/testhelpers/illhelpers.py
index 307a5a77d2f52e9d37afa3702e085765a276612e..f545392bd3d9c36c4011386326d506b6d3eadd17 100644
--- a/Framework/PythonInterface/test/testhelpers/illhelpers.py
+++ b/Framework/PythonInterface/test/testhelpers/illhelpers.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from mantid.kernel import DeltaEModeType, UnitConversion
import numpy
diff --git a/Framework/PythonInterface/test/testhelpers/mlzhelpers.py b/Framework/PythonInterface/test/testhelpers/mlzhelpers.py
index 02a9631f73737920d41d9504bc967f9ff08117dc..b53a551dfad4fc31444ec8f2d02631c078db8d48 100644
--- a/Framework/PythonInterface/test/testhelpers/mlzhelpers.py
+++ b/Framework/PythonInterface/test/testhelpers/mlzhelpers.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/test/testhelpers/tempfile_wrapper.py b/Framework/PythonInterface/test/testhelpers/tempfile_wrapper.py
index 9d75d8031c35c3b53ef6c672fb9a0962f75297e2..424ea5b1e8fafe3b2b790c0593027268321bf02e 100644
--- a/Framework/PythonInterface/test/testhelpers/tempfile_wrapper.py
+++ b/Framework/PythonInterface/test/testhelpers/tempfile_wrapper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from tempfile import NamedTemporaryFile
import os
diff --git a/Framework/PythonInterface/test/testhelpers/testrunner.py b/Framework/PythonInterface/test/testhelpers/testrunner.py
index 161558f5ea6928a36adf7b16954dceea082fa22a..ea7103a5c01e6f73b51d688badd9edc8cfbc0fca 100644
--- a/Framework/PythonInterface/test/testhelpers/testrunner.py
+++ b/Framework/PythonInterface/test/testhelpers/testrunner.py
@@ -11,8 +11,6 @@ once qtpy is universally used.
It is intended to be used as a launcher script for a given unit test file.
The reports are output to the current working directory.
"""
-from __future__ import (absolute_import, division, print_function)
-
import imp
import os
import sys
diff --git a/MantidPlot/ipython_widget/__init__.py b/MantidPlot/ipython_widget/__init__.py
index 1300e7ee5ed5416e7f3eacd883017afe7047c7f7..0f46fcd36c1854390f5ebb9f942861bbc680f909 100644
--- a/MantidPlot/ipython_widget/__init__.py
+++ b/MantidPlot/ipython_widget/__init__.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division,
- print_function)
+
from .mantid_ipython_widget import *
diff --git a/MantidPlot/ipython_widget/mantid_ipython_widget.py b/MantidPlot/ipython_widget/mantid_ipython_widget.py
index 2ab0a34db9f252e8a1843b5e9499a92edddf2216..ef29c7659c8e058db270e14afa7dde8e90fd7f58 100644
--- a/MantidPlot/ipython_widget/mantid_ipython_widget.py
+++ b/MantidPlot/ipython_widget/mantid_ipython_widget.py
@@ -4,14 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division,
- print_function)
+
import sys
import threading
import types
import warnings
-from mantid.py3compat import getfullargspec
+from inspect import getfullargspec
from PyQt4 import QtGui
# IPython monkey patches the pygments.lexer.RegexLexer.get_tokens_unprocessed method
diff --git a/MantidPlot/mantidplot.py b/MantidPlot/mantidplot.py
index a81905468499164d37fd50aa50ca14a91ce544de..85cda6be56c086620cb3f2743a7d96640fc2e954 100644
--- a/MantidPlot/mantidplot.py
+++ b/MantidPlot/mantidplot.py
@@ -10,8 +10,7 @@
# Load 'pymantidplot' which cannot be called 'mantidplot' because of
# name conflict with the MantidPlot binary (especially on osx)
#-------------------------------------------------------------------
-from __future__ import (absolute_import, division,
- print_function)
+
import os.path as osp
import sys
@@ -26,6 +25,7 @@ import pymantidplot.qtiplot
# error early if PyQt4 cannot be used
import PyQt4
+
def load_ui(caller_filename, ui_relfilename, baseinstance=None):
'''This is copied from mantidqt.utils.qt and should be deprecated as
soon as possible.'''
diff --git a/MantidPlot/mantidplotrc.py b/MantidPlot/mantidplotrc.py
index 1b463a9c7f2cdd7c4c20b6d5d3a3f1cfa8ae06f5..f0713a31d8f7c3876be93bf5333aaca02b39e7a6 100644
--- a/MantidPlot/mantidplotrc.py
+++ b/MantidPlot/mantidplotrc.py
@@ -23,8 +23,6 @@ if __name__ == '__main__':
except ImportError:
pass
- from six import iteritems as _iteritems
-
# Import MantidPlot python commands
import mantidplot
from mantidplot import *
@@ -70,7 +68,7 @@ if __name__ == '__main__':
return []
from mantid.simpleapi import _get_function_spec
keywords = []
- for name,obj in _iteritems(definitions):
+ for name,obj in definitions.items():
if name.startswith('_') : continue
if _inspect.isclass(obj) or _inspect.ismodule(obj):
continue
diff --git a/MantidPlot/pymantidplot/__init__.py b/MantidPlot/pymantidplot/__init__.py
index c8d9a29887ba5a7c2e1b81a5f3035d0131b95417..c306ad7e1641d9e843651079f025f396b15d590d 100644
--- a/MantidPlot/pymantidplot/__init__.py
+++ b/MantidPlot/pymantidplot/__init__.py
@@ -8,8 +8,7 @@
MantidPlot module to gain access to plotting functions etc.
Requires that the main script be run from within MantidPlot
"""
-from __future__ import (absolute_import, division,
- print_function)
+
# Requires MantidPlot
try:
import _qti
@@ -34,8 +33,6 @@ import mantidqtpython
from mantidqtpython import GraphOptions # noqa
# historical names in MantidPlot
from mantidqtpython import MantidQt as _MantidQt
-from six.moves import range
-
# (a) don't need a proxy & (b) can be constructed from python or (c) have enumerations within them
from _qti import (PlotSymbol, ImageSymbol, ArrowMarker, ImageMarker, InstrumentView) # noqa
@@ -63,6 +60,7 @@ def _get_analysis_data_service():
# -------------------------- Wrapped MantidPlot functions -----------------
+
def runPythonScript(code, asynchronous=False, quiet=False, redirect=True):
"""
Redirects the runPythonScript method to the app object
diff --git a/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py b/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py
index 5fc30c9d8e030be57c0df89a3c85d75b8ca21154..3d3fdceba7f5699eb438b848305a6097493bb77c 100644
--- a/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py
+++ b/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py
@@ -13,8 +13,7 @@ mode for MantidPlot is to run all python scripts asynchronously.
Providing this backend allows users to work with the standard matplotlib
API without modification
"""
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
try:
# Newer matplotlib has qt_compat
@@ -26,8 +25,6 @@ except ImportError:
# Import everything from the *real* matplotlib backend
from matplotlib.backends.backend_qt4agg import *
from matplotlib.figure import Figure
-import six
-
# Remove the implementations of new_figure_manager_*. We replace them below
del new_figure_manager
try:
@@ -71,7 +68,7 @@ class QAppThreadCall(QtCore.QObject):
QtCore.QMetaObject.invokeMethod(self, "on_call",
QtCore.Qt.BlockingQueuedConnection)
if self._exc_info is not None:
- six.reraise(*self._exc_info)
+ raise self._exc_info[1].with_traceback(self._exc_info[2])
return self._result
@QtCore.pyqtSlot()
diff --git a/MantidPlot/pymantidplot/proxies.py b/MantidPlot/pymantidplot/proxies.py
index 617b336c94729fa3b12fad9e00bb30f1bd269a7f..67fa08586b09d82de69b1bb92350f1dacde8a4f4 100644
--- a/MantidPlot/pymantidplot/proxies.py
+++ b/MantidPlot/pymantidplot/proxies.py
@@ -9,10 +9,6 @@ Module containing classes that act as proxies to the various MantidPlot gui obje
accessible from python. They listen for the QObject 'destroyed' signal and set the wrapped
reference to None, thus ensuring that further attempts at access do not cause a crash.
"""
-from __future__ import (absolute_import, division,
- print_function)
-from six.moves import range
-
from PyQt4 import QtCore, QtGui
from PyQt4.QtCore import Qt, pyqtSlot
try:
@@ -26,6 +22,7 @@ import mantidqtpython
#--------------------------- MultiThreaded Access ----------------------------
#-----------------------------------------------------------------------------
+
class CrossThreadCall(QtCore.QObject):
"""
Defines a dispatch call that marshals
@@ -94,6 +91,7 @@ class CrossThreadCall(QtCore.QObject):
argtype = int
return argtype
+
def threadsafe_call(callable, *args, **kwargs):
"""
Calls the given function with the given arguments
@@ -104,6 +102,7 @@ def threadsafe_call(callable, *args, **kwargs):
caller = CrossThreadCall(callable)
return caller.dispatch(*args, **kwargs)
+
def new_proxy(classType, callable, *args, **kwargs):
"""
Calls the callable object with the given args and kwargs dealing
@@ -124,6 +123,7 @@ def new_proxy(classType, callable, *args, **kwargs):
#--------------------------- Proxy Objects -----------------------------------
#-----------------------------------------------------------------------------
+
class QtProxyObject(QtCore.QObject):
"""Generic Proxy object for wrapping Qt C++ QObjects.
This holds the QObject internally and passes methods to it.
@@ -212,6 +212,8 @@ class QtProxyObject(QtCore.QObject):
self.__obj = obj
#-----------------------------------------------------------------------------
+
+
class MDIWindow(QtProxyObject):
"""Proxy for the _qti.MDIWindow object.
Also used for subclasses that do not need any methods intercepted (e.g. Table, Note, Matrix)
@@ -223,6 +225,8 @@ class MDIWindow(QtProxyObject):
return new_proxy(Folder, self._getHeldObject().folder)
#-----------------------------------------------------------------------------
+
+
class Graph(MDIWindow):
"""Proxy for the _qti.Graph object.
"""
@@ -440,6 +444,8 @@ class Graph3D(QtProxyObject):
threadsafe_call(self._getHeldObject().setMatrix, matrix._getHeldObject())
#-----------------------------------------------------------------------------
+
+
class Spectrogram(QtProxyObject):
"""Proxy for the _qti.Spectrogram object.
"""
@@ -451,6 +457,8 @@ class Spectrogram(QtProxyObject):
return new_proxy(QtProxyObject, self._getHeldObject().matrix)
#-----------------------------------------------------------------------------
+
+
class Folder(QtProxyObject):
"""Proxy for the _qti.Folder object.
"""
@@ -546,6 +554,8 @@ class Folder(QtProxyObject):
return new_proxy(Folder, self._getHeldObject().rootFolder)
#-----------------------------------------------------------------------------
+
+
class MantidMatrix(MDIWindow):
"""Proxy for the _qti.MantidMatrix object.
"""
@@ -575,6 +585,8 @@ class MantidMatrix(MDIWindow):
return new_proxy(Graph, self._getHeldObject().plotGraph2D, type)
#-----------------------------------------------------------------------------
+
+
class InstrumentView(MDIWindow):
"""Proxy for the instrument window
"""
@@ -755,6 +767,8 @@ class SliceViewerWindowProxy(QtProxyObject):
return liner
#-----------------------------------------------------------------------------
+
+
def getWorkspaceNames(source):
"""Takes a "source", which could be a WorkspaceGroup, or a list
of workspaces, or a list of names, and converts
@@ -802,6 +816,8 @@ def getWorkspaceNames(source):
return ws_names
#-----------------------------------------------------------------------------
+
+
class ProxyCompositePeaksPresenter(QtProxyObject):
def __init__(self, toproxy):
QtProxyObject.__init__(self,toproxy)
@@ -820,6 +836,8 @@ class ProxyCompositePeaksPresenter(QtProxyObject):
return new_proxy(QtProxyObject, self._getHeldObject().getPeaksPresenter, to_present)
#-----------------------------------------------------------------------------
+
+
class SliceViewerProxy(QtProxyObject):
"""Proxy for a C++ SliceViewer widget.
"""
@@ -921,26 +939,32 @@ class TiledWindowProxy(QtProxyObject):
"""
threadsafe_call(self._getHeldObject().clear)
+
def showHelpPage(page_name=None):
"""Show a page in the help system"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showHelpPage, page_name)
+
def showWikiPage(page_name=None):
"""Show a wiki page through the help system"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showWikiPage, page_name)
+
def showAlgorithmHelp(algorithm=None, version=-1):
"""Show an algorithm help page"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showAlgorithmHelp, algorithm, version)
+
def showConceptHelp(name=None):
"""Show a concept help page"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showConceptHelp, name)
+
def showFitFunctionHelp(name=None):
"""Show a fit function help page"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showFitFunctionHelp, name)
+
def showCustomInterfaceHelp(name=None):
"""Show a custom interface help page"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showCustomInterfaceHelp, name)
diff --git a/MantidPlot/pymantidplot/qtiplot.py b/MantidPlot/pymantidplot/qtiplot.py
index 9a3ebdf99bed5bd2b582129e9f229b4923196bc7..70e60bc0a770ed5cf60125b26a97a62983bee23d 100644
--- a/MantidPlot/pymantidplot/qtiplot.py
+++ b/MantidPlot/pymantidplot/qtiplot.py
@@ -11,8 +11,7 @@ qti-based MantidPlot Python plotting interface
As with other MantidPlot modules, this has to run from within MantidPlot
"""
-from __future__ import (absolute_import, division,
- print_function)
+
# Require MantidPlot
try:
@@ -25,6 +24,8 @@ from PyQt4 import QtCore
#-----------------------------------------------------------------------------
# Intercept qtiplot "plot" command and forward to plotSpectrum for a workspace
+
+
def plot(source, *args, **kwargs):
"""Create a new plot given a workspace, table or matrix.
diff --git a/MantidPlot/test/MantidPlotInputArgsCheck.py b/MantidPlot/test/MantidPlotInputArgsCheck.py
index c68753298a9da3de539c65b76776fa937188fad3..dc2d91043f2d4a7e1b25ea8fd9e39ed435006e4f 100644
--- a/MantidPlot/test/MantidPlotInputArgsCheck.py
+++ b/MantidPlot/test/MantidPlotInputArgsCheck.py
@@ -11,7 +11,6 @@ All these functions should throw a ValueError exception when, for example:
- the specified workspaces don't exist
- the index(es) of spectra, bin or dimension is wrong
"""
-from __future__ import (absolute_import, division, print_function)
import mantidplottests
from mantidplottests import *
import time
@@ -40,6 +39,7 @@ CreateMDWorkspace(Dimensions='3',Extents='0,10,0,10,0,10',Names='x,y,z',Units='m
WrongWorkspaceName = 'foo inexistent'
+
class MantidPlotInputArgsCheck(unittest.TestCase):
def setUp(self):
diff --git a/MantidPlot/test/MantidPlotMatplotlibTest.py b/MantidPlot/test/MantidPlotMatplotlibTest.py
index 6da54072598409c10c7beb80c64cdf26cdcaecb9..99ecc31cbf248a17ee37587381ce0e50c22ad20e 100644
--- a/MantidPlot/test/MantidPlotMatplotlibTest.py
+++ b/MantidPlot/test/MantidPlotMatplotlibTest.py
@@ -7,8 +7,6 @@
"""
Test matplotlib plotting for MantidPlot. Without our custom backend matplotlib graphs crash MantidPlot.
"""
-from __future__ import print_function
-
import mantidplottests
from mantidplottests import *
import time
diff --git a/MantidPlot/test/mantidplottests.py b/MantidPlot/test/mantidplottests.py
index a9da33b4cdd5aa35f21576b761fdf542e94cf9d5..9e9592bbe67686d2e8afca47feb19af5a3d8c8c9 100644
--- a/MantidPlot/test/mantidplottests.py
+++ b/MantidPlot/test/mantidplottests.py
@@ -13,7 +13,6 @@ Public methods:
screenshot(): take a screenshot and save to a report
"""
-from __future__ import (absolute_import, division, print_function)
import sys
import os
import unittest
@@ -33,6 +32,7 @@ except:
qtest = False
print("QTest not available")
+
def moveMouseToCentre(widget):
"""Moves the mouse over the widget
"""
@@ -41,6 +41,7 @@ def moveMouseToCentre(widget):
threadsafe_call(QTest.mouseMove, widget)
QtCore.QCoreApplication.processEvents()
+
def runTests(classname):
""" Run the test suite in the class.
Uses the XML runner if the MANTID_SOURCE environment variable was set.
diff --git a/Testing/Data/UnitTest/AttenuationProfile.DAT.md5 b/Testing/Data/UnitTest/AttenuationProfile.DAT.md5
new file mode 100644
index 0000000000000000000000000000000000000000..5f10d3b8dfbcfe89e31e585650813e499f66912c
--- /dev/null
+++ b/Testing/Data/UnitTest/AttenuationProfile.DAT.md5
@@ -0,0 +1 @@
+0c7226ecaad6ef64fd43f3596c0fa9f7
diff --git a/Testing/PerformanceTests/analysis_mpl.py b/Testing/PerformanceTests/analysis_mpl.py
index d5b8427b1bfb2d05ef27f0b3c119012b5ba50b7c..1d26bcff1a910f4a9bfe9abf3b8269dc6f78a3e8 100644
--- a/Testing/PerformanceTests/analysis_mpl.py
+++ b/Testing/PerformanceTests/analysis_mpl.py
@@ -7,15 +7,11 @@
""" Module containing functions for test
performance analysis, plotting, and saving
to other formats (CSV, PDF) """
-from __future__ import (absolute_import, division, print_function)
-
import datetime
import os
import numpy as np
from pylab import close, figure, gcf, plot, xticks, ylabel, xlabel, title, savefig
-from six.moves import range
-
import sqlresults
from sqlresults import get_results
diff --git a/Testing/PerformanceTests/sqlresults.py b/Testing/PerformanceTests/sqlresults.py
index bdb6de9750c2219d921afb9b1797f99c5b54438e..d060abe9fa93b232d2b0a75ebdc435f7fd9c10f2 100644
--- a/Testing/PerformanceTests/sqlresults.py
+++ b/Testing/PerformanceTests/sqlresults.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
try:
import sqlite3
has_sql = True
diff --git a/Testing/SystemTests/lib/systemtests/systemtesting.py b/Testing/SystemTests/lib/systemtests/systemtesting.py
index fe2d60a02daa19d046706fcf3912a70c7dfa282a..be7db3fb06b5f2bab22f55e92cf0411c4f4a8dd9 100644
--- a/Testing/SystemTests/lib/systemtests/systemtesting.py
+++ b/Testing/SystemTests/lib/systemtests/systemtesting.py
@@ -11,8 +11,6 @@ or by importing them into MantidPlot.
File change history is stored at: <https://github.com/mantidproject/systemtests>.
"""
-from __future__ import (absolute_import, division, print_function)
-
# == for testing conda build of mantid-framework ==========
import os
@@ -21,7 +19,6 @@ if os.environ.get('MANTID_FRAMEWORK_CONDA_SYSTEMTEST'):
import matplotlib
# =========================================================
-from six import PY3
import datetime
import difflib
import imp
@@ -764,9 +761,8 @@ class TestSuite(object):
self._result.status = status
self._result.addItem(['status', status])
# Dump std out so we know what happened
- if PY3:
- if isinstance(output, bytes):
- output = output.decode()
+ if isinstance(output, bytes):
+ output = output.decode()
self._result.output = '\n' + output
all_lines = output.split('\n')
# Find the test results
diff --git a/Testing/SystemTests/lib/systemtests/xmlreporter.py b/Testing/SystemTests/lib/systemtests/xmlreporter.py
index bcfe0d98a31bf94256f1f5da77323c666750aef7..2d2d911ed51012552caab20b83cb1468f187fc93 100644
--- a/Testing/SystemTests/lib/systemtests/xmlreporter.py
+++ b/Testing/SystemTests/lib/systemtests/xmlreporter.py
@@ -4,12 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import sys
from xml.dom.minidom import getDOMImplementation
import systemtesting
+
class XmlResultReporter(systemtesting.ResultReporter):
_time_taken = 0.0
diff --git a/Testing/SystemTests/scripts/InstallerTests.py b/Testing/SystemTests/scripts/InstallerTests.py
index 3f33057f878b9e5a156c0ce299c2b3cb8992a426..b45b97ebcb9517e19d915757c6b31f2c82333706 100644
--- a/Testing/SystemTests/scripts/InstallerTests.py
+++ b/Testing/SystemTests/scripts/InstallerTests.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""Finds a package, installs it and runs the tests against it.
"""
import argparse
diff --git a/Testing/SystemTests/scripts/mantidinstaller.py b/Testing/SystemTests/scripts/mantidinstaller.py
index 4b589a0f27696af45bf6ed54ed0b10892cc8e012..0e59456109b57d318595a6ce5893075f0a47782c 100644
--- a/Testing/SystemTests/scripts/mantidinstaller.py
+++ b/Testing/SystemTests/scripts/mantidinstaller.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""Defines classes for handling installation
"""
import platform
diff --git a/Testing/SystemTests/scripts/performance/analysis.py b/Testing/SystemTests/scripts/performance/analysis.py
index 2654be90a0188185ac6973f76b865b79f67da75a..16e027062d080969f5c4ddd22705efc8008b3691 100644
--- a/Testing/SystemTests/scripts/performance/analysis.py
+++ b/Testing/SystemTests/scripts/performance/analysis.py
@@ -7,8 +7,6 @@
""" Module containing functions for test
performance analysis, plotting, and saving
to other formats (CSV, PDF) """
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import testresult
import os
import sys
@@ -24,6 +22,8 @@ import random
DATE_STR_FORMAT = "%Y-%m-%d %H:%M:%S.%f"
#============================================================================================
+
+
def get_orderby_clause(last_num):
"""Returns a order by clause that limits to the last # revisions """
if last_num > 0:
@@ -98,6 +98,8 @@ def get_unique_fields(results, field):
return list(out)
#============================================================================================
+
+
def get_results_matching(results, field, value):
"""Given a list of TestResult,
return a list of TestResult's where 'field' matches 'value'."""
@@ -275,6 +277,8 @@ default_html_header = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transition
default_html_footer = """</body></html>"""
#============================================================================================
+
+
def make_css_file(path):
""" Make a save the report.css file to be used by all html """
default_css = """
@@ -310,6 +314,8 @@ font-weight: bold;
f.close()
#============================================================================================
+
+
def make_environment_html(res):
"""Return a HTML string with details of test environment, taken from the
'res' TestResult object"""
@@ -322,6 +328,8 @@ def make_environment_html(res):
return html
#============================================================================================
+
+
def make_detailed_html_file(basedir, name, fig1, fig2, fig3, fig4, last_num):
""" Create a detailed HTML report for the named test """
html = default_html_header
diff --git a/Testing/SystemTests/scripts/performance/sqlresults.py b/Testing/SystemTests/scripts/performance/sqlresults.py
index ed4d530cb3c9cc7f3fd694ffcca7cd94252ea2eb..ec1f57c4836bb0ce8e1523bab0601ddf1b574392 100644
--- a/Testing/SystemTests/scripts/performance/sqlresults.py
+++ b/Testing/SystemTests/scripts/performance/sqlresults.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
try:
import sqlite3
has_sql = True
@@ -22,6 +20,8 @@ import math
import random
#====================================================================================
+
+
def getSourceDir():
"""Returns the location of the source code."""
import os
@@ -44,17 +44,23 @@ TABLE_FIELDS = ['date', 'name', 'type', 'host', 'environment', 'runner',
database_file = os.path.join(getSourceDir(), "MantidSystemTests.db")
#=====================================================================
+
+
def get_database_filename():
"""Return the path to the database to use """
return database_file
#=====================================================================
+
+
def set_database_filename(value):
"""Override the default database location"""
global database_file
database_file = value
#=====================================================================
+
+
def SQLgetConnection():
""" Get a connection to the SQL database """
# These are automatic conversion factors
@@ -103,6 +109,8 @@ def get_latest_result(name=''):
return None
#=====================================================================
+
+
def get_results(name, type="", where_clause='', orderby_clause=''):
"""Return a list of testresult.TestResult objects
generated from looking up in the table
@@ -179,6 +187,8 @@ def get_all_field_values(field_name, where_clause=""):
return out
#=====================================================================
+
+
def get_latest_revison():
""" Return the latest revision number """
# Now get the latest revision
@@ -193,6 +203,8 @@ def get_latest_revison():
return 0
#=====================================================================
+
+
def add_revision():
""" Adds an entry with the current date/time to the table.
Retrieve the index of that entry = the "revision".
diff --git a/Testing/SystemTests/scripts/runSystemTests.py b/Testing/SystemTests/scripts/runSystemTests.py
index 641d723a0415a0919255e6a06af1dcedd5f2b399..c850a3c1cf0528272579e04d97da7f3f4b9da22d 100755
--- a/Testing/SystemTests/scripts/runSystemTests.py
+++ b/Testing/SystemTests/scripts/runSystemTests.py
@@ -5,15 +5,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import argparse
import os
import sys
import time
from multiprocessing import Process, Array, Manager, Value, Lock
-from six import itervalues
try:
# If any tests happen to hit a PyQt4 import make sure item uses version 2 of the api
# Remove this when everything is switched to qtpy
@@ -326,7 +323,7 @@ def main():
if options.dry_run:
print()
print("Tests that would be executed:")
- for suites in itervalues(test_list):
+ for suites in test_list.values():
for suite in suites:
print(' ' + suite.name)
elif not options.clean:
diff --git a/Testing/SystemTests/tests/analysis/AbinsTest.py b/Testing/SystemTests/tests/analysis/AbinsTest.py
index 0201954fbf1e3063aac61777648295c977fbd749..25ff1bb60536e5311404823a8231755a804d8f43 100644
--- a/Testing/SystemTests/tests/analysis/AbinsTest.py
+++ b/Testing/SystemTests/tests/analysis/AbinsTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import Abins, mtd, DeleteWorkspace
from AbinsModules import AbinsConstants, AbinsTestHelpers
diff --git a/Testing/SystemTests/tests/analysis/BASISTest.py b/Testing/SystemTests/tests/analysis/BASISTest.py
index 5f3fd867b0db7c1bfa28f3d000427a5f08e992f8..bbb972a2403c329964ba9b7ecb370919184fb96b 100644
--- a/Testing/SystemTests/tests/analysis/BASISTest.py
+++ b/Testing/SystemTests/tests/analysis/BASISTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid import config
from mantid.simpleapi import (BASISCrystalDiffraction, GroupWorkspaces,
diff --git a/Testing/SystemTests/tests/analysis/BilbySANSDataProcessorTest.py b/Testing/SystemTests/tests/analysis/BilbySANSDataProcessorTest.py
index 3c10edae98685a112ba2cde25ceed404a7fa20c8..4cf3748bec98a6f90830c9a98b717d732c7f9947 100644
--- a/Testing/SystemTests/tests/analysis/BilbySANSDataProcessorTest.py
+++ b/Testing/SystemTests/tests/analysis/BilbySANSDataProcessorTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from BilbyReductionScript import RunBilbyReduction
diff --git a/Testing/SystemTests/tests/analysis/BuildSQWTest.py b/Testing/SystemTests/tests/analysis/BuildSQWTest.py
index 4b041e1d8d4f696acedcd2449a224dc1c8daff78..46c56034e5109a7d39a6a2279b04b3afb76691eb 100644
--- a/Testing/SystemTests/tests/analysis/BuildSQWTest.py
+++ b/Testing/SystemTests/tests/analysis/BuildSQWTest.py
@@ -13,7 +13,6 @@
the result file that is ~30Gb. The files are not included with the standard
repository & required to be accessible from any machine that wishes to run the test.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py b/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py
index dab0cd186996ecf3439459b93fe06aa5b640d463..6fbc2de35738cf1d2031842a612c338b93e2c222 100644
--- a/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py
+++ b/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from LoadAndCheckBase import *
diff --git a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
index 0d81439462b866c84cd4c629cdacff393c1a766c..42a33495902a219456a9546770c78e6f3889efba 100644
--- a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
+++ b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.simpleapi import *
-from six import string_types
def _skip_test():
@@ -49,7 +47,7 @@ class PG3Calibration(systemtesting.MantidSystemTest):
MaxOffset=0.01, PeakPositions = '.6866,.7283,.8185,.8920,1.0758,1.2615,2.0599',
CrossCorrelation = False, RunNumber = 'PG3_2538')
- if isinstance(output, string_types):
+ if isinstance(output, str):
self.saved_cal_file = output.replace('.h5','.cal')
else:
raise NotImplementedError("Output from CalibrateRectangularDetectors is NOT string for calibration file name!")
@@ -97,7 +95,7 @@ class PG3CCCalibration(systemtesting.MantidSystemTest):
MaxOffset=0.01, PeakPositions = '0.7282933,1.261441',DetectorsPeaks = '17,6',
CrossCorrelation = True, RunNumber = 'PG3_2538')
- if isinstance(output, string_types):
+ if isinstance(output, str):
self.saved_cal_file = output.replace('.h5','.cal')
else:
raise NotImplementedError("Output from CalibrateRectangularDetectors is NOT string for calibration file name!")
diff --git a/Testing/SystemTests/tests/analysis/CodeConventions.py b/Testing/SystemTests/tests/analysis/CodeConventions.py
index a9bd3f22393321463c45f54df269cea93a5832d1..fec9d63d6bc527d85a52eb8f98cc559099f07403 100644
--- a/Testing/SystemTests/tests/analysis/CodeConventions.py
+++ b/Testing/SystemTests/tests/analysis/CodeConventions.py
@@ -5,14 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import re
import mantid
from mantid.simpleapi import *
-from six.moves import range
-from six import iteritems
-
MAX_ALG_LEN = 40 # TODO convention says 20 is the maximum
SPECIAL = ["InputWorkspace", "OutputWorkspace", "Workspace",
@@ -140,7 +136,7 @@ class Algorithms(systemtesting.MantidSystemTest):
def runTest(self):
algs = AlgorithmFactory.getRegisteredAlgorithms(True)
- for (name, versions) in iteritems(algs):
+ for (name, versions) in algs.items():
if not self.verifyAlgName(name):
self.__ranOk += 1
continue
diff --git a/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py b/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py
index c8885d6b5b36de0dd9e9640216474670b32cbe81..1d01967678e81d118bfcd7057e0b532638381836 100644
--- a/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py
+++ b/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/CountReflectionsTest.py b/Testing/SystemTests/tests/analysis/CountReflectionsTest.py
index 6d1ed6b7ca7bdd5bf149f2d3d7d2f6a41246d8a4..034d61ef831a6d8839326a8fb15a5100073c8195 100644
--- a/Testing/SystemTests/tests/analysis/CountReflectionsTest.py
+++ b/Testing/SystemTests/tests/analysis/CountReflectionsTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from SortHKLTest import HKLStatisticsTestMixin
diff --git a/Testing/SystemTests/tests/analysis/DOSTest.py b/Testing/SystemTests/tests/analysis/DOSTest.py
index 5534dbfc9c3e5439ff000bb596f7369de25e2814..65c9cfe91c2abbadafc4c2763a93f2180436e98d 100644
--- a/Testing/SystemTests/tests/analysis/DOSTest.py
+++ b/Testing/SystemTests/tests/analysis/DOSTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.kernel import *
from mantid.api import *
diff --git a/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py b/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
index bf399cb583ae0832e2d2c82e9e81be5e2293f324..610748049bd52934cee9b611dac5b9065bed95fd 100644
--- a/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
+++ b/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
@@ -9,7 +9,6 @@
System test that loads TOPAZ single-crystal data,
and runs Diffraction Workflow.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import numpy
import os
diff --git a/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py b/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
index bf569483a6765694657f0f36df7deb6296c6031f..053b76edaac92eefa30176097b23ba45164c3c33 100644
--- a/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
+++ b/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name,no-init
import os
from systemtesting import MantidSystemTest
diff --git a/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
index 928e96618731bbcdca77eaaf225504e05561b158..ce506f929162307dd23cfd6e1aa9d0888b6b32ba 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import math
import os
diff --git a/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
index c6477b2dc744c73fe428633fc5aabf89c514be2e..1502d84000652e3cf847493227838171678848a6 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
diff --git a/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py b/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
index 48a3bf557c0e0d862144346542428af99f0bac9f..7a82a7c9b65d981280e32cb7dfb38606298948e0 100644
--- a/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
+++ b/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
@@ -7,7 +7,6 @@
# pylint: disable=no-init
import systemtesting
from mantid.simpleapi import *
-from six import PY2
def rel_err_less_delta(val, ref, epsilon):
@@ -239,8 +238,6 @@ class EnginXCalibrateFullThenCalibrateTest(systemtesting.MantidSystemTest):
for idx in [0, 12, 516, 789, 891, 1112]:
cell_val = self.peaks_info.cell(idx, 1)
self.assertTrue(isinstance(cell_val, str))
- if PY2: # This test depends on consistent ordering of a dict which is not guaranteed for python 3
- self.assertEqual(cell_val[0:11], '{"1": {"A":')
self.assertEqual(cell_val[-2:], '}}')
# this will be used as a comparison delta in relative terms (percentage)
diff --git a/Testing/SystemTests/tests/analysis/EnginXScriptTest.py b/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
index 078ded2ee25261231fd27d5614bc22dd02b4471e..02ab8e33ec462bb6da9daae8bfcc9988a89ae8fe 100644
--- a/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
+++ b/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import shutil
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py b/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py
index 53954c27557f1a9bb1eceb674e09ac2d647c2b19..d3dff75930a1f3b29d1a9e7c6784efd1cef10233 100644
--- a/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py
+++ b/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from abc import ABCMeta, abstractmethod
import os
import re
diff --git a/Testing/SystemTests/tests/analysis/GUIStartupTest.py b/Testing/SystemTests/tests/analysis/GUIStartupTest.py
index 73efbf4fef27dd2349a57512ba1013945971a368..edacdbea8a09e607fcc677026c23556c76cb2357 100644
--- a/Testing/SystemTests/tests/analysis/GUIStartupTest.py
+++ b/Testing/SystemTests/tests/analysis/GUIStartupTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import platform
import subprocess
diff --git a/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py b/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
index f20d6fe3bfd76f082510d9c8fb9244aeaeb62cc9..6ecc3080b6ae171f82f20bccb402144f047964b6 100644
--- a/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
@@ -13,7 +13,6 @@
The following tests were converted from the unittest framework
that is part of python to the systemtesting framework used in Mantid.
"""
-from __future__ import (absolute_import, division, print_function)
import types
import traceback
diff --git a/Testing/SystemTests/tests/analysis/ILLDetectorEfficiencyCorUserTest.py b/Testing/SystemTests/tests/analysis/ILLDetectorEfficiencyCorUserTest.py
index fe96ca2f448fd4bebd3db54a56ee92c242f710ea..a937ef3c9805b971ff317dcf27b032e8bcfde73a 100644
--- a/Testing/SystemTests/tests/analysis/ILLDetectorEfficiencyCorUserTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLDetectorEfficiencyCorUserTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy
import systemtesting
from mantid.simpleapi import (ConvertUnits, DetectorEfficiencyCorUser, DirectILLCollectData)
diff --git a/Testing/SystemTests/tests/analysis/ILLDirectGeometryReductionTest.py b/Testing/SystemTests/tests/analysis/ILLDirectGeometryReductionTest.py
index d4462d82145e6a6283d663127884a89a45c0a041..dba4f6a6d5b2c06b093d8d42ce5cdf047a402824 100644
--- a/Testing/SystemTests/tests/analysis/ILLDirectGeometryReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLDirectGeometryReductionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid import mtd
from mantid.simpleapi import (config, CropWorkspace, DeleteWorkspace, DirectILLApplySelfShielding, DirectILLCollectData,
DirectILLDiagnostics, DirectILLIntegrateVanadium, DirectILLReduction, DirectILLSelfShielding,
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderD2BEfficiencyTest.py b/Testing/SystemTests/tests/analysis/ILLPowderD2BEfficiencyTest.py
index 07f9f82ca7039021a0ad9c4684589606f6c0e7ad..17133ebbe370317c10d9a20eea4815ee11cb40aa 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderD2BEfficiencyTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderD2BEfficiencyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import PowderILLEfficiency, GroupWorkspaces
from mantid import config, mtd
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderDetectorScanTest.py b/Testing/SystemTests/tests/analysis/ILLPowderDetectorScanTest.py
index 6862da7fc68810f6ee263960b2a45413795f6d36..46f51f9e22f73139dcb88e608fd86345a0f4be2f 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderDetectorScanTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderDetectorScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyClosureTest.py b/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyClosureTest.py
index e73e60c4ca1569c50e3af18a911c8e7c1db7ddea..c38e5b167ae963f02fc89d9b9a46d05cef1b8b80 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyClosureTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyClosureTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from tempfile import gettempdir
from os import path, remove
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyTest.py b/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyTest.py
index efab9cef6ae31a0129afe878ed8bed060fa2616b..a1edd2e7e4f47df24557d9ccf238f390a4b389d4 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import PowderILLEfficiency, GroupWorkspaces
from mantid import config, mtd
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderParameterScanTest.py b/Testing/SystemTests/tests/analysis/ILLPowderParameterScanTest.py
index a98317f161ef9aef4a4b730d32285e6b71a6bec8..6a07aadf012a299b543c10fd973811eb2b3b0453 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderParameterScanTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderParameterScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import PowderILLParameterScan
from mantid import config, mtd
diff --git a/Testing/SystemTests/tests/analysis/ILLReflAutoProcessTest.py b/Testing/SystemTests/tests/analysis/ILLReflAutoProcessTest.py
index 9b71506c5e19e4575e4034a74eb8173246e40793..bfa2dfe0860286ffe85d4f8741cbee8fa448b166 100644
--- a/Testing/SystemTests/tests/analysis/ILLReflAutoProcessTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLReflAutoProcessTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import ReflectometryILLAutoProcess, config, mtd
diff --git a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
index 4a20e2f4295ebd945aaa186505d63d91115a07ad..8d445c416dff000199e0d92894230bf2053a7d00 100644
--- a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from mantid.api import Workspace
@@ -14,11 +13,10 @@ import shutil
from abc import ABCMeta, abstractmethod
from Direct.PropertyManager import PropertyManager
-from six import with_metaclass
+#----------------------------------------------------------------------
-#----------------------------------------------------------------------
-class ISISDirectInelasticReduction(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISDirectInelasticReduction(metaclass=ABCMeta):
"""A base class for the ISIS direct inelastic tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py b/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
index 7c94af5a1dd94d699e0f370e8cff9a9cf2d5cab7..fc92255b4ad6d60dde31b636cecfd71cc39ee689 100644
--- a/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
+++ b/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
index 1ad59163af653ec9e3c6d12a3402186baff27028..bf83242817d2e0b2cc2fa00a22e79f323edbfeff 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init, too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import warnings
import systemtesting
@@ -14,8 +12,6 @@ import os
from abc import ABCMeta, abstractmethod
from mantid.simpleapi import *
import platform
-from six import with_metaclass
-
#==============================================================================
@@ -329,7 +325,7 @@ class QLWidthTest(systemtesting.MantidSystemTest):
#==============================================================================
-class JumpFitFunctionTestBase(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class JumpFitFunctionTestBase(metaclass=ABCMeta):
def __init__(self):
systemtesting.MantidSystemTest.__init__(self)
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
index 090c193822efee69035f6b9fbe52fa720097b4f9..6587db51b7601605a7c34d1d0a307369c8d8a6d9 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
@@ -73,7 +73,6 @@ systemtesting.MantidSystemTest
|
'''
-from __future__ import (absolute_import, division, print_function)
from abc import ABCMeta, abstractmethod
from mantid.simpleapi import *
@@ -82,10 +81,8 @@ from mantid.simpleapi import *
from mantid.api import FileFinder
from systemtesting import MantidSystemTest, using_gsl_v1
-from six import with_metaclass
-
-class ISISIndirectInelasticBase(with_metaclass(ABCMeta, MantidSystemTest)):
+class ISISIndirectInelasticBase(MantidSystemTest, metaclass=ABCMeta):
'''
A common base class for the ISISIndirectInelastic* base classes.
'''
@@ -157,7 +154,7 @@ class ISISIndirectInelasticBase(with_metaclass(ABCMeta, MantidSystemTest)):
#==============================================================================
-class ISISIndirectInelasticReduction(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticReduction(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic reduction tests
The workflow is defined in the _run() method, simply
@@ -386,7 +383,7 @@ class IRISMultiFileSummedReduction(ISISIndirectInelasticReduction):
#==============================================================================
-class ISISIndirectInelasticCalibration(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticCalibration(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic calibration tests
The workflow is defined in the _run() method, simply
@@ -457,7 +454,7 @@ class IRISCalibration(ISISIndirectInelasticCalibration):
#==============================================================================
-class ISISIndirectInelasticResolution(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticResolution(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic resolution tests
The workflow is defined in the _run() method, simply
@@ -545,7 +542,7 @@ class IRISResolution(ISISIndirectInelasticResolution):
#==============================================================================
-class ISISIndirectInelasticDiagnostics(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticDiagnostics(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic diagnostic tests
The workflow is defined in the _run() method, simply
@@ -619,7 +616,7 @@ class OSIRISDiagnostics(ISISIndirectInelasticDiagnostics):
#==============================================================================
-class ISISIndirectInelasticMoments(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticMoments(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic TransformToIqt/TransformToIqtFit tests
The output of Elwin is usually used with MSDFit and so we plug one into
@@ -683,7 +680,7 @@ class IRISMoments(ISISIndirectInelasticMoments):
#==============================================================================
-class ISISIndirectInelasticElwinAndMSDFit(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticElwinAndMSDFit(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic Elwin/MSD Fit tests
The output of Elwin is usually used with MSDFit and so we plug one into
@@ -785,7 +782,7 @@ class IRISElwinAndMSDFit(ISISIndirectInelasticElwinAndMSDFit):
#==============================================================================
-class ISISIndirectInelasticIqtAndIqtFit(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticIqtAndIqtFit(metaclass=ABCMeta):
'''
A base class for the ISIS indirect inelastic Iqt/IqtFit tests
@@ -909,7 +906,7 @@ class IRISIqtAndIqtFit(ISISIndirectInelasticIqtAndIqtFit):
#==============================================================================
-class ISISIndirectInelasticIqtAndIqtFitMulti(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticIqtAndIqtFitMulti(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic Iqt/IqtFit tests
The output of Elwin is usually used with MSDFit and so we plug one into
@@ -1043,7 +1040,7 @@ class IRISIqtAndIqtFitMulti(ISISIndirectInelasticIqtAndIqtFitMulti):
#==============================================================================
-class ISISIndirectInelasticConvFit(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticConvFit(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic ConvFit tests
The workflow is defined in the _run() method, simply
@@ -1148,7 +1145,7 @@ class IRISConvFit(ISISIndirectInelasticConvFit):
# Transmission Monitor Test
-class ISISIndirectInelasticTransmissionMonitor(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticTransmissionMonitor(metaclass=ABCMeta):
# Mark as an abstract class
def _run(self):
'''Defines the workflow for the test'''
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py
index 370e2abd3cdf1a9bc19c6669ae2158f76c2d99d8..90cdf90ea292c942ae171a25e3d60b059599619d 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as ms
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py
index 28ffe767b136643f3b770cda73efd72116c1f374..348892de97abeae8d7f8ebf09cc84ae27408b80e 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as ms
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
index 6f4cd225177151e29f0e8a0193d4eaa794beefa1..09bf72ffcf8c085940649c233180ee6a2bc8ca38 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
@@ -5,18 +5,15 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init,too-many-instance-attributes,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import math
import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
#----------------------------------------------------------------------
-class ISISMuonAnalysis(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISMuonAnalysis(systemtesting.MantidSystemTest, metaclass=ABCMeta):
"""A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
index 6331a0ea99959cac8238fc0686eb04820fe07315..92b7967f8b87e2551a2373c2d3d9b7e9d6138e54 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
@@ -5,17 +5,14 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init,too-many-instance-attributes,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
#----------------------------------------------------------------------
-class ISISMuonAnalysisGrouping(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISMuonAnalysisGrouping(systemtesting.MantidSystemTest, metaclass=ABCMeta):
"""A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
index e6cf63637416e9d268abb632b262a4f04953cb27..0fe57b9fbb8720b2327713256fce8c3820b8d799 100644
--- a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
@@ -9,15 +9,13 @@
These system tests are to verify that the IDF and parameter files for POLREF, CRISP, INTER and SURF are read properly
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import os
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-class ISISReflInstrumentIDFTest(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISReflInstrumentIDFTest(systemtesting.MantidSystemTest, metaclass=ABCMeta):
@abstractmethod
def get_IDF_name(self):
diff --git a/Testing/SystemTests/tests/analysis/ISISReflectometryWorkflowBase.py b/Testing/SystemTests/tests/analysis/ISISReflectometryWorkflowBase.py
index ecf743351845b5ef95477b50c8657a1de0bb46c7..bbbff8a0470583ceafb7425dcc1d482364ef9117 100644
--- a/Testing/SystemTests/tests/analysis/ISISReflectometryWorkflowBase.py
+++ b/Testing/SystemTests/tests/analysis/ISISReflectometryWorkflowBase.py
@@ -8,7 +8,6 @@
System Test for ISIS Reflectometry reduction
Adapted from scripts provided by Max Skoda.
"""
-from __future__ import (print_function)
from mantid.simpleapi import *
from mantid import ConfigService
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py
index a5202313cb861a03f5bfb9329282b13454e70691..df6792bcba004d4ce0ca288bc04e3fd42453fb0e 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import systemtesting
import shutil
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py
index ced0d1ff131beb7a963c3816b300a6cea13d6949..8b5e3a854b1af2f5faa41fab2bf68fb508529114 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import platform
import shutil
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
index 42d64ef90d06a727dbb3d8ab82e4c207a421e524..72ca3f6abce61ac865bf873e932860a5fc890319 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import systemtesting
import shutil
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
index 4dc45f8bf01fba19fd58326b71dbbd5473f15254..e0e9911071b37d1b0e77560fa42bc30e124e0e70 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import os
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
index 8165d9f397d2b7b5a28f2e95556197c7ac3ee464..b071c1c91a31fd280df0feec7adc3bb2646fc3a9 100644
--- a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
+++ b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
@@ -6,16 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,non-parent-init-called,too-few-public-methods
# non-parent-init-called is disabled to remove false positives from a bug in pyLint < 1.4
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
import systemtesting
import mantid.simpleapi as ms
from mantid import mtd
-from six import with_metaclass
-class ISISIndirectDiffractionReduction(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISIndirectDiffractionReduction(metaclass=ABCMeta):
"""
Base class for tests that use the ISISIndirectDiffractionReduction algorithm.
"""
diff --git a/Testing/SystemTests/tests/analysis/IndirectQuickRunTest.py b/Testing/SystemTests/tests/analysis/IndirectQuickRunTest.py
index 397f77f285e22a0ee4c62d16e60565805dfbfe2c..7508455ed51f72d16863e739fb6e546cf0f3e238 100644
--- a/Testing/SystemTests/tests/analysis/IndirectQuickRunTest.py
+++ b/Testing/SystemTests/tests/analysis/IndirectQuickRunTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (AnalysisDataService, WorkspaceGroup)
from mantid.simpleapi import (CompareWorkspaces, IndirectQuickRun, LoadNexus)
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/LinkedUBs_Test.py b/Testing/SystemTests/tests/analysis/LinkedUBs_Test.py
index 2107e4d37b3696cd004cbea6a190959b27181c65..2a5f88159d5421fcbe41ed4442b02cbcaae2cc67 100644
--- a/Testing/SystemTests/tests/analysis/LinkedUBs_Test.py
+++ b/Testing/SystemTests/tests/analysis/LinkedUBs_Test.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,no-init
# System test that loads short SXD numors and runs LinkedUBs.
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import numpy as np
diff --git a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
index 6efd57d980f1293e4b201232ea720918815c97fc..fd4450316a7903f6bee08933ebf9fcb49beec644 100644
--- a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
+++ b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
@@ -9,16 +9,14 @@
These system tests are to verify the behaviour of the ISIS reflectometry reduction scripts
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import mantid.api
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-class LoadAndCheckBase(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class LoadAndCheckBase(systemtesting.MantidSystemTest, metaclass=ABCMeta):
__comparison_out_workspace_name = 'a_integrated'
diff --git a/Testing/SystemTests/tests/analysis/LoadExedTest.py b/Testing/SystemTests/tests/analysis/LoadExedTest.py
index 530289c0ced512225b11aa5a954c94545c91223c..7a7c7f2dd54d29aab257ff3378f9e9985bf8f855 100644
--- a/Testing/SystemTests/tests/analysis/LoadExedTest.py
+++ b/Testing/SystemTests/tests/analysis/LoadExedTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as ms
diff --git a/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py b/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
index 52be91c318ed51192fa98b611f855421f9dc9cc8..2cd7f558782e23f85b5703274482d15cb8ba7e9f 100644
--- a/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
+++ b/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import config, Load
from mantid.api import FrameworkManager
import os
diff --git a/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py b/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
index d58fa443b22e014d48a9b7ff0b2ace3b6fdbc02c..681691016dd77f922bf11eed1659e54115fbe742 100644
--- a/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
+++ b/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import FrameworkManager
import os
diff --git a/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py b/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
index f03b9634a9d2cb2a78f80430e3c1897a8765c0e5..efec2c29a3cbb0cde29e36f6af5e4b6f1dac525a 100644
--- a/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
+++ b/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.api import FileFinder, MatrixWorkspace, mtd
diff --git a/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py b/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
index bdff0a744c9885021ab1c58d335f577353d78edd..63c930e0d209fcb74cd1ac2efda18805d848dfbe 100644
--- a/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
+++ b/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
@@ -10,14 +10,11 @@ Test some features of MDWorkspaces, such as
file-backed MDWorkspaces.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
-from six.moves import range
-
###############################################################################
diff --git a/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py b/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py
index 681a1dd4bb63b1dadabcfebeca6d7bad0415727a..9d0a9f547d13101ad6b778ee054c1a441ca21933 100644
--- a/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-locals,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py b/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
index 9f0b190f65fc53615dc2f16e9d76735cb3701543..ab6460a003ca5801cbf84d01ba780f067b4b0e51 100644
--- a/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import numpy as np
diff --git a/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py b/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
index 150b55b0447e95b999624116a8481347147e407a..468486569457214aed679a882de1152c3a314829 100644
--- a/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-locals,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import numpy as np
diff --git a/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py b/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
index 45b539145507a96a1a700ad9c90953a776119cb5..1b4aac129cc1fe7350f05521d1978a9d3444997f 100644
--- a/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
+++ b/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
@@ -15,7 +15,6 @@
# import systemtesting
-from __future__ import (absolute_import, division, print_function)
import numpy
from numpy import matrix
import math
diff --git a/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py b/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py
index 0dc688183327c3ac8e099d207726c61442aad1f7..401081ae39b9b9e15f7bd1096a4dc903cb8ca04f 100644
--- a/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py
+++ b/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py
@@ -14,7 +14,6 @@
# for powder diffractometers.
#
########################################################################
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as api
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py b/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py
index 4b33526eb53968ee49fe2bd99e440f128bde73b7..976417f44896ed85654ca50ad535101c74569220 100644
--- a/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py
+++ b/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py
@@ -8,7 +8,6 @@
"""
Extract or compute the Q values from reduced QENS data
"""
-from __future__ import (absolute_import, division, print_function)
from systemtesting import MantidSystemTest
import mantid
import mantid.simpleapi as sm
diff --git a/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py b/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
index 11135c5e5fb8dde70e00738579eb2aa608e7700c..2f69e364c887da0b12216c167f7d1f5f5c91e56d 100644
--- a/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
+++ b/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
@@ -19,7 +19,6 @@
#information.
#
#
-from __future__ import (absolute_import, division, print_function)
import time
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
index 993f502e81a268e5405f6ceb58ad372f66c1e10f..a03127c059558ebc4d6a1e905f952e3fcb862949 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
@@ -9,15 +9,13 @@
These system tests are to verify the behaviour of the ISIS reflectometry reduction scripts
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-class ReflectometryISIS(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ReflectometryISIS(systemtesting.MantidSystemTest, metaclass=ABCMeta):
@abstractmethod
def get_workspace_name(self):
diff --git a/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py b/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py
index 0ba0842ed1c1403f7b78caed36446dba48e50e7f..fcca174b061382ff83d7c04adacc1b48a09aa569 100644
--- a/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py
+++ b/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py
@@ -9,7 +9,6 @@
Verifies that a calibration file can be loaded once and reused to apply, using CopyInstrumentParameters, the same calibration
in successive reductions.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANS2DBatch.py b/Testing/SystemTests/tests/analysis/SANS2DBatch.py
index 95c02eb57abb0f6a4c7a36449943b54d280b579b..d04a0ad8e72f3bbe2fde4f38ae4be7f5db729fff 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DBatch.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DBatch.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py
index 3a9e223056541e5548a72554a1a6d00e2b4c081a..d7ebb0e83c118ab082eca0a536488c84c4ff056c 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid import config
diff --git a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py
index bb78811248b865a80ffe62a6940a0729c48bbcc7..a104bf37cd7de3eb4112f891b07bbfd73e7a2cf2 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py
index 9a645e4cf005bda095bad3e19ebadc1c42629747..99120e0ba26e68d5aa5a774153629dfa225c2b13 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, SetDetectorOffsets, Gravity, Set1D,
diff --git a/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py b/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
index 270d6648e1d696094e1276836c71638130812281..ad9810975e93f9f6564d006a5e7a19ded2b70cd1 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py
index 547acfe505c5b1c840d4479e28a418c20f6c159c..39966a7c04952212447baece6ce8fcfb572292cc 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py
index 53328e62be3f40012d26474c79285d33e7a85fb5..6e1dfc64d4b58f9a82751bddb6683b38c0fefa3f 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, AssignSample, WavRangeReduction,
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
index 6c2fd280a4ff65c9655d4bc4ae089a07fad669b6..71adc93e5e72b533e34af09bec0ef148c582b423 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
@@ -7,7 +7,6 @@
#pylint: disable=no-init,too-few-public-methods
# test batch mode with sans2d and selecting a period in batch mode
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.api import AnalysisDataService
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py
index dada802fb1914b9c1c49ba46ce9f6a0013b03308..ec95710827dd07219b0046fcbfb72029f4cda7cc 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py
index 0d2879054c0b3cb7cfad45bf81d6aff1b07ac7a4..dc913e1b5c39b2c13933479c57e61f3ed6bba612 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.kernel import config
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py
index 0d83c73d6285531bfdda3058eb3b8c4206e59e55..9f7853cf03a1edd61714e14d09082a383f276c51 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
index 63dc3e11feba66546fa380cdef0aadc01f424fd9..f10c1d276b775e35690dce94ddcb0bbed1a3f05b 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
@@ -19,7 +19,6 @@ The first 2 Tests ensures that the result provided by the GUI are the same for t
Test was first created to apply to Mantid Release 3.0.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import isis_reducer
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py
index db1f889e3eb84cce579a69b644408caed1699dde..7d9ab6101092f9aafdb44e3321d2d4289c31a195 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
import ISISCommandInterface as i
import copy
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py
index ff15655636707e1677845746702d048fefbdf949..3cc7930caa8e4f2ca5c0ce42cb08a7766a770c90 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py
@@ -10,7 +10,6 @@
One test has been removed from the port since it uses the ReductionSingleton.
"""
-from __future__ import (absolute_import, division, print_function)
import mantid # noqa
import systemtesting
import os
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py
index 7d4233374efc409668013b1c8c31a8334758421b..138bec176a4e056f2c7d74bd3b2774695d6bbe95 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py
@@ -10,7 +10,6 @@ The tests here are ports from the original SANS2DReductionGUI.py test suite. Not
include details about the ReductionSingleton
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.kernel import (config)
from mantid.api import (FileFinder)
diff --git a/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py b/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py
index f6a2c995799b74501b834f6898268901ea592bfa..042f21accd801a1cb45879fb9ad7b4fc3eb56d5d 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid # noqa
import ISISCommandInterface as i
import isis_reducer
diff --git a/Testing/SystemTests/tests/analysis/SANS2DSlicing.py b/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
index 31003fa3e89770b59ac95ee865cdec10042ea456..77f2556bc9a9de636f2f44b311d481da91305be6 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py
index 691487e97eba38d03df5f4bccbc2b63a2f321fcd..1fc9534c8f31ab82ca1c040fdceda33e4ebc8c9b 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.api import (AnalysisDataService, FileFinder)
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, BatchReduce, SetEventSlices,
diff --git a/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py b/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py
index 426cf71f621a23d20e3d94b73323881c538b9f76..47b4fea5bbea85142063e534fece7ae7290df2bf 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py
index 27f2bb0525cb39b6aa275d434cd4f30b2e0b0bb4..da0377ce093f850244f4bd7c01324f4e9a68e1e7 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, Gravity, Set1D, AssignSample,
diff --git a/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py b/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py
index 9e4a98f452847e23d2e9ede41e8a5e70f910e38e..2c6ee286af3104eb32bb408793cacffceae1ee18 100644
--- a/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py b/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py
index 6aba9a0c48fe2fe67b1ab3514c824dd2571b5076..384b386f1dae12bb694e7cd30b6c136a19a9ae40 100644
--- a/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import unittest
import os
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSCentreSample.py b/Testing/SystemTests/tests/analysis/SANSCentreSample.py
index bf6cbca41ee0a05ab4767e30484be7a85bf8f224..8155f2b6cfcdd01e5be6f5d44c94bce4674cbf17 100644
--- a/Testing/SystemTests/tests/analysis/SANSCentreSample.py
+++ b/Testing/SystemTests/tests/analysis/SANSCentreSample.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py b/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py
index e66a5cc48abddc2ed35cd2a9ccd96593ac358e84..7de71954ea3f65f43305cc4e4ffc93d2c23164ed 100644
--- a/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py
@@ -8,7 +8,6 @@
#pylint: disable=invalid-name
#pylint: disable=too-many-arguments
#pylint: disable=too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
import unittest
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py b/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py
index 17b37bd2ca5a35d5fb959a101139ab1747223076..f17d4626eef01f1d6be3d9eed8fcdc023e4ea1cd 100644
--- a/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import unittest
import os
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSFileChecking.py b/Testing/SystemTests/tests/analysis/SANSFileChecking.py
index e9953522b2c8cf9fb0f46edfa97ecfab5fe3d784..40c2f747528c1f6ac54e7a2ea054a58c403bdc8f 100644
--- a/Testing/SystemTests/tests/analysis/SANSFileChecking.py
+++ b/Testing/SystemTests/tests/analysis/SANSFileChecking.py
@@ -10,7 +10,6 @@
Check that file manipulation works fine
"""
-from __future__ import (absolute_import, division, print_function)
import unittest
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSILLAbsoluteScaleTest.py b/Testing/SystemTests/tests/analysis/SANSILLAbsoluteScaleTest.py
index 0690c3989203dd48b8564f1a0674175df963955c..99c4674ef07d0f541bba0d0a343fdfbbbdc374ab 100644
--- a/Testing/SystemTests/tests/analysis/SANSILLAbsoluteScaleTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSILLAbsoluteScaleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSILLAutoProcessTest.py b/Testing/SystemTests/tests/analysis/SANSILLAutoProcessTest.py
index 0e6d54b9abf7181b25617e9e8685597cbb4f59f0..5d3eec88f50078926f2fbe2cbf9a9d6fc205b632 100644
--- a/Testing/SystemTests/tests/analysis/SANSILLAutoProcessTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSILLAutoProcessTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import SANSILLAutoProcess, config, mtd, GroupWorkspaces, SaveNexusProcessed
import os
diff --git a/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py b/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py
index bea24b0aac0db00485f5aca390273b6182ca6f5e..d8ec0a1a3af0e6c90c49c64c77cdd3ad6ab61a73 100644
--- a/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQAddBatch.py b/Testing/SystemTests/tests/analysis/SANSLOQAddBatch.py
index a80df8d4d6230011b28571ce737c9bc3ebee9791..1a2aafbdd5c1aad0f8e0f77a77af4ac8a41703ea 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQAddBatch.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQAddBatch.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from mantid.api import FileFinder
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQBatch.py b/Testing/SystemTests/tests/analysis/SANSLOQBatch.py
index 17c23c1785fa255cfae29778efd37a42c90c88a9..fb94c339b2ebba2cef1e87b0e32befca0e1b979f 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQBatch.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQBatch.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from mantid import config
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py b/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py
index e0334f1e94cf01049caed5bde6b58985011a1a4e..625c09f70aa847be1ae464c2295c9f615ab9a7fc 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os.path
from mantid.kernel import config
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py b/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py
index 5b9736978925314cc1cf486f0a9b54715d40e05f..b6ffdbec9445b79abdab9544dcc978debfbeecd9 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py b/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py
index d9c6ad67bb440ebe743115543516c640fd7cacb9..09ab942c06702446c3f7e68e29d39c0c0ee6a00a 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (LOQ, Set2D, Detector, MaskFile, SetDetectorOffsets, Gravity,
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQCentreNoGrav.py b/Testing/SystemTests/tests/analysis/SANSLOQCentreNoGrav.py
index 36ce185baa572ece700f5d20fe83a769650e2f90..bc16d6a53055d295840901d6878954e76f6fa7a6 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQCentreNoGrav.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQCentreNoGrav.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQReductionGUI.py b/Testing/SystemTests/tests/analysis/SANSLOQReductionGUI.py
index 0c6b834ddcf3fd58b5a2359a6b0dd9ec60e1f450..645ee2fab3469ae4b64c36670210687dc290e57b 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQReductionGUI.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQReductionGUI.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import ISISCommandInterface as i
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQReductionGUITest_V2.py b/Testing/SystemTests/tests/analysis/SANSLOQReductionGUITest_V2.py
index 4ee325c93ac85e67a9b78c6613a9c9b7b5ede928..fb42b89d2fcdc19de0727895e7a1e09e61f3e526 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQReductionGUITest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQReductionGUITest_V2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.kernel import config
from mantid.api import FileFinder
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQTransFitWorkspace2D.py b/Testing/SystemTests/tests/analysis/SANSLOQTransFitWorkspace2D.py
index b2e9670faeb53fa401c0633a7961cdb25a5bce0b..0fe7bc76350d286eb80de89cca35bd3ffe2ba333 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQTransFitWorkspace2D.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQTransFitWorkspace2D.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSLOWCentreNoGrav_V2.py b/Testing/SystemTests/tests/analysis/SANSLOWCentreNoGrav_V2.py
index 7e259d2bf3598fad63578a1d07a579c08e11158d..7a604ede90e17f71dd0cf4032a25bbbc052c28fb 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOWCentreNoGrav_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOWCentreNoGrav_V2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (LOQ, Set1D, Detector, MaskFile, Gravity, AssignSample,
diff --git a/Testing/SystemTests/tests/analysis/SANSLoadTest.py b/Testing/SystemTests/tests/analysis/SANSLoadTest.py
index 241b311156301933b9030ed02d378b17282fc910..364a9931b847d82952941d28c3122c94909a38de 100644
--- a/Testing/SystemTests/tests/analysis/SANSLoadTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSLoadTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import unittest
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSLoadersTest.py b/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
index 2164482b6cdbe1bdb541e469b75c9a0a6ee1f58d..db4fb67b71ebe4fd4124d046b58ccc9314cc7ce8 100644
--- a/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
@@ -11,7 +11,6 @@ take considerable time because it involves loading data. Besides, it uses data t
currently available inside the systemtests.
"""
-from __future__ import (absolute_import, division, print_function)
import unittest
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py
index 93c86a7f091e8588e5cdace2832f4f2c15f35298..8582443594558950476cfa2a2cfcafb8dae5aaf6 100644
--- a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import DeleteWorkspace, mtd
import ISISCommandInterface as i
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py
index 7576e67bbfa2524f3e5c2b75ea5e0fb2d004acbe..1a401188abcac40c062454e7fa2788eef404d23f 100644
--- a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import DeleteWorkspace, mtd
from sans.command_interface.ISISCommandInterface import (SANS2DTUBES, MaskFile, SetDetectorOffsets, Gravity, Set1D,
diff --git a/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py b/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py
index 465452367795e72997834ce76ab9fd60a7884cdf..9eb1adeab130fb7cdea5e6d84d80ee51d1a3040a 100644
--- a/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py b/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py
index 6d76e23a0cd2bdf2e755afab7febc31f3e74b02f..38d44e52b912614435d74b068b8490f5241bfe9d 100644
--- a/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import unittest
import os
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSSaveTest.py b/Testing/SystemTests/tests/analysis/SANSSaveTest.py
index 20e0947e7fbfa6e386df0d31e7512f116774286c..f2d666dfc792e1ce0b4aebca7568e45266e2086f 100644
--- a/Testing/SystemTests/tests/analysis/SANSSaveTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSSaveTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import os
import mantid
import unittest
diff --git a/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py b/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py
index fdf418b6bec85f8c97a5581539aaecc56c6d46d4..3edd09c7a29dd9f24891f91e5ad068ba3559bf63 100644
--- a/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSUtilityTest.py b/Testing/SystemTests/tests/analysis/SANSUtilityTest.py
index fd733cb52f8695b69c74b176f3ccaf15804f9cb9..13eae87db49d961c239714409a01e0e1ca1ee83d 100644
--- a/Testing/SystemTests/tests/analysis/SANSUtilityTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSUtilityTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import SANSUtility as su
diff --git a/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py b/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py
index 7d9088f995f87792087ea6bdee73ce7e8da73de7..b3ccc89fde297bb6286f1957522cf259e3ca6059 100644
--- a/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from SANSUtility import can_load_as_event_workspace
diff --git a/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py b/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py
index 836843de73370406b8fa8e741ff8b273fed584bc..224a3e6fa21bf321ce0796acf6b9da9bdc35f3e1 100644
--- a/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py
+++ b/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py
@@ -9,7 +9,6 @@
Test the SNS inelatic reduction scripts.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
import shutil
diff --git a/Testing/SystemTests/tests/analysis/SNAPRedux.py b/Testing/SystemTests/tests/analysis/SNAPRedux.py
index 5388dcdd86adcfb2101ff13b1fcde63d89cefdd9..15194cde1bc8c9d3fffeea2090a1777d1089f2cc 100644
--- a/Testing/SystemTests/tests/analysis/SNAPRedux.py
+++ b/Testing/SystemTests/tests/analysis/SNAPRedux.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import os
diff --git a/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py b/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
index 9b1f1591c9a1a43a1c16df313db71d2599a0687a..db8393c2acaa34e1d0124f2dcb27878416cd1771 100644
--- a/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
+++ b/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SXDAnalysis.py b/Testing/SystemTests/tests/analysis/SXDAnalysis.py
index 7f838c5cddbc2892cd615264c2e03d0c0bb07c96..85f622fbd5a48f4bcbd2e7f708c9ff6a04ea16e9 100644
--- a/Testing/SystemTests/tests/analysis/SXDAnalysis.py
+++ b/Testing/SystemTests/tests/analysis/SXDAnalysis.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py b/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
index d610fa0e76a627c09ed0d7228d742a875afcbb3b..7f44cf648c3b533b598fdfd3079eeb0db7f55352 100644
--- a/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
+++ b/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
from abc import ABCMeta, abstractmethod
import os
-from six import with_metaclass
-
import systemtesting
from mantid.simpleapi import *
from mantid import config
@@ -22,7 +20,7 @@ def create_file_path(base_name):
return filename
-class SaveLoadNexusProcessedTestBase(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class SaveLoadNexusProcessedTestBase(systemtesting.MantidSystemTest, metaclass=ABCMeta):
filename = None
test_ws_name = 'input_ws'
diff --git a/Testing/SystemTests/tests/analysis/SaveNexusTest.py b/Testing/SystemTests/tests/analysis/SaveNexusTest.py
index 7fafd4e1122f2f843affcf5275902e522d050eb8..0aeb9e5f23b2f202cddebe2c8a1edd52a40cc41f 100644
--- a/Testing/SystemTests/tests/analysis/SaveNexusTest.py
+++ b/Testing/SystemTests/tests/analysis/SaveNexusTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import FrameworkManager
import os
diff --git a/Testing/SystemTests/tests/analysis/SortHKLTest.py b/Testing/SystemTests/tests/analysis/SortHKLTest.py
index 8397ed79742836c8341058fc768b6ff395b66e68..17774047eed815a1171e612ffe534e66a9ce7381 100644
--- a/Testing/SystemTests/tests/analysis/SortHKLTest.py
+++ b/Testing/SystemTests/tests/analysis/SortHKLTest.py
@@ -5,12 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import json
from mantid.simpleapi import *
from mantid.geometry import PointGroupFactory
-from six import iteritems
class HKLStatisticsTestMixin(object):
@@ -43,7 +41,7 @@ class HKLStatisticsTestMixin(object):
ub_parameters.update(
dict(
[(str(x), y if isinstance(y, float) else str(y))
- for x, y in iteritems(raw_ub_parameters)]
+ for x, y in raw_ub_parameters.items()]
))
return ub_parameters
@@ -150,7 +148,7 @@ class SortHKLTest(HKLStatisticsTestMixin, systemtesting.MantidSystemTest):
unique_map[unique].append(peak)
# pylint: disable=unused-variable
- for unique_hkl, equivalents in iteritems(unique_map):
+ for unique_hkl, equivalents in unique_map.items():
if len(equivalents) > 1:
reference_peak = equivalents[0]
for peak in equivalents[1:]:
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py
index 428ca565e8094bc2c0f52350685f2e5fd9d49e85..6c9659df1552ac356c8526224f6377ecfad92a8a 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import re
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
index 2027daf0f38eeb71efbc7365da56071f8e4ad8d9..f8c4e2ff04b1d5c57e1e9cc823e0dd679a515485 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from mantid.geometry import *
-from six import iteritems
class SpaceGroupReflectionConditionsTest(systemtesting.MantidSystemTest):
@@ -26,7 +24,7 @@ class SpaceGroupReflectionConditionsTest(systemtesting.MantidSystemTest):
def runTest(self):
sgTestDict = self.generateReflectionLists()
- for sgName, hkls in iteritems(sgTestDict):
+ for sgName, hkls in sgTestDict.items():
sg = SpaceGroupFactory.createSpaceGroup(sgName)
for hkl in hkls:
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
index 6e425ef8391182e1e1a407a76aeb0c3c035baa03..df7589651589f9df432a1a68029dbc79c8acb03b 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
@@ -5,10 +5,8 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.geometry import *
-from six import iteritems
class SpaceGroupUnitCellTest(systemtesting.MantidSystemTest):
@@ -40,7 +38,7 @@ class SpaceGroupUnitCellTest(systemtesting.MantidSystemTest):
self._check_spacegroup(sg, monoclinic_c_cells, monoclinic_c_compatiblity[lattice_system])
def _check_spacegroup(self, sg, cells, compatible_metrics):
- for system, cell in iteritems(cells):
+ for system, cell in cells.items():
is_allowed = sg.isAllowedUnitCell(cell)
should_be_allowed = system in compatible_metrics
diff --git a/Testing/SystemTests/tests/analysis/SphinxWarnings.py b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
index 50fbcdfc65bc3e580d0411d1e7a6e2436de1a7a7..4e4b5f087033f097746ba8d3802cff625d44fc99 100644
--- a/Testing/SystemTests/tests/analysis/SphinxWarnings.py
+++ b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
@@ -10,11 +10,9 @@ Some of the sphinx warnings come from the C++ code, from the properties of the a
This test tries to detect the most common such errors.
It also detects if a new category is created (i.e. someone uses Utilities instead of Utility)
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid
import re
-from six import iteritems
class SphinxWarnings(systemtesting.MantidSystemTest):
@@ -88,7 +86,7 @@ class SphinxWarnings(systemtesting.MantidSystemTest):
def runTest(self):
algs = mantid.AlgorithmFactory.getRegisteredAlgorithms(True)
- for (name, versions) in iteritems(algs):
+ for (name, versions) in algs.items():
for version in versions:
if mantid.api.DeprecatedAlgorithmChecker(name,version).isDeprecated()=='':
# get an instance
diff --git a/Testing/SystemTests/tests/analysis/SurfLoadingTest.py b/Testing/SystemTests/tests/analysis/SurfLoadingTest.py
index 1871838f2ad0d9c881e1884918fcf4cbd29ee642..2ee43fd4b908bca7c60866c714c46277d0c01447 100644
--- a/Testing/SystemTests/tests/analysis/SurfLoadingTest.py
+++ b/Testing/SystemTests/tests/analysis/SurfLoadingTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from LoadAndCheckBase import *
diff --git a/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py b/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
index 7300e8ee4f15d267c94243e59b45bf457a9df57a..55e6b9354bfd4e1a8921c25df0337e7b5486a8bc 100644
--- a/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
+++ b/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
@@ -10,7 +10,6 @@ System test that loads TOPAZ single-crystal data,
converts to Q space, finds peaks and indexes
them.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import numpy
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py b/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
index 6472bc1d7f6766609400c9b33b5a49afbf6e8ddd..98bb21f3c75f99e11032e7256a70d582352cc2c3 100644
--- a/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
+++ b/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
@@ -6,17 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import glob
import os
from mantid import config
-import six
import systemtesting
-if six.PY2:
- from io import open # noqa
# Constants
FILE_TO_TEST = None # "MARI_Definition.xml"
diff --git a/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py b/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
index ca13d12c374eebbbb22fb326f287f780b9468aea..f216e05557288418701bfbdd6cf9030a3aaee7a6 100644
--- a/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
+++ b/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
@@ -12,16 +12,12 @@ Unit test for Vesuvio corrections steps
Assumes that mantid can be imported and the data paths
are configured to find the Vesuvio data
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import numpy as np
from mantid.api import *
import mantid.simpleapi as ms
from mantid import *
-from six import iteritems
-
-
# ====================================Helper Functions=======================================
@@ -58,7 +54,7 @@ def _create_algorithm(**kwargs):
alg.setProperty("CorrectionWorkspaces", "__Correction")
alg.setProperty("CorrectedWorkspaces", "__Corrected")
alg.setProperty("LinearFitResult", "__LinearFit")
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
return alg
diff --git a/Testing/SystemTests/tests/analysis/WishCalibrate.py b/Testing/SystemTests/tests/analysis/WishCalibrate.py
index 133c9410c08679b111e3e30ab898386147f2d7c3..fed2bb4a1b3e4f512aebbbfdd0563f87a2b1723f 100644
--- a/Testing/SystemTests/tests/analysis/WishCalibrate.py
+++ b/Testing/SystemTests/tests/analysis/WishCalibrate.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import filecmp
import numpy as np
import os
diff --git a/Testing/SystemTests/tests/analysis/WishMasking.py b/Testing/SystemTests/tests/analysis/WishMasking.py
index e583061c0747aae5173def243f074cef43af99fd..f093a43696d7acabf89fcd17218d14c4625bfcec 100644
--- a/Testing/SystemTests/tests/analysis/WishMasking.py
+++ b/Testing/SystemTests/tests/analysis/WishMasking.py
@@ -10,7 +10,6 @@ Tests masking functionality specific to WISH. Working masking behaviour is criti
- Email Pascal Manuel @ ISIS if things break here and let him know how his scripts may need to be modified.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/complexShapeAbsorptionsTest.py b/Testing/SystemTests/tests/analysis/complexShapeAbsorptionsTest.py
index b8444723c997ea87493eb38d0ea8d4f8c0f7137c..94d14f140f1e203876819be86f9afa6a3393f775 100644
--- a/Testing/SystemTests/tests/analysis/complexShapeAbsorptionsTest.py
+++ b/Testing/SystemTests/tests/analysis/complexShapeAbsorptionsTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as mantid
from mantid import config
diff --git a/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py b/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
index fe78125a853520991ae442e439587a15d4af66c8..cafee1e0a86888af6af7d5dedc3132d863c92d63 100755
--- a/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
+++ b/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
@@ -7,7 +7,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# vim: encoding=utf-8
-from __future__ import print_function
import shutil, os, sys
from os.path import isdir, isfile, islink, join
from optparse import OptionParser
@@ -19,6 +18,7 @@ args = []
available_types = set(['scons'])
tool_stdout = PIPE
+
def main():
global options
global args
@@ -76,11 +76,13 @@ def main():
for t in tests:
clean_test(t)
+
def crawl_tests(target):
"""Gather the directories in the test directory."""
files = os.listdir(target)
return [f for f in files if isdir(f) and f[0] != '.']
+
def purge_tests(dirs):
"""Look at the test candidates and purge those that aren't from the list"""
tests = []
@@ -91,21 +93,25 @@ def purge_tests(dirs):
warn("{0} is not a test (missing TestDef.py file).".format(t))
return tests
+
def warn(msg):
"""A general warning function."""
if options.verbose:
print('[Warn]: ' + msg, file=sys.stderr)
+
def notice(msg):
"""A general print function."""
if options.verbose:
print(msg)
+
def debug(msg):
"""A debugging function"""
if options.debug:
print(msg)
+
def run_test(t):
"""Runs the test in directory t."""
opts = read_opts(t)
@@ -138,6 +144,7 @@ def run_test(t):
else:
print("test '{0}' successful.".format(t))
+
def read_opts(t):
"""Read the test options and return them."""
opts = {
@@ -148,6 +155,7 @@ def read_opts(t):
exec(open(join(t, "TestDef.py")), opts)
return opts
+
def setup_env(t, opts):
"""Set up the environment for the test."""
# symlinks
@@ -160,6 +168,7 @@ def setup_env(t, opts):
os.unlink(to)
os.symlink(frm, to)
+
def teardown_env(t, opts):
"""Remove all files generated for the test."""
links = opts['links']
@@ -168,6 +177,7 @@ def teardown_env(t, opts):
debug('removing link {0}'.format(to))
os.unlink(to)
+
def clean_test(t):
"""Remove all generated files."""
opts = read_opts(t)
@@ -177,6 +187,7 @@ def clean_test(t):
clean_scons(t, opts)
teardown_env(t, opts)
+
def clean_scons(t, opts):
"""Make scons clean after itself."""
cwd = os.getcwd()
@@ -190,6 +201,7 @@ def clean_scons(t, opts):
if isfile(sconsign):
os.unlink(sconsign)
+
def run_scons(t, opts):
"""Run scons test."""
cwd = os.getcwd()
diff --git a/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py b/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
index b97709ce36d8fee47f695ee6e67460455a0933dd..09000ae82eb5007816da83bcf58f5dcb38fa9018 100644
--- a/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
+++ b/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import re
#import sys
#import getopt
@@ -12,6 +11,7 @@ inBlock = 0
options=None
lastLineVoid = False
+
def scanInputFiles(files, _options):
'''Scan all input files for test suites'''
global options
@@ -31,6 +31,8 @@ def scanInputFiles(files, _options):
return [options,suites]
lineCont_re = re.compile('(.*)\\\s*$')
+
+
def scanInputFile(fileName):
'''Scan single input file for test suites'''
file = open(fileName)
@@ -57,6 +59,7 @@ def scanInputFile(fileName):
closeSuite()
file.close()
+
def scanInputLine( fileName, lineNo, line ):
'''Scan single input line for interesting stuff'''
scanLineForExceptionHandling( line )
@@ -68,6 +71,7 @@ def scanInputLine( fileName, lineNo, line ):
if suite:
scanLineInsideSuite( suite, lineNo, line )
+
def scanLineInsideSuite( suite, lineNo, line ):
'''Analyze line which is part of a suite'''
global inBlock
@@ -76,6 +80,7 @@ def scanLineInsideSuite( suite, lineNo, line ):
scanLineForCreate( suite, lineNo, line )
scanLineForDestroy( suite, lineNo, line )
+
def lineBelongsToSuite( suite, lineNo, line ):
'''Returns whether current line is part of the current suite.
This can be false when we are in a generated suite outside of CXXTEST_CODE() blocks
@@ -92,6 +97,8 @@ def lineBelongsToSuite( suite, lineNo, line ):
std_re = re.compile( r"\b(std\s*::|CXXTEST_STD|using\s+namespace\s+std\b|^\s*\#\s*include\s+<[a-z0-9]+>)" )
+
+
def scanLineForStandardLibrary( line ):
'''Check if current line uses standard library'''
global options
@@ -100,6 +107,8 @@ def scanLineForStandardLibrary( line ):
options.haveStandardLibrary = 1
exception_re = re.compile( r"\b(throw|try|catch|TSM?_ASSERT_THROWS[A-Z_]*)\b" )
+
+
def scanLineForExceptionHandling( line ):
'''Check if current line uses exception handling'''
global options
@@ -113,6 +122,8 @@ testsuite = '(?:(?:::)?\s*CxxTest\s*::\s*)?TestSuite'
suite_re = re.compile( r"\bclass\s+(%s)\s*:(?:\s*%s\s*,)*\s*public\s+%s"
% (classdef, baseclassdef, testsuite) )
generatedSuite_re = re.compile( r'\bCXXTEST_SUITE\s*\(\s*(\w*)\s*\)' )
+
+
def scanLineForSuiteStart( fileName, lineNo, line ):
'''Check if current line starts a new test suite'''
m = suite_re.search( line )
@@ -123,6 +134,7 @@ def scanLineForSuiteStart( fileName, lineNo, line ):
sys.stdout.write( "%s:%s: Warning: Inline test suites are deprecated.\n" % (fileName, lineNo) )
startSuite( m.group(1), fileName, lineNo, 1 )
+
def startSuite( name, file, line, generated ):
'''Start scanning a new suite'''
global suite
@@ -139,6 +151,7 @@ def startSuite( name, file, line, generated ):
'tests' : [],
'lines' : [] }
+
def lineStartsBlock( line ):
'''Check if current line starts a new CXXTEST_CODE() block'''
return re.search( r'\bCXXTEST_CODE\s*\(', line ) is not None
@@ -146,6 +159,8 @@ def lineStartsBlock( line ):
test_re = re.compile( r'^([^/]|/[^/])*\bvoid\s+([Tt]est\w+)\s*\(\s*(void)?\s*\)' )
void_re = re.compile( r'^([^/]|/[^/])*\bvoid\s*$' )
test_novoid_re = re.compile( r'^([^/]|/[^/])*\b([Tt]est\w+)\s*\(\s*(void)?\s*\)' )
+
+
def scanLineForTest( suite, lineNo, line ):
'''Check if current line starts a test'''
global lastLineVoid
@@ -163,6 +178,7 @@ def scanLineForTest( suite, lineNo, line ):
if m3:
lastLineVoid = True
+
def addTest( suite, name, line ):
'''Add a test function to the current suite'''
test = { 'name' : name,
@@ -173,6 +189,7 @@ def addTest( suite, name, line ):
}
suite['tests'].append( test )
+
def addLineToBlock( suite, lineNo, line ):
'''Append the line to the current CXXTEST_CODE() block'''
line = fixBlockLine( suite, lineNo, line )
@@ -184,6 +201,7 @@ def addLineToBlock( suite, lineNo, line ):
suite['lines'].append( line )
return e is None
+
def fixBlockLine( suite, lineNo, line):
'''Change all [E]TS_ macros used in a line to _[E]TS_ macros with the correct file/line'''
return re.sub( r'\b(E?TSM?_(ASSERT[A-Z_]*|FAIL))\s*\(',
@@ -191,17 +209,22 @@ def fixBlockLine( suite, lineNo, line):
line, 0 )
create_re = re.compile( r'\bstatic\s+\w+\s*\*\s*createSuite\s*\(\s*(void)?\s*\)' )
+
+
def scanLineForCreate( suite, lineNo, line ):
'''Check if current line defines a createSuite() function'''
if create_re.search( line ):
addSuiteCreateDestroy( suite, 'create', lineNo )
destroy_re = re.compile( r'\bstatic\s+void\s+destroySuite\s*\(\s*\w+\s*\*\s*\w*\s*\)' )
+
+
def scanLineForDestroy( suite, lineNo, line ):
'''Check if current line defines a destroySuite() function'''
if destroy_re.search( line ):
addSuiteCreateDestroy( suite, 'destroy', lineNo )
+
def cstr( s ):
'''Convert a string to its C representation'''
return '"' + s.replace( '\\', '\\\\' ) + '"'
@@ -213,6 +236,7 @@ def addSuiteCreateDestroy( suite, which, line ):
abort( '%s:%s: %sSuite() already declared' % ( suite['file'], str(line), which ) )
suite[which] = line
+
def closeSuite():
'''Close current suite and add it to the list if valid'''
global suite
@@ -222,6 +246,7 @@ def closeSuite():
rememberSuite(suite)
suite = None
+
def verifySuite(suite):
'''Verify current suite is legal'''
if 'create' in suite and 'destroy' not in suite:
@@ -231,6 +256,7 @@ def verifySuite(suite):
abort( '%s:%s: Suite %s has destroySuite() but no createSuite()' %
(suite['file'], suite['destroy'], suite['name']) )
+
def rememberSuite(suite):
'''Add current suite to list'''
global suites
diff --git a/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py b/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
index 2e17ecdb3c7f8af12d19fb833f0a5c8313d4ceda..391b8b3c6dd696dc54cc1f2b1f5a8bfa7107c214 100755
--- a/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
+++ b/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import
-
__all__ = ['main']
import sys
@@ -26,6 +24,7 @@ wrotePreamble = 0
wroteWorld = 0
lastIncluded = ''
+
def main(args=None):
'''The main program'''
#
@@ -47,6 +46,7 @@ def main(args=None):
[options,suites] = cxxtest_parser.scanInputFiles( files, options )
writeOutput()
+
def parseCommandline(args):
'''Analyze command line arguments'''
global imported_fog
@@ -162,11 +162,13 @@ def printVersion():
sys.stdout.write( "This is CxxTest version INSERT_VERSION_HERE.\n" )
sys.exit(0)
+
def setFiles(patterns ):
'''Set input files specified on command line'''
files = expandWildcards( patterns )
return files
+
def expandWildcards( patterns ):
'''Expand all wildcards in an array (glob)'''
fileNames = []
@@ -176,6 +178,7 @@ def expandWildcards( patterns ):
fileNames.append( fixBackslashes( fileName ) )
return fileNames
+
def fixBackslashes( fileName ):
'''Convert backslashes to slashes in file name'''
return re.sub( r'\\', '/', fileName, 0 )
@@ -188,6 +191,7 @@ def writeOutput():
else:
writeSimpleOutput()
+
def writeSimpleOutput():
'''Create output not based on template'''
output = startOutputFile()
@@ -204,6 +208,8 @@ def writeSimpleOutput():
include_re = re.compile( r"\s*\#\s*include\s+<cxxtest/" )
preamble_re = re.compile( r"^\s*<CxxTest\s+preamble>\s*$" )
world_re = re.compile( r"^\s*<CxxTest\s+world>\s*$" )
+
+
def writeTemplateOutput():
'''Create output based on template file'''
template = open(options.templateFileName)
@@ -224,6 +230,7 @@ def writeTemplateOutput():
template.close()
output.close()
+
def startOutputFile():
'''Create output file and write header'''
if options.outputFileName is not None:
@@ -233,6 +240,7 @@ def startOutputFile():
output.write( "/* Generated file, do not edit */\n\n" )
return output
+
def writePreamble( output ):
'''Write the CxxTest header (#includes and #defines)'''
global wrotePreamble
@@ -267,6 +275,7 @@ def writePreamble( output ):
output.write( "\n" )
wrotePreamble = 1
+
def writeMain( output ):
'''Write the main() function for the test runner'''
if not (options.gui or options.runner):
@@ -313,6 +322,7 @@ def writeWorld( output ):
writeInitialize( output )
wroteWorld = 1
+
def writeSuites(output):
'''Write all TestDescriptions and SuiteDescriptions'''
for suite in suites:
@@ -327,14 +337,17 @@ def writeSuites(output):
writeSuiteDescription( output, suite )
writeTestDescriptions( output, suite )
+
def isGenerated(suite):
'''Checks whether a suite class should be created'''
return suite['generated']
+
def isDynamic(suite):
'''Checks whether a suite is dynamic'''
return 'create' in suite
+
def writeInclude(output, file):
'''Add #include "file" statement'''
global lastIncluded
@@ -342,6 +355,7 @@ def writeInclude(output, file):
output.writelines( [ '#include "', file, '"\n\n' ] )
lastIncluded = file
+
def generateSuite( output, suite ):
'''Write a suite declared with CXXTEST_SUITE()'''
output.write( 'class %s : public CxxTest::TestSuite {\n' % suite['name'] )
@@ -350,6 +364,7 @@ def generateSuite( output, suite ):
output.write(line)
output.write( '};\n\n' )
+
def writeSuitePointer( output, suite ):
'''Create static suite pointer object for dynamic suites'''
if options.noStaticInit:
@@ -357,10 +372,12 @@ def writeSuitePointer( output, suite ):
else:
output.write( 'static %s *%s = nullptr;\n\n' % (suite['name'], suite['object']) )
+
def writeSuiteObject( output, suite ):
'''Create static suite object for non-dynamic suites'''
output.writelines( [ "static ", suite['name'], " ", suite['object'], ";\n\n" ] )
+
def writeTestList( output, suite ):
'''Write the head of the test linked list for a suite'''
if options.noStaticInit:
@@ -368,6 +385,7 @@ def writeTestList( output, suite ):
else:
output.write( 'static CxxTest::List %s = { nullptr, nullptr };\n' % suite['tlist'] )
+
def writeWorldDescr( output ):
'''Write the static name of the world name'''
if options.noStaticInit:
@@ -375,11 +393,13 @@ def writeWorldDescr( output ):
else:
output.write( 'const char* CxxTest::RealWorldDescription::_worldName = "cxxtest";\n' )
+
def writeTestDescriptions( output, suite ):
'''Write all test descriptions for a suite'''
for test in suite['tests']:
writeTestDescription( output, suite, test )
+
def writeTestDescription( output, suite, test ):
'''Write test description object'''
output.write( 'static class %s final : public CxxTest::RealTestDescription {\n' % test['class'] )
@@ -390,19 +410,23 @@ def writeTestDescription( output, suite, test ):
output.write( ' void runTest() override final { %s } // NOLINT\n' % runBody( suite, test ) )
output.write( '} %s;\n\n' % test['object'] )
+
def runBody( suite, test ):
'''Body of TestDescription::run()'''
if isDynamic(suite): return dynamicRun( suite, test )
else: return staticRun( suite, test )
+
def dynamicRun( suite, test ):
'''Body of TestDescription::run() for test in a dynamic suite'''
return 'if ( ' + suite['object'] + ' ) ' + suite['object'] + '->' + test['name'] + '();'
+
def staticRun( suite, test ):
'''Body of TestDescription::run() for test in a non-dynamic suite'''
return suite['object'] + '.' + test['name'] + '();'
+
def writeSuiteDescription( output, suite ):
'''Write SuiteDescription object'''
if isDynamic( suite ):
@@ -410,6 +434,7 @@ def writeSuiteDescription( output, suite ):
else:
writeStaticDescription( output, suite )
+
def writeDynamicDescription( output, suite ):
'''Write SuiteDescription for a dynamic suite'''
output.write( 'CxxTest::DynamicSuiteDescription<%s> %s' % (suite['name'], suite['dobject']) )
@@ -419,6 +444,7 @@ def writeDynamicDescription( output, suite ):
suite['object'], suite['create'], suite['destroy']) )
output.write( ';\n\n' )
+
def writeStaticDescription( output, suite ):
'''Write SuiteDescription for a static suite'''
output.write( 'CxxTest::StaticSuiteDescription %s' % suite['dobject'] )
@@ -427,10 +453,12 @@ def writeStaticDescription( output, suite ):
(suite['cfile'], suite['line'], suite['name'], suite['object'], suite['tlist']) )
output.write( ';\n\n' )
+
def writeRoot(output):
'''Write static members of CxxTest classes'''
output.write( '#include <cxxtest/Root.cpp>\n' )
+
def writeInitialize(output):
'''Write CxxTest::initialize(), which replaces static initialization'''
output.write( 'namespace CxxTest {\n' )
diff --git a/buildconfig/CMake/FindPyQt.py b/buildconfig/CMake/FindPyQt.py
index a4d8d4166007dc447ed2222f5801e4429b91c549..e17e534e8e74155a37e73cbd4ababac027595a8a 100644
--- a/buildconfig/CMake/FindPyQt.py
+++ b/buildconfig/CMake/FindPyQt.py
@@ -4,8 +4,6 @@
There is a commandline argument to select the version of PyQt.
"""
-from __future__ import print_function
-
import argparse
import os
import pprint
@@ -14,6 +12,7 @@ import sys
QT_TAG_RE = re.compile(r'Qt_\d+_\d+_\d+')
+
class PyQtConfig(object):
version_hex = None
@@ -98,6 +97,7 @@ def main():
print(PyQtConfig('PyQt%d' % args.version))
return 0
+
def get_options():
parser = argparse.ArgumentParser(description='Extract PyQt config information')
parser.add_argument('version', type=int, help="PyQt major version")
diff --git a/buildconfig/class_maker.py b/buildconfig/class_maker.py
index d50942b00c2cb4199b71c261f5cfa8ba9dac2fd7..4a3274ef0506a0e576981cd6d3386bb52460de52 100755
--- a/buildconfig/class_maker.py
+++ b/buildconfig/class_maker.py
@@ -6,8 +6,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" Utility for generating a class file, header, and test file """
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import argparse
import sys
import os
@@ -19,11 +17,15 @@ from cmakelists_utils import *
VERSION = "1.0"
#======================================================================
+
+
def get_year():
"""returns the current year"""
return datetime.datetime.now().year
#======================================================================
+
+
def write_header(subproject, classname, filename, args):
"""Write a class header file"""
print("Writing header file to", filename)
@@ -391,4 +393,4 @@ if __name__ == "__main__":
if args.subfolder[-1:] != "/":
args.subfolder += "/"
- generate(subproject, classname, overwrite, args)
\ No newline at end of file
+ generate(subproject, classname, overwrite, args)
diff --git a/buildconfig/cmakelists_utils.py b/buildconfig/cmakelists_utils.py
index 248f40ccb6a7396b32f7384a1ddaa2e02512150a..9731251afe9f8b6b5089200fd4a6298332bd9905 100644
--- a/buildconfig/cmakelists_utils.py
+++ b/buildconfig/cmakelists_utils.py
@@ -1,11 +1,11 @@
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import datetime
import os
import re
import sys
#======================================================================================
+
+
def find_basedir(project, subproject):
""" Returns the base directory. If the subproject is known to be in MantidQt or Vates, it uses that.
The default is current dir + Framework
@@ -122,6 +122,8 @@ def fix_cmake_format(subproject):
f.close()
#======================================================================
+
+
def fix_all_cmakes():
""" Fix all cmake files """
projects = ["Algorithms", "DataObjects", "MDAlgorithms", "API",
diff --git a/buildconfig/delete_class.py b/buildconfig/delete_class.py
index 69f8c3b5a9cd6266f1bee96ef4468a98bb75b15c..322deeb3c08c69de02d91918be61e293a482c917 100755
--- a/buildconfig/delete_class.py
+++ b/buildconfig/delete_class.py
@@ -6,8 +6,6 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
""" Utility for deleting a class file """
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import argparse
import datetime
import os
@@ -23,6 +21,8 @@ def delete_one(oldfilename):
os.system(cmd)
#======================================================================
+
+
def delete_all(subproject, classname, args):
# Directory at base of subproject
diff --git a/buildconfig/move_class.py b/buildconfig/move_class.py
index 5e6a1dea2e842a642ac372dc8273865f89709c73..23686f350a180cf8b210007b051e7479688bfd38 100755
--- a/buildconfig/move_class.py
+++ b/buildconfig/move_class.py
@@ -6,8 +6,6 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
""" Utility for moving a class file to a different project."""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import argparse
import datetime
import os
@@ -17,6 +15,8 @@ import sys
from cmakelists_utils import *
#======================================================================
+
+
def move_one(subproject, classname, newproject, newclassname, oldfilename, newfilename, args):
"""Move one file """
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/main.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/main.py
index 05f56278ef97d76b1badf6b72642823b853edee9..7ef2659a0b2bf40faab4ea51fc507f6701d475af 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/main.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/main.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
import sys
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/master_presenter.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/master_presenter.py
index ebd68d667287e75d976bc2ee7e83b07925c6f436..c260b8dcf76e24141c94982f734e61fea20bbebb 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/master_presenter.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/master_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
import presenter
import plot_presenter
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/master_view.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/master_view.py
index 06531ea48559b9763a88f00929d0566ab0500adf..a5b731d55e470e30ddc1769fc20d0888137a1427 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/master_view.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/master_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
import view
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py
index 4632a5563d71417d6b9fd46b4c23e2157f554e2c..10c01a68641b39caf1812f60eb0d9ad1f12d6a05 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
def line_colours():
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_data.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_data.py
index 995e99af40e8b6f777bc3e555b739f9120b22743..b0c5abfb33981fe7d2f97558da637b37f04eb50b 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_data.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_data.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py
index 15b621fc6b81fd1179be4f6ca035dc125b25fbe3..a69fe0ac83ae0f7587037e7a4378b41d21628d0e 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class PlotPresenter(object):
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_view.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_view.py
index c4d1c9aa0315715a805d271e46ea7cea939d7085..2c41e8bb992714afa558772a2d55a0eec7d0a8dd 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_view.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
import matplotlib.pyplot as plt
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py
index 02360230e3a416b6a704a20601d786c2b726b390..e970b3d6ee404d0a69c1ac1529b871342240e937 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class Presenter(object):
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/view.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/view.py
index 3f650cde0f2a071eed76cc13a38edba4686b178c..0f1aa66b9c0d57d6904c239ec529e12036cdb548 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/view.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtCore
diff --git a/docs/source/concepts/Materials.rst b/docs/source/concepts/Materials.rst
index 58ea2cfc42990d5049bbee41878eefaca8816426..ccc05e47bf9ccd061deb632edf1bd7bcc12a7b02 100644
--- a/docs/source/concepts/Materials.rst
+++ b/docs/source/concepts/Materials.rst
@@ -70,16 +70,31 @@ It can can be generated in one of three ways:
where :math:`\rho_m` is the mass density, :math:`N_A` is the Avogadro constant, and :math:`M_r` the relative molecular mass.
-Linear Absorption Coefficients
+Attenuation Coefficients
##############################
+The attenuation effect is calculated according to the following formula:
+
+.. math:: \exp(-\rho_n(\mu_s+\mu_a)t)
+
+where :math:`\rho_n` is in unit of :math:`\AA^{-3}`, :math:`t` is the material thickness in cm, the two attenuation coefficients representing scattering and absorption (:math:`\mu_s` and :math:`\mu_a` respectively) are calculated as follows:
+
.. math:: \mu_s = \rho_n \frac{1}{N_{atoms}}\sum_{i}s_{i}n_{i} \text{ units of 1/cm}
.. math:: s = \sigma_{total scattering}
.. math:: \mu_a = \rho_n \frac{1}{N_{atoms}}\sum_{i}a_{i}n_{i} \text{ units of 1/cm}
-.. math:: a = \sigma_{absorption} (\lambda=1.8)
+.. math:: a = \frac{\lambda}{\lambda_0} \sigma_{absorption} (\lambda_0) \text{ where } \lambda_0=1.8\AA
A detailed version of this is found in [2].
+The sum of the two attenuation coefficients can be replaced by an externally measured profile of attenuation versus wavelength if the scattering effect is wavelength dependent eg if a material is crystalline and shows some Bragg edges in its attenuation profile.
+Mantid supports a space delimited text file format for the externally measured profile containing the following columns:
+
+- wavelength (in :math:`\AA`)
+- attenuation factor (in :math:`mm^{-1}`)
+- error (currently ignored)
+
+Any lines not following this format (eg header rows) are ignored. The file must have a .DAT file extension.
+
Normalized Laue
###############
diff --git a/docs/source/concepts/PropertiesFile.rst b/docs/source/concepts/PropertiesFile.rst
index d6cf42272ef18eb1e93298931615262e1128613f..41994c91022d556c1d320c357dcd88db00c22817 100644
--- a/docs/source/concepts/PropertiesFile.rst
+++ b/docs/source/concepts/PropertiesFile.rst
@@ -36,9 +36,6 @@ General properties
| ``algorithms.categories.hidden`` | A comma separated list of any categories of | ``Muons,Testing`` |
| | algorithms that should be hidden in Mantid. | |
+----------------------------------+--------------------------------------------------+------------------------+
-| ``algorithms.retained`` | The Number of algorithms properties to retain in | ``50`` |
-| | memory for reference in scripts. | |
-+----------------------------------+--------------------------------------------------+------------------------+
| ``curvefitting.guiExclude`` | A semicolon separated list of function names | ``ExpDecay;Gaussian;`` |
| | that should be hidden in Mantid. | |
+----------------------------------+--------------------------------------------------+------------------------+
diff --git a/docs/source/concepts/SampleEnvironment.rst b/docs/source/concepts/SampleEnvironment.rst
index 7203b0baa9fa27f1c8710c40b159677f4df65ad9..75977ebf32eac85c37b3e827a547e91e23faefa3 100644
--- a/docs/source/concepts/SampleEnvironment.rst
+++ b/docs/source/concepts/SampleEnvironment.rst
@@ -114,6 +114,14 @@ map to the arguments of a similar name on the :ref:`SetSampleMaterial <algm-SetS
- ``cohscatterxsec``
- ``incohscatterxsec``
- ``absorptionxsec``
+- ``attenuationprofile``
+
+Mantid will search for the filename supplied in the attenuationprofile attribute in the
+following places (in order):
+
+- If a full path is supplied in the filename attribute then it will be used
+- Mantid will then check in the same directory as the environment definition file
+- Mantid will then check in the data search directories
Non-container Components
------------------------
diff --git a/docs/source/images/Plot1DSelectionDialog5-1.png b/docs/source/images/Plot1DSelectionDialog5-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..43fdb2f5b1dd0aacb0875f5a90eabdfe9118f90d
Binary files /dev/null and b/docs/source/images/Plot1DSelectionDialog5-1.png differ
diff --git a/docs/source/release/v5.1.0/framework.rst b/docs/source/release/v5.1.0/framework.rst
index a893818aae15fa7ccbaa5cd3a782ec694d43d5f4..769cda42cb59e2d06b749aaad5edaf333b6a5b3f 100644
--- a/docs/source/release/v5.1.0/framework.rst
+++ b/docs/source/release/v5.1.0/framework.rst
@@ -15,6 +15,18 @@ Concepts
Algorithms
----------
+- Add specialization to :ref:`SetUncertainties <algm-SetUncertainties>` for the
+ case where InputWorkspace == OutputWorkspace. Where possible, avoid the
+ cost of cloning the inputWorkspace.
+
+Data Handling
+-------------
+
+The material definition has been extended to include an optional filename containing a profile of attenuation factor versus wavelength. This new filename has been added as a parameter to these algorithms:
+- :ref:`SetSampleMaterial <algm-SetSampleMaterial>`
+- :ref:`LoadSampleEnvironment <algm-LoadSampleEnvironment>`
+The attenuation profile filename can also be specified in the materials section of the sample environment xml file
+
Data Objects
------------
diff --git a/docs/source/release/v5.1.0/mantidworkbench.rst b/docs/source/release/v5.1.0/mantidworkbench.rst
index 040b994c8ec9e752a18ee7c0176f5008b34ed7c7..89e3ce05d8610020309c59c9174920abfd0110d0 100644
--- a/docs/source/release/v5.1.0/mantidworkbench.rst
+++ b/docs/source/release/v5.1.0/mantidworkbench.rst
@@ -8,12 +8,19 @@ MantidWorkbench Changes
Improvements
############
+.. figure:: ../../images/Plot1DSelectionDialog5-1.png
+ :align: right
+
+- The plot selection dialog now correctly shows the full range of valid spectra to plot, not just the min to max range.
- Tile plots are now reloaded correctly by project recovery.
+- Fixed an issue where some scripts were running slower if a plot was open at the same time.
Bugfixes
########
-- Fixed a bug where setting columns to Y error in table workspaces wasn't working. The links between the Y error and Y columns weren't being set up properly
+- Fixed a bug where setting columns to Y error in table workspaces wasn't working. The links between the Y error and Y columns weren't being set up properly.
+- Fixed a crash when you selected a spectra to plot that was not present in a workspace.
+- The scale of the color bars on colorfill plots of ragged workspaces now uses the maximum and minimum values of the data.
:ref:`Release 5.1.0 <v5.1.0>`
diff --git a/docs/source/release/v5.1.0/ui.rst b/docs/source/release/v5.1.0/ui.rst
index f54c0b9bf1b1fcfc515e9208e63ff8a7b360b5a6..70d20e76c38dfdb4c2c7f27a39a72da78115b811 100644
--- a/docs/source/release/v5.1.0/ui.rst
+++ b/docs/source/release/v5.1.0/ui.rst
@@ -19,6 +19,7 @@ See :doc:`mantidplot`.
MantidWorkbench
---------------
+- Fixed new tab names not incrementing correctly on KDE display environments (i.e. KUbuntu).
See :doc:`mantidworkbench`.
diff --git a/docs/sphinxext/mantiddoc/directives/algorithm.py b/docs/sphinxext/mantiddoc/directives/algorithm.py
index f118d5c11173e2c3d2f78147c8d5164dc5f3318c..51f655f1f95f5c88acfba5ee5f5095aa183a2efd 100644
--- a/docs/sphinxext/mantiddoc/directives/algorithm.py
+++ b/docs/sphinxext/mantiddoc/directives/algorithm.py
@@ -4,12 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantiddoc.directives.base import AlgorithmBaseDirective #pylint: disable=unused-import
import os
import re
-from six import iteritems
-
REDIRECT_TEMPLATE = "redirect.html"
DEPRECATE_USE_ALG_RE = re.compile(r"Use\s(([A-Z][a-zA-Z0-9]+)\s(version ([0-9])+)?)\s*instead.")
@@ -20,6 +17,8 @@ DEPRECATE_USE_ALG_RE = re.compile(r"Use\s(([A-Z][a-zA-Z0-9]+)\s(version ([0-9])+
SCREENSHOT_MAX_HEIGHT = 250
#--------------------------------------------------------------------------
+
+
class AlgorithmDirective(AlgorithmBaseDirective):
"""
@@ -219,7 +218,7 @@ def html_collect_pages(dummy_app):
template = REDIRECT_TEMPLATE
all_algs = AlgorithmFactory.getRegisteredAlgorithms(True)
- for name, versions in iteritems(all_algs):
+ for name, versions in all_algs.items():
redirect_pagename = "algorithms/%s" % name
versions.sort()
highest_version = versions[-1]
@@ -229,6 +228,7 @@ def html_collect_pages(dummy_app):
#------------------------------------------------------------------------------------------------------------
+
def setup(app):
"""
Setup the directives when the extension is activated
diff --git a/docs/sphinxext/mantiddoc/directives/categories.py b/docs/sphinxext/mantiddoc/directives/categories.py
index 9842d126cee0419fa96f9018ca192214c36ed339..06f25388847b4d61ed8d51453c4f2e3d011cda6d 100644
--- a/docs/sphinxext/mantiddoc/directives/categories.py
+++ b/docs/sphinxext/mantiddoc/directives/categories.py
@@ -12,12 +12,10 @@
creates "index" pages that lists the contents of each category. The display of each
"index" page is controlled by a jinja2 template.
"""
-from __future__ import (absolute_import, division, print_function)
from mantiddoc.directives.base import AlgorithmBaseDirective, algorithm_name_and_version #pylint: disable=unused-import
from sphinx.util.osutil import relative_uri
import os
import posixpath
-from six import iteritems, itervalues
CATEGORY_PAGE_TEMPLATE = "category.html"
ALG_CATEGORY_PAGE_TEMPLATE = "algorithmcategories.html"
@@ -29,6 +27,7 @@ CATEGORIES_DIR = "categories"
# directory of the document and the category directory
INDEX_CATEGORIES = ["Algorithms", "FitFunctions", "Concepts", "Techniques", "Interfaces"]
+
class LinkItem(object):
"""
Defines a linkable item with a name and html reference
@@ -83,6 +82,7 @@ class LinkItem(object):
# endclass
+
class PageRef(LinkItem):
"""
Store details of a single page reference
@@ -93,6 +93,7 @@ class PageRef(LinkItem):
#endclass
+
class Category(LinkItem):
"""
Store information about a single category
@@ -315,6 +316,7 @@ def to_unix_style_path(path):
#---------------------------------------------------------------------------------
+
def html_collect_pages(app):
"""
Callback for the 'html-collect-pages' Sphinx event. Adds category
@@ -333,6 +335,7 @@ def html_collect_pages(app):
yield (name, context, template)
# enddef
+
def create_category_pages(app):
"""
Returns an iterable of (category_name, context, "category.html")
@@ -345,7 +348,7 @@ def create_category_pages(app):
template = CATEGORY_PAGE_TEMPLATE
categories = env.categories
- for name, category in iteritems(categories):
+ for name, category in categories.items():
context = {}
# First write out the named page
context["title"] = category.name
@@ -393,6 +396,8 @@ def create_category_pages(app):
# enddef
#-----------------------------------------------------------------------------------------------------------
+
+
def create_top_algorithm_category(categories):
"""
Returns a tuple of (category_name, context, "category.html")
@@ -409,7 +414,7 @@ def create_top_algorithm_category(categories):
all_top_categories = []
category_src_dir = ''
# If the category is a top category it will not contain "\\"
- for top_name, top_category in iteritems(categories):
+ for top_name, top_category in categories.items():
#Add all the top level categories
if "\\" not in top_name and top_category.section == 'algorithms':
#get additional text for each category
@@ -445,6 +450,7 @@ def create_top_algorithm_category(categories):
top_html_path_noext = posixpath.join('algorithms', 'index')
return (top_html_path_noext, top_context, template)
+
def extract_matching_categories(input_categories,filepath):
"""
Extract entries with a name matching that included the supplied file.
@@ -466,6 +472,8 @@ def extract_matching_categories(input_categories,filepath):
input_categories[:] = [category for category in input_categories if category.name not in name_list]
return extracted_list
+
+
def purge_categories(app, env, docname):
"""
Purge information about the given document name from the tracked algorithms
@@ -485,12 +493,14 @@ def purge_categories(app, env, docname):
return
deadref = PageRef(name, docname)
- for category in itervalues(categories):
+ for category in categories.values():
pages = category.pages
if deadref in pages:
pages.remove(deadref)
#------------------------------------------------------------------------------
+
+
def setup(app):
# Add categories directive
app.add_directive('categories', CategoriesDirective)
diff --git a/docs/sphinxext/mantiddoc/directives/diagram.py b/docs/sphinxext/mantiddoc/directives/diagram.py
index cd410e7da104b94e0d7a43161cf7c9d9046134d7..a01a6af317c1456b406d3dd4a0292831239caea2 100644
--- a/docs/sphinxext/mantiddoc/directives/diagram.py
+++ b/docs/sphinxext/mantiddoc/directives/diagram.py
@@ -4,13 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantiddoc.directives.base import BaseDirective #pylint: disable=unused-import
from sphinx.locale import _ #pylint: disable=unused-import
import os
from string import Template
import subprocess
-from six import PY3
######################
#CONFIGURABLE OPTIONS#
@@ -94,8 +92,7 @@ class DiagramDirective(BaseDirective):
raise RuntimeError("Cannot find dot-file: '" + diagram_name + "' in '" + os.path.join(env.srcdir,"diagrams"))
out_src = Template(in_src).substitute(STYLE)
- if PY3:
- out_src = out_src.encode()
+ out_src = out_src.encode()
gviz = subprocess.Popen([dot_executable,"-Tpng","-o",out_path], stdin=subprocess.PIPE)
gviz.communicate(input=out_src)
gviz.wait()
@@ -109,6 +106,7 @@ class DiagramDirective(BaseDirective):
#------------------------------------------------------------------------------------------------------------
+
def setup(app):
"""
Setup the directives when the extension is activated
diff --git a/docs/sphinxext/mantiddoc/directives/properties.py b/docs/sphinxext/mantiddoc/directives/properties.py
index cc027352d115bc76c72dd334f64cf870f857210c..d8f97dd546f98ffcb8774c1a9be0b95662c00947 100644
--- a/docs/sphinxext/mantiddoc/directives/properties.py
+++ b/docs/sphinxext/mantiddoc/directives/properties.py
@@ -5,14 +5,12 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,deprecated-module
-from __future__ import (absolute_import, division, print_function)
from mantiddoc.directives.base import AlgorithmBaseDirective #pylint: disable=unused-import
import re
from string import punctuation
-from six.moves import range
-
SUBSTITUTE_REF_RE = re.compile(r'\|(.+?)\|')
+
class PropertiesDirective(AlgorithmBaseDirective):
"""
diff --git a/docs/sphinxext/mantiddoc/directives/sourcelink.py b/docs/sphinxext/mantiddoc/directives/sourcelink.py
index 1baf5c6d6955c2405aa1eabb2cdc8559a7e90d7d..11aa65458c4b3ff43b04cd22d84d5c0ced742989 100644
--- a/docs/sphinxext/mantiddoc/directives/sourcelink.py
+++ b/docs/sphinxext/mantiddoc/directives/sourcelink.py
@@ -4,12 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import subprocess
-from six import iteritems
-
import mantid
from .base import AlgorithmBaseDirective #pylint: disable=unused-import
@@ -204,7 +200,7 @@ class SourceLinkDirective(AlgorithmBaseDirective):
valid_ext_list = []
self.add_rst(self.make_header("Source"))
- for extension, filepath in iteritems(file_paths):
+ for extension, filepath in file_paths.items():
if filepath is not None:
self.output_path_to_page(filepath, extension)
valid_ext_list.append(extension)
diff --git a/instrument/sampleenvironments/ISIS/DIAM_DEBEERS_MU.DAT b/instrument/sampleenvironments/ISIS/DIAM_DEBEERS_MU.DAT
new file mode 100644
index 0000000000000000000000000000000000000000..31fbfaab7c567cd879e668a1d9d081df6cfd28f8
--- /dev/null
+++ b/instrument/sampleenvironments/ISIS/DIAM_DEBEERS_MU.DAT
@@ -0,0 +1,6185 @@
+ SD/Co binder die (de Beers) 15.19mm thick in beam - sum
+
+ Wavelength lambda (Angstrom)
+ Mu(lambda) (mm-1)
+
+ 0.10027009E+00 0.82631156E-01 0.67007710E-03
+ 0.10055576E+00 0.82005039E-01 0.66678890E-03
+ 0.10084143E+00 0.81463188E-01 0.67050720E-03
+ 0.10112710E+00 0.82024753E-01 0.66888944E-03
+ 0.10141277E+00 0.82992032E-01 0.67302334E-03
+ 0.10169844E+00 0.82989216E-01 0.67353551E-03
+ 0.10198410E+00 0.82528308E-01 0.67860004E-03
+ 0.10226977E+00 0.81612773E-01 0.66396542E-03
+ 0.10255544E+00 0.82563899E-01 0.67542406E-03
+ 0.10284111E+00 0.82173750E-01 0.66889642E-03
+ 0.10312678E+00 0.83486386E-01 0.67878095E-03
+ 0.10341245E+00 0.83968453E-01 0.67739259E-03
+ 0.10369812E+00 0.81772044E-01 0.67071861E-03
+ 0.10398379E+00 0.83433434E-01 0.67702419E-03
+ 0.10426946E+00 0.83046526E-01 0.67519140E-03
+ 0.10455513E+00 0.83265930E-01 0.67653577E-03
+ 0.10484080E+00 0.82562856E-01 0.67586743E-03
+ 0.10512647E+00 0.82306124E-01 0.67431922E-03
+ 0.10541214E+00 0.81886202E-01 0.67096262E-03
+ 0.10569781E+00 0.83079800E-01 0.67484274E-03
+ 0.10598348E+00 0.82389295E-01 0.67355891E-03
+ 0.10626915E+00 0.83532117E-01 0.67840068E-03
+ 0.10655482E+00 0.83073236E-01 0.67957322E-03
+ 0.10684049E+00 0.83056584E-01 0.67458267E-03
+ 0.10712615E+00 0.83338223E-01 0.67831267E-03
+ 0.10741182E+00 0.82853466E-01 0.67205989E-03
+ 0.10769749E+00 0.82386963E-01 0.68199146E-03
+ 0.10798316E+00 0.81837632E-01 0.67231280E-03
+ 0.10826883E+00 0.83583370E-01 0.67543582E-03
+ 0.10855450E+00 0.83468191E-01 0.67924766E-03
+ 0.10884017E+00 0.83200261E-01 0.67930657E-03
+ 0.10912585E+00 0.82854532E-01 0.67873934E-03
+ 0.10941152E+00 0.82072653E-01 0.67380670E-03
+ 0.10969719E+00 0.81627138E-01 0.67367236E-03
+ 0.10998286E+00 0.81883073E-01 0.67290303E-03
+ 0.11026853E+00 0.83694540E-01 0.68210397E-03
+ 0.11055420E+00 0.82872465E-01 0.67975518E-03
+ 0.11083987E+00 0.82130626E-01 0.67755481E-03
+ 0.11112554E+00 0.83103836E-01 0.67606254E-03
+ 0.11141121E+00 0.83856829E-01 0.68126933E-03
+ 0.11169688E+00 0.82503892E-01 0.67626324E-03
+ 0.11198255E+00 0.82449667E-01 0.67953736E-03
+ 0.11226822E+00 0.82550749E-01 0.68019045E-03
+ 0.11255388E+00 0.83202168E-01 0.68025803E-03
+ 0.11283955E+00 0.80138810E-01 0.67423837E-03
+ 0.11312522E+00 0.83964176E-01 0.68546232E-03
+ 0.11341089E+00 0.82576767E-01 0.68250130E-03
+ 0.11369656E+00 0.82226411E-01 0.68061287E-03
+ 0.11398223E+00 0.83206244E-01 0.67966280E-03
+ 0.11426790E+00 0.82503587E-01 0.67813270E-03
+ 0.11455357E+00 0.82805365E-01 0.68368332E-03
+ 0.11483924E+00 0.83070487E-01 0.68353431E-03
+ 0.11512491E+00 0.82582034E-01 0.68043300E-03
+ 0.11541058E+00 0.83671421E-01 0.68514288E-03
+ 0.11569625E+00 0.83068244E-01 0.68114314E-03
+ 0.11598192E+00 0.84590107E-01 0.68771816E-03
+ 0.11626759E+00 0.82964852E-01 0.68508211E-03
+ 0.11655326E+00 0.82770348E-01 0.68137352E-03
+ 0.11683893E+00 0.82609326E-01 0.68327365E-03
+ 0.11712460E+00 0.82681119E-01 0.68002695E-03
+ 0.11741027E+00 0.81797488E-01 0.67806442E-03
+ 0.11769594E+00 0.83472334E-01 0.68559806E-03
+ 0.11798161E+00 0.82250901E-01 0.68245974E-03
+ 0.11826728E+00 0.83054863E-01 0.68427430E-03
+ 0.11855295E+00 0.83795786E-01 0.68605883E-03
+ 0.11883862E+00 0.83050802E-01 0.68341312E-03
+ 0.11912429E+00 0.84399886E-01 0.68734068E-03
+ 0.11940996E+00 0.84550612E-01 0.68635319E-03
+ 0.11969563E+00 0.82357123E-01 0.68722706E-03
+ 0.11998130E+00 0.82192920E-01 0.68340747E-03
+ 0.12026697E+00 0.84071517E-01 0.69323892E-03
+ 0.12055264E+00 0.83247580E-01 0.68623957E-03
+ 0.12083831E+00 0.82778715E-01 0.68599911E-03
+ 0.12112398E+00 0.84303036E-01 0.69098047E-03
+ 0.12140965E+00 0.82036518E-01 0.68473723E-03
+ 0.12169532E+00 0.83188683E-01 0.68520772E-03
+ 0.12198099E+00 0.83345518E-01 0.68796298E-03
+ 0.12226666E+00 0.84168933E-01 0.68903290E-03
+ 0.12255233E+00 0.82003623E-01 0.68418903E-03
+ 0.12283799E+00 0.82959987E-01 0.68760320E-03
+ 0.12312366E+00 0.81913680E-01 0.68357022E-03
+ 0.12340933E+00 0.83502501E-01 0.68600191E-03
+ 0.12369500E+00 0.82851321E-01 0.69117825E-03
+ 0.12398067E+00 0.83720490E-01 0.68707624E-03
+ 0.12426634E+00 0.83874136E-01 0.69124124E-03
+ 0.12455201E+00 0.82939312E-01 0.68538025E-03
+ 0.12483768E+00 0.84210224E-01 0.69254643E-03
+ 0.12512335E+00 0.84529102E-01 0.69170003E-03
+ 0.12540902E+00 0.84384702E-01 0.69310016E-03
+ 0.12569469E+00 0.82702041E-01 0.68726845E-03
+ 0.12598036E+00 0.83129324E-01 0.69035351E-03
+ 0.12626603E+00 0.83862588E-01 0.69150305E-03
+ 0.12655170E+00 0.84782951E-01 0.69462130E-03
+ 0.12683737E+00 0.81787400E-01 0.68345049E-03
+ 0.12712304E+00 0.84486030E-01 0.69697207E-03
+ 0.12740871E+00 0.82549289E-01 0.68737782E-03
+ 0.12769438E+00 0.83371297E-01 0.68958889E-03
+ 0.12798005E+00 0.83066851E-01 0.69023564E-03
+ 0.12826572E+00 0.83525732E-01 0.69233961E-03
+ 0.12855139E+00 0.82990699E-01 0.68703917E-03
+ 0.12883706E+00 0.82776085E-01 0.69120241E-03
+ 0.12912273E+00 0.84123075E-01 0.69433899E-03
+ 0.12940840E+00 0.83887279E-01 0.69553696E-03
+ 0.12969407E+00 0.84486090E-01 0.69186644E-03
+ 0.12997974E+00 0.82889445E-01 0.68854197E-03
+ 0.13026541E+00 0.82067885E-01 0.69138664E-03
+ 0.13055108E+00 0.83709560E-01 0.69294393E-03
+ 0.13083674E+00 0.84161259E-01 0.69450587E-03
+ 0.13112241E+00 0.83041891E-01 0.69779746E-03
+ 0.13140808E+00 0.82800269E-01 0.69028779E-03
+ 0.13169375E+00 0.83941236E-01 0.69874612E-03
+ 0.13197942E+00 0.83079718E-01 0.69192110E-03
+ 0.13226509E+00 0.83591945E-01 0.69584622E-03
+ 0.13255076E+00 0.83525576E-01 0.69524156E-03
+ 0.13283643E+00 0.82836874E-01 0.69171452E-03
+ 0.13312210E+00 0.83004162E-01 0.69217745E-03
+ 0.13340777E+00 0.82191221E-01 0.69223373E-03
+ 0.13369344E+00 0.83970129E-01 0.69477287E-03
+ 0.13397911E+00 0.83093137E-01 0.69322222E-03
+ 0.13426478E+00 0.82157597E-01 0.68919273E-03
+ 0.13455045E+00 0.84107660E-01 0.69670723E-03
+ 0.13483612E+00 0.83117560E-01 0.69414853E-03
+ 0.13512179E+00 0.82862839E-01 0.69122697E-03
+ 0.13540746E+00 0.82280882E-01 0.69114991E-03
+ 0.13569313E+00 0.84935442E-01 0.69717027E-03
+ 0.13597880E+00 0.82828641E-01 0.69360633E-03
+ 0.13626447E+00 0.82489274E-01 0.69714512E-03
+ 0.13655014E+00 0.83704069E-01 0.69524476E-03
+ 0.13683581E+00 0.82488336E-01 0.69519278E-03
+ 0.13712148E+00 0.82825869E-01 0.69547805E-03
+ 0.13740715E+00 0.83128080E-01 0.69786253E-03
+ 0.13769282E+00 0.83884582E-01 0.69822266E-03
+ 0.13797849E+00 0.82600623E-01 0.69569191E-03
+ 0.13826416E+00 0.83353862E-01 0.69780118E-03
+ 0.13854983E+00 0.86034819E-01 0.70839323E-03
+ 0.13883550E+00 0.85243568E-01 0.70588151E-03
+ 0.13912117E+00 0.85751608E-01 0.70941541E-03
+ 0.13940684E+00 0.88475309E-01 0.71732252E-03
+ 0.13969252E+00 0.86800471E-01 0.71275735E-03
+ 0.13997819E+00 0.85930496E-01 0.71120396E-03
+ 0.14026386E+00 0.85590281E-01 0.71209978E-03
+ 0.14054953E+00 0.86283453E-01 0.71131735E-03
+ 0.14083520E+00 0.84958874E-01 0.71028376E-03
+ 0.14112085E+00 0.85564129E-01 0.70680544E-03
+ 0.14140652E+00 0.84825322E-01 0.70329325E-03
+ 0.14169219E+00 0.83027609E-01 0.69745700E-03
+ 0.14197786E+00 0.83976150E-01 0.70172991E-03
+ 0.14226353E+00 0.83635777E-01 0.69354597E-03
+ 0.14254920E+00 0.82888126E-01 0.70151698E-03
+ 0.14283487E+00 0.83727174E-01 0.70184516E-03
+ 0.14312054E+00 0.83145201E-01 0.69914135E-03
+ 0.14340621E+00 0.82943529E-01 0.69850602E-03
+ 0.14369188E+00 0.83311439E-01 0.70337346E-03
+ 0.14397755E+00 0.83073385E-01 0.69545198E-03
+ 0.14426322E+00 0.83466262E-01 0.70225517E-03
+ 0.14454889E+00 0.84240891E-01 0.70330023E-03
+ 0.14483456E+00 0.83914876E-01 0.70232310E-03
+ 0.14512023E+00 0.83540335E-01 0.69768360E-03
+ 0.14540590E+00 0.82061999E-01 0.69859758E-03
+ 0.14569157E+00 0.83215430E-01 0.69790072E-03
+ 0.14597724E+00 0.83396368E-01 0.70111675E-03
+ 0.14626291E+00 0.84375255E-01 0.70358254E-03
+ 0.14654858E+00 0.81417099E-01 0.69724384E-03
+ 0.14683425E+00 0.84163167E-01 0.70446462E-03
+ 0.14711992E+00 0.85107855E-01 0.70777716E-03
+ 0.14740559E+00 0.83786964E-01 0.70637808E-03
+ 0.14769126E+00 0.82119368E-01 0.70095481E-03
+ 0.14797693E+00 0.83106428E-01 0.69851551E-03
+ 0.14826261E+00 0.84316321E-01 0.70685358E-03
+ 0.14854828E+00 0.82516022E-01 0.70076936E-03
+ 0.14883395E+00 0.83303489E-01 0.70451293E-03
+ 0.14911962E+00 0.83152078E-01 0.70203689E-03
+ 0.14940529E+00 0.82625732E-01 0.70085056E-03
+ 0.14969096E+00 0.83621971E-01 0.70158060E-03
+ 0.14997663E+00 0.83351217E-01 0.70207624E-03
+ 0.15026230E+00 0.82424179E-01 0.69906679E-03
+ 0.15054797E+00 0.83330840E-01 0.70380286E-03
+ 0.15083364E+00 0.84925234E-01 0.70822623E-03
+ 0.15111931E+00 0.81966452E-01 0.70172147E-03
+ 0.15140498E+00 0.82510293E-01 0.69845951E-03
+ 0.15169063E+00 0.83432429E-01 0.70452673E-03
+ 0.15197630E+00 0.84329925E-01 0.70669455E-03
+ 0.15226197E+00 0.84110327E-01 0.70708466E-03
+ 0.15254764E+00 0.82725234E-01 0.69955696E-03
+ 0.15283331E+00 0.84078580E-01 0.70626248E-03
+ 0.15311898E+00 0.83495788E-01 0.70243276E-03
+ 0.15340465E+00 0.85312210E-01 0.71522273E-03
+ 0.15369032E+00 0.83984196E-01 0.70570857E-03
+ 0.15397599E+00 0.82664907E-01 0.70216326E-03
+ 0.15426166E+00 0.84532879E-01 0.70633844E-03
+ 0.15454733E+00 0.83047628E-01 0.70614315E-03
+ 0.15483300E+00 0.84587075E-01 0.70958043E-03
+ 0.15511867E+00 0.83274186E-01 0.70519309E-03
+ 0.15540434E+00 0.82284994E-01 0.70330448E-03
+ 0.15569001E+00 0.84199347E-01 0.70691435E-03
+ 0.15597568E+00 0.83286151E-01 0.70528919E-03
+ 0.15626135E+00 0.84283888E-01 0.70800277E-03
+ 0.15654702E+00 0.84556125E-01 0.70744014E-03
+ 0.15683270E+00 0.84186032E-01 0.70968218E-03
+ 0.15711837E+00 0.84472008E-01 0.70974010E-03
+ 0.15740404E+00 0.83003633E-01 0.70722884E-03
+ 0.15768971E+00 0.83357781E-01 0.70419034E-03
+ 0.15797538E+00 0.82661092E-01 0.70563436E-03
+ 0.15826105E+00 0.83153903E-01 0.70551515E-03
+ 0.15854672E+00 0.83074309E-01 0.70690160E-03
+ 0.15883239E+00 0.84938414E-01 0.71066897E-03
+ 0.15911806E+00 0.83899423E-01 0.70907868E-03
+ 0.15940373E+00 0.83505660E-01 0.70949853E-03
+ 0.15968940E+00 0.84461071E-01 0.70971076E-03
+ 0.15997507E+00 0.83054416E-01 0.70631056E-03
+ 0.16026074E+00 0.83322987E-01 0.71047666E-03
+ 0.16054641E+00 0.84180824E-01 0.71018829E-03
+ 0.16083208E+00 0.83766475E-01 0.71301986E-03
+ 0.16111775E+00 0.83916456E-01 0.70778048E-03
+ 0.16140342E+00 0.84503219E-01 0.71288226E-03
+ 0.16168909E+00 0.83683789E-01 0.70863019E-03
+ 0.16197474E+00 0.83945803E-01 0.71353518E-03
+ 0.16226041E+00 0.82662128E-01 0.70722576E-03
+ 0.16254608E+00 0.84134467E-01 0.71524357E-03
+ 0.16283175E+00 0.82878515E-01 0.70367253E-03
+ 0.16311742E+00 0.84968209E-01 0.71253348E-03
+ 0.16340309E+00 0.83582811E-01 0.71234658E-03
+ 0.16368876E+00 0.83314084E-01 0.71452017E-03
+ 0.16397443E+00 0.84061876E-01 0.71039301E-03
+ 0.16426010E+00 0.83667889E-01 0.70942444E-03
+ 0.16454577E+00 0.83910577E-01 0.71266165E-03
+ 0.16483144E+00 0.84213473E-01 0.71778207E-03
+ 0.16511711E+00 0.84074683E-01 0.71040529E-03
+ 0.16540278E+00 0.83826520E-01 0.71114901E-03
+ 0.16568846E+00 0.83081767E-01 0.70755236E-03
+ 0.16597413E+00 0.83850183E-01 0.71423192E-03
+ 0.16625980E+00 0.83506010E-01 0.71255158E-03
+ 0.16654547E+00 0.82917914E-01 0.71156590E-03
+ 0.16683114E+00 0.83435319E-01 0.71384001E-03
+ 0.16711681E+00 0.84874809E-01 0.71914279E-03
+ 0.16740248E+00 0.83176404E-01 0.71382639E-03
+ 0.16768815E+00 0.83302990E-01 0.70913549E-03
+ 0.16797382E+00 0.82683057E-01 0.71098306E-03
+ 0.16825949E+00 0.83147839E-01 0.71010110E-03
+ 0.16854516E+00 0.84288619E-01 0.71563415E-03
+ 0.16883083E+00 0.83148286E-01 0.71204157E-03
+ 0.16911650E+00 0.84837966E-01 0.71738916E-03
+ 0.16940217E+00 0.84213533E-01 0.71757019E-03
+ 0.16968784E+00 0.82862310E-01 0.71240193E-03
+ 0.16997351E+00 0.83220601E-01 0.71320432E-03
+ 0.17025918E+00 0.82984962E-01 0.71389170E-03
+ 0.17054485E+00 0.84313378E-01 0.72114286E-03
+ 0.17083052E+00 0.84040985E-01 0.71328832E-03
+ 0.17111619E+00 0.84227249E-01 0.71940979E-03
+ 0.17140186E+00 0.83573297E-01 0.71358890E-03
+ 0.17168753E+00 0.83427124E-01 0.71892684E-03
+ 0.17197320E+00 0.83462469E-01 0.71331643E-03
+ 0.17225887E+00 0.83501846E-01 0.71719149E-03
+ 0.17254452E+00 0.84889501E-01 0.72083558E-03
+ 0.17283019E+00 0.84108151E-01 0.71942678E-03
+ 0.17311586E+00 0.84945731E-01 0.71680336E-03
+ 0.17340153E+00 0.83929494E-01 0.71764854E-03
+ 0.17368720E+00 0.84916219E-01 0.71983406E-03
+ 0.17397287E+00 0.83735399E-01 0.71674056E-03
+ 0.17425855E+00 0.83100937E-01 0.71096170E-03
+ 0.17454422E+00 0.84151186E-01 0.72015572E-03
+ 0.17482989E+00 0.82469821E-01 0.71248051E-03
+ 0.17511556E+00 0.84430091E-01 0.72013331E-03
+ 0.17540123E+00 0.84994197E-01 0.72397181E-03
+ 0.17568690E+00 0.83861358E-01 0.72120479E-03
+ 0.17597257E+00 0.83732516E-01 0.71997877E-03
+ 0.17625824E+00 0.83489425E-01 0.71753748E-03
+ 0.17654391E+00 0.84769115E-01 0.72346738E-03
+ 0.17682958E+00 0.83954081E-01 0.72007888E-03
+ 0.17711525E+00 0.83962731E-01 0.72141603E-03
+ 0.17740092E+00 0.84413096E-01 0.72351261E-03
+ 0.17768659E+00 0.84888846E-01 0.72595128E-03
+ 0.17797226E+00 0.84203154E-01 0.72063564E-03
+ 0.17825793E+00 0.83058730E-01 0.71936357E-03
+ 0.17854360E+00 0.83750494E-01 0.72379148E-03
+ 0.17882927E+00 0.84156975E-01 0.72399620E-03
+ 0.17911494E+00 0.83947182E-01 0.72344171E-03
+ 0.17940061E+00 0.84902182E-01 0.72622049E-03
+ 0.17968628E+00 0.84089845E-01 0.72055287E-03
+ 0.17997195E+00 0.85213199E-01 0.72695792E-03
+ 0.18025762E+00 0.84509522E-01 0.72701991E-03
+ 0.18054329E+00 0.84721312E-01 0.72268106E-03
+ 0.18082896E+00 0.84299490E-01 0.72468410E-03
+ 0.18111463E+00 0.83664581E-01 0.72085654E-03
+ 0.18140030E+00 0.83916843E-01 0.72084845E-03
+ 0.18168597E+00 0.85295446E-01 0.72025461E-03
+ 0.18197164E+00 0.83443567E-01 0.72267343E-03
+ 0.18225731E+00 0.83890662E-01 0.72070642E-03
+ 0.18254298E+00 0.83526075E-01 0.72015804E-03
+ 0.18282865E+00 0.83296455E-01 0.71972521E-03
+ 0.18311431E+00 0.84072419E-01 0.72360225E-03
+ 0.18339998E+00 0.83066851E-01 0.72008400E-03
+ 0.18368565E+00 0.83016455E-01 0.72077365E-03
+ 0.18397132E+00 0.84619701E-01 0.72677870E-03
+ 0.18425699E+00 0.84949918E-01 0.72874746E-03
+ 0.18454266E+00 0.84308453E-01 0.72792248E-03
+ 0.18482833E+00 0.83969422E-01 0.72095706E-03
+ 0.18511400E+00 0.84402375E-01 0.72460418E-03
+ 0.18539967E+00 0.83767347E-01 0.72443992E-03
+ 0.18568534E+00 0.83630569E-01 0.72063843E-03
+ 0.18597101E+00 0.84600762E-01 0.72046381E-03
+ 0.18625668E+00 0.82661949E-01 0.72268245E-03
+ 0.18654235E+00 0.85039631E-01 0.73361158E-03
+ 0.18682802E+00 0.84173806E-01 0.72565605E-03
+ 0.18711369E+00 0.83195426E-01 0.72343554E-03
+ 0.18739936E+00 0.84156983E-01 0.72284543E-03
+ 0.18768503E+00 0.85077897E-01 0.72883442E-03
+ 0.18797070E+00 0.84978931E-01 0.72762865E-03
+ 0.18825637E+00 0.83586477E-01 0.72417659E-03
+ 0.18854204E+00 0.84133156E-01 0.72483183E-03
+ 0.18882771E+00 0.85605733E-01 0.73087111E-03
+ 0.18911338E+00 0.83712220E-01 0.72637806E-03
+ 0.18939905E+00 0.84786221E-01 0.72888698E-03
+ 0.18968472E+00 0.84814698E-01 0.72525343E-03
+ 0.18997039E+00 0.83877720E-01 0.72165049E-03
+ 0.19025606E+00 0.83826050E-01 0.72560809E-03
+ 0.19054173E+00 0.84374472E-01 0.72481314E-03
+ 0.19082740E+00 0.85225463E-01 0.73090440E-03
+ 0.19111307E+00 0.83505213E-01 0.72530541E-03
+ 0.19139874E+00 0.84300265E-01 0.72915899E-03
+ 0.19168441E+00 0.84393047E-01 0.72305091E-03
+ 0.19197008E+00 0.84287859E-01 0.72685588E-03
+ 0.19225575E+00 0.84859625E-01 0.72907412E-03
+ 0.19254142E+00 0.85055709E-01 0.73338964E-03
+ 0.19282709E+00 0.83816245E-01 0.72593894E-03
+ 0.19311276E+00 0.84090635E-01 0.72276266E-03
+ 0.19339842E+00 0.85969187E-01 0.73419098E-03
+ 0.19368409E+00 0.84239066E-01 0.72661752E-03
+ 0.19396976E+00 0.84536478E-01 0.72908023E-03
+ 0.19425543E+00 0.84158264E-01 0.72568370E-03
+ 0.19454110E+00 0.84851258E-01 0.72927802E-03
+ 0.19482677E+00 0.84493153E-01 0.72845485E-03
+ 0.19511244E+00 0.84381483E-01 0.72992477E-03
+ 0.19539811E+00 0.83913654E-01 0.72830456E-03
+ 0.19568378E+00 0.84414884E-01 0.72879757E-03
+ 0.19596945E+00 0.84469028E-01 0.72721997E-03
+ 0.19625512E+00 0.85243292E-01 0.73196995E-03
+ 0.19654079E+00 0.85398413E-01 0.73312124E-03
+ 0.19682646E+00 0.85383035E-01 0.73522166E-03
+ 0.19711213E+00 0.83344586E-01 0.72541815E-03
+ 0.19739780E+00 0.83650120E-01 0.72715967E-03
+ 0.19768347E+00 0.84438242E-01 0.72712911E-03
+ 0.19796914E+00 0.84320135E-01 0.73306123E-03
+ 0.19825481E+00 0.84064484E-01 0.72931568E-03
+ 0.19854048E+00 0.85952505E-01 0.72740455E-03
+ 0.19882615E+00 0.84702909E-01 0.73178572E-03
+ 0.19911182E+00 0.83683349E-01 0.73099055E-03
+ 0.19939749E+00 0.84028475E-01 0.72853226E-03
+ 0.19968316E+00 0.85839376E-01 0.73838362E-03
+ 0.19996883E+00 0.85709535E-01 0.73786319E-03
+ 0.20025450E+00 0.82337186E-01 0.72684302E-03
+ 0.20054017E+00 0.84505491E-01 0.72972482E-03
+ 0.20082584E+00 0.84951736E-01 0.73563366E-03
+ 0.20111151E+00 0.84335722E-01 0.73254033E-03
+ 0.20139718E+00 0.85165203E-01 0.73550967E-03
+ 0.20168285E+00 0.83749972E-01 0.72990591E-03
+ 0.20196852E+00 0.85415296E-01 0.73484477E-03
+ 0.20225419E+00 0.85082643E-01 0.73411281E-03
+ 0.20253986E+00 0.84293291E-01 0.73238579E-03
+ 0.20282553E+00 0.84129661E-01 0.73081296E-03
+ 0.20311120E+00 0.85021764E-01 0.73681824E-03
+ 0.20339687E+00 0.84366471E-01 0.73242170E-03
+ 0.20368254E+00 0.84482171E-01 0.73378562E-03
+ 0.20396820E+00 0.82887143E-01 0.72617416E-03
+ 0.20425387E+00 0.84399171E-01 0.73054759E-03
+ 0.20453954E+00 0.83555177E-01 0.72839129E-03
+ 0.20482521E+00 0.84940203E-01 0.73837570E-03
+ 0.20511088E+00 0.84061883E-01 0.72999566E-03
+ 0.20539655E+00 0.83725408E-01 0.73115242E-03
+ 0.20568222E+00 0.84895082E-01 0.73534623E-03
+ 0.20596789E+00 0.83166242E-01 0.73334272E-03
+ 0.20625356E+00 0.84206812E-01 0.72979118E-03
+ 0.20653923E+00 0.84509879E-01 0.73543278E-03
+ 0.20682490E+00 0.84110878E-01 0.73522440E-03
+ 0.20711057E+00 0.85102588E-01 0.73636259E-03
+ 0.20739624E+00 0.84326968E-01 0.73313870E-03
+ 0.20768191E+00 0.84228672E-01 0.73498406E-03
+ 0.20796758E+00 0.83800942E-01 0.73489064E-03
+ 0.20825325E+00 0.83838679E-01 0.73218701E-03
+ 0.20853892E+00 0.84796190E-01 0.73334086E-03
+ 0.20882459E+00 0.85584380E-01 0.73606061E-03
+ 0.20911026E+00 0.85654028E-01 0.74077019E-03
+ 0.20939593E+00 0.85170381E-01 0.74165309E-03
+ 0.20968160E+00 0.84621474E-01 0.73580159E-03
+ 0.20996727E+00 0.84874779E-01 0.73350780E-03
+ 0.21025294E+00 0.83562359E-01 0.73080062E-03
+ 0.21053861E+00 0.85648105E-01 0.73843508E-03
+ 0.21082428E+00 0.83874688E-01 0.72946300E-03
+ 0.21110995E+00 0.85096881E-01 0.73810690E-03
+ 0.21139562E+00 0.84003083E-01 0.73309592E-03
+ 0.21168129E+00 0.83074309E-01 0.73147961E-03
+ 0.21196696E+00 0.84995665E-01 0.73496572E-03
+ 0.21225263E+00 0.85056290E-01 0.74367860E-03
+ 0.21253830E+00 0.83950669E-01 0.73310907E-03
+ 0.21282397E+00 0.84762938E-01 0.73524658E-03
+ 0.21310964E+00 0.85554369E-01 0.74040913E-03
+ 0.21339531E+00 0.84969610E-01 0.73867192E-03
+ 0.21368098E+00 0.83603278E-01 0.73375617E-03
+ 0.21396665E+00 0.85020728E-01 0.73220948E-03
+ 0.21425231E+00 0.84628493E-01 0.73691510E-03
+ 0.21453798E+00 0.85047096E-01 0.74022688E-03
+ 0.21482365E+00 0.84080227E-01 0.73590863E-03
+ 0.21510932E+00 0.84493943E-01 0.73889771E-03
+ 0.21539499E+00 0.85349508E-01 0.73775451E-03
+ 0.21568066E+00 0.84595755E-01 0.73895155E-03
+ 0.21596633E+00 0.85300595E-01 0.73996710E-03
+ 0.21625200E+00 0.84409602E-01 0.73582242E-03
+ 0.21653767E+00 0.85506313E-01 0.74097072E-03
+ 0.21682334E+00 0.85501045E-01 0.74261206E-03
+ 0.21710901E+00 0.84279425E-01 0.73730305E-03
+ 0.21739468E+00 0.83680846E-01 0.73545333E-03
+ 0.21768035E+00 0.85000649E-01 0.74019941E-03
+ 0.21796602E+00 0.84877022E-01 0.73884515E-03
+ 0.21825169E+00 0.81839032E-01 0.72240789E-03
+ 0.21853736E+00 0.86138614E-01 0.74462336E-03
+ 0.21882303E+00 0.85664093E-01 0.74081076E-03
+ 0.21910870E+00 0.85163258E-01 0.73696929E-03
+ 0.21939437E+00 0.85729577E-01 0.74623915E-03
+ 0.21968004E+00 0.84734976E-01 0.74124883E-03
+ 0.21996571E+00 0.83630718E-01 0.73364982E-03
+ 0.22025138E+00 0.84149726E-01 0.73884981E-03
+ 0.22053705E+00 0.83310381E-01 0.73357741E-03
+ 0.22082272E+00 0.85314795E-01 0.74505230E-03
+ 0.22110839E+00 0.84245287E-01 0.73694665E-03
+ 0.22139406E+00 0.83617024E-01 0.74013212E-03
+ 0.22167973E+00 0.86536482E-01 0.74393715E-03
+ 0.22196540E+00 0.85423291E-01 0.74259855E-03
+ 0.22225107E+00 0.85654318E-01 0.74689038E-03
+ 0.22253674E+00 0.85238136E-01 0.74160763E-03
+ 0.22282241E+00 0.86030170E-01 0.74561319E-03
+ 0.22310808E+00 0.85081324E-01 0.74705866E-03
+ 0.22339375E+00 0.84179200E-01 0.74054173E-03
+ 0.22367942E+00 0.84599361E-01 0.73584751E-03
+ 0.22396509E+00 0.86141668E-01 0.74825541E-03
+ 0.22425076E+00 0.84312655E-01 0.74186386E-03
+ 0.22453643E+00 0.84353186E-01 0.74101501E-03
+ 0.22482209E+00 0.84872909E-01 0.74266578E-03
+ 0.22510776E+00 0.83790973E-01 0.73523028E-03
+ 0.22539343E+00 0.83867699E-01 0.73504256E-03
+ 0.22567910E+00 0.84470950E-01 0.73895900E-03
+ 0.22596477E+00 0.83927967E-01 0.73717406E-03
+ 0.22625044E+00 0.83091468E-01 0.73861069E-03
+ 0.22653611E+00 0.85036270E-01 0.74503542E-03
+ 0.22682178E+00 0.84558234E-01 0.74097270E-03
+ 0.22710745E+00 0.84885441E-01 0.74612338E-03
+ 0.22739312E+00 0.84647454E-01 0.74378768E-03
+ 0.22767879E+00 0.85272104E-01 0.74939092E-03
+ 0.22796446E+00 0.85055463E-01 0.74075488E-03
+ 0.22825013E+00 0.85392542E-01 0.74331375E-03
+ 0.22853580E+00 0.85281998E-01 0.74558333E-03
+ 0.22882147E+00 0.83790578E-01 0.74001827E-03
+ 0.22910714E+00 0.85263155E-01 0.74504700E-03
+ 0.22939281E+00 0.85634306E-01 0.74752409E-03
+ 0.22967848E+00 0.85545868E-01 0.74582949E-03
+ 0.22996415E+00 0.84971868E-01 0.74282190E-03
+ 0.23024982E+00 0.85420109E-01 0.74112968E-03
+ 0.23053549E+00 0.84182665E-01 0.74296724E-03
+ 0.23082116E+00 0.84565371E-01 0.74189488E-03
+ 0.23110683E+00 0.84960461E-01 0.74367056E-03
+ 0.23139250E+00 0.85514165E-01 0.74628514E-03
+ 0.23167817E+00 0.84775224E-01 0.74467488E-03
+ 0.23196384E+00 0.86236700E-01 0.75179618E-03
+ 0.23224951E+00 0.84895529E-01 0.74658392E-03
+ 0.23253518E+00 0.85914291E-01 0.74753840E-03
+ 0.23282085E+00 0.83675444E-01 0.74153795E-03
+ 0.23310652E+00 0.86415194E-01 0.74887235E-03
+ 0.23339219E+00 0.84091850E-01 0.73980627E-03
+ 0.23367786E+00 0.84634766E-01 0.74568304E-03
+ 0.23396353E+00 0.86443946E-01 0.74917835E-03
+ 0.23424920E+00 0.83465867E-01 0.73835923E-03
+ 0.23453487E+00 0.85170113E-01 0.74650091E-03
+ 0.23482054E+00 0.85473701E-01 0.74718706E-03
+ 0.23510620E+00 0.84893338E-01 0.74407080E-03
+ 0.23539187E+00 0.85640691E-01 0.74909552E-03
+ 0.23567754E+00 0.85337669E-01 0.74794592E-03
+ 0.23596321E+00 0.84661134E-01 0.74242963E-03
+ 0.23624888E+00 0.83837308E-01 0.74018218E-03
+ 0.23653455E+00 0.85082673E-01 0.74767997E-03
+ 0.23682022E+00 0.85296050E-01 0.74570026E-03
+ 0.23710589E+00 0.85087620E-01 0.74832590E-03
+ 0.23739156E+00 0.83912998E-01 0.74315921E-03
+ 0.23767723E+00 0.84157191E-01 0.73848531E-03
+ 0.23796290E+00 0.85289143E-01 0.75023680E-03
+ 0.23824857E+00 0.83411515E-01 0.74406841E-03
+ 0.23853424E+00 0.85092805E-01 0.74398407E-03
+ 0.23881991E+00 0.84856577E-01 0.74070937E-03
+ 0.23910558E+00 0.83724700E-01 0.74503152E-03
+ 0.23939125E+00 0.85268043E-01 0.74549654E-03
+ 0.23967692E+00 0.84986724E-01 0.74639008E-03
+ 0.23996259E+00 0.84967047E-01 0.74779289E-03
+ 0.24024826E+00 0.85551888E-01 0.74907910E-03
+ 0.24053393E+00 0.85219480E-01 0.74792636E-03
+ 0.24081960E+00 0.84784560E-01 0.74669934E-03
+ 0.24110527E+00 0.85699596E-01 0.74886985E-03
+ 0.24139094E+00 0.84407948E-01 0.74560969E-03
+ 0.24167661E+00 0.86303078E-01 0.75226696E-03
+ 0.24196228E+00 0.85939452E-01 0.75232319E-03
+ 0.24224795E+00 0.85317768E-01 0.75114350E-03
+ 0.24253362E+00 0.85101597E-01 0.74842828E-03
+ 0.24281929E+00 0.84791027E-01 0.75035711E-03
+ 0.24310496E+00 0.85099675E-01 0.75003138E-03
+ 0.24339063E+00 0.84721155E-01 0.74606290E-03
+ 0.24367630E+00 0.85887656E-01 0.75378950E-03
+ 0.24396197E+00 0.86377665E-01 0.75827620E-03
+ 0.24424765E+00 0.84729291E-01 0.74679992E-03
+ 0.24453332E+00 0.85294083E-01 0.75037760E-03
+ 0.24481899E+00 0.85690215E-01 0.75235899E-03
+ 0.24510466E+00 0.85833184E-01 0.74846618E-03
+ 0.24539033E+00 0.85927650E-01 0.75466692E-03
+ 0.24567598E+00 0.85362479E-01 0.75351435E-03
+ 0.24596165E+00 0.84019013E-01 0.74761023E-03
+ 0.24624732E+00 0.85824862E-01 0.75397617E-03
+ 0.24653299E+00 0.84131144E-01 0.74343348E-03
+ 0.24681866E+00 0.84649958E-01 0.75011759E-03
+ 0.24710433E+00 0.86623482E-01 0.75593509E-03
+ 0.24739000E+00 0.85639864E-01 0.75176125E-03
+ 0.24767567E+00 0.84987931E-01 0.74830983E-03
+ 0.24796134E+00 0.84498249E-01 0.74962527E-03
+ 0.24824701E+00 0.85177608E-01 0.75131736E-03
+ 0.24853268E+00 0.85763820E-01 0.75203518E-03
+ 0.24881835E+00 0.84903724E-01 0.75359247E-03
+ 0.24910402E+00 0.85511506E-01 0.75353566E-03
+ 0.24938969E+00 0.85458323E-01 0.75229793E-03
+ 0.24967536E+00 0.86230740E-01 0.75219129E-03
+ 0.24996103E+00 0.85187159E-01 0.75657002E-03
+ 0.25024670E+00 0.85172839E-01 0.75205567E-03
+ 0.25053239E+00 0.85670993E-01 0.75315818E-03
+ 0.25081804E+00 0.84453106E-01 0.74700150E-03
+ 0.25110370E+00 0.85140355E-01 0.75439399E-03
+ 0.25138938E+00 0.85762061E-01 0.75621688E-03
+ 0.25167504E+00 0.84367484E-01 0.74655307E-03
+ 0.25196072E+00 0.84823370E-01 0.75341988E-03
+ 0.25224638E+00 0.85590757E-01 0.75180514E-03
+ 0.25253206E+00 0.85596085E-01 0.75665495E-03
+ 0.25281772E+00 0.85354760E-01 0.75781031E-03
+ 0.25310341E+00 0.87071717E-01 0.75628929E-03
+ 0.25338906E+00 0.85316390E-01 0.75400819E-03
+ 0.25367475E+00 0.85704193E-01 0.75851340E-03
+ 0.25396040E+00 0.84983930E-01 0.75206510E-03
+ 0.25424609E+00 0.86864188E-01 0.75605063E-03
+ 0.25453174E+00 0.83989069E-01 0.74686669E-03
+ 0.25481743E+00 0.84753297E-01 0.75342337E-03
+ 0.25510308E+00 0.85494086E-01 0.75265428E-03
+ 0.25538877E+00 0.86124226E-01 0.75599039E-03
+ 0.25567442E+00 0.85145168E-01 0.75183995E-03
+ 0.25596011E+00 0.85840456E-01 0.75846107E-03
+ 0.25624576E+00 0.86150005E-01 0.75894449E-03
+ 0.25653145E+00 0.86324945E-01 0.75338362E-03
+ 0.25681710E+00 0.86347185E-01 0.75644127E-03
+ 0.25710279E+00 0.84232032E-01 0.74988365E-03
+ 0.25738844E+00 0.85091665E-01 0.75419876E-03
+ 0.25767413E+00 0.84841982E-01 0.74857567E-03
+ 0.25795978E+00 0.84925987E-01 0.75525272E-03
+ 0.25824547E+00 0.85676424E-01 0.75820962E-03
+ 0.25853112E+00 0.86253151E-01 0.75867423E-03
+ 0.25881681E+00 0.85272901E-01 0.75670378E-03
+ 0.25910246E+00 0.85970484E-01 0.76025358E-03
+ 0.25938815E+00 0.85363939E-01 0.75353059E-03
+ 0.25967380E+00 0.85739419E-01 0.75821119E-03
+ 0.25995949E+00 0.86472705E-01 0.75694273E-03
+ 0.26024514E+00 0.85035287E-01 0.75299444E-03
+ 0.26053083E+00 0.84807672E-01 0.74933300E-03
+ 0.26081648E+00 0.85553318E-01 0.75935700E-03
+ 0.26110217E+00 0.85181192E-01 0.75368251E-03
+ 0.26138783E+00 0.85100152E-01 0.75276330E-03
+ 0.26167348E+00 0.85905209E-01 0.75758505E-03
+ 0.26195917E+00 0.85284926E-01 0.75592927E-03
+ 0.26224482E+00 0.85661322E-01 0.75773086E-03
+ 0.26253051E+00 0.84964968E-01 0.76049124E-03
+ 0.26281616E+00 0.85569210E-01 0.75923855E-03
+ 0.26310185E+00 0.85311353E-01 0.75677759E-03
+ 0.26338750E+00 0.84761500E-01 0.75155922E-03
+ 0.26367319E+00 0.86803026E-01 0.75819896E-03
+ 0.26395884E+00 0.85574776E-01 0.75887732E-03
+ 0.26424453E+00 0.85722156E-01 0.75877924E-03
+ 0.26453018E+00 0.84278248E-01 0.75585750E-03
+ 0.26481587E+00 0.86155862E-01 0.75859419E-03
+ 0.26510152E+00 0.86487100E-01 0.75878465E-03
+ 0.26538721E+00 0.84235795E-01 0.75091416E-03
+ 0.26567286E+00 0.85969038E-01 0.75791817E-03
+ 0.26595855E+00 0.85050069E-01 0.75583387E-03
+ 0.26624420E+00 0.86178064E-01 0.76394406E-03
+ 0.26652989E+00 0.86245708E-01 0.76015567E-03
+ 0.26681554E+00 0.86011365E-01 0.75666979E-03
+ 0.26710123E+00 0.85744552E-01 0.75676251E-03
+ 0.26738688E+00 0.85703075E-01 0.75878541E-03
+ 0.26767257E+00 0.86223625E-01 0.76461711E-03
+ 0.26795822E+00 0.84193490E-01 0.75110089E-03
+ 0.26824391E+00 0.86284339E-01 0.75962418E-03
+ 0.26852956E+00 0.86139597E-01 0.75643917E-03
+ 0.26881525E+00 0.85700795E-01 0.76130679E-03
+ 0.26910090E+00 0.84952481E-01 0.75721525E-03
+ 0.26938659E+00 0.86407088E-01 0.76071516E-03
+ 0.26967224E+00 0.85709006E-01 0.76032669E-03
+ 0.26995793E+00 0.85774980E-01 0.76389348E-03
+ 0.27024359E+00 0.85892744E-01 0.75733406E-03
+ 0.27052927E+00 0.86626850E-01 0.75991772E-03
+ 0.27081493E+00 0.85068077E-01 0.75581763E-03
+ 0.27110061E+00 0.85096605E-01 0.76056464E-03
+ 0.27138627E+00 0.84578201E-01 0.74942724E-03
+ 0.27167192E+00 0.85006945E-01 0.75727020E-03
+ 0.27195761E+00 0.84337503E-01 0.75083971E-03
+ 0.27224326E+00 0.86651787E-01 0.76534762E-03
+ 0.27252895E+00 0.85531600E-01 0.76050102E-03
+ 0.27281460E+00 0.85391521E-01 0.76051679E-03
+ 0.27310029E+00 0.86608753E-01 0.75995288E-03
+ 0.27338594E+00 0.84881760E-01 0.75976638E-03
+ 0.27367163E+00 0.85718945E-01 0.75687503E-03
+ 0.27395728E+00 0.87781601E-01 0.77089388E-03
+ 0.27424297E+00 0.86287521E-01 0.76089246E-03
+ 0.27452862E+00 0.85506715E-01 0.75855124E-03
+ 0.27481431E+00 0.86768806E-01 0.76432136E-03
+ 0.27509996E+00 0.85773371E-01 0.75922010E-03
+ 0.27538565E+00 0.86462520E-01 0.76347374E-03
+ 0.27567130E+00 0.86031906E-01 0.76394039E-03
+ 0.27595699E+00 0.85802473E-01 0.76350156E-03
+ 0.27624264E+00 0.84849648E-01 0.75414102E-03
+ 0.27652833E+00 0.84864236E-01 0.76025451E-03
+ 0.27681398E+00 0.85905358E-01 0.76042279E-03
+ 0.27709967E+00 0.85007019E-01 0.75711124E-03
+ 0.27738532E+00 0.85645683E-01 0.76022558E-03
+ 0.27767101E+00 0.84849060E-01 0.75631135E-03
+ 0.27795666E+00 0.86061001E-01 0.76587498E-03
+ 0.27824235E+00 0.88120870E-01 0.76936401E-03
+ 0.27852800E+00 0.85657090E-01 0.76252915E-03
+ 0.27881369E+00 0.87578684E-01 0.76575927E-03
+ 0.27909935E+00 0.85498035E-01 0.76283870E-03
+ 0.27938503E+00 0.86113289E-01 0.76275284E-03
+ 0.27967069E+00 0.84642231E-01 0.76263718E-03
+ 0.27995637E+00 0.84118024E-01 0.75542124E-03
+ 0.28024203E+00 0.86934991E-01 0.76889474E-03
+ 0.28052771E+00 0.86115025E-01 0.76025183E-03
+ 0.28081337E+00 0.85209712E-01 0.75888995E-03
+ 0.28109905E+00 0.86064465E-01 0.76677889E-03
+ 0.28138471E+00 0.86374894E-01 0.76674693E-03
+ 0.28167039E+00 0.85604534E-01 0.76615048E-03
+ 0.28195605E+00 0.85709162E-01 0.76158479E-03
+ 0.28224170E+00 0.85850216E-01 0.76776231E-03
+ 0.28252739E+00 0.86359367E-01 0.76497166E-03
+ 0.28281304E+00 0.86905457E-01 0.76746050E-03
+ 0.28309873E+00 0.85081778E-01 0.76012616E-03
+ 0.28338438E+00 0.86557575E-01 0.76963747E-03
+ 0.28367007E+00 0.86985968E-01 0.76766283E-03
+ 0.28395572E+00 0.85314788E-01 0.76132908E-03
+ 0.28424141E+00 0.86899444E-01 0.77063066E-03
+ 0.28452706E+00 0.85726172E-01 0.76506793E-03
+ 0.28481275E+00 0.84976703E-01 0.76350290E-03
+ 0.28509840E+00 0.86285897E-01 0.76493481E-03
+ 0.28538409E+00 0.86739004E-01 0.77104382E-03
+ 0.28566974E+00 0.84482424E-01 0.76203811E-03
+ 0.28595543E+00 0.86732112E-01 0.76815160E-03
+ 0.28624108E+00 0.85033938E-01 0.75949082E-03
+ 0.28652677E+00 0.86252838E-01 0.76830870E-03
+ 0.28681242E+00 0.86254664E-01 0.76472823E-03
+ 0.28709811E+00 0.85230656E-01 0.76657726E-03
+ 0.28738376E+00 0.86646408E-01 0.76880219E-03
+ 0.28766945E+00 0.87271228E-01 0.77235780E-03
+ 0.28795511E+00 0.86643696E-01 0.76643925E-03
+ 0.28824079E+00 0.84281750E-01 0.76234131E-03
+ 0.28852645E+00 0.85114345E-01 0.76026603E-03
+ 0.28881213E+00 0.86221725E-01 0.76852122E-03
+ 0.28909779E+00 0.86419471E-01 0.77055389E-03
+ 0.28938347E+00 0.87665550E-01 0.77463791E-03
+ 0.28966913E+00 0.85376099E-01 0.76368905E-03
+ 0.28995481E+00 0.87128334E-01 0.77052863E-03
+ 0.29024047E+00 0.85201912E-01 0.76600572E-03
+ 0.29052615E+00 0.85981026E-01 0.76676911E-03
+ 0.29081181E+00 0.86619563E-01 0.76950085E-03
+ 0.29109749E+00 0.85551903E-01 0.76802942E-03
+ 0.29138315E+00 0.86199135E-01 0.76698535E-03
+ 0.29166883E+00 0.85394509E-01 0.76778582E-03
+ 0.29195449E+00 0.85768715E-01 0.77035237E-03
+ 0.29224017E+00 0.85804448E-01 0.76749636E-03
+ 0.29252583E+00 0.86256161E-01 0.77085919E-03
+ 0.29281148E+00 0.86129919E-01 0.77064522E-03
+ 0.29309717E+00 0.87084085E-01 0.77019655E-03
+ 0.29338282E+00 0.85961238E-01 0.76901383E-03
+ 0.29366851E+00 0.86223446E-01 0.77214331E-03
+ 0.29395416E+00 0.85979819E-01 0.77014120E-03
+ 0.29423985E+00 0.85819758E-01 0.76801091E-03
+ 0.29452550E+00 0.86213328E-01 0.76534873E-03
+ 0.29481119E+00 0.86950466E-01 0.77381119E-03
+ 0.29509684E+00 0.87445058E-01 0.77601429E-03
+ 0.29538253E+00 0.85385732E-01 0.76168776E-03
+ 0.29566818E+00 0.86732656E-01 0.77269593E-03
+ 0.29595387E+00 0.85466824E-01 0.76952315E-03
+ 0.29623953E+00 0.86289860E-01 0.77149796E-03
+ 0.29652521E+00 0.86675033E-01 0.76977367E-03
+ 0.29681087E+00 0.85317187E-01 0.76546462E-03
+ 0.29709655E+00 0.86089835E-01 0.77036046E-03
+ 0.29738221E+00 0.85562468E-01 0.76688774E-03
+ 0.29766789E+00 0.85156545E-01 0.76221058E-03
+ 0.29795355E+00 0.86561315E-01 0.77239115E-03
+ 0.29823923E+00 0.86095318E-01 0.76675433E-03
+ 0.29852489E+00 0.87031208E-01 0.77137275E-03
+ 0.29881057E+00 0.85086040E-01 0.76439220E-03
+ 0.29909623E+00 0.84952407E-01 0.76789950E-03
+ 0.29938191E+00 0.85732050E-01 0.76298462E-03
+ 0.29966757E+00 0.87659918E-01 0.77967584E-03
+ 0.29995325E+00 0.87798998E-01 0.77618693E-03
+ 0.30023891E+00 0.85329413E-01 0.76520484E-03
+ 0.30052459E+00 0.84874526E-01 0.76780608E-03
+ 0.30081025E+00 0.87095886E-01 0.77619345E-03
+ 0.30109593E+00 0.86593270E-01 0.77034015E-03
+ 0.30138159E+00 0.87307341E-01 0.77690370E-03
+ 0.30166727E+00 0.86405240E-01 0.77162567E-03
+ 0.30195293E+00 0.85215807E-01 0.76647353E-03
+ 0.30223861E+00 0.86070396E-01 0.77035726E-03
+ 0.30252427E+00 0.86288914E-01 0.77367533E-03
+ 0.30280995E+00 0.85906915E-01 0.76871994E-03
+ 0.30309561E+00 0.85686132E-01 0.77271293E-03
+ 0.30338126E+00 0.86796194E-01 0.77667664E-03
+ 0.30366695E+00 0.86113714E-01 0.77119941E-03
+ 0.30395260E+00 0.86906359E-01 0.77323336E-03
+ 0.30423829E+00 0.86762182E-01 0.77452668E-03
+ 0.30452394E+00 0.86136632E-01 0.76897611E-03
+ 0.30480963E+00 0.85981809E-01 0.77032344E-03
+ 0.30509529E+00 0.86287357E-01 0.77252404E-03
+ 0.30538097E+00 0.85951619E-01 0.77043771E-03
+ 0.30566663E+00 0.85742965E-01 0.77113416E-03
+ 0.30595231E+00 0.87166011E-01 0.77320030E-03
+ 0.30623797E+00 0.87996654E-01 0.77805493E-03
+ 0.30652365E+00 0.85871965E-01 0.77269395E-03
+ 0.30680931E+00 0.85712090E-01 0.77249645E-03
+ 0.30709499E+00 0.86224154E-01 0.77448314E-03
+ 0.30738065E+00 0.85718043E-01 0.76785212E-03
+ 0.30766633E+00 0.85715070E-01 0.77321817E-03
+ 0.30795199E+00 0.85131496E-01 0.76776242E-03
+ 0.30823767E+00 0.86682796E-01 0.77205728E-03
+ 0.30852333E+00 0.86206250E-01 0.77136420E-03
+ 0.30880901E+00 0.86113743E-01 0.77460869E-03
+ 0.30909467E+00 0.86555615E-01 0.77309052E-03
+ 0.30938035E+00 0.84815010E-01 0.76734310E-03
+ 0.30966601E+00 0.87120004E-01 0.77533716E-03
+ 0.30995169E+00 0.87535061E-01 0.77831803E-03
+ 0.31023735E+00 0.86668521E-01 0.77376014E-03
+ 0.31052303E+00 0.86031988E-01 0.77631458E-03
+ 0.31080869E+00 0.84417783E-01 0.76539529E-03
+ 0.31109437E+00 0.87176874E-01 0.77748764E-03
+ 0.31138003E+00 0.86946540E-01 0.77447278E-03
+ 0.31166571E+00 0.86206719E-01 0.77071023E-03
+ 0.31195137E+00 0.86218461E-01 0.77204802E-03
+ 0.31223705E+00 0.84818862E-01 0.76938572E-03
+ 0.31252271E+00 0.87714873E-01 0.77215163E-03
+ 0.31280839E+00 0.86640187E-01 0.77750807E-03
+ 0.31309405E+00 0.85569933E-01 0.77094184E-03
+ 0.31337973E+00 0.86126857E-01 0.77002717E-03
+ 0.31366539E+00 0.87497033E-01 0.77612564E-03
+ 0.31395105E+00 0.86885192E-01 0.77402015E-03
+ 0.31423673E+00 0.86367875E-01 0.77249011E-03
+ 0.31452239E+00 0.87133236E-01 0.77844079E-03
+ 0.31480807E+00 0.85356712E-01 0.76757692E-03
+ 0.31509373E+00 0.87189950E-01 0.77691273E-03
+ 0.31537941E+00 0.86465277E-01 0.77572622E-03
+ 0.31566507E+00 0.87898053E-01 0.78164565E-03
+ 0.31595075E+00 0.85327968E-01 0.76887192E-03
+ 0.31623641E+00 0.86666770E-01 0.77532243E-03
+ 0.31652209E+00 0.86247675E-01 0.77214662E-03
+ 0.31680775E+00 0.86435840E-01 0.77528052E-03
+ 0.31709343E+00 0.87556474E-01 0.77942485E-03
+ 0.31737909E+00 0.85909434E-01 0.77244564E-03
+ 0.31766477E+00 0.86442299E-01 0.77339105E-03
+ 0.31795043E+00 0.87430179E-01 0.77880756E-03
+ 0.31823611E+00 0.85388161E-01 0.77070820E-03
+ 0.31852177E+00 0.86666323E-01 0.77336701E-03
+ 0.31880745E+00 0.87649353E-01 0.78303332E-03
+ 0.31909311E+00 0.86287901E-01 0.77723112E-03
+ 0.31937879E+00 0.87181360E-01 0.77597814E-03
+ 0.31966445E+00 0.86531028E-01 0.77588024E-03
+ 0.31995013E+00 0.86638711E-01 0.77568984E-03
+ 0.32023579E+00 0.86780161E-01 0.77659963E-03
+ 0.32052147E+00 0.85491091E-01 0.76914183E-03
+ 0.32080713E+00 0.86942449E-01 0.77633566E-03
+ 0.32109281E+00 0.87031499E-01 0.77570265E-03
+ 0.32137847E+00 0.86061329E-01 0.77511044E-03
+ 0.32166415E+00 0.86800374E-01 0.77125599E-03
+ 0.32194981E+00 0.86527072E-01 0.77748689E-03
+ 0.32223549E+00 0.84890753E-01 0.76915906E-03
+ 0.32252115E+00 0.86562999E-01 0.77527581E-03
+ 0.32280684E+00 0.86430632E-01 0.77643176E-03
+ 0.32309249E+00 0.85351355E-01 0.77432214E-03
+ 0.32337818E+00 0.87629728E-01 0.78145432E-03
+ 0.32366383E+00 0.85681394E-01 0.77304459E-03
+ 0.32394949E+00 0.86391963E-01 0.77452301E-03
+ 0.32423517E+00 0.85640229E-01 0.77111728E-03
+ 0.32452083E+00 0.87248169E-01 0.78046316E-03
+ 0.32480651E+00 0.85659444E-01 0.77046221E-03
+ 0.32509217E+00 0.87061383E-01 0.77490747E-03
+ 0.32537785E+00 0.85871965E-01 0.77672274E-03
+ 0.32566351E+00 0.87450929E-01 0.77907968E-03
+ 0.32594919E+00 0.87408870E-01 0.78131782E-03
+ 0.32623485E+00 0.87156132E-01 0.77552348E-03
+ 0.32652053E+00 0.86201146E-01 0.78004488E-03
+ 0.32680619E+00 0.86319640E-01 0.77250443E-03
+ 0.32709187E+00 0.85832164E-01 0.77258830E-03
+ 0.32737753E+00 0.86452961E-01 0.77747169E-03
+ 0.32766321E+00 0.84861718E-01 0.77236618E-03
+ 0.32794887E+00 0.87441400E-01 0.77988586E-03
+ 0.32823455E+00 0.87304853E-01 0.77599019E-03
+ 0.32852021E+00 0.84953576E-01 0.77005837E-03
+ 0.32880589E+00 0.87008014E-01 0.78000705E-03
+ 0.32909155E+00 0.86899228E-01 0.77538309E-03
+ 0.32937723E+00 0.86266086E-01 0.77650847E-03
+ 0.32966289E+00 0.86968422E-01 0.77976484E-03
+ 0.32994857E+00 0.87532513E-01 0.78199897E-03
+ 0.33023423E+00 0.86157665E-01 0.77638181E-03
+ 0.33051991E+00 0.87569885E-01 0.78384316E-03
+ 0.33080557E+00 0.86583756E-01 0.78196049E-03
+ 0.33109125E+00 0.86307198E-01 0.77661319E-03
+ 0.33137691E+00 0.87301120E-01 0.77641010E-03
+ 0.33166260E+00 0.86498328E-01 0.78029931E-03
+ 0.33194825E+00 0.87437488E-01 0.78021229E-03
+ 0.33223394E+00 0.86642742E-01 0.77790307E-03
+ 0.33251959E+00 0.85776016E-01 0.77672268E-03
+ 0.33280528E+00 0.86923458E-01 0.78162935E-03
+ 0.33309093E+00 0.86091772E-01 0.77664223E-03
+ 0.33337662E+00 0.86781055E-01 0.77973702E-03
+ 0.33366227E+00 0.85786514E-01 0.77391492E-03
+ 0.33394796E+00 0.85947767E-01 0.77715941E-03
+ 0.33423361E+00 0.86296685E-01 0.77823357E-03
+ 0.33451927E+00 0.87151155E-01 0.78391255E-03
+ 0.33480495E+00 0.86820506E-01 0.77845540E-03
+ 0.33509061E+00 0.87098472E-01 0.78284519E-03
+ 0.33537629E+00 0.86613886E-01 0.78148051E-03
+ 0.33566195E+00 0.86940885E-01 0.78058772E-03
+ 0.33594763E+00 0.86908616E-01 0.78194804E-03
+ 0.33623329E+00 0.85632890E-01 0.77303796E-03
+ 0.33651897E+00 0.85406594E-01 0.77462697E-03
+ 0.33680463E+00 0.88189267E-01 0.78434614E-03
+ 0.33709031E+00 0.85793667E-01 0.77495037E-03
+ 0.33737597E+00 0.86390376E-01 0.77758491E-03
+ 0.33766165E+00 0.86810201E-01 0.78139507E-03
+ 0.33794731E+00 0.87841742E-01 0.78531099E-03
+ 0.33823299E+00 0.86537756E-01 0.78121101E-03
+ 0.33851865E+00 0.86398900E-01 0.78055164E-03
+ 0.33880433E+00 0.87298289E-01 0.77724975E-03
+ 0.33908999E+00 0.86501665E-01 0.78043959E-03
+ 0.33937567E+00 0.85402735E-01 0.77504921E-03
+ 0.33966133E+00 0.87585747E-01 0.78697636E-03
+ 0.33994702E+00 0.86083531E-01 0.77633507E-03
+ 0.34023267E+00 0.87418228E-01 0.78440493E-03
+ 0.34051836E+00 0.86930975E-01 0.78335009E-03
+ 0.34080401E+00 0.86995170E-01 0.78151625E-03
+ 0.34108970E+00 0.85773662E-01 0.77510293E-03
+ 0.34137535E+00 0.86834610E-01 0.78059005E-03
+ 0.34166104E+00 0.87142244E-01 0.78577461E-03
+ 0.34194669E+00 0.87384485E-01 0.78848563E-03
+ 0.34223238E+00 0.86089574E-01 0.77565340E-03
+ 0.34251803E+00 0.86802326E-01 0.78259245E-03
+ 0.34280372E+00 0.87878495E-01 0.78126707E-03
+ 0.34308937E+00 0.86736523E-01 0.77923568E-03
+ 0.34337506E+00 0.87732665E-01 0.78698189E-03
+ 0.34366071E+00 0.87237060E-01 0.78607869E-03
+ 0.34394640E+00 0.85176475E-01 0.77722780E-03
+ 0.34423205E+00 0.86986884E-01 0.78404014E-03
+ 0.34451774E+00 0.85508488E-01 0.77806844E-03
+ 0.34480339E+00 0.87535717E-01 0.78439701E-03
+ 0.34508905E+00 0.86984828E-01 0.77770086E-03
+ 0.34537473E+00 0.86907834E-01 0.78720250E-03
+ 0.34566039E+00 0.84512092E-01 0.77436760E-03
+ 0.34594607E+00 0.87125666E-01 0.78421773E-03
+ 0.34623173E+00 0.86874075E-01 0.78580086E-03
+ 0.34651741E+00 0.87337337E-01 0.78755378E-03
+ 0.34680307E+00 0.88410504E-01 0.79033733E-03
+ 0.34708875E+00 0.86244792E-01 0.78260805E-03
+ 0.34737441E+00 0.86200617E-01 0.78554812E-03
+ 0.34766009E+00 0.87056629E-01 0.78726211E-03
+ 0.34794575E+00 0.87397948E-01 0.78501867E-03
+ 0.34823143E+00 0.86480275E-01 0.78772620E-03
+ 0.34851709E+00 0.86247548E-01 0.78200124E-03
+ 0.34880278E+00 0.87183833E-01 0.79049385E-03
+ 0.34908843E+00 0.88008918E-01 0.79003780E-03
+ 0.34937412E+00 0.86518414E-01 0.77851652E-03
+ 0.34965977E+00 0.87915502E-01 0.78401359E-03
+ 0.34994546E+00 0.86176120E-01 0.78128133E-03
+ 0.35023111E+00 0.87547109E-01 0.78516779E-03
+ 0.35051680E+00 0.86561978E-01 0.78559003E-03
+ 0.35080245E+00 0.87153398E-01 0.78402396E-03
+ 0.35108814E+00 0.86890444E-01 0.78954699E-03
+ 0.35137379E+00 0.87748200E-01 0.78813673E-03
+ 0.35165948E+00 0.87546140E-01 0.78699522E-03
+ 0.35194513E+00 0.86865090E-01 0.79193100E-03
+ 0.35223082E+00 0.87966494E-01 0.78943273E-03
+ 0.35251647E+00 0.87263741E-01 0.78628631E-03
+ 0.35280216E+00 0.87002330E-01 0.78920077E-03
+ 0.35308781E+00 0.87865449E-01 0.78972807E-03
+ 0.35337350E+00 0.89034997E-01 0.79624081E-03
+ 0.35365915E+00 0.85924990E-01 0.78184676E-03
+ 0.35394484E+00 0.87743752E-01 0.79225824E-03
+ 0.35423049E+00 0.86245805E-01 0.78222179E-03
+ 0.35451618E+00 0.87553196E-01 0.79277501E-03
+ 0.35480183E+00 0.87792516E-01 0.78738196E-03
+ 0.35508752E+00 0.85639037E-01 0.78361999E-03
+ 0.35537317E+00 0.87910600E-01 0.78914396E-03
+ 0.35565883E+00 0.85534208E-01 0.78462804E-03
+ 0.35594451E+00 0.86127266E-01 0.78444963E-03
+ 0.35623017E+00 0.88570945E-01 0.79285773E-03
+ 0.35651585E+00 0.87896198E-01 0.79620851E-03
+ 0.35680151E+00 0.87800719E-01 0.78866893E-03
+ 0.35708719E+00 0.88548347E-01 0.78989315E-03
+ 0.35737285E+00 0.85707821E-01 0.78431383E-03
+ 0.35765854E+00 0.85822038E-01 0.77916106E-03
+ 0.35794419E+00 0.88820107E-01 0.79088379E-03
+ 0.35822988E+00 0.86777948E-01 0.79044187E-03
+ 0.35851553E+00 0.86907223E-01 0.79094822E-03
+ 0.35880122E+00 0.87708034E-01 0.78801921E-03
+ 0.35908687E+00 0.87000310E-01 0.78757684E-03
+ 0.35937256E+00 0.87748751E-01 0.78819331E-03
+ 0.35965821E+00 0.84607184E-01 0.78264991E-03
+ 0.35994390E+00 0.86298242E-01 0.78497845E-03
+ 0.36022955E+00 0.86455442E-01 0.78917248E-03
+ 0.36051524E+00 0.87837435E-01 0.78768522E-03
+ 0.36080089E+00 0.87894596E-01 0.79427619E-03
+ 0.36108658E+00 0.88893890E-01 0.79308118E-03
+ 0.36137223E+00 0.87224044E-01 0.79102424E-03
+ 0.36165792E+00 0.87122016E-01 0.78937790E-03
+ 0.36194357E+00 0.85986041E-01 0.78308105E-03
+ 0.36222926E+00 0.86786069E-01 0.78884372E-03
+ 0.36251491E+00 0.87789908E-01 0.79893001E-03
+ 0.36280060E+00 0.86910650E-01 0.79088623E-03
+ 0.36308625E+00 0.88455699E-01 0.79540763E-03
+ 0.36337194E+00 0.87365523E-01 0.79122634E-03
+ 0.36365759E+00 0.87180585E-01 0.79274556E-03
+ 0.36394328E+00 0.86329922E-01 0.78752823E-03
+ 0.36422893E+00 0.87059274E-01 0.79243869E-03
+ 0.36451462E+00 0.87692797E-01 0.79124136E-03
+ 0.36480027E+00 0.87518483E-01 0.79279841E-03
+ 0.36508596E+00 0.87162904E-01 0.79204130E-03
+ 0.36537161E+00 0.84882237E-01 0.78089006E-03
+ 0.36565730E+00 0.86216033E-01 0.79102512E-03
+ 0.36594296E+00 0.88150725E-01 0.79254166E-03
+ 0.36622861E+00 0.86349636E-01 0.79185760E-03
+ 0.36651430E+00 0.87659597E-01 0.79521362E-03
+ 0.36679995E+00 0.87755084E-01 0.79799583E-03
+ 0.36708564E+00 0.86627662E-01 0.78958872E-03
+ 0.36737129E+00 0.87917700E-01 0.79592061E-03
+ 0.36765698E+00 0.86630829E-01 0.79307542E-03
+ 0.36794263E+00 0.86890958E-01 0.79207204E-03
+ 0.36822832E+00 0.88941373E-01 0.79872430E-03
+ 0.36851397E+00 0.87864220E-01 0.79475535E-03
+ 0.36879966E+00 0.87760068E-01 0.79663174E-03
+ 0.36908531E+00 0.87550499E-01 0.79411967E-03
+ 0.36937100E+00 0.86268626E-01 0.78969257E-03
+ 0.36965665E+00 0.86648352E-01 0.79192687E-03
+ 0.36994234E+00 0.88591084E-01 0.79912547E-03
+ 0.37022799E+00 0.88048771E-01 0.79817371E-03
+ 0.37051368E+00 0.87803312E-01 0.79534517E-03
+ 0.37079933E+00 0.88142589E-01 0.79765520E-03
+ 0.37108502E+00 0.88453449E-01 0.79740363E-03
+ 0.37137067E+00 0.86595654E-01 0.79160545E-03
+ 0.37165636E+00 0.89261800E-01 0.80595369E-03
+ 0.37194201E+00 0.89455269E-01 0.79795683E-03
+ 0.37222770E+00 0.86714946E-01 0.79506723E-03
+ 0.37251335E+00 0.87208256E-01 0.79368119E-03
+ 0.37279904E+00 0.86988479E-01 0.79424062E-03
+ 0.37308469E+00 0.87570705E-01 0.79246622E-03
+ 0.37337038E+00 0.87364957E-01 0.79280738E-03
+ 0.37365603E+00 0.87337300E-01 0.79375441E-03
+ 0.37394172E+00 0.85554793E-01 0.78940275E-03
+ 0.37422737E+00 0.88321909E-01 0.79730141E-03
+ 0.37451306E+00 0.88339016E-01 0.79950807E-03
+ 0.37479872E+00 0.85729748E-01 0.78727800E-03
+ 0.37508440E+00 0.86239539E-01 0.79477997E-03
+ 0.37537006E+00 0.87306529E-01 0.79887448E-03
+ 0.37565574E+00 0.87643214E-01 0.80027780E-03
+ 0.37594140E+00 0.89009315E-01 0.79984323E-03
+ 0.37622705E+00 0.86800136E-01 0.79130923E-03
+ 0.37651274E+00 0.87859623E-01 0.79409668E-03
+ 0.37679839E+00 0.87584138E-01 0.79811912E-03
+ 0.37708408E+00 0.87135084E-01 0.79516019E-03
+ 0.37736973E+00 0.86706340E-01 0.79193129E-03
+ 0.37765542E+00 0.87673381E-01 0.79997361E-03
+ 0.37794107E+00 0.87661430E-01 0.80017751E-03
+ 0.37822676E+00 0.87872587E-01 0.79784699E-03
+ 0.37851241E+00 0.87528832E-01 0.80011401E-03
+ 0.37879810E+00 0.88011600E-01 0.79521240E-03
+ 0.37908375E+00 0.86881049E-01 0.79749490E-03
+ 0.37936944E+00 0.87846458E-01 0.79836638E-03
+ 0.37965509E+00 0.87659091E-01 0.79614774E-03
+ 0.37994078E+00 0.86747982E-01 0.79428486E-03
+ 0.38022643E+00 0.87773867E-01 0.80046809E-03
+ 0.38051212E+00 0.85532807E-01 0.79163251E-03
+ 0.38079777E+00 0.88247694E-01 0.80189953E-03
+ 0.38108346E+00 0.85268348E-01 0.78846916E-03
+ 0.38136911E+00 0.86546518E-01 0.79531479E-03
+ 0.38165480E+00 0.88272393E-01 0.79979841E-03
+ 0.38194045E+00 0.87035015E-01 0.80096564E-03
+ 0.38222614E+00 0.88605314E-01 0.80381340E-03
+ 0.38251179E+00 0.88971265E-01 0.80336118E-03
+ 0.38279748E+00 0.86887151E-01 0.79432322E-03
+ 0.38308313E+00 0.86743139E-01 0.79732394E-03
+ 0.38336882E+00 0.87443821E-01 0.79712359E-03
+ 0.38365448E+00 0.88883691E-01 0.80075365E-03
+ 0.38394016E+00 0.87638296E-01 0.79849770E-03
+ 0.38422582E+00 0.88579066E-01 0.80438389E-03
+ 0.38451150E+00 0.87400153E-01 0.79448550E-03
+ 0.38479716E+00 0.87011747E-01 0.79512858E-03
+ 0.38508284E+00 0.87528527E-01 0.79606834E-03
+ 0.38536850E+00 0.88746630E-01 0.80217590E-03
+ 0.38565418E+00 0.87175950E-01 0.79800020E-03
+ 0.38593984E+00 0.87815739E-01 0.80507534E-03
+ 0.38622552E+00 0.87781973E-01 0.80088287E-03
+ 0.38651118E+00 0.87211050E-01 0.79610618E-03
+ 0.38679683E+00 0.87210342E-01 0.79621625E-03
+ 0.38708252E+00 0.87894730E-01 0.80311659E-03
+ 0.38736817E+00 0.87064415E-01 0.79461862E-03
+ 0.38765386E+00 0.88944800E-01 0.81208535E-03
+ 0.38793951E+00 0.87722562E-01 0.79817727E-03
+ 0.38822520E+00 0.86811580E-01 0.79713803E-03
+ 0.38851085E+00 0.87021224E-01 0.79533953E-03
+ 0.38879654E+00 0.87206490E-01 0.80486265E-03
+ 0.38908219E+00 0.87642238E-01 0.80155215E-03
+ 0.38936788E+00 0.87105758E-01 0.80005679E-03
+ 0.38965353E+00 0.87711103E-01 0.80135255E-03
+ 0.38993922E+00 0.88212609E-01 0.80096925E-03
+ 0.39022487E+00 0.87345988E-01 0.79835462E-03
+ 0.39051056E+00 0.87525807E-01 0.80098293E-03
+ 0.39079621E+00 0.87862343E-01 0.80365734E-03
+ 0.39108190E+00 0.87452382E-01 0.79926895E-03
+ 0.39136755E+00 0.89257598E-01 0.80336200E-03
+ 0.39165324E+00 0.88715866E-01 0.80593396E-03
+ 0.39193889E+00 0.86612597E-01 0.79777307E-03
+ 0.39222458E+00 0.88265769E-01 0.80320582E-03
+ 0.39251024E+00 0.88745244E-01 0.80628163E-03
+ 0.39279592E+00 0.89231215E-01 0.80944231E-03
+ 0.39308158E+00 0.88137813E-01 0.79920370E-03
+ 0.39336726E+00 0.86966626E-01 0.79603598E-03
+ 0.39365292E+00 0.87411061E-01 0.80616173E-03
+ 0.39393860E+00 0.87081484E-01 0.79670618E-03
+ 0.39422426E+00 0.87980010E-01 0.80412952E-03
+ 0.39450994E+00 0.86557828E-01 0.79987879E-03
+ 0.39479560E+00 0.86800262E-01 0.79856458E-03
+ 0.39508128E+00 0.86014092E-01 0.79673046E-03
+ 0.39536694E+00 0.88047057E-01 0.80237136E-03
+ 0.39565262E+00 0.89001656E-01 0.80695102E-03
+ 0.39593828E+00 0.86108461E-01 0.79272158E-03
+ 0.39622396E+00 0.88125296E-01 0.80540031E-03
+ 0.39650962E+00 0.89868687E-01 0.80795906E-03
+ 0.39679530E+00 0.87328508E-01 0.80305530E-03
+ 0.39708096E+00 0.87767981E-01 0.79935748E-03
+ 0.39736661E+00 0.87169699E-01 0.79973938E-03
+ 0.39765230E+00 0.89306682E-01 0.80808019E-03
+ 0.39793795E+00 0.87192602E-01 0.80125185E-03
+ 0.39822364E+00 0.87063923E-01 0.79961406E-03
+ 0.39850929E+00 0.87572798E-01 0.80454530E-03
+ 0.39879498E+00 0.85904449E-01 0.79617184E-03
+ 0.39908063E+00 0.87523535E-01 0.80184510E-03
+ 0.39936632E+00 0.88001244E-01 0.80349250E-03
+ 0.39965197E+00 0.87376043E-01 0.80345978E-03
+ 0.39993766E+00 0.88851556E-01 0.80816715E-03
+ 0.40022331E+00 0.86034201E-01 0.79685624E-03
+ 0.40050900E+00 0.89438178E-01 0.80576364E-03
+ 0.40079466E+00 0.87957345E-01 0.80364454E-03
+ 0.40108034E+00 0.89320362E-01 0.80841494E-03
+ 0.40136600E+00 0.88047296E-01 0.80555881E-03
+ 0.40165168E+00 0.88574849E-01 0.80711994E-03
+ 0.40193734E+00 0.88959321E-01 0.80604327E-03
+ 0.40222302E+00 0.88996634E-01 0.81129360E-03
+ 0.40250868E+00 0.88015735E-01 0.80740743E-03
+ 0.40279436E+00 0.87375447E-01 0.79909252E-03
+ 0.40308002E+00 0.87162860E-01 0.80215244E-03
+ 0.40336570E+00 0.88209450E-01 0.80267276E-03
+ 0.40365136E+00 0.85877821E-01 0.79715601E-03
+ 0.40393704E+00 0.89605987E-01 0.80627599E-03
+ 0.40422270E+00 0.86594194E-01 0.79974008E-03
+ 0.40450838E+00 0.89310288E-01 0.80664858E-03
+ 0.40479404E+00 0.88064313E-01 0.80236507E-03
+ 0.40507972E+00 0.87921359E-01 0.80137549E-03
+ 0.40536538E+00 0.88677056E-01 0.80594956E-03
+ 0.40565106E+00 0.87355375E-01 0.80169766E-03
+ 0.40593672E+00 0.87005630E-01 0.80279942E-03
+ 0.40622240E+00 0.88959478E-01 0.80618105E-03
+ 0.40650806E+00 0.87144963E-01 0.80001977E-03
+ 0.40679374E+00 0.88031717E-01 0.80774532E-03
+ 0.40707940E+00 0.87818988E-01 0.80630934E-03
+ 0.40736508E+00 0.88911183E-01 0.80721150E-03
+ 0.40765074E+00 0.89092895E-01 0.80791215E-03
+ 0.40793639E+00 0.87679543E-01 0.79803006E-03
+ 0.40822208E+00 0.87825917E-01 0.80243329E-03
+ 0.40850773E+00 0.89012958E-01 0.80981839E-03
+ 0.40879342E+00 0.87866113E-01 0.80133742E-03
+ 0.40907907E+00 0.89909889E-01 0.81342383E-03
+ 0.40936476E+00 0.88458747E-01 0.80581394E-03
+ 0.40965042E+00 0.86763658E-01 0.79613185E-03
+ 0.40993610E+00 0.87816730E-01 0.80402516E-03
+ 0.41022176E+00 0.88861056E-01 0.80444320E-03
+ 0.41050744E+00 0.87960914E-01 0.80783671E-03
+ 0.41079310E+00 0.87492697E-01 0.80224290E-03
+ 0.41107878E+00 0.88930145E-01 0.80695475E-03
+ 0.41136444E+00 0.87306164E-01 0.80047775E-03
+ 0.41165012E+00 0.89094266E-01 0.81120338E-03
+ 0.41193578E+00 0.88762976E-01 0.80945552E-03
+ 0.41222146E+00 0.89370228E-01 0.81188726E-03
+ 0.41250712E+00 0.88000894E-01 0.80362509E-03
+ 0.41279280E+00 0.86752549E-01 0.79963671E-03
+ 0.41307846E+00 0.88005126E-01 0.80311229E-03
+ 0.41336414E+00 0.88143639E-01 0.80867088E-03
+ 0.41364980E+00 0.87734193E-01 0.80071233E-03
+ 0.41393548E+00 0.88969350E-01 0.80475258E-03
+ 0.41422114E+00 0.87027013E-01 0.79832022E-03
+ 0.41450682E+00 0.87704383E-01 0.79831062E-03
+ 0.41479248E+00 0.87773986E-01 0.80332684E-03
+ 0.41507816E+00 0.88027768E-01 0.80477016E-03
+ 0.41536382E+00 0.87708361E-01 0.80359075E-03
+ 0.41564950E+00 0.88758908E-01 0.80472569E-03
+ 0.41593516E+00 0.89115702E-01 0.80639822E-03
+ 0.41622084E+00 0.87573223E-01 0.80565771E-03
+ 0.41650650E+00 0.89330874E-01 0.80462149E-03
+ 0.41679218E+00 0.87660648E-01 0.79786190E-03
+ 0.41707784E+00 0.88086367E-01 0.80317882E-03
+ 0.41736352E+00 0.87472819E-01 0.80072309E-03
+ 0.41764918E+00 0.87579295E-01 0.80418534E-03
+ 0.41793483E+00 0.87011963E-01 0.80144970E-03
+ 0.41822052E+00 0.87304376E-01 0.79730968E-03
+ 0.41850618E+00 0.89709282E-01 0.81236637E-03
+ 0.41879186E+00 0.87642089E-01 0.80518570E-03
+ 0.41907752E+00 0.88918999E-01 0.80969109E-03
+ 0.41936320E+00 0.87011747E-01 0.79898676E-03
+ 0.41964886E+00 0.89051105E-01 0.80447807E-03
+ 0.41993454E+00 0.88577919E-01 0.80531358E-03
+ 0.42022020E+00 0.88294201E-01 0.80310559E-03
+ 0.42050588E+00 0.89063279E-01 0.80591883E-03
+ 0.42079154E+00 0.87537967E-01 0.80007163E-03
+ 0.42107722E+00 0.88482648E-01 0.80712681E-03
+ 0.42136288E+00 0.88486426E-01 0.80579141E-03
+ 0.42164856E+00 0.87971091E-01 0.80302753E-03
+ 0.42193422E+00 0.88444069E-01 0.80658169E-03
+ 0.42221990E+00 0.88991933E-01 0.81022159E-03
+ 0.42250556E+00 0.88656716E-01 0.80749631E-03
+ 0.42279124E+00 0.89231275E-01 0.80219784E-03
+ 0.42307690E+00 0.87430000E-01 0.80393779E-03
+ 0.42336258E+00 0.87048270E-01 0.80042786E-03
+ 0.42364824E+00 0.89295961E-01 0.81248838E-03
+ 0.42393392E+00 0.88624835E-01 0.81053888E-03
+ 0.42421958E+00 0.87825730E-01 0.80126774E-03
+ 0.42450526E+00 0.86879909E-01 0.79823635E-03
+ 0.42479092E+00 0.87176748E-01 0.79841109E-03
+ 0.42507660E+00 0.88600881E-01 0.80739474E-03
+ 0.42536226E+00 0.88020280E-01 0.80413057E-03
+ 0.42564794E+00 0.87386139E-01 0.79940847E-03
+ 0.42593360E+00 0.87737218E-01 0.79923350E-03
+ 0.42621928E+00 0.88471241E-01 0.80312486E-03
+ 0.42650494E+00 0.88426404E-01 0.80839277E-03
+ 0.42679062E+00 0.88691473E-01 0.80449763E-03
+ 0.42707628E+00 0.87818503E-01 0.80281240E-03
+ 0.42736197E+00 0.87664030E-01 0.80110756E-03
+ 0.42764762E+00 0.86781129E-01 0.79836958E-03
+ 0.42793331E+00 0.89290336E-01 0.81046054E-03
+ 0.42821896E+00 0.88834301E-01 0.80632966E-03
+ 0.42850462E+00 0.88028774E-01 0.80477155E-03
+ 0.42879030E+00 0.88218637E-01 0.80104719E-03
+ 0.42907596E+00 0.87107539E-01 0.79719594E-03
+ 0.42936164E+00 0.90552002E-01 0.81691740E-03
+ 0.42964730E+00 0.88987343E-01 0.80544932E-03
+ 0.42993298E+00 0.88085152E-01 0.80164766E-03
+ 0.43021864E+00 0.88967845E-01 0.80396025E-03
+ 0.43050432E+00 0.89036524E-01 0.80226397E-03
+ 0.43078998E+00 0.86827353E-01 0.79952320E-03
+ 0.43107566E+00 0.88624917E-01 0.80659834E-03
+ 0.43136132E+00 0.88205799E-01 0.80616935E-03
+ 0.43164700E+00 0.87533563E-01 0.80047874E-03
+ 0.43193266E+00 0.87979406E-01 0.80230291E-03
+ 0.43221834E+00 0.88695914E-01 0.80432417E-03
+ 0.43250400E+00 0.86568125E-01 0.79498213E-03
+ 0.43278968E+00 0.88579148E-01 0.80701307E-03
+ 0.43307534E+00 0.89341432E-01 0.81082853E-03
+ 0.43336102E+00 0.89192346E-01 0.80770126E-03
+ 0.43364668E+00 0.89292549E-01 0.80944295E-03
+ 0.43393236E+00 0.87881222E-01 0.80212526E-03
+ 0.43421802E+00 0.87790184E-01 0.79743745E-03
+ 0.43450370E+00 0.88602968E-01 0.80721447E-03
+ 0.43478936E+00 0.88011414E-01 0.80286158E-03
+ 0.43507504E+00 0.88423625E-01 0.80524711E-03
+ 0.43536070E+00 0.89261539E-01 0.80450042E-03
+ 0.43564638E+00 0.89163832E-01 0.81168913E-03
+ 0.43593204E+00 0.88935472E-01 0.80332276E-03
+ 0.43621773E+00 0.88803463E-01 0.81029849E-03
+ 0.43650338E+00 0.87345429E-01 0.80248900E-03
+ 0.43678907E+00 0.89547329E-01 0.81074552E-03
+ 0.43707472E+00 0.88860996E-01 0.80580782E-03
+ 0.43736041E+00 0.87325491E-01 0.79823635E-03
+ 0.43764606E+00 0.88477880E-01 0.80269499E-03
+ 0.43793175E+00 0.90299986E-01 0.81399473E-03
+ 0.43821740E+00 0.88414244E-01 0.80288644E-03
+ 0.43850309E+00 0.89233316E-01 0.80814387E-03
+ 0.43878874E+00 0.87988190E-01 0.79922087E-03
+ 0.43907440E+00 0.88606678E-01 0.80906501E-03
+ 0.43936008E+00 0.86132795E-01 0.78988052E-03
+ 0.43964574E+00 0.88254325E-01 0.80183882E-03
+ 0.43993142E+00 0.87241367E-01 0.79928339E-03
+ 0.44021708E+00 0.88477939E-01 0.80512074E-03
+ 0.44050276E+00 0.87122343E-01 0.79961715E-03
+ 0.44078842E+00 0.88562451E-01 0.80328918E-03
+ 0.44107410E+00 0.89853376E-01 0.80691202E-03
+ 0.44135976E+00 0.87537713E-01 0.80168445E-03
+ 0.44164544E+00 0.87323442E-01 0.79037272E-03
+ 0.44193110E+00 0.87804981E-01 0.80329599E-03
+ 0.44221678E+00 0.87926261E-01 0.80042204E-03
+ 0.44250244E+00 0.88247940E-01 0.80565631E-03
+ 0.44278812E+00 0.88391565E-01 0.80274523E-03
+ 0.44307378E+00 0.88484600E-01 0.80823182E-03
+ 0.44335946E+00 0.87624386E-01 0.79868903E-03
+ 0.44364512E+00 0.88156708E-01 0.80171350E-03
+ 0.44393080E+00 0.86238347E-01 0.79738966E-03
+ 0.44421646E+00 0.89522816E-01 0.80822327E-03
+ 0.44450215E+00 0.89468338E-01 0.80403563E-03
+ 0.44478780E+00 0.89234971E-01 0.81251725E-03
+ 0.44507349E+00 0.86811341E-01 0.79477270E-03
+ 0.44535914E+00 0.87969236E-01 0.80472685E-03
+ 0.44564483E+00 0.89714557E-01 0.81039668E-03
+ 0.44593048E+00 0.90342782E-01 0.80645306E-03
+ 0.44621617E+00 0.89167595E-01 0.80710527E-03
+ 0.44650182E+00 0.89073874E-01 0.80966501E-03
+ 0.44678751E+00 0.89256525E-01 0.80738758E-03
+ 0.44707316E+00 0.88779271E-01 0.80750248E-03
+ 0.44735885E+00 0.89989662E-01 0.81145437E-03
+ 0.44764450E+00 0.89169540E-01 0.80457807E-03
+ 0.44793019E+00 0.88768639E-01 0.80232573E-03
+ 0.44821584E+00 0.88636108E-01 0.81213861E-03
+ 0.44850153E+00 0.89612141E-01 0.80792262E-03
+ 0.44878718E+00 0.89095056E-01 0.80939149E-03
+ 0.44907287E+00 0.88803440E-01 0.80549467E-03
+ 0.44935852E+00 0.87243982E-01 0.80079702E-03
+ 0.44964418E+00 0.88086978E-01 0.80459844E-03
+ 0.44992986E+00 0.89521363E-01 0.81149198E-03
+ 0.45021552E+00 0.91052100E-01 0.81071572E-03
+ 0.45050120E+00 0.88089809E-01 0.80175378E-03
+ 0.45078686E+00 0.88996805E-01 0.80463372E-03
+ 0.45107254E+00 0.87722868E-01 0.79912483E-03
+ 0.45135820E+00 0.87983780E-01 0.80281403E-03
+ 0.45164388E+00 0.88926978E-01 0.80681522E-03
+ 0.45192954E+00 0.89788936E-01 0.81339397E-03
+ 0.45221522E+00 0.89126669E-01 0.80743502E-03
+ 0.45250088E+00 0.88297069E-01 0.80099644E-03
+ 0.45278656E+00 0.88337734E-01 0.80430292E-03
+ 0.45307222E+00 0.86627699E-01 0.79759513E-03
+ 0.45335791E+00 0.87968662E-01 0.80675364E-03
+ 0.45364356E+00 0.87259240E-01 0.79819252E-03
+ 0.45392925E+00 0.89234948E-01 0.80923218E-03
+ 0.45421490E+00 0.87511219E-01 0.80078945E-03
+ 0.45450059E+00 0.88039137E-01 0.80267561E-03
+ 0.45478624E+00 0.88913009E-01 0.80844003E-03
+ 0.45507193E+00 0.88041179E-01 0.80268463E-03
+ 0.45535758E+00 0.89426070E-01 0.80923649E-03
+ 0.45564327E+00 0.89761473E-01 0.80714509E-03
+ 0.45592892E+00 0.86753495E-01 0.80007501E-03
+ 0.45621461E+00 0.89289889E-01 0.80993550E-03
+ 0.45650026E+00 0.88123888E-01 0.80429699E-03
+ 0.45678595E+00 0.88095263E-01 0.80171518E-03
+ 0.45707160E+00 0.89903906E-01 0.81016612E-03
+ 0.45735729E+00 0.87320626E-01 0.80325210E-03
+ 0.45764294E+00 0.88714153E-01 0.80155703E-03
+ 0.45792863E+00 0.88717237E-01 0.80624688E-03
+ 0.45821428E+00 0.89860596E-01 0.81059680E-03
+ 0.45849997E+00 0.87823994E-01 0.80506288E-03
+ 0.45878562E+00 0.89086905E-01 0.80770464E-03
+ 0.45907131E+00 0.90017349E-01 0.80821209E-03
+ 0.45935696E+00 0.88699870E-01 0.80847472E-03
+ 0.45964265E+00 0.88499829E-01 0.80444751E-03
+ 0.45992830E+00 0.87725177E-01 0.80379401E-03
+ 0.46021396E+00 0.89090191E-01 0.80725871E-03
+ 0.46049964E+00 0.87991230E-01 0.80043013E-03
+ 0.46078530E+00 0.88753834E-01 0.81225805E-03
+ 0.46107098E+00 0.88146813E-01 0.80380111E-03
+ 0.46135664E+00 0.88895455E-01 0.80811657E-03
+ 0.46164232E+00 0.89233629E-01 0.81397977E-03
+ 0.46192798E+00 0.88805787E-01 0.80891291E-03
+ 0.46221367E+00 0.88809587E-01 0.80795260E-03
+ 0.46249932E+00 0.89040108E-01 0.80700574E-03
+ 0.46278501E+00 0.88022672E-01 0.80333109E-03
+ 0.46307066E+00 0.88433415E-01 0.81434107E-03
+ 0.46335635E+00 0.87555513E-01 0.79962489E-03
+ 0.46364200E+00 0.89520343E-01 0.81256591E-03
+ 0.46392769E+00 0.88762559E-01 0.80708874E-03
+ 0.46421334E+00 0.90690911E-01 0.81455719E-03
+ 0.46449903E+00 0.89268140E-01 0.80796942E-03
+ 0.46478468E+00 0.90502411E-01 0.81767095E-03
+ 0.46507037E+00 0.89809984E-01 0.81173854E-03
+ 0.46535602E+00 0.90066671E-01 0.81490906E-03
+ 0.46564171E+00 0.89332610E-01 0.80822373E-03
+ 0.46592736E+00 0.89949392E-01 0.81902399E-03
+ 0.46621305E+00 0.88485956E-01 0.80668286E-03
+ 0.46649870E+00 0.89504644E-01 0.81092253E-03
+ 0.46678439E+00 0.89806795E-01 0.81044808E-03
+ 0.46707004E+00 0.89712501E-01 0.81233261E-03
+ 0.46735573E+00 0.89824215E-01 0.81236224E-03
+ 0.46764138E+00 0.88332944E-01 0.80938532E-03
+ 0.46792707E+00 0.88724658E-01 0.80980099E-03
+ 0.46821272E+00 0.88003665E-01 0.80938562E-03
+ 0.46849841E+00 0.88044234E-01 0.80756046E-03
+ 0.46878406E+00 0.89401618E-01 0.81098313E-03
+ 0.46906975E+00 0.89411728E-01 0.80794567E-03
+ 0.46935540E+00 0.89199737E-01 0.81368478E-03
+ 0.46964109E+00 0.90492465E-01 0.81612426E-03
+ 0.46992674E+00 0.89248523E-01 0.81435294E-03
+ 0.47021240E+00 0.89433283E-01 0.81519649E-03
+ 0.47049809E+00 0.89841798E-01 0.81722660E-03
+ 0.47078374E+00 0.89541726E-01 0.81459724E-03
+ 0.47106943E+00 0.89984559E-01 0.81476505E-03
+ 0.47135508E+00 0.88529497E-01 0.81245904E-03
+ 0.47164077E+00 0.90362884E-01 0.81943482E-03
+ 0.47192642E+00 0.90253770E-01 0.81610319E-03
+ 0.47221211E+00 0.89413173E-01 0.81911136E-03
+ 0.47249776E+00 0.91309704E-01 0.82176662E-03
+ 0.47278345E+00 0.89347221E-01 0.80856023E-03
+ 0.47306910E+00 0.88366725E-01 0.81055122E-03
+ 0.47335479E+00 0.88943116E-01 0.81765425E-03
+ 0.47364044E+00 0.90324916E-01 0.81794593E-03
+ 0.47392613E+00 0.88854074E-01 0.80880011E-03
+ 0.47421178E+00 0.90322979E-01 0.81666012E-03
+ 0.47449747E+00 0.89846231E-01 0.81803277E-03
+ 0.47478312E+00 0.89732863E-01 0.81431388E-03
+ 0.47506881E+00 0.87677412E-01 0.80510264E-03
+ 0.47535446E+00 0.89647517E-01 0.82125585E-03
+ 0.47564015E+00 0.88210762E-01 0.80425438E-03
+ 0.47592580E+00 0.91136202E-01 0.82453527E-03
+ 0.47621149E+00 0.89856178E-01 0.81767235E-03
+ 0.47649714E+00 0.89722216E-01 0.81988412E-03
+ 0.47678283E+00 0.88546671E-01 0.81272755E-03
+ 0.47706848E+00 0.88081881E-01 0.80903084E-03
+ 0.47735417E+00 0.88566743E-01 0.81512908E-03
+ 0.47763982E+00 0.90735778E-01 0.82205393E-03
+ 0.47792551E+00 0.88508114E-01 0.81200089E-03
+ 0.47821116E+00 0.88949591E-01 0.81034080E-03
+ 0.47849685E+00 0.89023083E-01 0.81418722E-03
+ 0.47878250E+00 0.89885592E-01 0.81822893E-03
+ 0.47906819E+00 0.89705199E-01 0.82094228E-03
+ 0.47935385E+00 0.88053994E-01 0.81109186E-03
+ 0.47963953E+00 0.89691959E-01 0.81431790E-03
+ 0.47992519E+00 0.88836879E-01 0.81132766E-03
+ 0.48021087E+00 0.88973604E-01 0.81710453E-03
+ 0.48049653E+00 0.90165220E-01 0.81994937E-03
+ 0.48078218E+00 0.88802159E-01 0.81828609E-03
+ 0.48106787E+00 0.89847885E-01 0.81963022E-03
+ 0.48135352E+00 0.89203849E-01 0.81807765E-03
+ 0.48163921E+00 0.89702852E-01 0.81758824E-03
+ 0.48192486E+00 0.89823380E-01 0.82003482E-03
+ 0.48221055E+00 0.87792702E-01 0.80989930E-03
+ 0.48249620E+00 0.90849735E-01 0.82317466E-03
+ 0.48278189E+00 0.89297958E-01 0.81786967E-03
+ 0.48306754E+00 0.90396218E-01 0.82133035E-03
+ 0.48335323E+00 0.89657642E-01 0.81817695E-03
+ 0.48363888E+00 0.89369968E-01 0.81849284E-03
+ 0.48392457E+00 0.88713415E-01 0.81765535E-03
+ 0.48421022E+00 0.88039093E-01 0.80740621E-03
+ 0.48449591E+00 0.90210967E-01 0.82193111E-03
+ 0.48478156E+00 0.88691026E-01 0.81452465E-03
+ 0.48506725E+00 0.90027519E-01 0.81826560E-03
+ 0.48535290E+00 0.88308662E-01 0.81512646E-03
+ 0.48563859E+00 0.87858543E-01 0.81261504E-03
+ 0.48592424E+00 0.88592641E-01 0.81834994E-03
+ 0.48620993E+00 0.87051205E-01 0.81270456E-03
+ 0.48649558E+00 0.88073321E-01 0.81064028E-03
+ 0.48678127E+00 0.88961393E-01 0.81757101E-03
+ 0.48706692E+00 0.90445228E-01 0.82352798E-03
+ 0.48735261E+00 0.88062979E-01 0.81612222E-03
+ 0.48763826E+00 0.88965744E-01 0.82129420E-03
+ 0.48792395E+00 0.90028487E-01 0.81984990E-03
+ 0.48820961E+00 0.88647358E-01 0.82167203E-03
+ 0.48849529E+00 0.89314535E-01 0.81935996E-03
+ 0.48878095E+00 0.89464270E-01 0.81957242E-03
+ 0.48906663E+00 0.89285597E-01 0.82133384E-03
+ 0.48935229E+00 0.89289427E-01 0.82247570E-03
+ 0.48963797E+00 0.89640364E-01 0.82011020E-03
+ 0.48992363E+00 0.88726655E-01 0.81672159E-03
+ 0.49020931E+00 0.90134822E-01 0.82455191E-03
+ 0.49049497E+00 0.89022897E-01 0.82055322E-03
+ 0.49078065E+00 0.88433094E-01 0.81813813E-03
+ 0.49106631E+00 0.89929409E-01 0.82708156E-03
+ 0.49135196E+00 0.89208700E-01 0.82393322E-03
+ 0.49163765E+00 0.91129407E-01 0.83063019E-03
+ 0.49192330E+00 0.87953553E-01 0.81659248E-03
+ 0.49220899E+00 0.88952966E-01 0.82299323E-03
+ 0.49249464E+00 0.90049759E-01 0.82655251E-03
+ 0.49278033E+00 0.90265580E-01 0.82551397E-03
+ 0.49306598E+00 0.89448713E-01 0.81951689E-03
+ 0.49335167E+00 0.89031190E-01 0.81704010E-03
+ 0.49363732E+00 0.88051789E-01 0.81786193E-03
+ 0.49392301E+00 0.89617513E-01 0.82129071E-03
+ 0.49420866E+00 0.90095237E-01 0.82868844E-03
+ 0.49449435E+00 0.88972606E-01 0.82169968E-03
+ 0.49478000E+00 0.89876868E-01 0.82960119E-03
+ 0.49506569E+00 0.88779941E-01 0.81648439E-03
+ 0.49535134E+00 0.88663019E-01 0.81429171E-03
+ 0.49563703E+00 0.89273609E-01 0.82377542E-03
+ 0.49592268E+00 0.89129545E-01 0.82233635E-03
+ 0.49620837E+00 0.89497007E-01 0.82692190E-03
+ 0.49649402E+00 0.89193799E-01 0.82324562E-03
+ 0.49677971E+00 0.88430889E-01 0.82156406E-03
+ 0.49706537E+00 0.90667002E-01 0.82352571E-03
+ 0.49735105E+00 0.90561748E-01 0.82607183E-03
+ 0.49763671E+00 0.90361811E-01 0.82598237E-03
+ 0.49792239E+00 0.90067893E-01 0.82961598E-03
+ 0.49820805E+00 0.88059038E-01 0.81724086E-03
+ 0.49849373E+00 0.90140156E-01 0.83220197E-03
+ 0.49877939E+00 0.90628400E-01 0.83217089E-03
+ 0.49906507E+00 0.88669017E-01 0.82634488E-03
+ 0.49935073E+00 0.87952070E-01 0.81634359E-03
+ 0.49963641E+00 0.90129435E-01 0.82849996E-03
+ 0.49992207E+00 0.89212775E-01 0.82449976E-03
+ 0.50020772E+00 0.89209072E-01 0.82249608E-03
+ 0.50049341E+00 0.88885769E-01 0.82376081E-03
+ 0.50077909E+00 0.89543916E-01 0.82561036E-03
+ 0.50106478E+00 0.88994905E-01 0.82534750E-03
+ 0.50135040E+00 0.90362243E-01 0.82687207E-03
+ 0.50163609E+00 0.90558514E-01 0.82819979E-03
+ 0.50192177E+00 0.89705475E-01 0.83174463E-03
+ 0.50220740E+00 0.90084352E-01 0.82762359E-03
+ 0.50249308E+00 0.88548809E-01 0.82144391E-03
+ 0.50277877E+00 0.90025164E-01 0.83016179E-03
+ 0.50306445E+00 0.89288019E-01 0.82667434E-03
+ 0.50335008E+00 0.89600489E-01 0.82913873E-03
+ 0.50363576E+00 0.90375625E-01 0.82677061E-03
+ 0.50392145E+00 0.87907173E-01 0.82161836E-03
+ 0.50420713E+00 0.87667949E-01 0.81884844E-03
+ 0.50449276E+00 0.88459000E-01 0.82143780E-03
+ 0.50477844E+00 0.90147749E-01 0.83030591E-03
+ 0.50506413E+00 0.88452652E-01 0.81897876E-03
+ 0.50534981E+00 0.89722604E-01 0.82615693E-03
+ 0.50563544E+00 0.88962033E-01 0.82391710E-03
+ 0.50592113E+00 0.89702621E-01 0.82856894E-03
+ 0.50620681E+00 0.90045862E-01 0.82627282E-03
+ 0.50649250E+00 0.88709548E-01 0.82740182E-03
+ 0.50677812E+00 0.89584582E-01 0.82760822E-03
+ 0.50706381E+00 0.89014992E-01 0.82541106E-03
+ 0.50734949E+00 0.88182867E-01 0.82002196E-03
+ 0.50763518E+00 0.89509256E-01 0.82743977E-03
+ 0.50792080E+00 0.90041816E-01 0.82906138E-03
+ 0.50820649E+00 0.88305764E-01 0.82517997E-03
+ 0.50849217E+00 0.89640982E-01 0.82766695E-03
+ 0.50877786E+00 0.87593794E-01 0.82248036E-03
+ 0.50906348E+00 0.89759678E-01 0.83202519E-03
+ 0.50934917E+00 0.89907177E-01 0.82891638E-03
+ 0.50963485E+00 0.91177166E-01 0.83997770E-03
+ 0.50992054E+00 0.90235613E-01 0.83361316E-03
+ 0.51020616E+00 0.90950333E-01 0.83770219E-03
+ 0.51049185E+00 0.88964082E-01 0.82715461E-03
+ 0.51077753E+00 0.88579237E-01 0.82738727E-03
+ 0.51106322E+00 0.90200946E-01 0.83060522E-03
+ 0.51134884E+00 0.87126531E-01 0.82308013E-03
+ 0.51163453E+00 0.90263627E-01 0.83348039E-03
+ 0.51192021E+00 0.88484988E-01 0.83090010E-03
+ 0.51220584E+00 0.89393593E-01 0.82665856E-03
+ 0.51249152E+00 0.88784397E-01 0.82689081E-03
+ 0.51277721E+00 0.90943985E-01 0.83627825E-03
+ 0.51306289E+00 0.91031954E-01 0.83468133E-03
+ 0.51334852E+00 0.89719199E-01 0.82884979E-03
+ 0.51363420E+00 0.88375576E-01 0.82568335E-03
+ 0.51391989E+00 0.89994803E-01 0.83210843E-03
+ 0.51420557E+00 0.91062374E-01 0.83314924E-03
+ 0.51449120E+00 0.88277973E-01 0.82868559E-03
+ 0.51477689E+00 0.89190349E-01 0.83118619E-03
+ 0.51506257E+00 0.89773446E-01 0.83389907E-03
+ 0.51534826E+00 0.87333225E-01 0.82425337E-03
+ 0.51563388E+00 0.91775201E-01 0.83985960E-03
+ 0.51591957E+00 0.90409689E-01 0.83658547E-03
+ 0.51620525E+00 0.89440301E-01 0.83127973E-03
+ 0.51649094E+00 0.89449756E-01 0.83467073E-03
+ 0.51677656E+00 0.90475745E-01 0.83902851E-03
+ 0.51706225E+00 0.88096440E-01 0.82588906E-03
+ 0.51734793E+00 0.90689376E-01 0.83705853E-03
+ 0.51763362E+00 0.89369573E-01 0.83155214E-03
+ 0.51791924E+00 0.90723217E-01 0.83928503E-03
+ 0.51820493E+00 0.91007121E-01 0.84248354E-03
+ 0.51849061E+00 0.89681014E-01 0.83354017E-03
+ 0.51877630E+00 0.89674786E-01 0.83051488E-03
+ 0.51906192E+00 0.90626732E-01 0.83864806E-03
+ 0.51934761E+00 0.89282833E-01 0.82709827E-03
+ 0.51963329E+00 0.89320883E-01 0.83488465E-03
+ 0.51991898E+00 0.90381123E-01 0.83738146E-03
+ 0.52020460E+00 0.89426488E-01 0.83531271E-03
+ 0.52049029E+00 0.91065995E-01 0.83879381E-03
+ 0.52077597E+00 0.90034075E-01 0.83408161E-03
+ 0.52106166E+00 0.89653023E-01 0.83509006E-03
+ 0.52134728E+00 0.91189511E-01 0.84177859E-03
+ 0.52163297E+00 0.88680990E-01 0.82906825E-03
+ 0.52191865E+00 0.90033554E-01 0.83360949E-03
+ 0.52220434E+00 0.89800619E-01 0.83614822E-03
+ 0.52248996E+00 0.91404326E-01 0.84704458E-03
+ 0.52277565E+00 0.90329282E-01 0.83605672E-03
+ 0.52306134E+00 0.90270042E-01 0.83735824E-03
+ 0.52334696E+00 0.88701576E-01 0.82831399E-03
+ 0.52363265E+00 0.89556962E-01 0.83933887E-03
+ 0.52391833E+00 0.91144033E-01 0.84073603E-03
+ 0.52420402E+00 0.89603715E-01 0.83349366E-03
+ 0.52448964E+00 0.90673730E-01 0.83585951E-03
+ 0.52477533E+00 0.91596141E-01 0.84234262E-03
+ 0.52506101E+00 0.88474363E-01 0.83612307E-03
+ 0.52534670E+00 0.90192541E-01 0.84035355E-03
+ 0.52563232E+00 0.90880409E-01 0.84034074E-03
+ 0.52591801E+00 0.89910679E-01 0.83834934E-03
+ 0.52620369E+00 0.91012761E-01 0.83927601E-03
+ 0.52648938E+00 0.89202471E-01 0.83732192E-03
+ 0.52677500E+00 0.90922102E-01 0.84095949E-03
+ 0.52706069E+00 0.89594185E-01 0.84018428E-03
+ 0.52734637E+00 0.91887563E-01 0.84792334E-03
+ 0.52763206E+00 0.89745827E-01 0.83848753E-03
+ 0.52791768E+00 0.89582004E-01 0.83854486E-03
+ 0.52820337E+00 0.90691224E-01 0.83845091E-03
+ 0.52848905E+00 0.88280790E-01 0.83319267E-03
+ 0.52877474E+00 0.91435909E-01 0.84362342E-03
+ 0.52906036E+00 0.91068201E-01 0.84679085E-03
+ 0.52934605E+00 0.91076262E-01 0.83862466E-03
+ 0.52963173E+00 0.90324849E-01 0.84023591E-03
+ 0.52991742E+00 0.90797536E-01 0.84065553E-03
+ 0.53020304E+00 0.92278898E-01 0.85097417E-03
+ 0.53048873E+00 0.89328311E-01 0.83636126E-03
+ 0.53077441E+00 0.88971101E-01 0.83154085E-03
+ 0.53106010E+00 0.89737333E-01 0.83244534E-03
+ 0.53134573E+00 0.91347665E-01 0.83876943E-03
+ 0.53163141E+00 0.90153225E-01 0.83907106E-03
+ 0.53191710E+00 0.91239110E-01 0.84627914E-03
+ 0.53220278E+00 0.89486979E-01 0.83517737E-03
+ 0.53248841E+00 0.89819863E-01 0.83531917E-03
+ 0.53277409E+00 0.89464739E-01 0.83630357E-03
+ 0.53305978E+00 0.88717625E-01 0.83429145E-03
+ 0.53334540E+00 0.89954153E-01 0.84112072E-03
+ 0.53363109E+00 0.90382189E-01 0.84149576E-03
+ 0.53391677E+00 0.89497991E-01 0.84105437E-03
+ 0.53420246E+00 0.88962354E-01 0.83147280E-03
+ 0.53448808E+00 0.92306703E-01 0.84907701E-03
+ 0.53477377E+00 0.90788171E-01 0.84057491E-03
+ 0.53505945E+00 0.91902107E-01 0.84703579E-03
+ 0.53534514E+00 0.90760045E-01 0.84345537E-03
+ 0.53563076E+00 0.90523183E-01 0.84486970E-03
+ 0.53591645E+00 0.89433260E-01 0.84113918E-03
+ 0.53620213E+00 0.90741642E-01 0.84391329E-03
+ 0.53648782E+00 0.89851424E-01 0.84186491E-03
+ 0.53677344E+00 0.89628257E-01 0.84001559E-03
+ 0.53705913E+00 0.89990377E-01 0.83838525E-03
+ 0.53734481E+00 0.90295866E-01 0.83994004E-03
+ 0.53763050E+00 0.89096777E-01 0.84047799E-03
+ 0.53791612E+00 0.91863252E-01 0.84720063E-03
+ 0.53820181E+00 0.90937711E-01 0.84183068E-03
+ 0.53848749E+00 0.89344338E-01 0.83775446E-03
+ 0.53877318E+00 0.89559987E-01 0.84231357E-03
+ 0.53905880E+00 0.89535721E-01 0.83955919E-03
+ 0.53934449E+00 0.90215087E-01 0.84573677E-03
+ 0.53963017E+00 0.92063539E-01 0.85153466E-03
+ 0.53991586E+00 0.90771548E-01 0.84934320E-03
+ 0.54020149E+00 0.88350713E-01 0.83953637E-03
+ 0.54048717E+00 0.91080531E-01 0.84585167E-03
+ 0.54077286E+00 0.89795902E-01 0.84165146E-03
+ 0.54105854E+00 0.90142593E-01 0.84157352E-03
+ 0.54134417E+00 0.90538204E-01 0.84455608E-03
+ 0.54162985E+00 0.92838354E-01 0.85608341E-03
+ 0.54191554E+00 0.89307316E-01 0.84132742E-03
+ 0.54220122E+00 0.91057114E-01 0.83908311E-03
+ 0.54248685E+00 0.89089416E-01 0.83595875E-03
+ 0.54277253E+00 0.91730192E-01 0.85123099E-03
+ 0.54305822E+00 0.90213530E-01 0.84349699E-03
+ 0.54334384E+00 0.90274826E-01 0.84343716E-03
+ 0.54362953E+00 0.91052234E-01 0.85208460E-03
+ 0.54391521E+00 0.91694355E-01 0.85145747E-03
+ 0.54420090E+00 0.91299303E-01 0.85033407E-03
+ 0.54448652E+00 0.89701436E-01 0.83964533E-03
+ 0.54477221E+00 0.90495825E-01 0.83973049E-03
+ 0.54505789E+00 0.90501636E-01 0.84449898E-03
+ 0.54534358E+00 0.90426438E-01 0.84273773E-03
+ 0.54562920E+00 0.90342030E-01 0.84595795E-03
+ 0.54591489E+00 0.88413820E-01 0.84157806E-03
+ 0.54620057E+00 0.89691892E-01 0.84188732E-03
+ 0.54648626E+00 0.90886146E-01 0.84653264E-03
+ 0.54677188E+00 0.90055481E-01 0.84317091E-03
+ 0.54705757E+00 0.90609096E-01 0.84409752E-03
+ 0.54734325E+00 0.90089776E-01 0.84447046E-03
+ 0.54762894E+00 0.91224641E-01 0.85043284E-03
+ 0.54791456E+00 0.89869469E-01 0.84119354E-03
+ 0.54820025E+00 0.90219758E-01 0.84641558E-03
+ 0.54848593E+00 0.90870433E-01 0.84762560E-03
+ 0.54877162E+00 0.89955069E-01 0.83945080E-03
+ 0.54905725E+00 0.89417771E-01 0.84316271E-03
+ 0.54934293E+00 0.90608254E-01 0.84287068E-03
+ 0.54962862E+00 0.89295827E-01 0.84583240E-03
+ 0.54991430E+00 0.90495303E-01 0.84356294E-03
+ 0.55019993E+00 0.89603469E-01 0.84197143E-03
+ 0.55048561E+00 0.91513485E-01 0.85314031E-03
+ 0.55077130E+00 0.89762129E-01 0.84359618E-03
+ 0.55105698E+00 0.89128114E-01 0.84224762E-03
+ 0.55134261E+00 0.89648113E-01 0.84556779E-03
+ 0.55162829E+00 0.89889966E-01 0.84574032E-03
+ 0.55191398E+00 0.90065502E-01 0.85205061E-03
+ 0.55219966E+00 0.90332180E-01 0.84868405E-03
+ 0.55248529E+00 0.90321593E-01 0.84584742E-03
+ 0.55277097E+00 0.88959843E-01 0.83799066E-03
+ 0.55305666E+00 0.90736546E-01 0.84930094E-03
+ 0.55334234E+00 0.92387177E-01 0.85716252E-03
+ 0.55362797E+00 0.90454832E-01 0.84801507E-03
+ 0.55391365E+00 0.89909881E-01 0.84331504E-03
+ 0.55419934E+00 0.90592563E-01 0.84460172E-03
+ 0.55448496E+00 0.89765437E-01 0.84471970E-03
+ 0.55477065E+00 0.90512574E-01 0.84777107E-03
+ 0.55505633E+00 0.91299996E-01 0.85348176E-03
+ 0.55534202E+00 0.90103589E-01 0.84412395E-03
+ 0.55562764E+00 0.88385731E-01 0.84251072E-03
+ 0.55591333E+00 0.89000754E-01 0.84295729E-03
+ 0.55619901E+00 0.89546539E-01 0.84612687E-03
+ 0.55648470E+00 0.91360204E-01 0.85296441E-03
+ 0.55677032E+00 0.90157695E-01 0.84826985E-03
+ 0.55705601E+00 0.90211056E-01 0.84631593E-03
+ 0.55734169E+00 0.91704682E-01 0.85348089E-03
+ 0.55762738E+00 0.89913227E-01 0.84990670E-03
+ 0.55791301E+00 0.91862120E-01 0.85744151E-03
+ 0.55819869E+00 0.90372935E-01 0.84374187E-03
+ 0.55848438E+00 0.92254475E-01 0.85464044E-03
+ 0.55877006E+00 0.91617204E-01 0.85447368E-03
+ 0.55905569E+00 0.90665497E-01 0.84759068E-03
+ 0.55934137E+00 0.90173535E-01 0.85128663E-03
+ 0.55962706E+00 0.91372162E-01 0.84966974E-03
+ 0.55991274E+00 0.90291232E-01 0.85094571E-03
+ 0.56019837E+00 0.89981340E-01 0.84906310E-03
+ 0.56048405E+00 0.91146149E-01 0.85500116E-03
+ 0.56076974E+00 0.89190319E-01 0.84500457E-03
+ 0.56105542E+00 0.90621352E-01 0.84838091E-03
+ 0.56134105E+00 0.90672970E-01 0.85273490E-03
+ 0.56162673E+00 0.91996118E-01 0.85444393E-03
+ 0.56191242E+00 0.89758098E-01 0.84567169E-03
+ 0.56219810E+00 0.91528900E-01 0.85741875E-03
+ 0.56248373E+00 0.91025308E-01 0.85646030E-03
+ 0.56276941E+00 0.90803288E-01 0.85081469E-03
+ 0.56305510E+00 0.90120971E-01 0.85186405E-03
+ 0.56334078E+00 0.89140303E-01 0.84393291E-03
+ 0.56362641E+00 0.90653203E-01 0.85559324E-03
+ 0.56391209E+00 0.89575790E-01 0.84265327E-03
+ 0.56419778E+00 0.93688965E-01 0.86662086E-03
+ 0.56448340E+00 0.89790337E-01 0.84799557E-03
+ 0.56476909E+00 0.90429679E-01 0.85508847E-03
+ 0.56505477E+00 0.90724371E-01 0.85202197E-03
+ 0.56534046E+00 0.90496160E-01 0.84790576E-03
+ 0.56562608E+00 0.91582768E-01 0.85174397E-03
+ 0.56591177E+00 0.91650911E-01 0.85531379E-03
+ 0.56619745E+00 0.89609779E-01 0.84961863E-03
+ 0.56648314E+00 0.89671373E-01 0.84685459E-03
+ 0.56676877E+00 0.91024205E-01 0.85474877E-03
+ 0.56705445E+00 0.91693126E-01 0.85760106E-03
+ 0.56734014E+00 0.91557451E-01 0.85730857E-03
+ 0.56762582E+00 0.91664486E-01 0.85994235E-03
+ 0.56791145E+00 0.90918981E-01 0.85648621E-03
+ 0.56819713E+00 0.90694100E-01 0.85211074E-03
+ 0.56848282E+00 0.91723517E-01 0.85923146E-03
+ 0.56876850E+00 0.93335442E-01 0.86424139E-03
+ 0.56905413E+00 0.93132734E-01 0.86474174E-03
+ 0.56933981E+00 0.91837093E-01 0.85943227E-03
+ 0.56962550E+00 0.91805175E-01 0.85454073E-03
+ 0.56991118E+00 0.91829836E-01 0.85841300E-03
+ 0.57019681E+00 0.90692900E-01 0.85029786E-03
+ 0.57048249E+00 0.92731729E-01 0.86155295E-03
+ 0.57076818E+00 0.90433560E-01 0.85622520E-03
+ 0.57105386E+00 0.89324474E-01 0.84792066E-03
+ 0.57133949E+00 0.92675798E-01 0.86132984E-03
+ 0.57162517E+00 0.91364793E-01 0.85516769E-03
+ 0.57191086E+00 0.92080005E-01 0.85845409E-03
+ 0.57219654E+00 0.91168061E-01 0.85394678E-03
+ 0.57248217E+00 0.90783790E-01 0.85242139E-03
+ 0.57276785E+00 0.89905828E-01 0.85642980E-03
+ 0.57305354E+00 0.90357944E-01 0.85552514E-03
+ 0.57333922E+00 0.93197718E-01 0.86533109E-03
+ 0.57362485E+00 0.92938215E-01 0.85092377E-03
+ 0.57391948E+00 0.91114059E-01 0.85491198E-03
+ 0.57420516E+00 0.91741629E-01 0.85890183E-03
+ 0.57449079E+00 0.90275757E-01 0.84753014E-03
+ 0.57477647E+00 0.90691224E-01 0.85544481E-03
+ 0.57506216E+00 0.92549376E-01 0.86380198E-03
+ 0.57534784E+00 0.92179954E-01 0.84396184E-03
+ 0.57564241E+00 0.90617239E-01 0.85414579E-03
+ 0.57592809E+00 0.89739479E-01 0.85237215E-03
+ 0.57621378E+00 0.90386905E-01 0.85889606E-03
+ 0.57649940E+00 0.90036228E-01 0.84041094E-03
+ 0.57679403E+00 0.91833316E-01 0.85520558E-03
+ 0.57707971E+00 0.89107387E-01 0.84333803E-03
+ 0.57736534E+00 0.90491243E-01 0.83788356E-03
+ 0.57765996E+00 0.90782918E-01 0.85546792E-03
+ 0.57794565E+00 0.90783738E-01 0.85494673E-03
+ 0.57823128E+00 0.89360125E-01 0.83720603E-03
+ 0.57852590E+00 0.90511858E-01 0.85367227E-03
+ 0.57881159E+00 0.90178326E-01 0.83632366E-03
+ 0.57910615E+00 0.90271041E-01 0.85086370E-03
+ 0.57939184E+00 0.90999149E-01 0.84548385E-03
+ 0.57968640E+00 0.89908503E-01 0.84833574E-03
+ 0.57997209E+00 0.90705387E-01 0.85151149E-03
+ 0.58025777E+00 0.90177327E-01 0.83865609E-03
+ 0.58055234E+00 0.90344049E-01 0.85489271E-03
+ 0.58083802E+00 0.92627406E-01 0.85050322E-03
+ 0.58113265E+00 0.92612803E-01 0.84313698E-03
+ 0.58142722E+00 0.90783380E-01 0.85664273E-03
+ 0.58171290E+00 0.90701610E-01 0.84132556E-03
+ 0.58200747E+00 0.92563637E-01 0.86299918E-03
+ 0.58229315E+00 0.88404633E-01 0.82936225E-03
+ 0.58258778E+00 0.90478376E-01 0.84661267E-03
+ 0.58288234E+00 0.90103455E-01 0.85605081E-03
+ 0.58316803E+00 0.92164055E-01 0.85103186E-03
+ 0.58346260E+00 0.90810336E-01 0.84396452E-03
+ 0.58375722E+00 0.90647615E-01 0.85376075E-03
+ 0.58404291E+00 0.91146268E-01 0.84438955E-03
+ 0.58433747E+00 0.90249158E-01 0.84654748E-03
+ 0.58463210E+00 0.91225825E-01 0.86058927E-03
+ 0.58491772E+00 0.89406125E-01 0.83449209E-03
+ 0.58521235E+00 0.92346698E-01 0.85343810E-03
+ 0.58550692E+00 0.90991154E-01 0.83876209E-03
+ 0.58580154E+00 0.91166653E-01 0.84470731E-03
+ 0.58609611E+00 0.91216028E-01 0.86097384E-03
+ 0.58638179E+00 0.89964487E-01 0.83859160E-03
+ 0.58667642E+00 0.87331973E-01 0.83302351E-03
+ 0.58697098E+00 0.90920039E-01 0.84108947E-03
+ 0.58726561E+00 0.91149285E-01 0.84762723E-03
+ 0.58756018E+00 0.91743417E-01 0.85378037E-03
+ 0.58785480E+00 0.91192707E-01 0.84650359E-03
+ 0.58814937E+00 0.91092959E-01 0.84608159E-03
+ 0.58844399E+00 0.89976549E-01 0.83998468E-03
+ 0.58873856E+00 0.91781989E-01 0.85065258E-03
+ 0.58903319E+00 0.90787835E-01 0.84417214E-03
+ 0.58932775E+00 0.90326436E-01 0.84291270E-03
+ 0.58962238E+00 0.89873649E-01 0.84511680E-03
+ 0.58991694E+00 0.91106050E-01 0.84139989E-03
+ 0.59021157E+00 0.90541996E-01 0.84798533E-03
+ 0.59050614E+00 0.92135377E-01 0.85341360E-03
+ 0.59080076E+00 0.90678528E-01 0.84755715E-03
+ 0.59109533E+00 0.90899929E-01 0.84698963E-03
+ 0.59138995E+00 0.90342864E-01 0.83925918E-03
+ 0.59168458E+00 0.91229044E-01 0.84339821E-03
+ 0.59197915E+00 0.91002360E-01 0.85047830E-03
+ 0.59227377E+00 0.91212511E-01 0.84110367E-03
+ 0.59257728E+00 0.92752896E-01 0.84801891E-03
+ 0.59287184E+00 0.91476239E-01 0.84893208E-03
+ 0.59316647E+00 0.91655917E-01 0.85008866E-03
+ 0.59346104E+00 0.88707007E-01 0.83753123E-03
+ 0.59375566E+00 0.90039805E-01 0.83365128E-03
+ 0.59405917E+00 0.90637036E-01 0.84381434E-03
+ 0.59435380E+00 0.91092162E-01 0.84713561E-03
+ 0.59464836E+00 0.91545649E-01 0.83938974E-03
+ 0.59495193E+00 0.90968534E-01 0.84585242E-03
+ 0.59524649E+00 0.90218224E-01 0.84395841E-03
+ 0.59554112E+00 0.90251334E-01 0.82974683E-03
+ 0.59584463E+00 0.90556502E-01 0.84533985E-03
+ 0.59613919E+00 0.92372410E-01 0.85515622E-03
+ 0.59643382E+00 0.92488319E-01 0.84344129E-03
+ 0.59673733E+00 0.92670046E-01 0.85603911E-03
+ 0.59703195E+00 0.90540588E-01 0.83505164E-03
+ 0.59733546E+00 0.90850495E-01 0.85199601E-03
+ 0.59763002E+00 0.91196232E-01 0.84010127E-03
+ 0.59793359E+00 0.90841495E-01 0.84698288E-03
+ 0.59822816E+00 0.91877155E-01 0.83852280E-03
+ 0.59853172E+00 0.91382250E-01 0.84698841E-03
+ 0.59882629E+00 0.90987958E-01 0.83972036E-03
+ 0.59912980E+00 0.91143690E-01 0.84513915E-03
+ 0.59942442E+00 0.92197433E-01 0.84434147E-03
+ 0.59972793E+00 0.92032224E-01 0.85445179E-03
+ 0.60002255E+00 0.89916877E-01 0.83118916E-03
+ 0.60032606E+00 0.92192225E-01 0.84279996E-03
+ 0.60062957E+00 0.91330379E-01 0.84895967E-03
+ 0.60092419E+00 0.92103340E-01 0.84536395E-03
+ 0.60122770E+00 0.91348097E-01 0.85436506E-03
+ 0.60152233E+00 0.92939056E-01 0.84730558E-03
+ 0.60182583E+00 0.91810957E-01 0.84275479E-03
+ 0.60212934E+00 0.92282578E-01 0.84328133E-03
+ 0.60243285E+00 0.91547787E-01 0.84991119E-03
+ 0.60272747E+00 0.91768898E-01 0.84250543E-03
+ 0.60303098E+00 0.93126282E-01 0.84993278E-03
+ 0.60333455E+00 0.90916708E-01 0.83850353E-03
+ 0.60363805E+00 0.91494739E-01 0.85340615E-03
+ 0.60393262E+00 0.92205696E-01 0.84415294E-03
+ 0.60423619E+00 0.90693183E-01 0.83632243E-03
+ 0.60453969E+00 0.90339370E-01 0.83661306E-03
+ 0.60484320E+00 0.90695158E-01 0.83627092E-03
+ 0.60514677E+00 0.91067210E-01 0.84065920E-03
+ 0.60545027E+00 0.90887986E-01 0.83676900E-03
+ 0.60575378E+00 0.91676481E-01 0.83559466E-03
+ 0.60605729E+00 0.92912033E-01 0.84154878E-03
+ 0.60636085E+00 0.91417976E-01 0.84374379E-03
+ 0.60666436E+00 0.92677243E-01 0.85755199E-03
+ 0.60695893E+00 0.90229005E-01 0.83724636E-03
+ 0.60726249E+00 0.91709293E-01 0.82857127E-03
+ 0.60757494E+00 0.91891460E-01 0.84644300E-03
+ 0.60787845E+00 0.90855867E-01 0.83966448E-03
+ 0.60818195E+00 0.91591343E-01 0.84612385E-03
+ 0.60848552E+00 0.90692408E-01 0.83962420E-03
+ 0.60878903E+00 0.92022032E-01 0.84194343E-03
+ 0.60909253E+00 0.91347255E-01 0.84146386E-03
+ 0.60939610E+00 0.91076657E-01 0.83432824E-03
+ 0.60969961E+00 0.89986615E-01 0.83306985E-03
+ 0.61000311E+00 0.91880538E-01 0.84562734E-03
+ 0.61030662E+00 0.88241443E-01 0.81520970E-03
+ 0.61061913E+00 0.91299549E-01 0.84409758E-03
+ 0.61092263E+00 0.91780305E-01 0.83951151E-03
+ 0.61122614E+00 0.91552980E-01 0.84426888E-03
+ 0.61152965E+00 0.89441076E-01 0.82961947E-03
+ 0.61183321E+00 0.89638606E-01 0.82202151E-03
+ 0.61214566E+00 0.89645348E-01 0.83515106E-03
+ 0.61244917E+00 0.90617254E-01 0.83983433E-03
+ 0.61275268E+00 0.91149516E-01 0.82720845E-03
+ 0.61306512E+00 0.91372177E-01 0.84295374E-03
+ 0.61336869E+00 0.90952575E-01 0.83603367E-03
+ 0.61367220E+00 0.92085324E-01 0.82995970E-03
+ 0.61398464E+00 0.91731653E-01 0.84248575E-03
+ 0.61428815E+00 0.91151126E-01 0.82695304E-03
+ 0.61460060E+00 0.91944493E-01 0.84386708E-03
+ 0.61490417E+00 0.90673529E-01 0.83825726E-03
+ 0.61520767E+00 0.90582311E-01 0.82937762E-03
+ 0.61552012E+00 0.92625186E-01 0.84660581E-03
+ 0.61582363E+00 0.91710649E-01 0.82784554E-03
+ 0.61613607E+00 0.91263354E-01 0.84047363E-03
+ 0.61643964E+00 0.91635279E-01 0.83843590E-03
+ 0.61675209E+00 0.91067210E-01 0.84261078E-03
+ 0.61705559E+00 0.91207378E-01 0.82503620E-03
+ 0.61736804E+00 0.91816880E-01 0.84008870E-03
+ 0.61768049E+00 0.92611194E-01 0.84892008E-03
+ 0.61798400E+00 0.91040090E-01 0.82658476E-03
+ 0.61829644E+00 0.93287259E-01 0.85614494E-03
+ 0.61860001E+00 0.92682667E-01 0.83363103E-03
+ 0.61891246E+00 0.91176912E-01 0.82996942E-03
+ 0.61922491E+00 0.91794007E-01 0.84734429E-03
+ 0.61952841E+00 0.91334216E-01 0.83741965E-03
+ 0.61984086E+00 0.91208197E-01 0.82977337E-03
+ 0.62015331E+00 0.92285939E-01 0.84633578E-03
+ 0.62045687E+00 0.92349745E-01 0.83555956E-03
+ 0.62076932E+00 0.93459211E-01 0.83739136E-03
+ 0.62108177E+00 0.90296037E-01 0.83345466E-03
+ 0.62139422E+00 0.91893226E-01 0.83368889E-03
+ 0.62170666E+00 0.89666501E-01 0.84077090E-03
+ 0.62201017E+00 0.91216005E-01 0.83707977E-03
+ 0.62232262E+00 0.88762090E-01 0.82091498E-03
+ 0.62263507E+00 0.91745332E-01 0.83208474E-03
+ 0.62294751E+00 0.90953156E-01 0.82637841E-03
+ 0.62325996E+00 0.91835618E-01 0.83676667E-03
+ 0.62357241E+00 0.91975108E-01 0.83653070E-03
+ 0.62388492E+00 0.89897908E-01 0.82639110E-03
+ 0.62419736E+00 0.90476766E-01 0.82816719E-03
+ 0.62450981E+00 0.89314140E-01 0.82201022E-03
+ 0.62482226E+00 0.89667305E-01 0.82808058E-03
+ 0.62513471E+00 0.90796232E-01 0.82708360E-03
+ 0.62544715E+00 0.91079392E-01 0.83068846E-03
+ 0.62575960E+00 0.90248816E-01 0.83324459E-03
+ 0.62607205E+00 0.91824263E-01 0.83494070E-03
+ 0.62638450E+00 0.91320924E-01 0.83075004E-03
+ 0.62669694E+00 0.89598618E-01 0.82662900E-03
+ 0.62700939E+00 0.90637557E-01 0.82982023E-03
+ 0.62732184E+00 0.91989800E-01 0.83493517E-03
+ 0.62763429E+00 0.91506116E-01 0.83551533E-03
+ 0.62794673E+00 0.89495875E-01 0.81595068E-03
+ 0.62826812E+00 0.90786278E-01 0.83163427E-03
+ 0.62858057E+00 0.91193371E-01 0.83381671E-03
+ 0.62889302E+00 0.91437884E-01 0.83128852E-03
+ 0.62920547E+00 0.91892771E-01 0.83771127E-03
+ 0.62951791E+00 0.91110751E-01 0.82174200E-03
+ 0.62983930E+00 0.90791099E-01 0.83142018E-03
+ 0.63015175E+00 0.91579072E-01 0.83678763E-03
+ 0.63046420E+00 0.89686722E-01 0.81466127E-03
+ 0.63078558E+00 0.92490509E-01 0.83842740E-03
+ 0.63109803E+00 0.92409931E-01 0.84275939E-03
+ 0.63141048E+00 0.91084547E-01 0.82352274E-03
+ 0.63173187E+00 0.92556119E-01 0.83532743E-03
+ 0.63204432E+00 0.91520242E-01 0.83920558E-03
+ 0.63235676E+00 0.91716610E-01 0.82301931E-03
+ 0.63267815E+00 0.91444880E-01 0.83575875E-03
+ 0.63299060E+00 0.90957396E-01 0.82639436E-03
+ 0.63331199E+00 0.91446780E-01 0.84306934E-03
+ 0.63362443E+00 0.89232869E-01 0.81738021E-03
+ 0.63394582E+00 0.92478730E-01 0.84010517E-03
+ 0.63425827E+00 0.93065843E-01 0.83389116E-03
+ 0.63457966E+00 0.91450334E-01 0.83403493E-03
+ 0.63489211E+00 0.91210030E-01 0.82365295E-03
+ 0.63521349E+00 0.91719098E-01 0.83671737E-03
+ 0.63552594E+00 0.91483362E-01 0.83196867E-03
+ 0.63584733E+00 0.93246534E-01 0.83619863E-03
+ 0.63616866E+00 0.91821618E-01 0.83955965E-03
+ 0.63648117E+00 0.91411963E-01 0.82980900E-03
+ 0.63680249E+00 0.92039526E-01 0.83879766E-03
+ 0.63711494E+00 0.93785904E-01 0.83234732E-03
+ 0.63743633E+00 0.92138380E-01 0.83040213E-03
+ 0.63775772E+00 0.91372125E-01 0.82940864E-03
+ 0.63807911E+00 0.92230096E-01 0.84605004E-03
+ 0.63839155E+00 0.91020480E-01 0.82881848E-03
+ 0.63871294E+00 0.92475466E-01 0.83192147E-03
+ 0.63903433E+00 0.92743397E-01 0.83224062E-03
+ 0.63935572E+00 0.93073040E-01 0.84591360E-03
+ 0.63966817E+00 0.90994351E-01 0.82616566E-03
+ 0.63998950E+00 0.92667133E-01 0.83369360E-03
+ 0.64031088E+00 0.92436485E-01 0.83152059E-03
+ 0.64063227E+00 0.91495231E-01 0.83108665E-03
+ 0.64095366E+00 0.92293568E-01 0.83499850E-03
+ 0.64127505E+00 0.91921084E-01 0.83018100E-03
+ 0.64159644E+00 0.91940030E-01 0.83475118E-03
+ 0.64191777E+00 0.91812588E-01 0.82791835E-03
+ 0.64223915E+00 0.92786573E-01 0.83057326E-03
+ 0.64256054E+00 0.91577217E-01 0.83214010E-03
+ 0.64288193E+00 0.93187675E-01 0.83389261E-03
+ 0.64320332E+00 0.93350947E-01 0.83852134E-03
+ 0.64352471E+00 0.91887243E-01 0.83664764E-03
+ 0.64384604E+00 0.91754913E-01 0.83102827E-03
+ 0.64416742E+00 0.92822030E-01 0.83827053E-03
+ 0.64448881E+00 0.91642372E-01 0.83397818E-03
+ 0.64481020E+00 0.91925353E-01 0.83104370E-03
+ 0.64513159E+00 0.92568561E-01 0.83480706E-03
+ 0.64545298E+00 0.93140230E-01 0.83514897E-03
+ 0.64577430E+00 0.93871579E-01 0.84025861E-03
+ 0.64609569E+00 0.92578955E-01 0.82617078E-03
+ 0.64642602E+00 0.92253275E-01 0.83197787E-03
+ 0.64674741E+00 0.92033967E-01 0.82885748E-03
+ 0.64706880E+00 0.93646340E-01 0.84151723E-03
+ 0.64739013E+00 0.90728961E-01 0.82643004E-03
+ 0.64771152E+00 0.93167186E-01 0.82577713E-03
+ 0.64804184E+00 0.92305772E-01 0.83353504E-03
+ 0.64836323E+00 0.92588812E-01 0.83932601E-03
+ 0.64868462E+00 0.93274467E-01 0.83259720E-03
+ 0.64901489E+00 0.92049748E-01 0.83288568E-03
+ 0.64933628E+00 0.93382165E-01 0.84243942E-03
+ 0.64965767E+00 0.91869712E-01 0.81914023E-03
+ 0.64998794E+00 0.90941280E-01 0.82642736E-03
+ 0.65030932E+00 0.91535248E-01 0.82241796E-03
+ 0.65063965E+00 0.92566416E-01 0.84002683E-03
+ 0.65096104E+00 0.90225369E-01 0.81499130E-03
+ 0.65129131E+00 0.91918476E-01 0.83598221E-03
+ 0.65161270E+00 0.90993382E-01 0.81999687E-03
+ 0.65194303E+00 0.91266282E-01 0.83067850E-03
+ 0.65226442E+00 0.91188543E-01 0.82159141E-03
+ 0.65259469E+00 0.93010023E-01 0.84124046E-03
+ 0.65291607E+00 0.92129692E-01 0.82849176E-03
+ 0.65324640E+00 0.89553997E-01 0.82282093E-03
+ 0.65356773E+00 0.92452548E-01 0.82249119E-03
+ 0.65389806E+00 0.92052244E-01 0.83096587E-03
+ 0.65422839E+00 0.91892958E-01 0.83692884E-03
+ 0.65454978E+00 0.90597287E-01 0.81429066E-03
+ 0.65488005E+00 0.90431914E-01 0.81726367E-03
+ 0.65521038E+00 0.92017807E-01 0.83276827E-03
+ 0.65553176E+00 0.91137126E-01 0.82168169E-03
+ 0.65586203E+00 0.91043845E-01 0.82363671E-03
+ 0.65619236E+00 0.90974413E-01 0.83159894E-03
+ 0.65651375E+00 0.93309589E-01 0.82939240E-03
+ 0.65684402E+00 0.91878109E-01 0.82436472E-03
+ 0.65717435E+00 0.91589913E-01 0.82060148E-03
+ 0.65750462E+00 0.90800017E-01 0.82653633E-03
+ 0.65783495E+00 0.93016475E-01 0.83862466E-03
+ 0.65815634E+00 0.93118660E-01 0.82911440E-03
+ 0.65848666E+00 0.93366824E-01 0.83647668E-03
+ 0.65881693E+00 0.91940768E-01 0.82753116E-03
+ 0.65914726E+00 0.90954095E-01 0.82420011E-03
+ 0.65947753E+00 0.93673125E-01 0.83194062E-03
+ 0.65980786E+00 0.92068888E-01 0.83147181E-03
+ 0.66013819E+00 0.92926979E-01 0.82997879E-03
+ 0.66046846E+00 0.91768630E-01 0.82921394E-03
+ 0.66079879E+00 0.92855878E-01 0.83388685E-03
+ 0.66112906E+00 0.92906870E-01 0.83375280E-03
+ 0.66145939E+00 0.92448682E-01 0.82755036E-03
+ 0.66178972E+00 0.91605566E-01 0.82487857E-03
+ 0.66211998E+00 0.92524312E-01 0.83374744E-03
+ 0.66245031E+00 0.92956237E-01 0.83086250E-03
+ 0.66278058E+00 0.91798350E-01 0.82096533E-03
+ 0.66311091E+00 0.89751624E-01 0.82437752E-03
+ 0.66344124E+00 0.92416324E-01 0.82151813E-03
+ 0.66378045E+00 0.92855446E-01 0.83123083E-03
+ 0.66411078E+00 0.92004701E-01 0.83049317E-03
+ 0.66444105E+00 0.91853738E-01 0.82884985E-03
+ 0.66477138E+00 0.92916414E-01 0.83454454E-03
+ 0.66510165E+00 0.92215203E-01 0.82134589E-03
+ 0.66544092E+00 0.91182552E-01 0.82215649E-03
+ 0.66577119E+00 0.92284799E-01 0.83282770E-03
+ 0.66610152E+00 0.92241585E-01 0.82248769E-03
+ 0.66644073E+00 0.92529558E-01 0.83395274E-03
+ 0.66677105E+00 0.91185816E-01 0.83103933E-03
+ 0.66710138E+00 0.93424961E-01 0.82364568E-03
+ 0.66744059E+00 0.92500716E-01 0.82909374E-03
+ 0.66777092E+00 0.92396744E-01 0.83343731E-03
+ 0.66810119E+00 0.92536792E-01 0.82702399E-03
+ 0.66844046E+00 0.93100809E-01 0.83274441E-03
+ 0.66877073E+00 0.93697660E-01 0.82404079E-03
+ 0.66911000E+00 0.92884772E-01 0.83614892E-03
+ 0.66944027E+00 0.94048738E-01 0.83670655E-03
+ 0.66977954E+00 0.93197256E-01 0.83877298E-03
+ 0.67010981E+00 0.92760995E-01 0.82686514E-03
+ 0.67044908E+00 0.92212178E-01 0.83499617E-03
+ 0.67077935E+00 0.92260331E-01 0.82018762E-03
+ 0.67111862E+00 0.93244895E-01 0.83837030E-03
+ 0.67144889E+00 0.93407907E-01 0.82764222E-03
+ 0.67178816E+00 0.95092490E-01 0.83680643E-03
+ 0.67212737E+00 0.94013698E-01 0.84741059E-03
+ 0.67245770E+00 0.93440071E-01 0.83175401E-03
+ 0.67279691E+00 0.95107354E-01 0.83781709E-03
+ 0.67313612E+00 0.94009899E-01 0.84103114E-03
+ 0.67346644E+00 0.91448493E-01 0.82070165E-03
+ 0.67380565E+00 0.93440689E-01 0.83160016E-03
+ 0.67414492E+00 0.94094083E-01 0.83254202E-03
+ 0.67448413E+00 0.93619905E-01 0.84535085E-03
+ 0.67481446E+00 0.93482308E-01 0.83233748E-03
+ 0.67515367E+00 0.93632333E-01 0.83215971E-03
+ 0.67549294E+00 0.93910649E-01 0.83414651E-03
+ 0.67583215E+00 0.93522742E-01 0.83191285E-03
+ 0.67617136E+00 0.93904831E-01 0.83322055E-03
+ 0.67651063E+00 0.93235560E-01 0.83675893E-03
+ 0.67684090E+00 0.92678502E-01 0.82624366E-03
+ 0.67718017E+00 0.91788054E-01 0.82836521E-03
+ 0.67751938E+00 0.94783552E-01 0.83965098E-03
+ 0.67785859E+00 0.93898974E-01 0.83680433E-03
+ 0.67819786E+00 0.94785988E-01 0.84049476E-03
+ 0.67853707E+00 0.94061114E-01 0.83846040E-03
+ 0.67887634E+00 0.96367873E-01 0.84947777E-03
+ 0.67921555E+00 0.94844520E-01 0.84191980E-03
+ 0.67955476E+00 0.94405450E-01 0.84174820E-03
+ 0.67989403E+00 0.93857653E-01 0.83591713E-03
+ 0.68023324E+00 0.96026331E-01 0.84355159E-03
+ 0.68057245E+00 0.93446046E-01 0.82824443E-03
+ 0.68092066E+00 0.95602289E-01 0.84688171E-03
+ 0.68125987E+00 0.94462901E-01 0.83956047E-03
+ 0.68159908E+00 0.94074838E-01 0.83743106E-03
+ 0.68193835E+00 0.94131485E-01 0.83824852E-03
+ 0.68227756E+00 0.95774084E-01 0.85067173E-03
+ 0.68261683E+00 0.94349548E-01 0.82411268E-03
+ 0.68296498E+00 0.93299143E-01 0.83825330E-03
+ 0.68330419E+00 0.94353266E-01 0.83902152E-03
+ 0.68364340E+00 0.95848545E-01 0.84723247E-03
+ 0.68398267E+00 0.94846055E-01 0.83209481E-03
+ 0.68433082E+00 0.95516466E-01 0.84201421E-03
+ 0.68467003E+00 0.95497817E-01 0.84608269E-03
+ 0.68500930E+00 0.95592506E-01 0.83299435E-03
+ 0.68535745E+00 0.94214320E-01 0.84214075E-03
+ 0.68569666E+00 0.95159352E-01 0.83510659E-03
+ 0.68604481E+00 0.94346285E-01 0.84007031E-03
+ 0.68638408E+00 0.95192343E-01 0.83502120E-03
+ 0.68673223E+00 0.95430061E-01 0.84449252E-03
+ 0.68707144E+00 0.96156128E-01 0.85252727E-03
+ 0.68741071E+00 0.94723031E-01 0.83787949E-03
+ 0.68775886E+00 0.95717527E-01 0.84820925E-03
+ 0.68809807E+00 0.94463758E-01 0.83066156E-03
+ 0.68844622E+00 0.94468445E-01 0.83377492E-03
+ 0.68879443E+00 0.94365180E-01 0.84470201E-03
+ 0.68913364E+00 0.94592489E-01 0.83108147E-03
+ 0.68948179E+00 0.95140226E-01 0.84512477E-03
+ 0.68982106E+00 0.95807888E-01 0.83940447E-03
+ 0.69016922E+00 0.94366513E-01 0.83515415E-03
+ 0.69051737E+00 0.95402017E-01 0.84528892E-03
+ 0.69085658E+00 0.95136225E-01 0.83923904E-03
+ 0.69120473E+00 0.93338765E-01 0.83192269E-03
+ 0.69155294E+00 0.94468191E-01 0.84791321E-03
+ 0.69189215E+00 0.94384350E-01 0.83332864E-03
+ 0.69224030E+00 0.94105378E-01 0.83167612E-03
+ 0.69258845E+00 0.94170824E-01 0.83105621E-03
+ 0.69293660E+00 0.93317702E-01 0.82388934E-03
+ 0.69328481E+00 0.94691947E-01 0.84795587E-03
+ 0.69362402E+00 0.93350708E-01 0.83061488E-03
+ 0.69397217E+00 0.94759554E-01 0.83104242E-03
+ 0.69432032E+00 0.93278386E-01 0.83323393E-03
+ 0.69466847E+00 0.94371647E-01 0.83408679E-03
+ 0.69501668E+00 0.95768712E-01 0.84332220E-03
+ 0.69536483E+00 0.94789438E-01 0.83726476E-03
+ 0.69571298E+00 0.95071055E-01 0.83600351E-03
+ 0.69606113E+00 0.93503311E-01 0.83181733E-03
+ 0.69640929E+00 0.94022766E-01 0.83335361E-03
+ 0.69675744E+00 0.91722205E-01 0.82504976E-03
+ 0.69710565E+00 0.94277292E-01 0.83796732E-03
+ 0.69745380E+00 0.92788927E-01 0.82558504E-03
+ 0.69780195E+00 0.92933632E-01 0.83491014E-03
+ 0.69815010E+00 0.92421778E-01 0.82691322E-03
+ 0.69849825E+00 0.91825642E-01 0.82236412E-03
+ 0.69884640E+00 0.93424864E-01 0.82683738E-03
+ 0.69919455E+00 0.92038184E-01 0.81273506E-03
+ 0.69955164E+00 0.91073915E-01 0.82095101E-03
+ 0.69989985E+00 0.92931464E-01 0.82920486E-03
+ 0.70024800E+00 0.92941813E-01 0.82629651E-03
+ 0.70059615E+00 0.93037792E-01 0.82847971E-03
+ 0.70094430E+00 0.92008322E-01 0.81562833E-03
+ 0.70130140E+00 0.92419013E-01 0.82579453E-03
+ 0.70164955E+00 0.90358496E-01 0.81743824E-03
+ 0.70199770E+00 0.91375314E-01 0.81507681E-03
+ 0.70235479E+00 0.91932222E-01 0.82758401E-03
+ 0.70270294E+00 0.92043482E-01 0.82250673E-03
+ 0.70305109E+00 0.91347568E-01 0.81423472E-03
+ 0.70340818E+00 0.93120530E-01 0.83608466E-03
+ 0.70375639E+00 0.92082366E-01 0.82505459E-03
+ 0.70410454E+00 0.93602300E-01 0.81625819E-03
+ 0.70446163E+00 0.92073850E-01 0.83007826E-03
+ 0.70480978E+00 0.91622852E-01 0.81881229E-03
+ 0.70516688E+00 0.92316173E-01 0.82523946E-03
+ 0.70551503E+00 0.92325233E-01 0.81871450E-03
+ 0.70587212E+00 0.93481742E-01 0.83904737E-03
+ 0.70622027E+00 0.92277363E-01 0.82323240E-03
+ 0.70657736E+00 0.93780562E-01 0.83474838E-03
+ 0.70692551E+00 0.93434237E-01 0.82541694E-03
+ 0.70728260E+00 0.92841320E-01 0.82130538E-03
+ 0.70763969E+00 0.91524027E-01 0.83092105E-03
+ 0.70798784E+00 0.91691069E-01 0.81552635E-03
+ 0.70834494E+00 0.91033958E-01 0.81547431E-03
+ 0.70870203E+00 0.90709627E-01 0.82310964E-03
+ 0.70905018E+00 0.91570169E-01 0.82106586E-03
+ 0.70940727E+00 0.91688327E-01 0.82119321E-03
+ 0.70976436E+00 0.90906627E-01 0.81827177E-03
+ 0.71012145E+00 0.91968521E-01 0.82984770E-03
+ 0.71046960E+00 0.93852893E-01 0.82378788E-03
+ 0.71082669E+00 0.93150154E-01 0.82647981E-03
+ 0.71118379E+00 0.93236879E-01 0.82766340E-03
+ 0.71154088E+00 0.93332171E-01 0.82810788E-03
+ 0.71189797E+00 0.93352966E-01 0.83452003E-03
+ 0.71224612E+00 0.92334285E-01 0.82349946E-03
+ 0.71260321E+00 0.93068153E-01 0.82588964E-03
+ 0.71296030E+00 0.94442874E-01 0.82753395E-03
+ 0.71331739E+00 0.91099314E-01 0.81876910E-03
+ 0.71367449E+00 0.92654258E-01 0.82676602E-03
+ 0.71403158E+00 0.91503300E-01 0.82194107E-03
+ 0.71438861E+00 0.93044378E-01 0.82845078E-03
+ 0.71474570E+00 0.92742197E-01 0.82186511E-03
+ 0.71510279E+00 0.92184439E-01 0.82321325E-03
+ 0.71545988E+00 0.93175292E-01 0.82364626E-03
+ 0.71581697E+00 0.92878394E-01 0.82691741E-03
+ 0.71617407E+00 0.91686934E-01 0.81667630E-03
+ 0.71653116E+00 0.92663057E-01 0.81451144E-03
+ 0.71689719E+00 0.92789575E-01 0.82150690E-03
+ 0.71725428E+00 0.90981700E-01 0.82069403E-03
+ 0.71761137E+00 0.91747217E-01 0.82406087E-03
+ 0.71796846E+00 0.91752924E-01 0.82350807E-03
+ 0.71832550E+00 0.91369160E-01 0.80427720E-03
+ 0.71869153E+00 0.93047760E-01 0.82338613E-03
+ 0.71904862E+00 0.93254767E-01 0.82952756E-03
+ 0.71940571E+00 0.92017569E-01 0.82405104E-03
+ 0.71976280E+00 0.93500204E-01 0.82675024E-03
+ 0.72012883E+00 0.92655137E-01 0.82989683E-03
+ 0.72048593E+00 0.91784500E-01 0.82688883E-03
+ 0.72084302E+00 0.91957763E-01 0.81086805E-03
+ 0.72120899E+00 0.91201454E-01 0.82162302E-03
+ 0.72156608E+00 0.92380323E-01 0.82271860E-03
+ 0.72193211E+00 0.94080836E-01 0.83467894E-03
+ 0.72228920E+00 0.92051417E-01 0.82778110E-03
+ 0.72264630E+00 0.92467211E-01 0.81533653E-03
+ 0.72301227E+00 0.91655061E-01 0.82075706E-03
+ 0.72336936E+00 0.93447886E-01 0.82787883E-03
+ 0.72373539E+00 0.89976542E-01 0.82103192E-03
+ 0.72409248E+00 0.92925720E-01 0.81845152E-03
+ 0.72445852E+00 0.93326643E-01 0.82570291E-03
+ 0.72482449E+00 0.93755215E-01 0.83675393E-03
+ 0.72518158E+00 0.93543917E-01 0.82491711E-03
+ 0.72554761E+00 0.91127060E-01 0.82471734E-03
+ 0.72590470E+00 0.92076838E-01 0.82074373E-03
+ 0.72627074E+00 0.92949525E-01 0.82298258E-03
+ 0.72663671E+00 0.91608979E-01 0.82632125E-03
+ 0.72699380E+00 0.92941545E-01 0.82072872E-03
+ 0.72735983E+00 0.91512799E-01 0.81888726E-03
+ 0.72772586E+00 0.91832004E-01 0.81723346E-03
+ 0.72809184E+00 0.92621960E-01 0.82901289E-03
+ 0.72844893E+00 0.91385335E-01 0.81274821E-03
+ 0.72881496E+00 0.91856435E-01 0.82083745E-03
+ 0.72918099E+00 0.92120454E-01 0.82215859E-03
+ 0.72954696E+00 0.92251748E-01 0.82083070E-03
+ 0.72991300E+00 0.91172434E-01 0.81881601E-03
+ 0.73027903E+00 0.91213055E-01 0.81479899E-03
+ 0.73064506E+00 0.91402374E-01 0.81626524E-03
+ 0.73101103E+00 0.92960440E-01 0.83174981E-03
+ 0.73136812E+00 0.93383469E-01 0.82693738E-03
+ 0.73173416E+00 0.92207335E-01 0.81953319E-03
+ 0.73210019E+00 0.91840073E-01 0.82151941E-03
+ 0.73246616E+00 0.91586202E-01 0.82320307E-03
+ 0.73283219E+00 0.91951847E-01 0.81891636E-03
+ 0.73319823E+00 0.92786707E-01 0.81479462E-03
+ 0.73357314E+00 0.91652907E-01 0.82604476E-03
+ 0.73393917E+00 0.92211589E-01 0.82522276E-03
+ 0.73430520E+00 0.93642168E-01 0.83043490E-03
+ 0.73467118E+00 0.93152620E-01 0.82881062E-03
+ 0.73503721E+00 0.92115670E-01 0.82152669E-03
+ 0.73540324E+00 0.93941070E-01 0.83430723E-03
+ 0.73576921E+00 0.93117535E-01 0.81755919E-03
+ 0.73614419E+00 0.92984162E-01 0.82297414E-03
+ 0.73651022E+00 0.93501084E-01 0.83335390E-03
+ 0.73687619E+00 0.92266493E-01 0.82615227E-03
+ 0.73724222E+00 0.93485028E-01 0.82214724E-03
+ 0.73761714E+00 0.93588285E-01 0.83299913E-03
+ 0.73798317E+00 0.91811426E-01 0.82579115E-03
+ 0.73834920E+00 0.94696015E-01 0.82837744E-03
+ 0.73872411E+00 0.92730895E-01 0.82780607E-03
+ 0.73909014E+00 0.92773527E-01 0.82961476E-03
+ 0.73945618E+00 0.93106747E-01 0.82308246E-03
+ 0.73983109E+00 0.93239114E-01 0.83072094E-03
+ 0.74019712E+00 0.92653133E-01 0.82080683E-03
+ 0.74057204E+00 0.92706777E-01 0.83000102E-03
+ 0.74093807E+00 0.93569241E-01 0.82595315E-03
+ 0.74131304E+00 0.93721822E-01 0.83851867E-03
+ 0.74167901E+00 0.92414379E-01 0.82010950E-03
+ 0.74205399E+00 0.92651837E-01 0.83053549E-03
+ 0.74241996E+00 0.94450995E-01 0.82598120E-03
+ 0.74279493E+00 0.93989991E-01 0.83816866E-03
+ 0.74316096E+00 0.93989715E-01 0.82962867E-03
+ 0.74353588E+00 0.94200827E-01 0.82982937E-03
+ 0.74391085E+00 0.93359783E-01 0.83569222E-03
+ 0.74427682E+00 0.93049511E-01 0.82552823E-03
+ 0.74465179E+00 0.94877459E-01 0.82855625E-03
+ 0.74502671E+00 0.95245898E-01 0.83869393E-03
+ 0.74540168E+00 0.94194226E-01 0.83900453E-03
+ 0.74576765E+00 0.94648883E-01 0.83084189E-03
+ 0.74614263E+00 0.92408180E-01 0.81808871E-03
+ 0.74651754E+00 0.93426824E-01 0.82617073E-03
+ 0.74689251E+00 0.92054270E-01 0.82263665E-03
+ 0.74726743E+00 0.92655234E-01 0.83593995E-03
+ 0.74763346E+00 0.92009895E-01 0.81832061E-03
+ 0.74800837E+00 0.93137562E-01 0.82358753E-03
+ 0.74838334E+00 0.93720444E-01 0.83055347E-03
+ 0.74875826E+00 0.92717312E-01 0.82320534E-03
+ 0.74913323E+00 0.93986109E-01 0.83363056E-03
+ 0.74950814E+00 0.94224177E-01 0.83022413E-03
+ 0.74988312E+00 0.92786923E-01 0.82640490E-03
+ 0.75025803E+00 0.94057687E-01 0.83048223E-03
+ 0.75063300E+00 0.93179919E-01 0.82615373E-03
+ 0.75100791E+00 0.91902569E-01 0.82420162E-03
+ 0.75138289E+00 0.92802063E-01 0.82836149E-03
+ 0.75175780E+00 0.94230697E-01 0.83167630E-03
+ 0.75213277E+00 0.94285235E-01 0.82909362E-03
+ 0.75250769E+00 0.94128981E-01 0.82738663E-03
+ 0.75289154E+00 0.93842015E-01 0.83142077E-03
+ 0.75326651E+00 0.93158998E-01 0.83106296E-03
+ 0.75364143E+00 0.94143741E-01 0.83564012E-03
+ 0.75401640E+00 0.92719711E-01 0.82707667E-03
+ 0.75439131E+00 0.93981199E-01 0.81810961E-03
+ 0.75477523E+00 0.93139052E-01 0.83059527E-03
+ 0.75515014E+00 0.93111999E-01 0.83298329E-03
+ 0.75552505E+00 0.96373074E-01 0.84152742E-03
+ 0.75590003E+00 0.93556270E-01 0.82271663E-03
+ 0.75628388E+00 0.93343943E-01 0.83643204E-03
+ 0.75665885E+00 0.93965225E-01 0.82380627E-03
+ 0.75704271E+00 0.93058661E-01 0.83148055E-03
+ 0.75741762E+00 0.93599029E-01 0.83435426E-03
+ 0.75779259E+00 0.93200706E-01 0.81915874E-03
+ 0.75817645E+00 0.92512794E-01 0.83177362E-03
+ 0.75855142E+00 0.94621636E-01 0.82889240E-03
+ 0.75893527E+00 0.93824521E-01 0.83566556E-03
+ 0.75931019E+00 0.92410654E-01 0.82388992E-03
+ 0.75969410E+00 0.93139827E-01 0.83118584E-03
+ 0.76006901E+00 0.93196124E-01 0.81964291E-03
+ 0.76045287E+00 0.92129536E-01 0.82729844E-03
+ 0.76082784E+00 0.93505405E-01 0.82963455E-03
+ 0.76121169E+00 0.92400149E-01 0.81717450E-03
+ 0.76159555E+00 0.92027664E-01 0.82570023E-03
+ 0.76197052E+00 0.93023114E-01 0.82899514E-03
+ 0.76235437E+00 0.95042475E-01 0.83006703E-03
+ 0.76273823E+00 0.93020149E-01 0.83164807E-03
+ 0.76311320E+00 0.93111180E-01 0.82465849E-03
+ 0.76349705E+00 0.93615375E-01 0.82733401E-03
+ 0.76388091E+00 0.92789494E-01 0.82293514E-03
+ 0.76426476E+00 0.92760436E-01 0.82287536E-03
+ 0.76464868E+00 0.94273560E-01 0.84180926E-03
+ 0.76502359E+00 0.93727253E-01 0.82863017E-03
+ 0.76540744E+00 0.93860961E-01 0.82691078E-03
+ 0.76579136E+00 0.93457364E-01 0.82765112E-03
+ 0.76617521E+00 0.91619693E-01 0.82109286E-03
+ 0.76655906E+00 0.93512930E-01 0.83490566E-03
+ 0.76694292E+00 0.94411224E-01 0.83408493E-03
+ 0.76732683E+00 0.94496757E-01 0.83332160E-03
+ 0.76771069E+00 0.94098181E-01 0.83151186E-03
+ 0.76809454E+00 0.93930945E-01 0.83750801E-03
+ 0.76847839E+00 0.94635926E-01 0.83194050E-03
+ 0.76886231E+00 0.94858743E-01 0.84054930E-03
+ 0.76924616E+00 0.91882721E-01 0.82559063E-03
+ 0.76963001E+00 0.92677988E-01 0.82916958E-03
+ 0.77001387E+00 0.93335770E-01 0.82610571E-03
+ 0.77039778E+00 0.94530515E-01 0.83980843E-03
+ 0.77078164E+00 0.94471045E-01 0.82604447E-03
+ 0.77117443E+00 0.94991826E-01 0.83511689E-03
+ 0.77155828E+00 0.95629185E-01 0.84606849E-03
+ 0.77194214E+00 0.95927142E-01 0.84403064E-03
+ 0.77232605E+00 0.95667578E-01 0.84352511E-03
+ 0.77270991E+00 0.95295250E-01 0.83305023E-03
+ 0.77310270E+00 0.94964899E-01 0.84415521E-03
+ 0.77348655E+00 0.96326508E-01 0.84497390E-03
+ 0.77387041E+00 0.94397321E-01 0.82340633E-03
+ 0.77426320E+00 0.94700702E-01 0.83608733E-03
+ 0.77464712E+00 0.96885361E-01 0.84638386E-03
+ 0.77503097E+00 0.94709687E-01 0.83681737E-03
+ 0.77542377E+00 0.95664985E-01 0.84192853E-03
+ 0.77580762E+00 0.95716067E-01 0.83451712E-03
+ 0.77620041E+00 0.94330736E-01 0.83960796E-03
+ 0.77658433E+00 0.95808558E-01 0.83728303E-03
+ 0.77697712E+00 0.94402589E-01 0.84032340E-03
+ 0.77736098E+00 0.95298275E-01 0.83462661E-03
+ 0.77775377E+00 0.94278909E-01 0.84363582E-03
+ 0.77813762E+00 0.94155632E-01 0.82545297E-03
+ 0.77853042E+00 0.95136717E-01 0.83659351E-03
+ 0.77892321E+00 0.95482528E-01 0.84730017E-03
+ 0.77930707E+00 0.95630832E-01 0.83880499E-03
+ 0.77969986E+00 0.94682321E-01 0.84451935E-03
+ 0.78008378E+00 0.95291607E-01 0.83593803E-03
+ 0.78047657E+00 0.94980843E-01 0.83444279E-03
+ 0.78086936E+00 0.95327131E-01 0.83115278E-03
+ 0.78126216E+00 0.94795056E-01 0.83644141E-03
+ 0.78164601E+00 0.93820833E-01 0.82566106E-03
+ 0.78203881E+00 0.93944281E-01 0.82694931E-03
+ 0.78243160E+00 0.93875967E-01 0.82755648E-03
+ 0.78282440E+00 0.92868298E-01 0.82257623E-03
+ 0.78321719E+00 0.93110040E-01 0.83025475E-03
+ 0.78360105E+00 0.94378218E-01 0.83293283E-03
+ 0.78399384E+00 0.93649156E-01 0.83075505E-03
+ 0.78438663E+00 0.93942709E-01 0.82719437E-03
+ 0.78477943E+00 0.92888296E-01 0.82462427E-03
+ 0.78517222E+00 0.95154367E-01 0.83046657E-03
+ 0.78556502E+00 0.92375390E-01 0.82747341E-03
+ 0.78595781E+00 0.94650589E-01 0.83625602E-03
+ 0.78635061E+00 0.94591491E-01 0.83553325E-03
+ 0.78674340E+00 0.92469506E-01 0.83004707E-03
+ 0.78713620E+00 0.95356703E-01 0.83957607E-03
+ 0.78752899E+00 0.93948215E-01 0.82920509E-03
+ 0.78792185E+00 0.94032526E-01 0.82415517E-03
+ 0.78832352E+00 0.94261780E-01 0.83639391E-03
+ 0.78871632E+00 0.94994716E-01 0.83552493E-03
+ 0.78910911E+00 0.93719997E-01 0.82808529E-03
+ 0.78950191E+00 0.95505930E-01 0.83784200E-03
+ 0.78989470E+00 0.93396910E-01 0.82481990E-03
+ 0.79029644E+00 0.94166934E-01 0.83377131E-03
+ 0.79068923E+00 0.92101917E-01 0.82760659E-03
+ 0.79108202E+00 0.94839312E-01 0.83524454E-03
+ 0.79147482E+00 0.94119504E-01 0.82578690E-03
+ 0.79187655E+00 0.94778284E-01 0.84193127E-03
+ 0.79226935E+00 0.94917275E-01 0.82956837E-03
+ 0.79267108E+00 0.93932003E-01 0.83424628E-03
+ 0.79306388E+00 0.93461432E-01 0.83094934E-03
+ 0.79345667E+00 0.93123220E-01 0.82083035E-03
+ 0.79385841E+00 0.95572963E-01 0.83941862E-03
+ 0.79425120E+00 0.94667286E-01 0.83407568E-03
+ 0.79465294E+00 0.94795361E-01 0.84277330E-03
+ 0.79504573E+00 0.94187237E-01 0.82875160E-03
+ 0.79544741E+00 0.94244912E-01 0.83890260E-03
+ 0.79584020E+00 0.94603695E-01 0.83047024E-03
+ 0.79624194E+00 0.93849316E-01 0.83059812E-03
+ 0.79663473E+00 0.93029462E-01 0.81767066E-03
+ 0.79703647E+00 0.92795767E-01 0.82036573E-03
+ 0.79743820E+00 0.94514824E-01 0.84333098E-03
+ 0.79783100E+00 0.94045676E-01 0.82709460E-03
+ 0.79823273E+00 0.94604433E-01 0.83408208E-03
+ 0.79863441E+00 0.91594614E-01 0.81602548E-03
+ 0.79903615E+00 0.93454070E-01 0.83438837E-03
+ 0.79942894E+00 0.93758516E-01 0.82333927E-03
+ 0.79983068E+00 0.94262302E-01 0.83140295E-03
+ 0.80023241E+00 0.93001164E-01 0.82449400E-03
+ 0.80063415E+00 0.94997711E-01 0.84490841E-03
+ 0.80102694E+00 0.93461931E-01 0.82766247E-03
+ 0.80142862E+00 0.94014697E-01 0.83241018E-03
+ 0.80183035E+00 0.94159849E-01 0.82642003E-03
+ 0.80223209E+00 0.94153218E-01 0.82934886E-03
+ 0.80263382E+00 0.93930140E-01 0.82786975E-03
+ 0.80303556E+00 0.93079440E-01 0.82603324E-03
+ 0.80343723E+00 0.94430625E-01 0.82971511E-03
+ 0.80383897E+00 0.93519382E-01 0.83220471E-03
+ 0.80424070E+00 0.92863992E-01 0.82467851E-03
+ 0.80464244E+00 0.93618914E-01 0.83071366E-03
+ 0.80504417E+00 0.95240347E-01 0.83943072E-03
+ 0.80544585E+00 0.93795739E-01 0.83581742E-03
+ 0.80584759E+00 0.93276463E-01 0.82546374E-03
+ 0.80624932E+00 0.95410369E-01 0.83082722E-03
+ 0.80666000E+00 0.94957098E-01 0.83379977E-03
+ 0.80706167E+00 0.94673060E-01 0.83077879E-03
+ 0.80746341E+00 0.95521845E-01 0.84288913E-03
+ 0.80786514E+00 0.94634041E-01 0.82877756E-03
+ 0.80827576E+00 0.96538708E-01 0.84388122E-03
+ 0.80867749E+00 0.95322169E-01 0.84326207E-03
+ 0.80907923E+00 0.95876113E-01 0.84385951E-03
+ 0.80948097E+00 0.95116347E-01 0.82824234E-03
+ 0.80989158E+00 0.95312469E-01 0.84375258E-03
+ 0.81029332E+00 0.95341809E-01 0.83661306E-03
+ 0.81069505E+00 0.95777348E-01 0.83806098E-03
+ 0.81110573E+00 0.96451871E-01 0.85308129E-03
+ 0.81150740E+00 0.95362067E-01 0.83056133E-03
+ 0.81191808E+00 0.94266877E-01 0.82919438E-03
+ 0.81231982E+00 0.93734980E-01 0.82621933E-03
+ 0.81273043E+00 0.95164254E-01 0.84098696E-03
+ 0.81313217E+00 0.95682427E-01 0.83356170E-03
+ 0.81354284E+00 0.95317967E-01 0.84445241E-03
+ 0.81394452E+00 0.97255081E-01 0.84202387E-03
+ 0.81435519E+00 0.96173212E-01 0.83825423E-03
+ 0.81476587E+00 0.96268944E-01 0.84407034E-03
+ 0.81516755E+00 0.97712286E-01 0.84492407E-03
+ 0.81557822E+00 0.95119759E-01 0.83607924E-03
+ 0.81598890E+00 0.95470592E-01 0.84555714E-03
+ 0.81639057E+00 0.96833982E-01 0.84131764E-03
+ 0.81680125E+00 0.94508931E-01 0.83311606E-03
+ 0.81721187E+00 0.96386358E-01 0.84963581E-03
+ 0.81761360E+00 0.95614418E-01 0.83629374E-03
+ 0.81802428E+00 0.96411325E-01 0.83858246E-03
+ 0.81843489E+00 0.96288227E-01 0.84007182E-03
+ 0.81884557E+00 0.95883951E-01 0.84794930E-03
+ 0.81925625E+00 0.96926324E-01 0.84390154E-03
+ 0.81966686E+00 0.96601382E-01 0.83858892E-03
+ 0.82007754E+00 0.95466897E-01 0.84845722E-03
+ 0.82047921E+00 0.95672220E-01 0.83952420E-03
+ 0.82088989E+00 0.95759273E-01 0.83498331E-03
+ 0.82130057E+00 0.94069190E-01 0.83564728E-03
+ 0.82171118E+00 0.96987642E-01 0.84434531E-03
+ 0.82212186E+00 0.95448323E-01 0.83744439E-03
+ 0.82253247E+00 0.95568612E-01 0.83074404E-03
+ 0.82295209E+00 0.95571361E-01 0.84264536E-03
+ 0.82336271E+00 0.95214464E-01 0.83425589E-03
+ 0.82377338E+00 0.95363334E-01 0.83677558E-03
+ 0.82418400E+00 0.94411165E-01 0.83507691E-03
+ 0.82459468E+00 0.95600210E-01 0.83924172E-03
+ 0.82500529E+00 0.94848827E-01 0.83763798E-03
+ 0.82541597E+00 0.93081355E-01 0.81854232E-03
+ 0.82583553E+00 0.94830103E-01 0.83796738E-03
+ 0.82624620E+00 0.93859226E-01 0.83252852E-03
+ 0.82665688E+00 0.94128720E-01 0.82661147E-03
+ 0.82707644E+00 0.93780808E-01 0.83209242E-03
+ 0.82748705E+00 0.97203620E-01 0.84777240E-03
+ 0.82789773E+00 0.94269462E-01 0.82201208E-03
+ 0.82831728E+00 0.94719946E-01 0.83490263E-03
+ 0.82872796E+00 0.94382018E-01 0.83660911E-03
+ 0.82913858E+00 0.94539553E-01 0.82772766E-03
+ 0.82955819E+00 0.95819220E-01 0.84554200E-03
+ 0.82996881E+00 0.95398970E-01 0.82761212E-03
+ 0.83038843E+00 0.94920836E-01 0.84077276E-03
+ 0.83079904E+00 0.93456134E-01 0.82074897E-03
+ 0.83121866E+00 0.95537394E-01 0.84078690E-03
+ 0.83162928E+00 0.95999897E-01 0.83095359E-03
+ 0.83204889E+00 0.93226984E-01 0.83010516E-03
+ 0.83246845E+00 0.95715471E-01 0.84616896E-03
+ 0.83287907E+00 0.95695660E-01 0.83190005E-03
+ 0.83329868E+00 0.97118944E-01 0.85811713E-03
+ 0.83370930E+00 0.95773488E-01 0.83466654E-03
+ 0.83412892E+00 0.95959768E-01 0.83111227E-03
+ 0.83454847E+00 0.96920632E-01 0.84297388E-03
+ 0.83496803E+00 0.95159613E-01 0.84473891E-03
+ 0.83537871E+00 0.97363114E-01 0.84299420E-03
+ 0.83579826E+00 0.95494226E-01 0.83996827E-03
+ 0.83621788E+00 0.96593194E-01 0.83715725E-03
+ 0.83663744E+00 0.94450913E-01 0.83483139E-03
+ 0.83705699E+00 0.94550274E-01 0.83181658E-03
+ 0.83747661E+00 0.96041821E-01 0.84830227E-03
+ 0.83788723E+00 0.95823601E-01 0.83856727E-03
+ 0.83830684E+00 0.96017323E-01 0.83406433E-03
+ 0.83872640E+00 0.93609914E-01 0.82918670E-03
+ 0.83914596E+00 0.93664072E-01 0.82404824E-03
+ 0.83956558E+00 0.92987888E-01 0.82957232E-03
+ 0.83998513E+00 0.91948651E-01 0.81579800E-03
+ 0.84040469E+00 0.92680536E-01 0.82601933E-03
+ 0.84082431E+00 0.92081361E-01 0.81156055E-03
+ 0.84125280E+00 0.93905665E-01 0.82459417E-03
+ 0.84167236E+00 0.93583561E-01 0.82745304E-03
+ 0.84209192E+00 0.95815167E-01 0.83827408E-03
+ 0.84251153E+00 0.93100905E-01 0.82680391E-03
+ 0.84293109E+00 0.93733467E-01 0.82218600E-03
+ 0.84335065E+00 0.92753328E-01 0.81656291E-03
+ 0.84377921E+00 0.93189724E-01 0.82896574E-03
+ 0.84419876E+00 0.93751363E-01 0.82901545E-03
+ 0.84461832E+00 0.91603301E-01 0.82576351E-03
+ 0.84503794E+00 0.94348460E-01 0.82148303E-03
+ 0.84546643E+00 0.93667671E-01 0.83180994E-03
+ 0.84588599E+00 0.93169764E-01 0.81970164E-03
+ 0.84631449E+00 0.94515420E-01 0.83250797E-03
+ 0.84673411E+00 0.92657499E-01 0.82438631E-03
+ 0.84715366E+00 0.94105296E-01 0.81931433E-03
+ 0.84758216E+00 0.93411505E-01 0.83126011E-03
+ 0.84800172E+00 0.94066679E-01 0.82607911E-03
+ 0.84843022E+00 0.95212303E-01 0.83669921E-03
+ 0.84884983E+00 0.93820952E-01 0.82402211E-03
+ 0.84927833E+00 0.93996435E-01 0.83391799E-03
+ 0.84969789E+00 0.95544048E-01 0.82929828E-03
+ 0.85012639E+00 0.94559424E-01 0.82867005E-03
+ 0.85055488E+00 0.95596023E-01 0.84452203E-03
+ 0.85097450E+00 0.94050422E-01 0.82933094E-03
+ 0.85140300E+00 0.93844652E-01 0.81690942E-03
+ 0.85183150E+00 0.94585724E-01 0.84066053E-03
+ 0.85225105E+00 0.94628073E-01 0.82593068E-03
+ 0.85267955E+00 0.96347496E-01 0.83755021E-03
+ 0.85310811E+00 0.94556957E-01 0.83212147E-03
+ 0.85353661E+00 0.95344208E-01 0.83757023E-03
+ 0.85395616E+00 0.94481073E-01 0.82949566E-03
+ 0.85438466E+00 0.95832989E-01 0.83374366E-03
+ 0.85481316E+00 0.94437912E-01 0.82703721E-03
+ 0.85524166E+00 0.95341362E-01 0.83052408E-03
+ 0.85567021E+00 0.93615882E-01 0.82872104E-03
+ 0.85609871E+00 0.94702907E-01 0.82909246E-03
+ 0.85652721E+00 0.94894990E-01 0.83557918E-03
+ 0.85695571E+00 0.95170386E-01 0.83354977E-03
+ 0.85738420E+00 0.95625080E-01 0.83903637E-03
+ 0.85781270E+00 0.95721558E-01 0.83266216E-03
+ 0.85824120E+00 0.95603555E-01 0.83766133E-03
+ 0.85866970E+00 0.95554039E-01 0.83579542E-03
+ 0.85909820E+00 0.95496766E-01 0.83710061E-03
+ 0.85952675E+00 0.95306411E-01 0.84378483E-03
+ 0.85995525E+00 0.96251428E-01 0.83871500E-03
+ 0.86038375E+00 0.94697207E-01 0.82286750E-03
+ 0.86082119E+00 0.95649548E-01 0.83948992E-03
+ 0.86124969E+00 0.95351078E-01 0.83589752E-03
+ 0.86167818E+00 0.96133925E-01 0.84106450E-03
+ 0.86210668E+00 0.95639840E-01 0.82546810E-03
+ 0.86254412E+00 0.96444458E-01 0.84011629E-03
+ 0.86297262E+00 0.95581844E-01 0.83738804E-03
+ 0.86340111E+00 0.96554376E-01 0.83732005E-03
+ 0.86383855E+00 0.97408831E-01 0.84921654E-03
+ 0.86426705E+00 0.96248813E-01 0.84052514E-03
+ 0.86469555E+00 0.95518969E-01 0.83070638E-03
+ 0.86513299E+00 0.96150227E-01 0.84708870E-03
+ 0.86556149E+00 0.97440310E-01 0.84082969E-03
+ 0.86599892E+00 0.96631184E-01 0.84685482E-03
+ 0.86642742E+00 0.98214537E-01 0.84309047E-03
+ 0.86686486E+00 0.96919537E-01 0.84638735E-03
+ 0.86729336E+00 0.97470924E-01 0.83963311E-03
+ 0.86773080E+00 0.95352836E-01 0.83932874E-03
+ 0.86815929E+00 0.97938985E-01 0.84455794E-03
+ 0.86859673E+00 0.95753238E-01 0.83586120E-03
+ 0.86903417E+00 0.96782565E-01 0.84696966E-03
+ 0.86946267E+00 0.95810458E-01 0.83197979E-03
+ 0.86990011E+00 0.97622089E-01 0.84096269E-03
+ 0.87033755E+00 0.96661903E-01 0.83123840E-03
+ 0.87077498E+00 0.94862796E-01 0.83981041E-03
+ 0.87120348E+00 0.96748807E-01 0.83593262E-03
+ 0.87164092E+00 0.95397986E-01 0.82927814E-03
+ 0.87207836E+00 0.96732415E-01 0.84322639E-03
+ 0.87251580E+00 0.95679566E-01 0.83193672E-03
+ 0.87295318E+00 0.95219053E-01 0.83833031E-03
+ 0.87339061E+00 0.96058421E-01 0.84662868E-03
+ 0.87381911E+00 0.96660167E-01 0.83578756E-03
+ 0.87425655E+00 0.97865537E-01 0.84356347E-03
+ 0.87469399E+00 0.95695682E-01 0.83763589E-03
+ 0.87513143E+00 0.97172976E-01 0.84458123E-03
+ 0.87556887E+00 0.96355103E-01 0.83735213E-03
+ 0.87600631E+00 0.97232841E-01 0.84626884E-03
+ 0.87644374E+00 0.98689653E-01 0.83759119E-03
+ 0.87689006E+00 0.96416689E-01 0.83702110E-03
+ 0.87732750E+00 0.96825711E-01 0.83762949E-03
+ 0.87776494E+00 0.97173929E-01 0.84342418E-03
+ 0.87820238E+00 0.97178258E-01 0.85149024E-03
+ 0.87863982E+00 0.96579067E-01 0.83475414E-03
+ 0.87907726E+00 0.98064810E-01 0.83859853E-03
+ 0.87952363E+00 0.96565463E-01 0.83966093E-03
+ 0.87996101E+00 0.97467273E-01 0.84567082E-03
+ 0.88039845E+00 0.96370287E-01 0.84135652E-03
+ 0.88083589E+00 0.97477198E-01 0.83828124E-03
+ 0.88128227E+00 0.98229066E-01 0.84678933E-03
+ 0.88171971E+00 0.96586287E-01 0.83802443E-03
+ 0.88216603E+00 0.99206068E-01 0.85984770E-03
+ 0.88260347E+00 0.98876804E-01 0.85497525E-03
+ 0.88304090E+00 0.97412162E-01 0.83758036E-03
+ 0.88348728E+00 0.97678341E-01 0.84645464E-03
+ 0.88392472E+00 0.98128624E-01 0.84176124E-03
+ 0.88437104E+00 0.99955067E-01 0.86180656E-03
+ 0.88480848E+00 0.96658133E-01 0.83961646E-03
+ 0.88525486E+00 0.98205537E-01 0.84315380E-03
+ 0.88570124E+00 0.97960442E-01 0.85169839E-03
+ 0.88613868E+00 0.99455811E-01 0.85189345E-03
+ 0.88658500E+00 0.98288596E-01 0.84838597E-03
+ 0.88702244E+00 0.98470710E-01 0.84212929E-03
+ 0.88746881E+00 0.10101839E+00 0.85851958E-03
+ 0.88791513E+00 0.99856898E-01 0.85056067E-03
+ 0.88836151E+00 0.98575875E-01 0.85859257E-03
+ 0.88879895E+00 0.98729111E-01 0.84806210E-03
+ 0.88924533E+00 0.97182482E-01 0.84175303E-03
+ 0.88969165E+00 0.99461667E-01 0.85162994E-03
+ 0.89013803E+00 0.98881088E-01 0.84772607E-03
+ 0.89058441E+00 0.98708317E-01 0.85550058E-03
+ 0.89102179E+00 0.99155687E-01 0.85261458E-03
+ 0.89146817E+00 0.97246066E-01 0.84233331E-03
+ 0.89191455E+00 0.98760009E-01 0.84768049E-03
+ 0.89236087E+00 0.98981999E-01 0.84896036E-03
+ 0.89280725E+00 0.98829553E-01 0.84959017E-03
+ 0.89325362E+00 0.97663328E-01 0.84552099E-03
+ 0.89369994E+00 0.98370068E-01 0.84863958E-03
+ 0.89414632E+00 0.98896548E-01 0.85567340E-03
+ 0.89459270E+00 0.99969111E-01 0.85327093E-03
+ 0.89503902E+00 0.98839000E-01 0.84104127E-03
+ 0.89549434E+00 0.98948076E-01 0.85193024E-03
+ 0.89594072E+00 0.99082872E-01 0.84954279E-03
+ 0.89638704E+00 0.10070639E+00 0.85559068E-03
+ 0.89683342E+00 0.97643435E-01 0.84698125E-03
+ 0.89727980E+00 0.98141141E-01 0.84271800E-03
+ 0.89773506E+00 0.10035855E+00 0.85939781E-03
+ 0.89818144E+00 0.99212475E-01 0.85181027E-03
+ 0.89862776E+00 0.10012275E+00 0.84779039E-03
+ 0.89908308E+00 0.99472247E-01 0.85433107E-03
+ 0.89952940E+00 0.99967979E-01 0.85794815E-03
+ 0.89997578E+00 0.98736830E-01 0.84633013E-03
+ 0.90043104E+00 0.10086311E+00 0.86244347E-03
+ 0.90087742E+00 0.10040314E+00 0.85293938E-03
+ 0.90133274E+00 0.99523306E-01 0.85953955E-03
+ 0.90177906E+00 0.10002143E+00 0.84746355E-03
+ 0.90223438E+00 0.99864684E-01 0.85868710E-03
+ 0.90268070E+00 0.98758839E-01 0.84807636E-03
+ 0.90313601E+00 0.99625513E-01 0.85941952E-03
+ 0.90358233E+00 0.99821799E-01 0.84717257E-03
+ 0.90403765E+00 0.10140840E+00 0.86507213E-03
+ 0.90448397E+00 0.98684259E-01 0.84740267E-03
+ 0.90493929E+00 0.10128961E+00 0.86031621E-03
+ 0.90539455E+00 0.10043153E+00 0.85111527E-03
+ 0.90584987E+00 0.10060553E+00 0.86167181E-03
+ 0.90629619E+00 0.10193093E+00 0.85986382E-03
+ 0.90675151E+00 0.10033040E+00 0.85722271E-03
+ 0.90720677E+00 0.10222188E+00 0.86004223E-03
+ 0.90766209E+00 0.10167480E+00 0.86763536E-03
+ 0.90810841E+00 0.10222087E+00 0.86312031E-03
+ 0.90856373E+00 0.10046865E+00 0.85304002E-03
+ 0.90901899E+00 0.10123918E+00 0.85887744E-03
+ 0.90947431E+00 0.10205896E+00 0.86764822E-03
+ 0.90992957E+00 0.10192288E+00 0.86415804E-03
+ 0.91038489E+00 0.99737301E-01 0.84957446E-03
+ 0.91084015E+00 0.10228645E+00 0.86599338E-03
+ 0.91129541E+00 0.10058893E+00 0.85379963E-03
+ 0.91175073E+00 0.10252946E+00 0.86989056E-03
+ 0.91220599E+00 0.10231429E+00 0.86917751E-03
+ 0.91266131E+00 0.10230052E+00 0.86977688E-03
+ 0.91311657E+00 0.10177157E+00 0.86380646E-03
+ 0.91357189E+00 0.10192735E+00 0.85962255E-03
+ 0.91403610E+00 0.10161958E+00 0.86498505E-03
+ 0.91449136E+00 0.10196834E+00 0.86276617E-03
+ 0.91494668E+00 0.10224456E+00 0.86693052E-03
+ 0.91540194E+00 0.10298657E+00 0.85826439E-03
+ 0.91586614E+00 0.10303411E+00 0.86875237E-03
+ 0.91632146E+00 0.10338183E+00 0.87130995E-03
+ 0.91677672E+00 0.10181127E+00 0.85899251E-03
+ 0.91724092E+00 0.10143100E+00 0.86614239E-03
+ 0.91769624E+00 0.10111318E+00 0.86223340E-03
+ 0.91815150E+00 0.10279805E+00 0.85848034E-03
+ 0.91861576E+00 0.10348479E+00 0.87019551E-03
+ 0.91907102E+00 0.10374165E+00 0.86961139E-03
+ 0.91953522E+00 0.10295379E+00 0.87480305E-03
+ 0.91999054E+00 0.10256638E+00 0.86088979E-03
+ 0.92045474E+00 0.10386964E+00 0.87433268E-03
+ 0.92091000E+00 0.10088836E+00 0.85191609E-03
+ 0.92137420E+00 0.10380411E+00 0.87954826E-03
+ 0.92182952E+00 0.10435509E+00 0.87185012E-03
+ 0.92229372E+00 0.10253964E+00 0.86322858E-03
+ 0.92275792E+00 0.10347407E+00 0.87501400E-03
+ 0.92321324E+00 0.10266451E+00 0.85967226E-03
+ 0.92367744E+00 0.10351339E+00 0.86891069E-03
+ 0.92414165E+00 0.10379301E+00 0.87330618E-03
+ 0.92460585E+00 0.10437822E+00 0.88202039E-03
+ 0.92506117E+00 0.10184585E+00 0.86192705E-03
+ 0.92552537E+00 0.10167369E+00 0.85923378E-03
+ 0.92598957E+00 0.10163183E+00 0.85445604E-03
+ 0.92645377E+00 0.10105984E+00 0.85077243E-03
+ 0.92691803E+00 0.99957116E-01 0.84959477E-03
+ 0.92738223E+00 0.98905273E-01 0.84265450E-03
+ 0.92784643E+00 0.99580713E-01 0.84749085E-03
+ 0.92831063E+00 0.99820279E-01 0.84819668E-03
+ 0.92877483E+00 0.98925762E-01 0.84442215E-03
+ 0.92923909E+00 0.98276176E-01 0.84314618E-03
+ 0.92970330E+00 0.99547774E-01 0.84453501E-03
+ 0.93016750E+00 0.98620601E-01 0.84354443E-03
+ 0.93063170E+00 0.99482618E-01 0.85521396E-03
+ 0.93109590E+00 0.98919272E-01 0.84447599E-03
+ 0.93156016E+00 0.98397076E-01 0.84082939E-03
+ 0.93202436E+00 0.99872433E-01 0.83832711E-03
+ 0.93249750E+00 0.98676555E-01 0.84559788E-03
+ 0.93296170E+00 0.97644873E-01 0.84197533E-03
+ 0.93342590E+00 0.99597380E-01 0.85099041E-03
+ 0.93389010E+00 0.98223969E-01 0.83363295E-03
+ 0.93436325E+00 0.99355698E-01 0.84455847E-03
+ 0.93482751E+00 0.99924162E-01 0.84963854E-03
+ 0.93529171E+00 0.99281326E-01 0.83817454E-03
+ 0.93576485E+00 0.99682614E-01 0.84888685E-03
+ 0.93622905E+00 0.10048964E+00 0.85386820E-03
+ 0.93669325E+00 0.98874189E-01 0.83986996E-03
+ 0.93716639E+00 0.99658065E-01 0.85320312E-03
+ 0.93763059E+00 0.10132000E+00 0.84468932E-03
+ 0.93810374E+00 0.98667026E-01 0.83936972E-03
+ 0.93857688E+00 0.10081523E+00 0.85553923E-03
+ 0.93904114E+00 0.99515103E-01 0.84027211E-03
+ 0.93951428E+00 0.10040913E+00 0.85144828E-03
+ 0.93997848E+00 0.10069887E+00 0.84879540E-03
+ 0.94045162E+00 0.10036451E+00 0.85024186E-03
+ 0.94092476E+00 0.99895820E-01 0.85143291E-03
+ 0.94138896E+00 0.99742621E-01 0.84167713E-03
+ 0.94186211E+00 0.98764092E-01 0.83964260E-03
+ 0.94233525E+00 0.99520765E-01 0.85085136E-03
+ 0.94280839E+00 0.10197179E+00 0.86020853E-03
+ 0.94327259E+00 0.10100606E+00 0.84949395E-03
+ 0.94374573E+00 0.10001209E+00 0.84777788E-03
+ 0.94421887E+00 0.10007551E+00 0.84897951E-03
+ 0.94469202E+00 0.10087028E+00 0.84902690E-03
+ 0.94516516E+00 0.10160895E+00 0.85503480E-03
+ 0.94563830E+00 0.10023039E+00 0.85257145E-03
+ 0.94611144E+00 0.10025921E+00 0.84639661E-03
+ 0.94658458E+00 0.10263968E+00 0.85856667E-03
+ 0.94705772E+00 0.10088149E+00 0.84979140E-03
+ 0.94753087E+00 0.10047033E+00 0.85199240E-03
+ 0.94800401E+00 0.10168531E+00 0.85387856E-03
+ 0.94847715E+00 0.99439375E-01 0.84776821E-03
+ 0.94895029E+00 0.10059696E+00 0.84898167E-03
+ 0.94942343E+00 0.98491140E-01 0.83920668E-03
+ 0.94989657E+00 0.99018864E-01 0.83163485E-03
+ 0.95037866E+00 0.98608993E-01 0.83325821E-03
+ 0.95085180E+00 0.95675029E-01 0.82488271E-03
+ 0.95132494E+00 0.96894071E-01 0.82908658E-03
+ 0.95179808E+00 0.97050406E-01 0.82066766E-03
+ 0.95228010E+00 0.94739996E-01 0.82442723E-03
+ 0.95275325E+00 0.95844522E-01 0.82248979E-03
+ 0.95322639E+00 0.94694361E-01 0.80901280E-03
+ 0.95370847E+00 0.93923934E-01 0.81563951E-03
+ 0.95418161E+00 0.93700871E-01 0.80673205E-03
+ 0.95466369E+00 0.94273336E-01 0.81156846E-03
+ 0.95513684E+00 0.93543969E-01 0.80783642E-03
+ 0.95561892E+00 0.94059713E-01 0.81532402E-03
+ 0.95609206E+00 0.94671622E-01 0.80987491E-03
+ 0.95657408E+00 0.94157234E-01 0.81643549E-03
+ 0.95704722E+00 0.95136352E-01 0.81376918E-03
+ 0.95752931E+00 0.95234014E-01 0.81871659E-03
+ 0.95800245E+00 0.93614772E-01 0.80675632E-03
+ 0.95848453E+00 0.94418503E-01 0.80602523E-03
+ 0.95896655E+00 0.94241500E-01 0.81324793E-03
+ 0.95944864E+00 0.93019344E-01 0.80977095E-03
+ 0.95992178E+00 0.93976244E-01 0.81039366E-03
+ 0.96040386E+00 0.93291685E-01 0.80463599E-03
+ 0.96088594E+00 0.95813155E-01 0.81294903E-03
+ 0.96136796E+00 0.95018879E-01 0.82130142E-03
+ 0.96184111E+00 0.95392495E-01 0.81491220E-03
+ 0.96232319E+00 0.93580604E-01 0.80300902E-03
+ 0.96280527E+00 0.93999423E-01 0.80523134E-03
+ 0.96328735E+00 0.94485842E-01 0.81151031E-03
+ 0.96376938E+00 0.94428480E-01 0.80939470E-03
+ 0.96425146E+00 0.93877889E-01 0.80569234E-03
+ 0.96473354E+00 0.94760239E-01 0.81328466E-03
+ 0.96521562E+00 0.95306598E-01 0.81406272E-03
+ 0.96569765E+00 0.96073635E-01 0.82181772E-03
+ 0.96617973E+00 0.96766099E-01 0.82131795E-03
+ 0.96666181E+00 0.94457775E-01 0.80258521E-03
+ 0.96715283E+00 0.94503745E-01 0.80789218E-03
+ 0.96763486E+00 0.93082063E-01 0.80958870E-03
+ 0.96811694E+00 0.94460391E-01 0.80798112E-03
+ 0.96859902E+00 0.94543457E-01 0.81333256E-03
+ 0.96908110E+00 0.95567197E-01 0.81079657E-03
+ 0.96957207E+00 0.92005834E-01 0.80076320E-03
+ 0.97005415E+00 0.96001767E-01 0.82194339E-03
+ 0.97053623E+00 0.96224129E-01 0.80878957E-03
+ 0.97102720E+00 0.96271962E-01 0.81979204E-03
+ 0.97150928E+00 0.95420867E-01 0.82241767E-03
+ 0.97199136E+00 0.95677458E-01 0.80870849E-03
+ 0.97248232E+00 0.95116779E-01 0.82361721E-03
+ 0.97296441E+00 0.95857576E-01 0.80919376E-03
+ 0.97345537E+00 0.97341038E-01 0.82566089E-03
+ 0.97393745E+00 0.96644782E-01 0.81668328E-03
+ 0.97442847E+00 0.95739260E-01 0.81397261E-03
+ 0.97491944E+00 0.96773438E-01 0.82573819E-03
+ 0.97540152E+00 0.95429271E-01 0.81136543E-03
+ 0.97589254E+00 0.96299089E-01 0.81856479E-03
+ 0.97637457E+00 0.96541218E-01 0.81377302E-03
+ 0.97686559E+00 0.95294595E-01 0.81182359E-03
+ 0.97735655E+00 0.96899681E-01 0.81746001E-03
+ 0.97784758E+00 0.95730379E-01 0.82179520E-03
+ 0.97832966E+00 0.95763132E-01 0.81566063E-03
+ 0.97882062E+00 0.94748907E-01 0.80874556E-03
+ 0.97931165E+00 0.98754890E-01 0.83003973E-03
+ 0.97980261E+00 0.95946863E-01 0.81659609E-03
+ 0.98029363E+00 0.95152430E-01 0.81088650E-03
+ 0.98078460E+00 0.97995132E-01 0.83580764E-03
+ 0.98126668E+00 0.98274961E-01 0.82067028E-03
+ 0.98175770E+00 0.95836759E-01 0.81700727E-03
+ 0.98224866E+00 0.96485332E-01 0.81213313E-03
+ 0.98273969E+00 0.96889280E-01 0.82191254E-03
+ 0.98323065E+00 0.97221091E-01 0.81259874E-03
+ 0.98373055E+00 0.96670598E-01 0.82152378E-03
+ 0.98422158E+00 0.98464772E-01 0.82984474E-03
+ 0.98471254E+00 0.97418509E-01 0.82306081E-03
+ 0.98520356E+00 0.98155297E-01 0.82554179E-03
+ 0.98569459E+00 0.98306306E-01 0.82457904E-03
+ 0.98618555E+00 0.96081711E-01 0.80545043E-03
+ 0.98668545E+00 0.97486123E-01 0.82565501E-03
+ 0.98717648E+00 0.98330870E-01 0.82636450E-03
+ 0.98766744E+00 0.97796954E-01 0.82771108E-03
+ 0.98815846E+00 0.99137217E-01 0.82375022E-03
+ 0.98865837E+00 0.97837053E-01 0.82434539E-03
+ 0.98914939E+00 0.98563723E-01 0.82427997E-03
+ 0.98964930E+00 0.97710580E-01 0.82839699E-03
+ 0.99014032E+00 0.99139377E-01 0.83005638E-03
+ 0.99063128E+00 0.98422684E-01 0.82213909E-03
+ 0.99113119E+00 0.98091453E-01 0.82806294E-03
+ 0.99162221E+00 0.99147737E-01 0.82442648E-03
+ 0.99212211E+00 0.98694474E-01 0.82211412E-03
+ 0.99262208E+00 0.99460997E-01 0.83057821E-03
+ 0.99311304E+00 0.99178866E-01 0.82448887E-03
+ 0.99361295E+00 0.97050771E-01 0.82169060E-03
+ 0.99410397E+00 0.98342732E-01 0.82216965E-03
+ 0.99460387E+00 0.97948819E-01 0.81414107E-03
+ 0.99510378E+00 0.96685477E-01 0.81148389E-03
+ 0.99560374E+00 0.97251534E-01 0.82127325E-03
+ 0.99609470E+00 0.97196162E-01 0.81575423E-03
+ 0.99659467E+00 0.96935146E-01 0.81243250E-03
+ 0.99709457E+00 0.96985377E-01 0.81255747E-03
+ 0.99759448E+00 0.96708223E-01 0.81045897E-03
+ 0.99809444E+00 0.95059335E-01 0.80402760E-03
+ 0.99859434E+00 0.93917586E-01 0.80693216E-03
+ 0.99908531E+00 0.95659211E-01 0.80549711E-03
+ 0.99958527E+00 0.93106315E-01 0.79710985E-03
+ 0.10000851E+01 0.95263846E-01 0.80275163E-03
+ 0.10005851E+01 0.95252417E-01 0.80987305E-03
+ 0.10010850E+01 0.95278613E-01 0.79961581E-03
+ 0.10015938E+01 0.95771126E-01 0.80622506E-03
+ 0.10020938E+01 0.95114395E-01 0.80383878E-03
+ 0.10025938E+01 0.94401680E-01 0.79906877E-03
+ 0.10030936E+01 0.94482057E-01 0.80435385E-03
+ 0.10035936E+01 0.95391914E-01 0.80350717E-03
+ 0.10040935E+01 0.94493836E-01 0.79666032E-03
+ 0.10046023E+01 0.95121466E-01 0.80458366E-03
+ 0.10051023E+01 0.97114816E-01 0.81242860E-03
+ 0.10056021E+01 0.95612690E-01 0.80546679E-03
+ 0.10061021E+01 0.97009748E-01 0.81135076E-03
+ 0.10066110E+01 0.95996067E-01 0.80653687E-03
+ 0.10071108E+01 0.95077701E-01 0.79815980E-03
+ 0.10076197E+01 0.95214069E-01 0.80679520E-03
+ 0.10081196E+01 0.95818467E-01 0.81026636E-03
+ 0.10086195E+01 0.95075026E-01 0.79780573E-03
+ 0.10091285E+01 0.94539069E-01 0.80685614E-03
+ 0.10096283E+01 0.95102862E-01 0.79929380E-03
+ 0.10101372E+01 0.96166819E-01 0.79798856E-03
+ 0.10106460E+01 0.95864244E-01 0.81195222E-03
+ 0.10111459E+01 0.95979281E-01 0.80430857E-03
+ 0.10116549E+01 0.95721580E-01 0.80590340E-03
+ 0.10121547E+01 0.96246205E-01 0.80137904E-03
+ 0.10126636E+01 0.95988989E-01 0.80558186E-03
+ 0.10131724E+01 0.96739955E-01 0.80265658E-03
+ 0.10136813E+01 0.95976815E-01 0.81037462E-03
+ 0.10141811E+01 0.97929671E-01 0.81477332E-03
+ 0.10146900E+01 0.96973024E-01 0.80839335E-03
+ 0.10151989E+01 0.95083050E-01 0.80466963E-03
+ 0.10157077E+01 0.96939370E-01 0.80842234E-03
+ 0.10162166E+01 0.95465906E-01 0.79809560E-03
+ 0.10167254E+01 0.95231012E-01 0.80071291E-03
+ 0.10172343E+01 0.96043549E-01 0.80898288E-03
+ 0.10177431E+01 0.96274726E-01 0.80405059E-03
+ 0.10182520E+01 0.97403742E-01 0.80775988E-03
+ 0.10187608E+01 0.97972557E-01 0.80880790E-03
+ 0.10192697E+01 0.97699985E-01 0.81563130E-03
+ 0.10197785E+01 0.97151481E-01 0.80842053E-03
+ 0.10202874E+01 0.97802803E-01 0.81121089E-03
+ 0.10207962E+01 0.97631447E-01 0.81571820E-03
+ 0.10213051E+01 0.97585775E-01 0.81143092E-03
+ 0.10218139E+01 0.96700840E-01 0.80077414E-03
+ 0.10223317E+01 0.97185440E-01 0.81087230E-03
+ 0.10228405E+01 0.97555459E-01 0.81396161E-03
+ 0.10233494E+01 0.98723479E-01 0.80721121E-03
+ 0.10238671E+01 0.95016517E-01 0.80098497E-03
+ 0.10243760E+01 0.98452143E-01 0.81535475E-03
+ 0.10248848E+01 0.99009253E-01 0.80692762E-03
+ 0.10254027E+01 0.97757593E-01 0.81101671E-03
+ 0.10259115E+01 0.97631164E-01 0.80871588E-03
+ 0.10264293E+01 0.97190715E-01 0.80942438E-03
+ 0.10269381E+01 0.98326869E-01 0.80890214E-03
+ 0.10274559E+01 0.97125269E-01 0.80804533E-03
+ 0.10279647E+01 0.98242767E-01 0.80537196E-03
+ 0.10284826E+01 0.98523960E-01 0.81740459E-03
+ 0.10289913E+01 0.97914688E-01 0.80806226E-03
+ 0.10295092E+01 0.98075353E-01 0.80607168E-03
+ 0.10300269E+01 0.97921439E-01 0.80987951E-03
+ 0.10305358E+01 0.98126397E-01 0.80636085E-03
+ 0.10310535E+01 0.96096694E-01 0.80122013E-03
+ 0.10315714E+01 0.96491829E-01 0.79878996E-03
+ 0.10320891E+01 0.98256484E-01 0.81506430E-03
+ 0.10325980E+01 0.95921889E-01 0.79726375E-03
+ 0.10331157E+01 0.97732298E-01 0.80700580E-03
+ 0.10336335E+01 0.97047463E-01 0.79775928E-03
+ 0.10341513E+01 0.98424822E-01 0.80566562E-03
+ 0.10346690E+01 0.96620254E-01 0.80283335E-03
+ 0.10351869E+01 0.98017372E-01 0.80714759E-03
+ 0.10357046E+01 0.97514592E-01 0.80604077E-03
+ 0.10362223E+01 0.96571565E-01 0.79924747E-03
+ 0.10367402E+01 0.97414620E-01 0.80622209E-03
+ 0.10372579E+01 0.97493038E-01 0.80112572E-03
+ 0.10377758E+01 0.98544598E-01 0.81033516E-03
+ 0.10382935E+01 0.97624473E-01 0.80663891E-03
+ 0.10388113E+01 0.98230869E-01 0.81356696E-03
+ 0.10393291E+01 0.98596111E-01 0.80202671E-03
+ 0.10398557E+01 0.98327532E-01 0.80987799E-03
+ 0.10403736E+01 0.98997407E-01 0.81032066E-03
+ 0.10408913E+01 0.98150060E-01 0.80987555E-03
+ 0.10414091E+01 0.97119562E-01 0.79836999E-03
+ 0.10419358E+01 0.99842198E-01 0.81346033E-03
+ 0.10424535E+01 0.97976096E-01 0.80202776E-03
+ 0.10429803E+01 0.98881431E-01 0.80932875E-03
+ 0.10434980E+01 0.98298818E-01 0.81139064E-03
+ 0.10440158E+01 0.98569565E-01 0.80609659E-03
+ 0.10445426E+01 0.10036416E+00 0.82000351E-03
+ 0.10450603E+01 0.98185800E-01 0.80018985E-03
+ 0.10455871E+01 0.99379346E-01 0.81388390E-03
+ 0.10461048E+01 0.10059076E+00 0.81012317E-03
+ 0.10466315E+01 0.10063003E+00 0.81398804E-03
+ 0.10471582E+01 0.98932341E-01 0.81232016E-03
+ 0.10476760E+01 0.97946763E-01 0.80763630E-03
+ 0.10482026E+01 0.99483244E-01 0.80629950E-03
+ 0.10487294E+01 0.10093828E+00 0.82483480E-03
+ 0.10492471E+01 0.10016052E+00 0.81453228E-03
+ 0.10497738E+01 0.10176658E+00 0.81912638E-03
+ 0.10503006E+01 0.99187233E-01 0.80744299E-03
+ 0.10508273E+01 0.10024029E+00 0.81334444E-03
+ 0.10513539E+01 0.99182442E-01 0.80132880E-03
+ 0.10518807E+01 0.10093929E+00 0.81564183E-03
+ 0.10524074E+01 0.98716252E-01 0.81434357E-03
+ 0.10529251E+01 0.99778630E-01 0.81155880E-03
+ 0.10534519E+01 0.99926457E-01 0.81112783E-03
+ 0.10539786E+01 0.10086831E+00 0.81517029E-03
+ 0.10545052E+01 0.99703953E-01 0.80303953E-03
+ 0.10550408E+01 0.10028208E+00 0.81334828E-03
+ 0.10555676E+01 0.99990375E-01 0.81428234E-03
+ 0.10560943E+01 0.99983536E-01 0.80999237E-03
+ 0.10566210E+01 0.10091818E+00 0.81823376E-03
+ 0.10571477E+01 0.10158230E+00 0.81852992E-03
+ 0.10576744E+01 0.99558569E-01 0.80269430E-03
+ 0.10582100E+01 0.10171365E+00 0.82018966E-03
+ 0.10587368E+01 0.10021507E+00 0.81108004E-03
+ 0.10592635E+01 0.99841677E-01 0.80761116E-03
+ 0.10597901E+01 0.10065340E+00 0.81047096E-03
+ 0.10603257E+01 0.10127087E+00 0.81635563E-03
+ 0.10608525E+01 0.10174078E+00 0.81153348E-03
+ 0.10613881E+01 0.10088893E+00 0.81750017E-03
+ 0.10619148E+01 0.10093874E+00 0.81877521E-03
+ 0.10624415E+01 0.10130138E+00 0.81286789E-03
+ 0.10629772E+01 0.10147624E+00 0.81039919E-03
+ 0.10635128E+01 0.10274776E+00 0.82490646E-03
+ 0.10640395E+01 0.10230403E+00 0.81948569E-03
+ 0.10645751E+01 0.10168483E+00 0.81974419E-03
+ 0.10651019E+01 0.10189256E+00 0.81467128E-03
+ 0.10656375E+01 0.10422504E+00 0.82290935E-03
+ 0.10661731E+01 0.10326479E+00 0.82497823E-03
+ 0.10666997E+01 0.10090747E+00 0.80678158E-03
+ 0.10672355E+01 0.10324835E+00 0.81902533E-03
+ 0.10677711E+01 0.10132585E+00 0.81155391E-03
+ 0.10683067E+01 0.10206475E+00 0.81270200E-03
+ 0.10688423E+01 0.10184657E+00 0.82225318E-03
+ 0.10693690E+01 0.10145888E+00 0.81099028E-03
+ 0.10699047E+01 0.10147800E+00 0.81074727E-03
+ 0.10704403E+01 0.10258832E+00 0.81629440E-03
+ 0.10709759E+01 0.10251069E+00 0.81872701E-03
+ 0.10715115E+01 0.10211237E+00 0.81488193E-03
+ 0.10720471E+01 0.10192596E+00 0.81306562E-03
+ 0.10725828E+01 0.10364308E+00 0.82111487E-03
+ 0.10731184E+01 0.10262771E+00 0.82115474E-03
+ 0.10736541E+01 0.10296343E+00 0.81754115E-03
+ 0.10741986E+01 0.10271405E+00 0.82142383E-03
+ 0.10747342E+01 0.10363873E+00 0.82449918E-03
+ 0.10752699E+01 0.10378660E+00 0.82065078E-03
+ 0.10758055E+01 0.10164488E+00 0.81324478E-03
+ 0.10763412E+01 0.10445240E+00 0.81496668E-03
+ 0.10768857E+01 0.10354382E+00 0.82304957E-03
+ 0.10774213E+01 0.10412927E+00 0.82794507E-03
+ 0.10779569E+01 0.10371746E+00 0.81858807E-03
+ 0.10785015E+01 0.10614968E+00 0.83667773E-03
+ 0.10790372E+01 0.10341104E+00 0.81382587E-03
+ 0.10795817E+01 0.10418992E+00 0.82696276E-03
+ 0.10801173E+01 0.10361622E+00 0.82401565E-03
+ 0.10806530E+01 0.10485777E+00 0.81933418E-03
+ 0.10811975E+01 0.10511851E+00 0.81953249E-03
+ 0.10817420E+01 0.10411473E+00 0.82317175E-03
+ 0.10822778E+01 0.10260241E+00 0.81342133E-03
+ 0.10828223E+01 0.10208451E+00 0.81380852E-03
+ 0.10833579E+01 0.10358454E+00 0.81280078E-03
+ 0.10839025E+01 0.10323676E+00 0.81487739E-03
+ 0.10844470E+01 0.10416470E+00 0.81567274E-03
+ 0.10849916E+01 0.10328877E+00 0.82102831E-03
+ 0.10855272E+01 0.10356987E+00 0.81527833E-03
+ 0.10860717E+01 0.10244542E+00 0.80568303E-03
+ 0.10866163E+01 0.10287451E+00 0.81267842E-03
+ 0.10871608E+01 0.10230650E+00 0.80880307E-03
+ 0.10877055E+01 0.10129578E+00 0.80323673E-03
+ 0.10882500E+01 0.10339929E+00 0.81271824E-03
+ 0.10887946E+01 0.10341932E+00 0.80948876E-03
+ 0.10893391E+01 0.10235134E+00 0.80887746E-03
+ 0.10898837E+01 0.10207893E+00 0.80790394E-03
+ 0.10904282E+01 0.10262122E+00 0.80651086E-03
+ 0.10909728E+01 0.10097892E+00 0.80485700E-03
+ 0.10915173E+01 0.10323771E+00 0.81405905E-03
+ 0.10920619E+01 0.10188713E+00 0.80717762E-03
+ 0.10926064E+01 0.10243381E+00 0.80668257E-03
+ 0.10931510E+01 0.10147747E+00 0.80623681E-03
+ 0.10936955E+01 0.10395554E+00 0.80611795E-03
+ 0.10942490E+01 0.10177339E+00 0.80337166E-03
+ 0.10947937E+01 0.10060366E+00 0.79930079E-03
+ 0.10953382E+01 0.10388416E+00 0.81041706E-03
+ 0.10958917E+01 0.10331406E+00 0.81047910E-03
+ 0.10964363E+01 0.10353071E+00 0.81275438E-03
+ 0.10969808E+01 0.10340296E+00 0.80695515E-03
+ 0.10975343E+01 0.10279240E+00 0.80631318E-03
+ 0.10980788E+01 0.10121579E+00 0.80051273E-03
+ 0.10986323E+01 0.10389166E+00 0.81581617E-03
+ 0.10991769E+01 0.10312522E+00 0.80631505E-03
+ 0.10997304E+01 0.10289837E+00 0.80331485E-03
+ 0.11002839E+01 0.10549047E+00 0.82174444E-03
+ 0.11008284E+01 0.10395676E+00 0.81152422E-03
+ 0.11013819E+01 0.10286277E+00 0.80347317E-03
+ 0.11019354E+01 0.10451557E+00 0.81538560E-03
+ 0.11024799E+01 0.10305440E+00 0.80303987E-03
+ 0.11030334E+01 0.10429093E+00 0.81325992E-03
+ 0.11035869E+01 0.10340156E+00 0.80646941E-03
+ 0.11041404E+01 0.10341626E+00 0.81417413E-03
+ 0.11046849E+01 0.10289730E+00 0.80430548E-03
+ 0.11052384E+01 0.10346155E+00 0.80609281E-03
+ 0.11057919E+01 0.10469326E+00 0.81087794E-03
+ 0.11063454E+01 0.10330827E+00 0.80244336E-03
+ 0.11068989E+01 0.10442118E+00 0.81174710E-03
+ 0.11074524E+01 0.10615736E+00 0.81853842E-03
+ 0.11080059E+01 0.10458300E+00 0.80960267E-03
+ 0.11085594E+01 0.10512534E+00 0.81262493E-03
+ 0.11091129E+01 0.10476954E+00 0.81321975E-03
+ 0.11096663E+01 0.10546995E+00 0.80786541E-03
+ 0.11102287E+01 0.10333738E+00 0.80044754E-03
+ 0.11107821E+01 0.10438047E+00 0.81208296E-03
+ 0.11113356E+01 0.10599799E+00 0.81768015E-03
+ 0.11118891E+01 0.10400551E+00 0.80792926E-03
+ 0.11124426E+01 0.10419248E+00 0.79971476E-03
+ 0.11130050E+01 0.10639022E+00 0.82118384E-03
+ 0.11135585E+01 0.10552547E+00 0.81229664E-03
+ 0.11141120E+01 0.10386212E+00 0.80435810E-03
+ 0.11146744E+01 0.10695747E+00 0.82341360E-03
+ 0.11152279E+01 0.10615062E+00 0.80958329E-03
+ 0.11157904E+01 0.10543486E+00 0.81736827E-03
+ 0.11163439E+01 0.10540368E+00 0.81010791E-03
+ 0.11169063E+01 0.10461357E+00 0.81352296E-03
+ 0.11174598E+01 0.10383731E+00 0.80115715E-03
+ 0.11180222E+01 0.10725795E+00 0.81902853E-03
+ 0.11185845E+01 0.10736170E+00 0.82288001E-03
+ 0.11191380E+01 0.10487501E+00 0.80714549E-03
+ 0.11197004E+01 0.10563868E+00 0.80990605E-03
+ 0.11202629E+01 0.10564262E+00 0.81770151E-03
+ 0.11208163E+01 0.10561530E+00 0.80861821E-03
+ 0.11213788E+01 0.10713616E+00 0.81582059E-03
+ 0.11219412E+01 0.10487037E+00 0.80345653E-03
+ 0.11225036E+01 0.10431654E+00 0.80312643E-03
+ 0.11230659E+01 0.10355540E+00 0.79897116E-03
+ 0.11236284E+01 0.10627299E+00 0.81471913E-03
+ 0.11241819E+01 0.10454611E+00 0.80359424E-03
+ 0.11247443E+01 0.10425680E+00 0.80066966E-03
+ 0.11253067E+01 0.10345201E+00 0.79475576E-03
+ 0.11258692E+01 0.10282946E+00 0.79306605E-03
+ 0.11264316E+01 0.10169928E+00 0.78034739E-03
+ 0.11270028E+01 0.10169339E+00 0.78995357E-03
+ 0.11275653E+01 0.10194354E+00 0.78856247E-03
+ 0.11281277E+01 0.97766370E-01 0.76356390E-03
+ 0.11286901E+01 0.99356107E-01 0.77346369E-03
+ 0.11292526E+01 0.10067464E+00 0.77487476E-03
+ 0.11298239E+01 0.10040187E+00 0.78100659E-03
+ 0.11303862E+01 0.99982210E-01 0.77850424E-03
+ 0.11309487E+01 0.10078523E+00 0.78732439E-03
+ 0.11315111E+01 0.10079612E+00 0.77400130E-03
+ 0.11320825E+01 0.10119601E+00 0.77793415E-03
+ 0.11326449E+01 0.10194173E+00 0.78050292E-03
+ 0.11332163E+01 0.10094831E+00 0.78133441E-03
+ 0.11337786E+01 0.99895276E-01 0.77044859E-03
+ 0.11343499E+01 0.10039438E+00 0.77804975E-03
+ 0.11349124E+01 0.10051351E+00 0.77338115E-03
+ 0.11354837E+01 0.99956654E-01 0.77423191E-03
+ 0.11360462E+01 0.10266112E+00 0.78273128E-03
+ 0.11366174E+01 0.10093255E+00 0.77600504E-03
+ 0.11371888E+01 0.10126615E+00 0.77785231E-03
+ 0.11377512E+01 0.10188636E+00 0.77718607E-03
+ 0.11383226E+01 0.99075802E-01 0.76768745E-03
+ 0.11388938E+01 0.10206483E+00 0.77927671E-03
+ 0.11394652E+01 0.10260036E+00 0.79310354E-03
+ 0.11400276E+01 0.10115270E+00 0.77319954E-03
+ 0.11405990E+01 0.10213285E+00 0.77965582E-03
+ 0.11411703E+01 0.10072157E+00 0.77551731E-03
+ 0.11417416E+01 0.10106462E+00 0.77656261E-03
+ 0.11423130E+01 0.10212824E+00 0.77753986E-03
+ 0.11428844E+01 0.10144867E+00 0.77711110E-03
+ 0.11434556E+01 0.10071051E+00 0.77108172E-03
+ 0.11440270E+01 0.10027521E+00 0.77171525E-03
+ 0.11445984E+01 0.10101037E+00 0.77202270E-03
+ 0.11451697E+01 0.10226916E+00 0.77750150E-03
+ 0.11457410E+01 0.10029044E+00 0.76380995E-03
+ 0.11463213E+01 0.10156213E+00 0.77703688E-03
+ 0.11468927E+01 0.10261812E+00 0.77878276E-03
+ 0.11474640E+01 0.10270940E+00 0.77883003E-03
+ 0.11480353E+01 0.10163607E+00 0.77076576E-03
+ 0.11486156E+01 0.10237339E+00 0.77819964E-03
+ 0.11491870E+01 0.10294709E+00 0.78121142E-03
+ 0.11497582E+01 0.10276780E+00 0.77278900E-03
+ 0.11503385E+01 0.10212420E+00 0.77690696E-03
+ 0.11509099E+01 0.10242251E+00 0.77430619E-03
+ 0.11514901E+01 0.10170905E+00 0.77678362E-03
+ 0.11520615E+01 0.10210740E+00 0.76772436E-03
+ 0.11526418E+01 0.10271644E+00 0.78358693E-03
+ 0.11532131E+01 0.10233245E+00 0.77307696E-03
+ 0.11537933E+01 0.10269301E+00 0.78137993E-03
+ 0.11543647E+01 0.10381459E+00 0.77694136E-03
+ 0.11549450E+01 0.10149724E+00 0.77094499E-03
+ 0.11555252E+01 0.10087407E+00 0.77643717E-03
+ 0.11560966E+01 0.10276396E+00 0.77126484E-03
+ 0.11566769E+01 0.10380945E+00 0.77993819E-03
+ 0.11572571E+01 0.10350733E+00 0.77892246E-03
+ 0.11578374E+01 0.10344172E+00 0.77897537E-03
+ 0.11584176E+01 0.10315075E+00 0.78419212E-03
+ 0.11589890E+01 0.10382548E+00 0.77984662E-03
+ 0.11595693E+01 0.10427749E+00 0.77809970E-03
+ 0.11601495E+01 0.10306700E+00 0.77725051E-03
+ 0.11607298E+01 0.10474730E+00 0.78401726E-03
+ 0.11613101E+01 0.10288730E+00 0.77678601E-03
+ 0.11618903E+01 0.10290206E+00 0.77412598E-03
+ 0.11624706E+01 0.10520761E+00 0.77928754E-03
+ 0.11630597E+01 0.10431515E+00 0.78351621E-03
+ 0.11636400E+01 0.10614654E+00 0.79449685E-03
+ 0.11642203E+01 0.10388245E+00 0.77699084E-03
+ 0.11648005E+01 0.10380059E+00 0.78158133E-03
+ 0.11653808E+01 0.10526531E+00 0.77859743E-03
+ 0.11659700E+01 0.10381275E+00 0.77996223E-03
+ 0.11665503E+01 0.10408472E+00 0.77908172E-03
+ 0.11671306E+01 0.10405056E+00 0.77138998E-03
+ 0.11677197E+01 0.10574392E+00 0.78943453E-03
+ 0.11683000E+01 0.10439913E+00 0.77997032E-03
+ 0.11688803E+01 0.10333741E+00 0.77433669E-03
+ 0.11694695E+01 0.10590862E+00 0.78423077E-03
+ 0.11700498E+01 0.10347135E+00 0.77097589E-03
+ 0.11706389E+01 0.10580093E+00 0.79022750E-03
+ 0.11712192E+01 0.10406964E+00 0.77159418E-03
+ 0.11718084E+01 0.10504383E+00 0.77843666E-03
+ 0.11723976E+01 0.10362715E+00 0.77939499E-03
+ 0.11729778E+01 0.10601530E+00 0.78357168E-03
+ 0.11735671E+01 0.10611255E+00 0.78077690E-03
+ 0.11741563E+01 0.10562461E+00 0.77901088E-03
+ 0.11747454E+01 0.10551709E+00 0.79030806E-03
+ 0.11753258E+01 0.10630262E+00 0.78555581E-03
+ 0.11759149E+01 0.10595999E+00 0.78376185E-03
+ 0.11765041E+01 0.10476382E+00 0.77582704E-03
+ 0.11770933E+01 0.10617552E+00 0.78007835E-03
+ 0.11776825E+01 0.10636428E+00 0.78289094E-03
+ 0.11782717E+01 0.10724938E+00 0.78372710E-03
+ 0.11788609E+01 0.10551124E+00 0.77823375E-03
+ 0.11794500E+01 0.10650750E+00 0.78109180E-03
+ 0.11800393E+01 0.10611986E+00 0.78324188E-03
+ 0.11806284E+01 0.10673405E+00 0.78623707E-03
+ 0.11812177E+01 0.10762762E+00 0.78989437E-03
+ 0.11818068E+01 0.10592542E+00 0.77881914E-03
+ 0.11823961E+01 0.10758411E+00 0.77684282E-03
+ 0.11829941E+01 0.10708054E+00 0.78572432E-03
+ 0.11835834E+01 0.10676260E+00 0.78757765E-03
+ 0.11841725E+01 0.10643084E+00 0.77800849E-03
+ 0.11847707E+01 0.10605138E+00 0.77807734E-03
+ 0.11853598E+01 0.10732586E+00 0.78494695E-03
+ 0.11859491E+01 0.10725511E+00 0.78155100E-03
+ 0.11865472E+01 0.10791673E+00 0.78982383E-03
+ 0.11871364E+01 0.10671765E+00 0.78093453E-03
+ 0.11877345E+01 0.10653946E+00 0.78459742E-03
+ 0.11883237E+01 0.10714265E+00 0.78076922E-03
+ 0.11889218E+01 0.10716673E+00 0.78768004E-03
+ 0.11895109E+01 0.10878736E+00 0.78487914E-03
+ 0.11901091E+01 0.10745113E+00 0.77682058E-03
+ 0.11907072E+01 0.10738778E+00 0.78206114E-03
+ 0.11912965E+01 0.10825785E+00 0.78887702E-03
+ 0.11918945E+01 0.10869946E+00 0.78596798E-03
+ 0.11924927E+01 0.10825872E+00 0.78715303E-03
+ 0.11930908E+01 0.10891154E+00 0.79172681E-03
+ 0.11936800E+01 0.10785884E+00 0.78079622E-03
+ 0.11942781E+01 0.10639399E+00 0.77612849E-03
+ 0.11948762E+01 0.10845763E+00 0.78562670E-03
+ 0.11954744E+01 0.10771714E+00 0.78045577E-03
+ 0.11960725E+01 0.10793684E+00 0.78205025E-03
+ 0.11966707E+01 0.10767218E+00 0.78058324E-03
+ 0.11972687E+01 0.10921076E+00 0.78850280E-03
+ 0.11978668E+01 0.10830197E+00 0.78570645E-03
+ 0.11984650E+01 0.10738055E+00 0.78064710E-03
+ 0.11990631E+01 0.10813685E+00 0.78171992E-03
+ 0.11996613E+01 0.10776037E+00 0.77676662E-03
+ 0.12002683E+01 0.10799046E+00 0.78016060E-03
+ 0.12008663E+01 0.10639806E+00 0.77383028E-03
+ 0.12014645E+01 0.10541907E+00 0.76926575E-03
+ 0.12020626E+01 0.10631705E+00 0.76710060E-03
+ 0.12026696E+01 0.10477632E+00 0.76678110E-03
+ 0.12032678E+01 0.10450513E+00 0.76248805E-03
+ 0.12038748E+01 0.10526695E+00 0.76300034E-03
+ 0.12044729E+01 0.10263857E+00 0.75520482E-03
+ 0.12050711E+01 0.10337394E+00 0.75082580E-03
+ 0.12056781E+01 0.10371634E+00 0.75679366E-03
+ 0.12062763E+01 0.10168525E+00 0.74581651E-03
+ 0.12068833E+01 0.10291706E+00 0.74788538E-03
+ 0.12074903E+01 0.10288919E+00 0.75386418E-03
+ 0.12080885E+01 0.10229775E+00 0.73950813E-03
+ 0.12086955E+01 0.10225489E+00 0.74411213E-03
+ 0.12093025E+01 0.10170940E+00 0.74695935E-03
+ 0.12099007E+01 0.10121901E+00 0.73905336E-03
+ 0.12105078E+01 0.10244506E+00 0.74375933E-03
+ 0.12111148E+01 0.10066645E+00 0.73713093E-03
+ 0.12117218E+01 0.10143080E+00 0.74021699E-03
+ 0.12123289E+01 0.10098866E+00 0.74646465E-03
+ 0.12129270E+01 0.10187108E+00 0.74362638E-03
+ 0.12135340E+01 0.10278852E+00 0.74417348E-03
+ 0.12141411E+01 0.10219581E+00 0.74357871E-03
+ 0.12147481E+01 0.10195454E+00 0.73899457E-03
+ 0.12153552E+01 0.10098465E+00 0.73271029E-03
+ 0.12159711E+01 0.10303513E+00 0.74497628E-03
+ 0.12165782E+01 0.10145690E+00 0.74158539E-03
+ 0.12171853E+01 0.10146797E+00 0.74430439E-03
+ 0.12177923E+01 0.10147445E+00 0.73803496E-03
+ 0.12183994E+01 0.10173771E+00 0.74380764E-03
+ 0.12190064E+01 0.10208464E+00 0.73573389E-03
+ 0.12196224E+01 0.10389779E+00 0.74893644E-03
+ 0.12202294E+01 0.10056521E+00 0.73306751E-03
+ 0.12208365E+01 0.10229257E+00 0.73437789E-03
+ 0.12214525E+01 0.10215156E+00 0.74409891E-03
+ 0.12220595E+01 0.10349217E+00 0.74246223E-03
+ 0.12226754E+01 0.10203772E+00 0.74349256E-03
+ 0.12232826E+01 0.10224591E+00 0.73465105E-03
+ 0.12238985E+01 0.10194197E+00 0.73938916E-03
+ 0.12245055E+01 0.10392378E+00 0.74360409E-03
+ 0.12251215E+01 0.10215280E+00 0.74101309E-03
+ 0.12257285E+01 0.10079047E+00 0.72771480E-03
+ 0.12263446E+01 0.10220193E+00 0.73497667E-03
+ 0.12269605E+01 0.10187273E+00 0.74052031E-03
+ 0.12275676E+01 0.10176229E+00 0.73163491E-03
+ 0.12281835E+01 0.10246704E+00 0.74131286E-03
+ 0.12287995E+01 0.10311363E+00 0.73841115E-03
+ 0.12294155E+01 0.10149513E+00 0.73272159E-03
+ 0.12300315E+01 0.10357752E+00 0.73888770E-03
+ 0.12306385E+01 0.10332362E+00 0.73750515E-03
+ 0.12312545E+01 0.10327457E+00 0.73922501E-03
+ 0.12318704E+01 0.10307857E+00 0.73965272E-03
+ 0.12324865E+01 0.10288572E+00 0.73623675E-03
+ 0.12331024E+01 0.10261024E+00 0.73283125E-03
+ 0.12337184E+01 0.10304326E+00 0.73046098E-03
+ 0.12343433E+01 0.10434638E+00 0.74556191E-03
+ 0.12349592E+01 0.10290600E+00 0.73497480E-03
+ 0.12355752E+01 0.10430907E+00 0.74227294E-03
+ 0.12361913E+01 0.10326479E+00 0.73708652E-03
+ 0.12368072E+01 0.10385078E+00 0.73584093E-03
+ 0.12374321E+01 0.10223100E+00 0.73335686E-03
+ 0.12380481E+01 0.10323326E+00 0.73666655E-03
+ 0.12386640E+01 0.10400850E+00 0.73691609E-03
+ 0.12392889E+01 0.10416745E+00 0.74378215E-03
+ 0.12399049E+01 0.10322683E+00 0.73608331E-03
+ 0.12405210E+01 0.10448173E+00 0.73745451E-03
+ 0.12411458E+01 0.10324816E+00 0.73935994E-03
+ 0.12417618E+01 0.10408741E+00 0.73533878E-03
+ 0.12423867E+01 0.10486999E+00 0.73952286E-03
+ 0.12430116E+01 0.10504524E+00 0.74143236E-03
+ 0.12436275E+01 0.10508129E+00 0.74462325E-03
+ 0.12442524E+01 0.10502501E+00 0.73867082E-03
+ 0.12448773E+01 0.10434179E+00 0.74384920E-03
+ 0.12454933E+01 0.10543048E+00 0.74020022E-03
+ 0.12461183E+01 0.10464709E+00 0.73554862E-03
+ 0.12467432E+01 0.10510325E+00 0.74032717E-03
+ 0.12473681E+01 0.10421231E+00 0.73534547E-03
+ 0.12479930E+01 0.10479702E+00 0.74386824E-03
+ 0.12486089E+01 0.10635803E+00 0.74409432E-03
+ 0.12492338E+01 0.10517766E+00 0.73932187E-03
+ 0.12498587E+01 0.10538594E+00 0.74240175E-03
+ 0.12504836E+01 0.10607339E+00 0.74277777E-03
+ 0.12511085E+01 0.10572791E+00 0.74294407E-03
+ 0.12517334E+01 0.10515520E+00 0.73010952E-03
+ 0.12523673E+01 0.10649800E+00 0.74394437E-03
+ 0.12529922E+01 0.10631666E+00 0.74221008E-03
+ 0.12536170E+01 0.10609271E+00 0.73865161E-03
+ 0.12542419E+01 0.10493101E+00 0.73850079E-03
+ 0.12548668E+01 0.10454825E+00 0.72639075E-03
+ 0.12555007E+01 0.10408236E+00 0.73093793E-03
+ 0.12561256E+01 0.10409947E+00 0.73426345E-03
+ 0.12567505E+01 0.10550921E+00 0.72944612E-03
+ 0.12573843E+01 0.10329802E+00 0.73063240E-03
+ 0.12580092E+01 0.10487251E+00 0.73203747E-03
+ 0.12586430E+01 0.10328905E+00 0.72772318E-03
+ 0.12592679E+01 0.10375262E+00 0.72598906E-03
+ 0.12599018E+01 0.10287465E+00 0.72344299E-03
+ 0.12605267E+01 0.10156322E+00 0.71393582E-03
+ 0.12611605E+01 0.10109559E+00 0.71590388E-03
+ 0.12617855E+01 0.10349891E+00 0.72324392E-03
+ 0.12624192E+01 0.10073624E+00 0.70946530E-03
+ 0.12630531E+01 0.10258093E+00 0.72260818E-03
+ 0.12636780E+01 0.10164817E+00 0.71165100E-03
+ 0.12643118E+01 0.10293283E+00 0.71870000E-03
+ 0.12649456E+01 0.10245584E+00 0.71589422E-03
+ 0.12655795E+01 0.10217965E+00 0.71415649E-03
+ 0.12662133E+01 0.10406251E+00 0.72256586E-03
+ 0.12668471E+01 0.10182959E+00 0.71571517E-03
+ 0.12674810E+01 0.10311404E+00 0.71762782E-03
+ 0.12681148E+01 0.10144588E+00 0.70864434E-03
+ 0.12687486E+01 0.10330214E+00 0.71993360E-03
+ 0.12693825E+01 0.10227793E+00 0.71269233E-03
+ 0.12700163E+01 0.10219678E+00 0.71578403E-03
+ 0.12706501E+01 0.10305414E+00 0.72012225E-03
+ 0.12712840E+01 0.10194744E+00 0.71169937E-03
+ 0.12719178E+01 0.10142806E+00 0.70640905E-03
+ 0.12725606E+01 0.10309382E+00 0.71677391E-03
+ 0.12731944E+01 0.10314514E+00 0.72325487E-03
+ 0.12738283E+01 0.10329518E+00 0.71219518E-03
+ 0.12744709E+01 0.10372287E+00 0.71908260E-03
+ 0.12751048E+01 0.10462132E+00 0.72210102E-03
+ 0.12757386E+01 0.10311974E+00 0.71245484E-03
+ 0.12763814E+01 0.10259438E+00 0.71416452E-03
+ 0.12770152E+01 0.10297830E+00 0.71285857E-03
+ 0.12776580E+01 0.10288676E+00 0.71517512E-03
+ 0.12782918E+01 0.10439717E+00 0.71655109E-03
+ 0.12789346E+01 0.10349195E+00 0.71062369E-03
+ 0.12795774E+01 0.10362439E+00 0.71779144E-03
+ 0.12802111E+01 0.10286486E+00 0.70980814E-03
+ 0.12808539E+01 0.10377166E+00 0.71142276E-03
+ 0.12814966E+01 0.10293340E+00 0.71766938E-03
+ 0.12821305E+01 0.10334536E+00 0.71001303E-03
+ 0.12827733E+01 0.10352975E+00 0.71230606E-03
+ 0.12834160E+01 0.10446140E+00 0.71699283E-03
+ 0.12840588E+01 0.10408784E+00 0.71336573E-03
+ 0.12847015E+01 0.10405390E+00 0.71588851E-03
+ 0.12853442E+01 0.10371704E+00 0.71337936E-03
+ 0.12859870E+01 0.10469069E+00 0.71672886E-03
+ 0.12866298E+01 0.10368664E+00 0.71180164E-03
+ 0.12872726E+01 0.10309140E+00 0.70664578E-03
+ 0.12879153E+01 0.10459861E+00 0.71732292E-03
+ 0.12885580E+01 0.10627416E+00 0.71999460E-03
+ 0.12892008E+01 0.10417982E+00 0.70579199E-03
+ 0.12898525E+01 0.10485371E+00 0.71722409E-03
+ 0.12904953E+01 0.10481302E+00 0.71578682E-03
+ 0.12911381E+01 0.10442547E+00 0.71605068E-03
+ 0.12917808E+01 0.10458443E+00 0.70802425E-03
+ 0.12924324E+01 0.10550187E+00 0.72190125E-03
+ 0.12930752E+01 0.10500144E+00 0.71208755E-03
+ 0.12937269E+01 0.10484362E+00 0.71371818E-03
+ 0.12943697E+01 0.10511220E+00 0.71620295E-03
+ 0.12950124E+01 0.10482879E+00 0.71172952E-03
+ 0.12956641E+01 0.10541700E+00 0.71398728E-03
+ 0.12963158E+01 0.10489082E+00 0.71579299E-03
+ 0.12969586E+01 0.10431060E+00 0.70727529E-03
+ 0.12976102E+01 0.10619964E+00 0.71675592E-03
+ 0.12982619E+01 0.10553293E+00 0.71572652E-03
+ 0.12989047E+01 0.10530011E+00 0.71432162E-03
+ 0.12995564E+01 0.10504719E+00 0.70937478E-03
+ 0.13002080E+01 0.10795024E+00 0.72347868E-03
+ 0.13008597E+01 0.10549682E+00 0.71997067E-03
+ 0.13015025E+01 0.10508048E+00 0.70957543E-03
+ 0.13021542E+01 0.10635601E+00 0.71701792E-03
+ 0.13028058E+01 0.10509428E+00 0.70720707E-03
+ 0.13034575E+01 0.10539131E+00 0.71180076E-03
+ 0.13041092E+01 0.10568949E+00 0.71239908E-03
+ 0.13047609E+01 0.10669022E+00 0.71711012E-03
+ 0.13054125E+01 0.10565180E+00 0.71063428E-03
+ 0.13060642E+01 0.10614965E+00 0.70931995E-03
+ 0.13067249E+01 0.10616760E+00 0.71475672E-03
+ 0.13073765E+01 0.10485403E+00 0.70862728E-03
+ 0.13080282E+01 0.10736486E+00 0.71926939E-03
+ 0.13086799E+01 0.10712913E+00 0.71348302E-03
+ 0.13093405E+01 0.10668649E+00 0.71701757E-03
+ 0.13099922E+01 0.10792915E+00 0.72288141E-03
+ 0.13106439E+01 0.10867082E+00 0.71864674E-03
+ 0.13113046E+01 0.10739242E+00 0.71913766E-03
+ 0.13119562E+01 0.10820949E+00 0.71467791E-03
+ 0.13126168E+01 0.10664991E+00 0.71504689E-03
+ 0.13132685E+01 0.10761483E+00 0.71611331E-03
+ 0.13139291E+01 0.10676380E+00 0.71276794E-03
+ 0.13145808E+01 0.10794063E+00 0.71750756E-03
+ 0.13152415E+01 0.10813897E+00 0.71695307E-03
+ 0.13159020E+01 0.10824273E+00 0.71948726E-03
+ 0.13165537E+01 0.10834017E+00 0.71585592E-03
+ 0.13172143E+01 0.10735077E+00 0.71394723E-03
+ 0.13178749E+01 0.10739950E+00 0.71302010E-03
+ 0.13185356E+01 0.10808949E+00 0.71821659E-03
+ 0.13191872E+01 0.10683350E+00 0.70767041E-03
+ 0.13198478E+01 0.10797641E+00 0.71485672E-03
+ 0.13205085E+01 0.10822286E+00 0.71868737E-03
+ 0.13211690E+01 0.10807345E+00 0.71474654E-03
+ 0.13218297E+01 0.10901469E+00 0.71823894E-03
+ 0.13224902E+01 0.10762496E+00 0.71114750E-03
+ 0.13231509E+01 0.10877272E+00 0.71997574E-03
+ 0.13238115E+01 0.10960879E+00 0.71864255E-03
+ 0.13244810E+01 0.10871315E+00 0.71606849E-03
+ 0.13251417E+01 0.10768285E+00 0.71416609E-03
+ 0.13258022E+01 0.10782979E+00 0.71429118E-03
+ 0.13264629E+01 0.10924147E+00 0.71408349E-03
+ 0.13271325E+01 0.10898349E+00 0.71923283E-03
+ 0.13277930E+01 0.10858128E+00 0.71490736E-03
+ 0.13284537E+01 0.11024672E+00 0.72007603E-03
+ 0.13291231E+01 0.10908551E+00 0.71784487E-03
+ 0.13297838E+01 0.11033561E+00 0.71936549E-03
+ 0.13304533E+01 0.11056158E+00 0.72671467E-03
+ 0.13311139E+01 0.10944079E+00 0.71689318E-03
+ 0.13317834E+01 0.11031724E+00 0.72187750E-03
+ 0.13324441E+01 0.10918489E+00 0.71374921E-03
+ 0.13331137E+01 0.10969384E+00 0.71494782E-03
+ 0.13337831E+01 0.10954830E+00 0.71700307E-03
+ 0.13344438E+01 0.10941047E+00 0.71286329E-03
+ 0.13351133E+01 0.11122216E+00 0.72184874E-03
+ 0.13357829E+01 0.11019670E+00 0.71578735E-03
+ 0.13364524E+01 0.11020313E+00 0.72272390E-03
+ 0.13371130E+01 0.11154334E+00 0.72412682E-03
+ 0.13377825E+01 0.10933987E+00 0.71174907E-03
+ 0.13384521E+01 0.11009344E+00 0.71695383E-03
+ 0.13391216E+01 0.11086725E+00 0.72024931E-03
+ 0.13397912E+01 0.11139032E+00 0.72264858E-03
+ 0.13404607E+01 0.11178482E+00 0.72180730E-03
+ 0.13411303E+01 0.11101536E+00 0.71909314E-03
+ 0.13417997E+01 0.11167436E+00 0.71950711E-03
+ 0.13424783E+01 0.11129007E+00 0.72179059E-03
+ 0.13431478E+01 0.11157276E+00 0.72423258E-03
+ 0.13438174E+01 0.10991205E+00 0.71333256E-03
+ 0.13444868E+01 0.11161241E+00 0.71824249E-03
+ 0.13451653E+01 0.11200896E+00 0.72267506E-03
+ 0.13458349E+01 0.11144488E+00 0.71973476E-03
+ 0.13465043E+01 0.11103557E+00 0.71640179E-03
+ 0.13471829E+01 0.11225884E+00 0.72375417E-03
+ 0.13478523E+01 0.11219224E+00 0.71930594E-03
+ 0.13485309E+01 0.11041532E+00 0.71376911E-03
+ 0.13492004E+01 0.11169339E+00 0.71557303E-03
+ 0.13498789E+01 0.11189154E+00 0.72218309E-03
+ 0.13505484E+01 0.11220454E+00 0.71923225E-03
+ 0.13512268E+01 0.11254920E+00 0.71914127E-03
+ 0.13519053E+01 0.11183052E+00 0.71914174E-03
+ 0.13525748E+01 0.11323732E+00 0.72311400E-03
+ 0.13532534E+01 0.11250436E+00 0.71791146E-03
+ 0.13539318E+01 0.11238138E+00 0.71805157E-03
+ 0.13546102E+01 0.11299357E+00 0.71961147E-03
+ 0.13552887E+01 0.11349946E+00 0.72260259E-03
+ 0.13559672E+01 0.11310513E+00 0.71972178E-03
+ 0.13566457E+01 0.11453857E+00 0.73210988E-03
+ 0.13573152E+01 0.11410910E+00 0.71744696E-03
+ 0.13580025E+01 0.11278032E+00 0.71866292E-03
+ 0.13586811E+01 0.11266388E+00 0.71856118E-03
+ 0.13593595E+01 0.11375547E+00 0.72403369E-03
+ 0.13600380E+01 0.11395827E+00 0.72710105E-03
+ 0.13607165E+01 0.11304113E+00 0.71985711E-03
+ 0.13613949E+01 0.11286686E+00 0.71796682E-03
+ 0.13620734E+01 0.11353869E+00 0.71989349E-03
+ 0.13627608E+01 0.11239239E+00 0.71787002E-03
+ 0.13634392E+01 0.11509751E+00 0.72771369E-03
+ 0.13641177E+01 0.11297779E+00 0.71280962E-03
+ 0.13648051E+01 0.11418797E+00 0.72476262E-03
+ 0.13654835E+01 0.11429235E+00 0.71688992E-03
+ 0.13661710E+01 0.11225535E+00 0.71656995E-03
+ 0.13668494E+01 0.11395069E+00 0.71291870E-03
+ 0.13675368E+01 0.11262269E+00 0.71540225E-03
+ 0.13682153E+01 0.11195477E+00 0.70655177E-03
+ 0.13689027E+01 0.11120692E+00 0.70415542E-03
+ 0.13695900E+01 0.11087186E+00 0.70678943E-03
+ 0.13702686E+01 0.11060335E+00 0.70031482E-03
+ 0.13709559E+01 0.11000315E+00 0.69709588E-03
+ 0.13716433E+01 0.10988362E+00 0.69762149E-03
+ 0.13723307E+01 0.10896150E+00 0.69062971E-03
+ 0.13730181E+01 0.10830786E+00 0.68886986E-03
+ 0.13737055E+01 0.10756709E+00 0.69029885E-03
+ 0.13743839E+01 0.10732751E+00 0.68194792E-03
+ 0.13750714E+01 0.10872961E+00 0.68926875E-03
+ 0.13757588E+01 0.10828379E+00 0.68325188E-03
+ 0.13764551E+01 0.10671476E+00 0.67869650E-03
+ 0.13771424E+01 0.10673389E+00 0.68175432E-03
+ 0.13778299E+01 0.10654191E+00 0.67757955E-03
+ 0.13785173E+01 0.10675431E+00 0.68221416E-03
+ 0.13792046E+01 0.10776901E+00 0.68278267E-03
+ 0.13798920E+01 0.10521876E+00 0.66854211E-03
+ 0.13805884E+01 0.10640082E+00 0.68133970E-03
+ 0.13812758E+01 0.10709278E+00 0.67885063E-03
+ 0.13819631E+01 0.10650772E+00 0.67269296E-03
+ 0.13826594E+01 0.10677487E+00 0.67969371E-03
+ 0.13833468E+01 0.10822432E+00 0.67891291E-03
+ 0.13840432E+01 0.10591307E+00 0.67210366E-03
+ 0.13847306E+01 0.10695140E+00 0.67369861E-03
+ 0.13854269E+01 0.10653380E+00 0.67789532E-03
+ 0.13861142E+01 0.10736016E+00 0.67369617E-03
+ 0.13868107E+01 0.10740891E+00 0.67499292E-03
+ 0.13875070E+01 0.10866781E+00 0.68485847E-03
+ 0.13881943E+01 0.10751636E+00 0.67506148E-03
+ 0.13888906E+01 0.10853440E+00 0.68104337E-03
+ 0.13895869E+01 0.10745319E+00 0.67479623E-03
+ 0.13902832E+01 0.10590994E+00 0.66874764E-03
+ 0.13909796E+01 0.10646197E+00 0.66908466E-03
+ 0.13916759E+01 0.10738931E+00 0.67948969E-03
+ 0.13923633E+01 0.10669060E+00 0.67189697E-03
+ 0.13930596E+01 0.10726996E+00 0.67144976E-03
+ 0.13937649E+01 0.10720930E+00 0.67451812E-03
+ 0.13944612E+01 0.10866337E+00 0.68130373E-03
+ 0.13951575E+01 0.10839809E+00 0.67970931E-03
+ 0.13958539E+01 0.10805042E+00 0.67467702E-03
+ 0.13965502E+01 0.10872321E+00 0.67902869E-03
+ 0.13972465E+01 0.10896760E+00 0.68153220E-03
+ 0.13979428E+01 0.10789239E+00 0.67160546E-03
+ 0.13986480E+01 0.10601405E+00 0.66886685E-03
+ 0.13993443E+01 0.10873332E+00 0.67393249E-03
+ 0.14000496E+01 0.10866822E+00 0.67790184E-03
+ 0.14007460E+01 0.10630031E+00 0.67065470E-03
+ 0.14014423E+01 0.10783608E+00 0.67034434E-03
+ 0.14021475E+01 0.10915158E+00 0.68014150E-03
+ 0.14028438E+01 0.10908999E+00 0.67721616E-03
+ 0.14035491E+01 0.10772187E+00 0.67146699E-03
+ 0.14042543E+01 0.10833752E+00 0.67859987E-03
+ 0.14049506E+01 0.10875082E+00 0.67183486E-03
+ 0.14056559E+01 0.10866435E+00 0.67477062E-03
+ 0.14063611E+01 0.10983880E+00 0.68296585E-03
+ 0.14070574E+01 0.10931045E+00 0.67496870E-03
+ 0.14077626E+01 0.10952204E+00 0.67644432E-03
+ 0.14084679E+01 0.10902479E+00 0.67518529E-03
+ 0.14091731E+01 0.10938864E+00 0.67713833E-03
+ 0.14098785E+01 0.11013208E+00 0.67891082E-03
+ 0.14105837E+01 0.10876866E+00 0.67322684E-03
+ 0.14112890E+01 0.10849094E+00 0.67181507E-03
+ 0.14119942E+01 0.11007297E+00 0.67699101E-03
+ 0.14126995E+01 0.10903042E+00 0.67663559E-03
+ 0.14134047E+01 0.10877127E+00 0.67354500E-03
+ 0.14141099E+01 0.11021527E+00 0.68018481E-03
+ 0.14148152E+01 0.11070241E+00 0.67737728E-03
+ 0.14155294E+01 0.10833475E+00 0.67328924E-03
+ 0.14162346E+01 0.10962408E+00 0.67757023E-03
+ 0.14169399E+01 0.10997222E+00 0.67456567E-03
+ 0.14176540E+01 0.11033790E+00 0.67782647E-03
+ 0.14183593E+01 0.11106019E+00 0.67558972E-03
+ 0.14190735E+01 0.11000801E+00 0.67481853E-03
+ 0.14197787E+01 0.11022425E+00 0.67594089E-03
+ 0.14204929E+01 0.11000909E+00 0.67841122E-03
+ 0.14211981E+01 0.11079083E+00 0.67594822E-03
+ 0.14219123E+01 0.11136761E+00 0.67747588E-03
+ 0.14226176E+01 0.10893675E+00 0.67059987E-03
+ 0.14233317E+01 0.11158012E+00 0.67850534E-03
+ 0.14240459E+01 0.10969908E+00 0.67191827E-03
+ 0.14247600E+01 0.11082322E+00 0.68194704E-03
+ 0.14254653E+01 0.11120886E+00 0.67715131E-03
+ 0.14261794E+01 0.11071124E+00 0.67723176E-03
+ 0.14268936E+01 0.11197317E+00 0.67671860E-03
+ 0.14276078E+01 0.11074162E+00 0.67521556E-03
+ 0.14283220E+01 0.11088680E+00 0.67761674E-03
+ 0.14290361E+01 0.11177511E+00 0.68045274E-03
+ 0.14297503E+01 0.11028981E+00 0.67161274E-03
+ 0.14304645E+01 0.11134313E+00 0.67888014E-03
+ 0.14311787E+01 0.11153679E+00 0.67781145E-03
+ 0.14318929E+01 0.11103825E+00 0.67415216E-03
+ 0.14326071E+01 0.11224543E+00 0.67593344E-03
+ 0.14333302E+01 0.11314908E+00 0.68448723E-03
+ 0.14340444E+01 0.11232011E+00 0.67923829E-03
+ 0.14347584E+01 0.11026396E+00 0.66933490E-03
+ 0.14354815E+01 0.11114699E+00 0.67576923E-03
+ 0.14361957E+01 0.11221854E+00 0.67441468E-03
+ 0.14369189E+01 0.11266004E+00 0.68050128E-03
+ 0.14376330E+01 0.11154243E+00 0.67385146E-03
+ 0.14383562E+01 0.11325341E+00 0.68366493E-03
+ 0.14390703E+01 0.11157159E+00 0.67480071E-03
+ 0.14397935E+01 0.11372039E+00 0.68581518E-03
+ 0.14405075E+01 0.11350928E+00 0.68089680E-03
+ 0.14412307E+01 0.11319008E+00 0.67752734E-03
+ 0.14419538E+01 0.11198426E+00 0.67838933E-03
+ 0.14426680E+01 0.11326371E+00 0.67899877E-03
+ 0.14433911E+01 0.11280550E+00 0.67913375E-03
+ 0.14441142E+01 0.11315043E+00 0.67730120E-03
+ 0.14448372E+01 0.11200785E+00 0.67340321E-03
+ 0.14455603E+01 0.11489557E+00 0.68678055E-03
+ 0.14462835E+01 0.11286648E+00 0.67602663E-03
+ 0.14470066E+01 0.11349104E+00 0.67776541E-03
+ 0.14477297E+01 0.11264048E+00 0.67435158E-03
+ 0.14484528E+01 0.11363577E+00 0.68065024E-03
+ 0.14491758E+01 0.11278888E+00 0.67435548E-03
+ 0.14498990E+01 0.11130440E+00 0.66301122E-03
+ 0.14506310E+01 0.10948043E+00 0.66491548E-03
+ 0.14513541E+01 0.10987616E+00 0.66401553E-03
+ 0.14520773E+01 0.10864864E+00 0.65786124E-03
+ 0.14528003E+01 0.10725122E+00 0.64703572E-03
+ 0.14535323E+01 0.10550582E+00 0.64257660E-03
+ 0.14542555E+01 0.10532814E+00 0.63724665E-03
+ 0.14549875E+01 0.10039467E+00 0.62029477E-03
+ 0.14557105E+01 0.10338285E+00 0.62965421E-03
+ 0.14564426E+01 0.10239114E+00 0.62967063E-03
+ 0.14571657E+01 0.10211761E+00 0.62512181E-03
+ 0.14578978E+01 0.10022860E+00 0.62157481E-03
+ 0.14586208E+01 0.10194357E+00 0.62414049E-03
+ 0.14593529E+01 0.10205738E+00 0.62181149E-03
+ 0.14600849E+01 0.10043129E+00 0.61823742E-03
+ 0.14608170E+01 0.10075019E+00 0.61864185E-03
+ 0.14615489E+01 0.10036664E+00 0.61827764E-03
+ 0.14622720E+01 0.99417619E-01 0.61243266E-03
+ 0.14630041E+01 0.99943504E-01 0.61240903E-03
+ 0.14637361E+01 0.10004532E+00 0.61352231E-03
+ 0.14644681E+01 0.10002325E+00 0.61558496E-03
+ 0.14652002E+01 0.97831883E-01 0.60630223E-03
+ 0.14659323E+01 0.99229716E-01 0.60833938E-03
+ 0.14666642E+01 0.98523252E-01 0.60539099E-03
+ 0.14674052E+01 0.99341273E-01 0.60945476E-03
+ 0.14681373E+01 0.98649159E-01 0.60934870E-03
+ 0.14688692E+01 0.97689301E-01 0.60477253E-03
+ 0.14696013E+01 0.97443014E-01 0.60031051E-03
+ 0.14703423E+01 0.98792270E-01 0.60723984E-03
+ 0.14710742E+01 0.97716838E-01 0.60476729E-03
+ 0.14718063E+01 0.98557130E-01 0.60627947E-03
+ 0.14725473E+01 0.98241888E-01 0.60793204E-03
+ 0.14732792E+01 0.97179726E-01 0.59784192E-03
+ 0.14740202E+01 0.99001825E-01 0.60963939E-03
+ 0.14747523E+01 0.97942375E-01 0.60316204E-03
+ 0.14754932E+01 0.98752446E-01 0.60294592E-03
+ 0.14762342E+01 0.99016212E-01 0.60760183E-03
+ 0.14769661E+01 0.99067830E-01 0.60819881E-03
+ 0.14777071E+01 0.99294312E-01 0.60585421E-03
+ 0.14784482E+01 0.98302111E-01 0.60666789E-03
+ 0.14791801E+01 0.99558368E-01 0.60779817E-03
+ 0.14799211E+01 0.97663991E-01 0.59936766E-03
+ 0.14806620E+01 0.98307297E-01 0.60408417E-03
+ 0.14814030E+01 0.98987222E-01 0.60517236E-03
+ 0.14821440E+01 0.97177982E-01 0.59694331E-03
+ 0.14828849E+01 0.99696524E-01 0.60432922E-03
+ 0.14836259E+01 0.98319754E-01 0.60282153E-03
+ 0.14843668E+01 0.98785765E-01 0.60343469E-03
+ 0.14851078E+01 0.98475538E-01 0.59816585E-03
+ 0.14858576E+01 0.99029936E-01 0.60248212E-03
+ 0.14865986E+01 0.98594718E-01 0.60146884E-03
+ 0.14873396E+01 0.99892214E-01 0.60842151E-03
+ 0.14880805E+01 0.10020892E+00 0.60464354E-03
+ 0.14888304E+01 0.97731851E-01 0.60036522E-03
+ 0.14895713E+01 0.99783681E-01 0.60055900E-03
+ 0.14903213E+01 0.99137880E-01 0.60539664E-03
+ 0.14910622E+01 0.99093236E-01 0.59958361E-03
+ 0.14918121E+01 0.98874196E-01 0.60320756E-03
+ 0.14925530E+01 0.99982962E-01 0.60210098E-03
+ 0.14933029E+01 0.98802298E-01 0.60208299E-03
+ 0.14940438E+01 0.99889874E-01 0.60234067E-03
+ 0.14947938E+01 0.10009191E+00 0.60480245E-03
+ 0.14955436E+01 0.99619187E-01 0.60757826E-03
+ 0.14962846E+01 0.10021950E+00 0.60348201E-03
+ 0.14970345E+01 0.99479094E-01 0.60266105E-03
+ 0.14977844E+01 0.99597134E-01 0.60302432E-03
+ 0.14985342E+01 0.99206589E-01 0.59824466E-03
+ 0.14992841E+01 0.99470384E-01 0.60170615E-03
+ 0.15000340E+01 0.99854022E-01 0.60221314E-03
+ 0.15007839E+01 0.10061003E+00 0.60446205E-03
+ 0.15015337E+01 0.10064617E+00 0.60601818E-03
+ 0.15022837E+01 0.10042905E+00 0.60687459E-03
+ 0.15030335E+01 0.10004285E+00 0.60246594E-03
+ 0.15037835E+01 0.10019483E+00 0.59928506E-03
+ 0.15045422E+01 0.10088806E+00 0.60720003E-03
+ 0.15052922E+01 0.10056672E+00 0.60469517E-03
+ 0.15060420E+01 0.10108057E+00 0.59992430E-03
+ 0.15068008E+01 0.99176675E-01 0.59820648E-03
+ 0.15075507E+01 0.10047320E+00 0.60603686E-03
+ 0.15083005E+01 0.10141759E+00 0.60258614E-03
+ 0.15090594E+01 0.10149486E+00 0.60862454E-03
+ 0.15098093E+01 0.10042176E+00 0.60114730E-03
+ 0.15105681E+01 0.10123645E+00 0.60206873E-03
+ 0.15113269E+01 0.10175087E+00 0.60889107E-03
+ 0.15120767E+01 0.10101785E+00 0.60249009E-03
+ 0.15128356E+01 0.10228704E+00 0.60732960E-03
+ 0.15135944E+01 0.10139206E+00 0.60702092E-03
+ 0.15143443E+01 0.10080741E+00 0.59997360E-03
+ 0.15151031E+01 0.10175534E+00 0.60529570E-03
+ 0.15158619E+01 0.10250059E+00 0.60603092E-03
+ 0.15166208E+01 0.10256632E+00 0.60787867E-03
+ 0.15173795E+01 0.10252783E+00 0.60732081E-03
+ 0.15181383E+01 0.10295347E+00 0.60811423E-03
+ 0.15188972E+01 0.10159462E+00 0.60419989E-03
+ 0.15196559E+01 0.10175461E+00 0.60405472E-03
+ 0.15204148E+01 0.10185526E+00 0.60406665E-03
+ 0.15211736E+01 0.10191406E+00 0.60612941E-03
+ 0.15219324E+01 0.10280913E+00 0.60330424E-03
+ 0.15227002E+01 0.10176302E+00 0.60447102E-03
+ 0.15234590E+01 0.10314319E+00 0.61037752E-03
+ 0.15242177E+01 0.10227051E+00 0.60243689E-03
+ 0.15249854E+01 0.10213869E+00 0.60437550E-03
+ 0.15257443E+01 0.10362538E+00 0.60742529E-03
+ 0.15265120E+01 0.10341878E+00 0.61011710E-03
+ 0.15272708E+01 0.10408857E+00 0.60783268E-03
+ 0.15280386E+01 0.10187218E+00 0.60334720E-03
+ 0.15287974E+01 0.10279912E+00 0.60556957E-03
+ 0.15295651E+01 0.10228813E+00 0.60753617E-03
+ 0.15303240E+01 0.10366607E+00 0.60686929E-03
+ 0.15310917E+01 0.10348225E+00 0.60804439E-03
+ 0.15318594E+01 0.10358173E+00 0.60642773E-03
+ 0.15326271E+01 0.10315406E+00 0.60469424E-03
+ 0.15333949E+01 0.10320139E+00 0.60725893E-03
+ 0.15341537E+01 0.10504068E+00 0.61309768E-03
+ 0.15349214E+01 0.10486476E+00 0.61326224E-03
+ 0.15356892E+01 0.10367489E+00 0.60613855E-03
+ 0.15364569E+01 0.10361730E+00 0.60663966E-03
+ 0.15372247E+01 0.10417714E+00 0.60590240E-03
+ 0.15380013E+01 0.10433763E+00 0.60949882E-03
+ 0.15387690E+01 0.10364789E+00 0.60808461E-03
+ 0.15395368E+01 0.10430529E+00 0.60891447E-03
+ 0.15403045E+01 0.10371257E+00 0.60979358E-03
+ 0.15410722E+01 0.10458623E+00 0.60448359E-03
+ 0.15418489E+01 0.10490368E+00 0.61150780E-03
+ 0.15426167E+01 0.10326251E+00 0.60383300E-03
+ 0.15433844E+01 0.10471547E+00 0.60932105E-03
+ 0.15441611E+01 0.10477301E+00 0.61005226E-03
+ 0.15449288E+01 0.10454103E+00 0.60569675E-03
+ 0.15457054E+01 0.10457070E+00 0.60761254E-03
+ 0.15464733E+01 0.10446204E+00 0.60387183E-03
+ 0.15472499E+01 0.10413954E+00 0.60654688E-03
+ 0.15480266E+01 0.10495684E+00 0.61124831E-03
+ 0.15487943E+01 0.10566884E+00 0.61212300E-03
+ 0.15495709E+01 0.10490235E+00 0.60639140E-03
+ 0.15503476E+01 0.10512538E+00 0.61015278E-03
+ 0.15511242E+01 0.10604918E+00 0.61094353E-03
+ 0.15519010E+01 0.10593507E+00 0.61106775E-03
+ 0.15526776E+01 0.10465959E+00 0.60408493E-03
+ 0.15534543E+01 0.10519908E+00 0.60724514E-03
+ 0.15542309E+01 0.10523712E+00 0.60720218E-03
+ 0.15550076E+01 0.10612331E+00 0.61106490E-03
+ 0.15557842E+01 0.10504119E+00 0.60711568E-03
+ 0.15565609E+01 0.10620724E+00 0.61152969E-03
+ 0.15573376E+01 0.10597408E+00 0.60994830E-03
+ 0.15581143E+01 0.10607397E+00 0.60566812E-03
+ 0.15588999E+01 0.10534338E+00 0.61096926E-03
+ 0.15596765E+01 0.10606174E+00 0.60929626E-03
+ 0.15604532E+01 0.10610772E+00 0.60501910E-03
+ 0.15612388E+01 0.10587303E+00 0.60650730E-03
+ 0.15620154E+01 0.10682630E+00 0.60841767E-03
+ 0.15628010E+01 0.10698624E+00 0.61392831E-03
+ 0.15635777E+01 0.10709865E+00 0.61234384E-03
+ 0.15643632E+01 0.10704255E+00 0.61178196E-03
+ 0.15651399E+01 0.10535698E+00 0.60493953E-03
+ 0.15659255E+01 0.10725830E+00 0.61045727E-03
+ 0.15667112E+01 0.10824915E+00 0.61575678E-03
+ 0.15674878E+01 0.10719980E+00 0.60941401E-03
+ 0.15682734E+01 0.10434191E+00 0.59769221E-03
+ 0.15690590E+01 0.10672110E+00 0.60776412E-03
+ 0.15698446E+01 0.10700609E+00 0.60661306E-03
+ 0.15706302E+01 0.10774547E+00 0.61218569E-03
+ 0.15714158E+01 0.10823971E+00 0.61357295E-03
+ 0.15722014E+01 0.10757885E+00 0.61252632E-03
+ 0.15729870E+01 0.10737589E+00 0.61064959E-03
+ 0.15737725E+01 0.10812842E+00 0.61406201E-03
+ 0.15745581E+01 0.10697638E+00 0.61010988E-03
+ 0.15753437E+01 0.10857408E+00 0.61180425E-03
+ 0.15761383E+01 0.10831334E+00 0.61253313E-03
+ 0.15769238E+01 0.10857086E+00 0.61669527E-03
+ 0.15777094E+01 0.10864616E+00 0.61048195E-03
+ 0.15785040E+01 0.10733260E+00 0.61031355E-03
+ 0.15792896E+01 0.10947144E+00 0.61770162E-03
+ 0.15800751E+01 0.10871556E+00 0.61175087E-03
+ 0.15808697E+01 0.10838956E+00 0.61428471E-03
+ 0.15816553E+01 0.10846105E+00 0.61055785E-03
+ 0.15824498E+01 0.11001498E+00 0.61560469E-03
+ 0.15832443E+01 0.10943802E+00 0.61667548E-03
+ 0.15840299E+01 0.10838790E+00 0.60825184E-03
+ 0.15848243E+01 0.10905048E+00 0.61413780E-03
+ 0.15856189E+01 0.10823876E+00 0.60871331E-03
+ 0.15864134E+01 0.11041270E+00 0.62074512E-03
+ 0.15871990E+01 0.11000501E+00 0.61663915E-03
+ 0.15879935E+01 0.10927570E+00 0.61342219E-03
+ 0.15887880E+01 0.11035184E+00 0.61790313E-03
+ 0.15895826E+01 0.10985255E+00 0.61558647E-03
+ 0.15903771E+01 0.10971981E+00 0.61531819E-03
+ 0.15911716E+01 0.10975423E+00 0.61135343E-03
+ 0.15919751E+01 0.10961079E+00 0.61288150E-03
+ 0.15927696E+01 0.10811411E+00 0.60935068E-03
+ 0.15935640E+01 0.11098531E+00 0.61872881E-03
+ 0.15943586E+01 0.11018299E+00 0.61865954E-03
+ 0.15951531E+01 0.11106467E+00 0.61704422E-03
+ 0.15959566E+01 0.10946397E+00 0.61383110E-03
+ 0.15967511E+01 0.11129884E+00 0.61614072E-03
+ 0.15975546E+01 0.11115038E+00 0.61922736E-03
+ 0.15983491E+01 0.10980915E+00 0.61275414E-03
+ 0.15991524E+01 0.11066610E+00 0.61773625E-03
+ 0.15999470E+01 0.11054166E+00 0.61633240E-03
+ 0.16007504E+01 0.11169987E+00 0.62289101E-03
+ 0.16015450E+01 0.11056963E+00 0.61379734E-03
+ 0.16023484E+01 0.11097392E+00 0.61677332E-03
+ 0.16031519E+01 0.11083581E+00 0.61550847E-03
+ 0.16039553E+01 0.11071961E+00 0.61507622E-03
+ 0.16047587E+01 0.11193111E+00 0.62260544E-03
+ 0.16055533E+01 0.11109725E+00 0.61697827E-03
+ 0.16063567E+01 0.11105945E+00 0.61567407E-03
+ 0.16071602E+01 0.11181580E+00 0.62097365E-03
+ 0.16079637E+01 0.11299770E+00 0.62368735E-03
+ 0.16087670E+01 0.11216885E+00 0.61870390E-03
+ 0.16095705E+01 0.11111915E+00 0.61411317E-03
+ 0.16103829E+01 0.11214846E+00 0.62218023E-03
+ 0.16111864E+01 0.11252210E+00 0.62094169E-03
+ 0.16119897E+01 0.11205313E+00 0.61911572E-03
+ 0.16127932E+01 0.11139788E+00 0.61609806E-03
+ 0.16136056E+01 0.11279099E+00 0.62458706E-03
+ 0.16144091E+01 0.11263979E+00 0.62210741E-03
+ 0.16152124E+01 0.11060737E+00 0.61193574E-03
+ 0.16160249E+01 0.11279505E+00 0.62619953E-03
+ 0.16168283E+01 0.11306028E+00 0.61854866E-03
+ 0.16176407E+01 0.11208341E+00 0.61814435E-03
+ 0.16184530E+01 0.11218466E+00 0.62304776E-03
+ 0.16192565E+01 0.11315481E+00 0.62136794E-03
+ 0.16200689E+01 0.11370296E+00 0.62536640E-03
+ 0.16208812E+01 0.11303888E+00 0.62579871E-03
+ 0.16216847E+01 0.11331061E+00 0.62210590E-03
+ 0.16224971E+01 0.11394795E+00 0.62814151E-03
+ 0.16233095E+01 0.11309927E+00 0.62069425E-03
+ 0.16241218E+01 0.11288823E+00 0.62119437E-03
+ 0.16249342E+01 0.11345193E+00 0.62472897E-03
+ 0.16257466E+01 0.11450022E+00 0.62739028E-03
+ 0.16265589E+01 0.11322258E+00 0.62083756E-03
+ 0.16273713E+01 0.11339907E+00 0.62433601E-03
+ 0.16281837E+01 0.11334828E+00 0.61692926E-03
+ 0.16290050E+01 0.11148929E+00 0.61383401E-03
+ 0.16298174E+01 0.11247117E+00 0.61991648E-03
+ 0.16306298E+01 0.11188146E+00 0.61562954E-03
+ 0.16314421E+01 0.11152657E+00 0.61280862E-03
+ 0.16322634E+01 0.11050145E+00 0.61056478E-03
+ 0.16330758E+01 0.11040259E+00 0.60551421E-03
+ 0.16338971E+01 0.10900131E+00 0.60124317E-03
+ 0.16347095E+01 0.10895678E+00 0.59969240E-03
+ 0.16355307E+01 0.10739979E+00 0.59780694E-03
+ 0.16363431E+01 0.10611410E+00 0.58899313E-03
+ 0.16371645E+01 0.10686875E+00 0.59240981E-03
+ 0.16379857E+01 0.10628537E+00 0.59306493E-03
+ 0.16387981E+01 0.10611196E+00 0.58929226E-03
+ 0.16396194E+01 0.10520300E+00 0.58569870E-03
+ 0.16404407E+01 0.10502737E+00 0.58565784E-03
+ 0.16412621E+01 0.10521682E+00 0.58580050E-03
+ 0.16420833E+01 0.10409062E+00 0.58306952E-03
+ 0.16429046E+01 0.10393501E+00 0.58129791E-03
+ 0.16437259E+01 0.10456989E+00 0.58175268E-03
+ 0.16445472E+01 0.10342890E+00 0.57940639E-03
+ 0.16453685E+01 0.10413229E+00 0.57987554E-03
+ 0.16461898E+01 0.10328618E+00 0.57938759E-03
+ 0.16470112E+01 0.10453039E+00 0.57779270E-03
+ 0.16478413E+01 0.10414655E+00 0.58010902E-03
+ 0.16486627E+01 0.10255647E+00 0.57681999E-03
+ 0.16494839E+01 0.10323308E+00 0.57353120E-03
+ 0.16503142E+01 0.10355717E+00 0.57823001E-03
+ 0.16511354E+01 0.10315534E+00 0.57621259E-03
+ 0.16519657E+01 0.10426118E+00 0.58202981E-03
+ 0.16527870E+01 0.10339814E+00 0.57584286E-03
+ 0.16536173E+01 0.10184596E+00 0.57346461E-03
+ 0.16544385E+01 0.10398993E+00 0.57589583E-03
+ 0.16552688E+01 0.10267317E+00 0.57079678E-03
+ 0.16560990E+01 0.10344744E+00 0.57861907E-03
+ 0.16569203E+01 0.10299323E+00 0.57593564E-03
+ 0.16577505E+01 0.10327748E+00 0.57299226E-03
+ 0.16585808E+01 0.10282439E+00 0.57168974E-03
+ 0.16594110E+01 0.10338560E+00 0.57527138E-03
+ 0.16602412E+01 0.10429611E+00 0.57725009E-03
+ 0.16610714E+01 0.10336555E+00 0.57301694E-03
+ 0.16619016E+01 0.10399751E+00 0.57591824E-03
+ 0.16627319E+01 0.10416626E+00 0.57652011E-03
+ 0.16635621E+01 0.10310633E+00 0.57448092E-03
+ 0.16643924E+01 0.10287605E+00 0.57270128E-03
+ 0.16652225E+01 0.10400628E+00 0.57118875E-03
+ 0.16660618E+01 0.10243620E+00 0.57344529E-03
+ 0.16668919E+01 0.10350875E+00 0.57314499E-03
+ 0.16677222E+01 0.10416558E+00 0.57185377E-03
+ 0.16685613E+01 0.10351791E+00 0.57578500E-03
+ 0.16693915E+01 0.10386628E+00 0.57267869E-03
+ 0.16702307E+01 0.10450744E+00 0.57644059E-03
+ 0.16710609E+01 0.10371392E+00 0.57409535E-03
+ 0.16719000E+01 0.10425200E+00 0.57363661E-03
+ 0.16727393E+01 0.10425976E+00 0.57947810E-03
+ 0.16735694E+01 0.10444684E+00 0.57431607E-03
+ 0.16744087E+01 0.10495086E+00 0.57679060E-03
+ 0.16752478E+01 0.10394354E+00 0.57306769E-03
+ 0.16760869E+01 0.10432530E+00 0.57640753E-03
+ 0.16769172E+01 0.10381144E+00 0.57261466E-03
+ 0.16777563E+01 0.10547587E+00 0.57665433E-03
+ 0.16785954E+01 0.10419446E+00 0.57571119E-03
+ 0.16794347E+01 0.10647321E+00 0.58065343E-03
+ 0.16802738E+01 0.10541354E+00 0.57575817E-03
+ 0.16811218E+01 0.10475717E+00 0.57462836E-03
+ 0.16819611E+01 0.10591964E+00 0.57946442E-03
+ 0.16828002E+01 0.10449386E+00 0.57561975E-03
+ 0.16836393E+01 0.10460842E+00 0.57452312E-03
+ 0.16844785E+01 0.10511678E+00 0.57405763E-03
+ 0.16853266E+01 0.10650815E+00 0.58276608E-03
+ 0.16861657E+01 0.10361630E+00 0.57142379E-03
+ 0.16870137E+01 0.10450904E+00 0.57659869E-03
+ 0.16878530E+01 0.10643598E+00 0.57839550E-03
+ 0.16887010E+01 0.10634577E+00 0.58103440E-03
+ 0.16895401E+01 0.10490222E+00 0.57676597E-03
+ 0.16903883E+01 0.10575832E+00 0.57628239E-03
+ 0.16912364E+01 0.10559849E+00 0.57886459E-03
+ 0.16920755E+01 0.10538785E+00 0.57847262E-03
+ 0.16929235E+01 0.10556357E+00 0.57679543E-03
+ 0.16937717E+01 0.10664003E+00 0.58159907E-03
+ 0.16946198E+01 0.10542624E+00 0.57683227E-03
+ 0.16954678E+01 0.10649376E+00 0.57876302E-03
+ 0.16963159E+01 0.10589553E+00 0.57727809E-03
+ 0.16971641E+01 0.10698171E+00 0.58375619E-03
+ 0.16980121E+01 0.10666475E+00 0.58273476E-03
+ 0.16988602E+01 0.10632148E+00 0.58067200E-03
+ 0.16997082E+01 0.10621674E+00 0.57820015E-03
+ 0.17005563E+01 0.10695291E+00 0.58107346E-03
+ 0.17014045E+01 0.10691151E+00 0.57869486E-03
+ 0.17022614E+01 0.10683710E+00 0.58146927E-03
+ 0.17031095E+01 0.10657930E+00 0.58208464E-03
+ 0.17039576E+01 0.10827507E+00 0.58381667E-03
+ 0.17048146E+01 0.10759293E+00 0.58551237E-03
+ 0.17056627E+01 0.10680330E+00 0.57858857E-03
+ 0.17065197E+01 0.10751773E+00 0.58564247E-03
+ 0.17073678E+01 0.10741558E+00 0.58282696E-03
+ 0.17082248E+01 0.10809904E+00 0.58397505E-03
+ 0.17090818E+01 0.10794865E+00 0.58602908E-03
+ 0.17099298E+01 0.10800737E+00 0.58377167E-03
+ 0.17107869E+01 0.10703658E+00 0.58079604E-03
+ 0.17116439E+01 0.10772043E+00 0.58228138E-03
+ 0.17125009E+01 0.10743232E+00 0.58323698E-03
+ 0.17133579E+01 0.10882056E+00 0.58622228E-03
+ 0.17142149E+01 0.10729928E+00 0.58117649E-03
+ 0.17150719E+01 0.10878698E+00 0.58875099E-03
+ 0.17159289E+01 0.10869481E+00 0.58583473E-03
+ 0.17167859E+01 0.10695859E+00 0.58332179E-03
+ 0.17176429E+01 0.10920099E+00 0.58708159E-03
+ 0.17185000E+01 0.10879825E+00 0.58443687E-03
+ 0.17193660E+01 0.10820486E+00 0.58508728E-03
+ 0.17202229E+01 0.10935292E+00 0.58808335E-03
+ 0.17210799E+01 0.10917941E+00 0.58477308E-03
+ 0.17219459E+01 0.10917697E+00 0.58866816E-03
+ 0.17228029E+01 0.10997823E+00 0.59288193E-03
+ 0.17236599E+01 0.10935382E+00 0.58673840E-03
+ 0.17245258E+01 0.10958210E+00 0.58765482E-03
+ 0.17253917E+01 0.10996084E+00 0.59373153E-03
+ 0.17262487E+01 0.10881127E+00 0.58600138E-03
+ 0.17271147E+01 0.11137408E+00 0.59299282E-03
+ 0.17279806E+01 0.10930322E+00 0.58961823E-03
+ 0.17288376E+01 0.10974684E+00 0.58975036E-03
+ 0.17297035E+01 0.11006253E+00 0.58835454E-03
+ 0.17305695E+01 0.11000219E+00 0.59119338E-03
+ 0.17314354E+01 0.11003097E+00 0.59025508E-03
+ 0.17323014E+01 0.11024261E+00 0.59000414E-03
+ 0.17331673E+01 0.10911530E+00 0.58574224E-03
+ 0.17340332E+01 0.10954051E+00 0.58821414E-03
+ 0.17348992E+01 0.11132374E+00 0.59331517E-03
+ 0.17357651E+01 0.10988458E+00 0.58769266E-03
+ 0.17366400E+01 0.11014921E+00 0.59117214E-03
+ 0.17375059E+01 0.10987643E+00 0.58802497E-03
+ 0.17383718E+01 0.11155611E+00 0.59460220E-03
+ 0.17392467E+01 0.11129337E+00 0.59550250E-03
+ 0.17401127E+01 0.11020943E+00 0.58894616E-03
+ 0.17409875E+01 0.10958425E+00 0.59010257E-03
+ 0.17418535E+01 0.11176384E+00 0.59303921E-03
+ 0.17427284E+01 0.11198293E+00 0.59773732E-03
+ 0.17435943E+01 0.11166442E+00 0.59485913E-03
+ 0.17444692E+01 0.11099184E+00 0.59002568E-03
+ 0.17453440E+01 0.11107370E+00 0.59496390E-03
+ 0.17462100E+01 0.11145516E+00 0.59257325E-03
+ 0.17470849E+01 0.11051402E+00 0.59109100E-03
+ 0.17479596E+01 0.11142213E+00 0.59381581E-03
+ 0.17488345E+01 0.11204571E+00 0.59520634E-03
+ 0.17497094E+01 0.11163050E+00 0.59443794E-03
+ 0.17505842E+01 0.11186462E+00 0.59429486E-03
+ 0.17514591E+01 0.11190499E+00 0.59609441E-03
+ 0.17523340E+01 0.11159101E+00 0.59596973E-03
+ 0.17532089E+01 0.11261650E+00 0.59866626E-03
+ 0.17540838E+01 0.11188989E+00 0.59439422E-03
+ 0.17549675E+01 0.11216841E+00 0.59693685E-03
+ 0.17558423E+01 0.11241146E+00 0.59707445E-03
+ 0.17567172E+01 0.11281610E+00 0.59456541E-03
+ 0.17576010E+01 0.11214210E+00 0.59669674E-03
+ 0.17584759E+01 0.11174329E+00 0.59622212E-03
+ 0.17593508E+01 0.11289474E+00 0.59582177E-03
+ 0.17602345E+01 0.11320641E+00 0.59836480E-03
+ 0.17611183E+01 0.11306216E+00 0.60241012E-03
+ 0.17619932E+01 0.11288577E+00 0.59941900E-03
+ 0.17628770E+01 0.11273675E+00 0.59480715E-03
+ 0.17637608E+01 0.11333633E+00 0.60364307E-03
+ 0.17646357E+01 0.11343835E+00 0.60010364E-03
+ 0.17655194E+01 0.11391127E+00 0.60127798E-03
+ 0.17664032E+01 0.11358733E+00 0.60000969E-03
+ 0.17672870E+01 0.11488615E+00 0.60480309E-03
+ 0.17681708E+01 0.11438881E+00 0.60565089E-03
+ 0.17690545E+01 0.11363745E+00 0.59946743E-03
+ 0.17699383E+01 0.11403100E+00 0.60266542E-03
+ 0.17708222E+01 0.11312009E+00 0.59517712E-03
+ 0.17717149E+01 0.11383180E+00 0.60357072E-03
+ 0.17725986E+01 0.11397691E+00 0.60313451E-03
+ 0.17734824E+01 0.11370155E+00 0.60100597E-03
+ 0.17743663E+01 0.11393327E+00 0.59785321E-03
+ 0.17752590E+01 0.11461633E+00 0.60545141E-03
+ 0.17761427E+01 0.11345688E+00 0.59683237E-03
+ 0.17770355E+01 0.11197444E+00 0.59440552E-03
+ 0.17779193E+01 0.11349981E+00 0.59745047E-03
+ 0.17788121E+01 0.11289843E+00 0.59923087E-03
+ 0.17796957E+01 0.11077321E+00 0.58735552E-03
+ 0.17805885E+01 0.11082554E+00 0.58797392E-03
+ 0.17814813E+01 0.11088351E+00 0.58768422E-03
+ 0.17823739E+01 0.11005984E+00 0.58542093E-03
+ 0.17832577E+01 0.11051170E+00 0.58742956E-03
+ 0.17841505E+01 0.10879292E+00 0.57977438E-03
+ 0.17850431E+01 0.10931888E+00 0.58251939E-03
+ 0.17859359E+01 0.10898864E+00 0.58325252E-03
+ 0.17868286E+01 0.10920572E+00 0.58188895E-03
+ 0.17877213E+01 0.10970545E+00 0.58310688E-03
+ 0.17886140E+01 0.10830778E+00 0.57632662E-03
+ 0.17895157E+01 0.10901567E+00 0.58217900E-03
+ 0.17904084E+01 0.10839457E+00 0.57917059E-03
+ 0.17913011E+01 0.10726622E+00 0.57359127E-03
+ 0.17921939E+01 0.10909414E+00 0.57984912E-03
+ 0.17930955E+01 0.10790303E+00 0.57846581E-03
+ 0.17939882E+01 0.10816605E+00 0.57616661E-03
+ 0.17948898E+01 0.10838470E+00 0.57896704E-03
+ 0.17957826E+01 0.10834501E+00 0.57495869E-03
+ 0.17966843E+01 0.10801548E+00 0.57677983E-03
+ 0.17975769E+01 0.10755487E+00 0.57425245E-03
+ 0.17984786E+01 0.10778822E+00 0.57273055E-03
+ 0.17993802E+01 0.10828232E+00 0.57583646E-03
+ 0.18002819E+01 0.10906690E+00 0.57840027E-03
+ 0.18011835E+01 0.10754982E+00 0.57716371E-03
+ 0.18020762E+01 0.10898528E+00 0.57967106E-03
+ 0.18029779E+01 0.10863974E+00 0.58035587E-03
+ 0.18038795E+01 0.10836124E+00 0.57754479E-03
+ 0.18047812E+01 0.10873486E+00 0.57834631E-03
+ 0.18056828E+01 0.10892917E+00 0.57663739E-03
+ 0.18065934E+01 0.10914216E+00 0.57970814E-03
+ 0.18074950E+01 0.10971647E+00 0.57957921E-03
+ 0.18083967E+01 0.10862896E+00 0.57828013E-03
+ 0.18092983E+01 0.10824698E+00 0.57318545E-03
+ 0.18102089E+01 0.10786647E+00 0.57646428E-03
+ 0.18111105E+01 0.10847919E+00 0.57660026E-03
+ 0.18120122E+01 0.10904218E+00 0.57570986E-03
+ 0.18129227E+01 0.10884821E+00 0.57779264E-03
+ 0.18138244E+01 0.10940423E+00 0.57723018E-03
+ 0.18147349E+01 0.10942933E+00 0.57802687E-03
+ 0.18156456E+01 0.10925162E+00 0.58015424E-03
+ 0.18165472E+01 0.10967811E+00 0.57645055E-03
+ 0.18174578E+01 0.10817076E+00 0.57344511E-03
+ 0.18183683E+01 0.11042011E+00 0.58124325E-03
+ 0.18192790E+01 0.10949656E+00 0.57880871E-03
+ 0.18201895E+01 0.10917185E+00 0.57683559E-03
+ 0.18211000E+01 0.10986226E+00 0.57986903E-03
+ 0.18220106E+01 0.10932609E+00 0.57579041E-03
+ 0.18229212E+01 0.10989536E+00 0.58048614E-03
+ 0.18238318E+01 0.10999735E+00 0.57849626E-03
+ 0.18247423E+01 0.10917721E+00 0.57798799E-03
+ 0.18256530E+01 0.11062538E+00 0.58136479E-03
+ 0.18265635E+01 0.11001222E+00 0.57623058E-03
+ 0.18274829E+01 0.10905300E+00 0.57637587E-03
+ 0.18283936E+01 0.10976628E+00 0.58012328E-03
+ 0.18293041E+01 0.11089444E+00 0.58078987E-03
+ 0.18302237E+01 0.10997369E+00 0.57964562E-03
+ 0.18311342E+01 0.10945351E+00 0.57797658E-03
+ 0.18320537E+01 0.11103179E+00 0.57892274E-03
+ 0.18329732E+01 0.11164559E+00 0.58502285E-03
+ 0.18338838E+01 0.11114827E+00 0.57938538E-03
+ 0.18348032E+01 0.11059901E+00 0.58215758E-03
+ 0.18357228E+01 0.11112723E+00 0.58138830E-03
+ 0.18366423E+01 0.11170807E+00 0.58758550E-03
+ 0.18375528E+01 0.11102949E+00 0.58179582E-03
+ 0.18384724E+01 0.11086644E+00 0.58085343E-03
+ 0.18393918E+01 0.11085389E+00 0.58204844E-03
+ 0.18403113E+01 0.11220116E+00 0.58589736E-03
+ 0.18412309E+01 0.11174450E+00 0.58376149E-03
+ 0.18421593E+01 0.11208004E+00 0.58402796E-03
+ 0.18430787E+01 0.11112729E+00 0.58229320E-03
+ 0.18439983E+01 0.11174884E+00 0.58485416E-03
+ 0.18449178E+01 0.11140542E+00 0.58030675E-03
+ 0.18458462E+01 0.11226188E+00 0.58551028E-03
+ 0.18467656E+01 0.11223348E+00 0.58619771E-03
+ 0.18476852E+01 0.11272841E+00 0.58670365E-03
+ 0.18486136E+01 0.11175613E+00 0.58539020E-03
+ 0.18495331E+01 0.11194700E+00 0.58484386E-03
+ 0.18504615E+01 0.11263853E+00 0.58645307E-03
+ 0.18513900E+01 0.11290100E+00 0.59017848E-03
+ 0.18523095E+01 0.11166918E+00 0.58263930E-03
+ 0.18532379E+01 0.11356155E+00 0.59046107E-03
+ 0.18541663E+01 0.11336442E+00 0.58779982E-03
+ 0.18550948E+01 0.11284864E+00 0.58758835E-03
+ 0.18560232E+01 0.11306340E+00 0.58763439E-03
+ 0.18569516E+01 0.11388631E+00 0.58841542E-03
+ 0.18578800E+01 0.11399116E+00 0.59107819E-03
+ 0.18588084E+01 0.11360887E+00 0.58913772E-03
+ 0.18597369E+01 0.11229062E+00 0.58620324E-03
+ 0.18606653E+01 0.11369414E+00 0.59004407E-03
+ 0.18615937E+01 0.11365593E+00 0.59064530E-03
+ 0.18625221E+01 0.11398613E+00 0.58793940E-03
+ 0.18634595E+01 0.11436665E+00 0.59509027E-03
+ 0.18643880E+01 0.11331689E+00 0.58731355E-03
+ 0.18653164E+01 0.11318520E+00 0.58841484E-03
+ 0.18662537E+01 0.11406078E+00 0.59103547E-03
+ 0.18671821E+01 0.11405031E+00 0.58947259E-03
+ 0.18681195E+01 0.11419708E+00 0.59091015E-03
+ 0.18690568E+01 0.11492116E+00 0.59629895E-03
+ 0.18699852E+01 0.11403707E+00 0.58917562E-03
+ 0.18709227E+01 0.11451298E+00 0.59131702E-03
+ 0.18718600E+01 0.11421490E+00 0.59145142E-03
+ 0.18727974E+01 0.11449269E+00 0.59171428E-03
+ 0.18737347E+01 0.11454964E+00 0.59255061E-03
+ 0.18746721E+01 0.11506075E+00 0.59191871E-03
+ 0.18756094E+01 0.11483872E+00 0.59181591E-03
+ 0.18765467E+01 0.11416465E+00 0.59217279E-03
+ 0.18774841E+01 0.11505827E+00 0.59444568E-03
+ 0.18784214E+01 0.11469394E+00 0.59401197E-03
+ 0.18793588E+01 0.11512279E+00 0.59406419E-03
+ 0.18802962E+01 0.11639881E+00 0.59602904E-03
+ 0.18812425E+01 0.11583819E+00 0.59770839E-03
+ 0.18821799E+01 0.11578485E+00 0.59804146E-03
+ 0.18831172E+01 0.11628367E+00 0.59691514E-03
+ 0.18840635E+01 0.11589980E+00 0.59878704E-03
+ 0.18850008E+01 0.11563440E+00 0.59530343E-03
+ 0.18859471E+01 0.11519240E+00 0.59194845E-03
+ 0.18868934E+01 0.11591002E+00 0.59914024E-03
+ 0.18878307E+01 0.11635502E+00 0.59769861E-03
+ 0.18887770E+01 0.11697498E+00 0.60100306E-03
+ 0.18897233E+01 0.11622197E+00 0.59988687E-03
+ 0.18906696E+01 0.11661028E+00 0.59838098E-03
+ 0.18916159E+01 0.11627940E+00 0.59816998E-03
+ 0.18925622E+01 0.11683653E+00 0.60176791E-03
+ 0.18935084E+01 0.11721103E+00 0.60052844E-03
+ 0.18944547E+01 0.11741733E+00 0.60316588E-03
+ 0.18954010E+01 0.11644066E+00 0.59913483E-03
+ 0.18963473E+01 0.11714868E+00 0.60366414E-03
+ 0.18972936E+01 0.11613832E+00 0.59985230E-03
+ 0.18982399E+01 0.11743680E+00 0.60131279E-03
+ 0.18991950E+01 0.11692841E+00 0.60268509E-03
+ 0.19001412E+01 0.11860923E+00 0.60904707E-03
+ 0.19010875E+01 0.11734651E+00 0.60179958E-03
+ 0.19020427E+01 0.11730690E+00 0.60155068E-03
+ 0.19029890E+01 0.11665316E+00 0.60031353E-03
+ 0.19039443E+01 0.11897881E+00 0.60624984E-03
+ 0.19048995E+01 0.11705081E+00 0.60351490E-03
+ 0.19058458E+01 0.11741611E+00 0.60355075E-03
+ 0.19068010E+01 0.11786392E+00 0.60485426E-03
+ 0.19077562E+01 0.11786199E+00 0.60535874E-03
+ 0.19087114E+01 0.11906022E+00 0.60906826E-03
+ 0.19096665E+01 0.11718965E+00 0.60417765E-03
+ 0.19106218E+01 0.11869223E+00 0.60585130E-03
+ 0.19115770E+01 0.11751045E+00 0.60540350E-03
+ 0.19125322E+01 0.11841681E+00 0.60785445E-03
+ 0.19134874E+01 0.11810828E+00 0.60669833E-03
+ 0.19144427E+01 0.11879615E+00 0.60872239E-03
+ 0.19153979E+01 0.11887574E+00 0.60908892E-03
+ 0.19163531E+01 0.12006862E+00 0.61215617E-03
+ 0.19173172E+01 0.11913186E+00 0.60974341E-03
+ 0.19182724E+01 0.11928642E+00 0.61171001E-03
+ 0.19192365E+01 0.11901601E+00 0.61097025E-03
+ 0.19201918E+01 0.11920267E+00 0.60820661E-03
+ 0.19211559E+01 0.12031695E+00 0.61676785E-03
+ 0.19221110E+01 0.11976368E+00 0.61180029E-03
+ 0.19230752E+01 0.12002856E+00 0.61142159E-03
+ 0.19240394E+01 0.12022229E+00 0.61822135E-03
+ 0.19249946E+01 0.11962359E+00 0.61137980E-03
+ 0.19259588E+01 0.11962171E+00 0.61333342E-03
+ 0.19269228E+01 0.12022313E+00 0.61397452E-03
+ 0.19278870E+01 0.12033796E+00 0.61476405E-03
+ 0.19288511E+01 0.12141152E+00 0.61929104E-03
+ 0.19298153E+01 0.11913475E+00 0.60997577E-03
+ 0.19307793E+01 0.12148196E+00 0.62171370E-03
+ 0.19317435E+01 0.12109944E+00 0.61849976E-03
+ 0.19327077E+01 0.12092350E+00 0.61511347E-03
+ 0.19336807E+01 0.12200958E+00 0.62263402E-03
+ 0.19346448E+01 0.12120023E+00 0.62063819E-03
+ 0.19356090E+01 0.12106544E+00 0.61776483E-03
+ 0.19365821E+01 0.12163669E+00 0.62059367E-03
+ 0.19375461E+01 0.12076673E+00 0.61578059E-03
+ 0.19385192E+01 0.12087229E+00 0.61879487E-03
+ 0.19394834E+01 0.12110665E+00 0.61868667E-03
+ 0.19404564E+01 0.12214372E+00 0.62093080E-03
+ 0.19414295E+01 0.12191521E+00 0.62569557E-03
+ 0.19423937E+01 0.12125119E+00 0.62128954E-03
+ 0.19433666E+01 0.12116084E+00 0.61667961E-03
+ 0.19443398E+01 0.12218471E+00 0.62461541E-03
+ 0.19453129E+01 0.12149949E+00 0.62096590E-03
+ 0.19462858E+01 0.12357658E+00 0.62922353E-03
+ 0.19472589E+01 0.12079374E+00 0.61745982E-03
+ 0.19482321E+01 0.12142660E+00 0.62320073E-03
+ 0.19492050E+01 0.12255497E+00 0.62277220E-03
+ 0.19501781E+01 0.12234277E+00 0.62679342E-03
+ 0.19511513E+01 0.12336549E+00 0.62648725E-03
+ 0.19521332E+01 0.12314989E+00 0.62960887E-03
+ 0.19531063E+01 0.12266306E+00 0.62706677E-03
+ 0.19540793E+01 0.12285618E+00 0.62387279E-03
+ 0.19550613E+01 0.12218361E+00 0.62563486E-03
+ 0.19560344E+01 0.12328886E+00 0.62737887E-03
+ 0.19570163E+01 0.12340290E+00 0.62778796E-03
+ 0.19579984E+01 0.12268184E+00 0.62710774E-03
+ 0.19589714E+01 0.12323043E+00 0.62870071E-03
+ 0.19599534E+01 0.12371299E+00 0.63005631E-03
+ 0.19609354E+01 0.12259692E+00 0.62686094E-03
+ 0.19619174E+01 0.12405139E+00 0.63468184E-03
+ 0.19628904E+01 0.12353788E+00 0.62884367E-03
+ 0.19638724E+01 0.12379982E+00 0.63221640E-03
+ 0.19648545E+01 0.12408698E+00 0.63133950E-03
+ 0.19658364E+01 0.12422811E+00 0.63170039E-03
+ 0.19668273E+01 0.12383535E+00 0.63271547E-03
+ 0.19678093E+01 0.12340195E+00 0.63251430E-03
+ 0.19687914E+01 0.12410453E+00 0.63332950E-03
+ 0.19697733E+01 0.12486070E+00 0.63204125E-03
+ 0.19707642E+01 0.12437578E+00 0.63510065E-03
+ 0.19717462E+01 0.12591535E+00 0.64326212E-03
+ 0.19727283E+01 0.12429789E+00 0.63318876E-03
+ 0.19737191E+01 0.12503889E+00 0.63887349E-03
+ 0.19747010E+01 0.12582535E+00 0.63699944E-03
+ 0.19756920E+01 0.12566648E+00 0.63990726E-03
+ 0.19766829E+01 0.12532797E+00 0.63890044E-03
+ 0.19776649E+01 0.12568836E+00 0.63875969E-03
+ 0.19786558E+01 0.12409209E+00 0.63487043E-03
+ 0.19796468E+01 0.12576796E+00 0.63961546E-03
+ 0.19806377E+01 0.12606214E+00 0.64124400E-03
+ 0.19816285E+01 0.12645324E+00 0.64155663E-03
+ 0.19826195E+01 0.12597571E+00 0.64057915E-03
+ 0.19836104E+01 0.12487321E+00 0.63612469E-03
+ 0.19846014E+01 0.12537564E+00 0.63870347E-03
+ 0.19855922E+01 0.12527350E+00 0.64151868E-03
+ 0.19865832E+01 0.12694576E+00 0.64472033E-03
+ 0.19875830E+01 0.12672350E+00 0.64673676E-03
+ 0.19885739E+01 0.12730561E+00 0.64711436E-03
+ 0.19895649E+01 0.12730159E+00 0.64511708E-03
+ 0.19905647E+01 0.12517665E+00 0.64263720E-03
+ 0.19915556E+01 0.12729494E+00 0.64650347E-03
+ 0.19925555E+01 0.12737656E+00 0.64825162E-03
+ 0.19935464E+01 0.12698685E+00 0.64456055E-03
+ 0.19945462E+01 0.12767099E+00 0.64821116E-03
+ 0.19955461E+01 0.12753285E+00 0.65274682E-03
+ 0.19965370E+01 0.12779546E+00 0.64856495E-03
+ 0.19975368E+01 0.12718365E+00 0.64901198E-03
+ 0.19985367E+01 0.12757221E+00 0.64995576E-03
+ 0.19995365E+01 0.12866662E+00 0.65372791E-03
+ 0.20005364E+01 0.12785222E+00 0.65044197E-03
+ 0.20015361E+01 0.12775646E+00 0.64885453E-03
+ 0.20025361E+01 0.12772514E+00 0.65151305E-03
+ 0.20035360E+01 0.12806255E+00 0.65105624E-03
+ 0.20045447E+01 0.12822127E+00 0.65529061E-03
+ 0.20055444E+01 0.12876780E+00 0.65578567E-03
+ 0.20065444E+01 0.12770909E+00 0.65044285E-03
+ 0.20075531E+01 0.12948331E+00 0.66070195E-03
+ 0.20085530E+01 0.12893157E+00 0.65401808E-03
+ 0.20095618E+01 0.12920988E+00 0.65967947E-03
+ 0.20105615E+01 0.12865871E+00 0.65451732E-03
+ 0.20115705E+01 0.12824892E+00 0.65538572E-03
+ 0.20125701E+01 0.12921800E+00 0.65612333E-03
+ 0.20135789E+01 0.12815040E+00 0.65391243E-03
+ 0.20145876E+01 0.12926687E+00 0.65874396E-03
+ 0.20155966E+01 0.12989467E+00 0.66066638E-03
+ 0.20166054E+01 0.12967657E+00 0.66157494E-03
+ 0.20176141E+01 0.12905096E+00 0.65663963E-03
+ 0.20186229E+01 0.12852684E+00 0.65625308E-03
+ 0.20196316E+01 0.12968387E+00 0.65992930E-03
+ 0.20206404E+01 0.12891889E+00 0.66041457E-03
+ 0.20216491E+01 0.13065799E+00 0.66443841E-03
+ 0.20226579E+01 0.12848079E+00 0.65612653E-03
+ 0.20236666E+01 0.12941544E+00 0.65754203E-03
+ 0.20246844E+01 0.13009839E+00 0.66381629E-03
+ 0.20256932E+01 0.13005452E+00 0.66112599E-03
+ 0.20267107E+01 0.13030976E+00 0.66521193E-03
+ 0.20277197E+01 0.12984915E+00 0.65930397E-03
+ 0.20287373E+01 0.13060147E+00 0.66766219E-03
+ 0.20297461E+01 0.13103439E+00 0.66667056E-03
+ 0.20307639E+01 0.13125937E+00 0.66558801E-03
+ 0.20317814E+01 0.13145095E+00 0.67108189E-03
+ 0.20327902E+01 0.13054603E+00 0.66584261E-03
+ 0.20338080E+01 0.13198811E+00 0.67059993E-03
+ 0.20348256E+01 0.13066109E+00 0.66519459E-03
+ 0.20358434E+01 0.12998959E+00 0.66078280E-03
+ 0.20368609E+01 0.13266151E+00 0.67375199E-03
+ 0.20378788E+01 0.13229190E+00 0.67140313E-03
+ 0.20388966E+01 0.13099049E+00 0.66371559E-03
+ 0.20399232E+01 0.13196832E+00 0.67251397E-03
+ 0.20409408E+01 0.13290741E+00 0.67538867E-03
+ 0.20419586E+01 0.13148192E+00 0.66473143E-03
+ 0.20429852E+01 0.13287422E+00 0.67425834E-03
+ 0.20440028E+01 0.13203044E+00 0.66981273E-03
+ 0.20450294E+01 0.13158019E+00 0.67023910E-03
+ 0.20460472E+01 0.13214128E+00 0.66863524E-03
+ 0.20470738E+01 0.13356932E+00 0.68185915E-03
+ 0.20480914E+01 0.13241448E+00 0.67171850E-03
+ 0.20491180E+01 0.13317373E+00 0.67454134E-03
+ 0.20501447E+01 0.13303374E+00 0.67610509E-03
+ 0.20511713E+01 0.13324431E+00 0.68088289E-03
+ 0.20521979E+01 0.13267246E+00 0.67899714E-03
+ 0.20532157E+01 0.13322879E+00 0.67865045E-03
+ 0.20542424E+01 0.13138564E+00 0.66768355E-03
+ 0.20552778E+01 0.13377894E+00 0.67944435E-03
+ 0.20563045E+01 0.13366799E+00 0.68001566E-03
+ 0.20573311E+01 0.13341364E+00 0.67883858E-03
+ 0.20583577E+01 0.13313963E+00 0.67769224E-03
+ 0.20593843E+01 0.13406008E+00 0.67953300E-03
+ 0.20604198E+01 0.13387038E+00 0.68456813E-03
+ 0.20614464E+01 0.13512012E+00 0.68274065E-03
+ 0.20624821E+01 0.13515787E+00 0.69128629E-03
+ 0.20635087E+01 0.13325372E+00 0.67532703E-03
+ 0.20645442E+01 0.13387249E+00 0.68217766E-03
+ 0.20655708E+01 0.13614123E+00 0.69238222E-03
+ 0.20666065E+01 0.13409020E+00 0.68317668E-03
+ 0.20676420E+01 0.13565941E+00 0.69309573E-03
+ 0.20686686E+01 0.13496219E+00 0.68562024E-03
+ 0.20697041E+01 0.13510370E+00 0.68498118E-03
+ 0.20707397E+01 0.13501497E+00 0.68759487E-03
+ 0.20717752E+01 0.13527475E+00 0.68877015E-03
+ 0.20728109E+01 0.13557224E+00 0.69032121E-03
+ 0.20738463E+01 0.13589878E+00 0.68917015E-03
+ 0.20748909E+01 0.13568604E+00 0.69079455E-03
+ 0.20759263E+01 0.13656588E+00 0.69453422E-03
+ 0.20769620E+01 0.13445833E+00 0.68484928E-03
+ 0.20779974E+01 0.13573900E+00 0.69079298E-03
+ 0.20790420E+01 0.13520530E+00 0.69039478E-03
+ 0.20800776E+01 0.13572930E+00 0.68851718E-03
+ 0.20811219E+01 0.13687709E+00 0.69973787E-03
+ 0.20821576E+01 0.13695909E+00 0.69796684E-03
+ 0.20832021E+01 0.13642974E+00 0.69401140E-03
+ 0.20842466E+01 0.13593678E+00 0.69470017E-03
+ 0.20852821E+01 0.13738099E+00 0.70045283E-03
+ 0.20863266E+01 0.13596724E+00 0.69362199E-03
+ 0.20873711E+01 0.13709460E+00 0.69666503E-03
+ 0.20884156E+01 0.13667136E+00 0.69691398E-03
+ 0.20894599E+01 0.13523427E+00 0.68795017E-03
+ 0.20905044E+01 0.13699351E+00 0.69943006E-03
+ 0.20915489E+01 0.13758065E+00 0.70063118E-03
+ 0.20925934E+01 0.13800777E+00 0.70534594E-03
+ 0.20936379E+01 0.13811904E+00 0.70211501E-03
+ 0.20946913E+01 0.13678056E+00 0.69899019E-03
+ 0.20957358E+01 0.13775560E+00 0.70506398E-03
+ 0.20967803E+01 0.13824296E+00 0.70375885E-03
+ 0.20978336E+01 0.13709013E+00 0.70177263E-03
+ 0.20988781E+01 0.13800640E+00 0.70415559E-03
+ 0.20999315E+01 0.13856971E+00 0.70670876E-03
+ 0.21009760E+01 0.13791128E+00 0.70287992E-03
+ 0.21020296E+01 0.13718158E+00 0.69925765E-03
+ 0.21030829E+01 0.13958199E+00 0.71049470E-03
+ 0.21041362E+01 0.13849862E+00 0.71013876E-03
+ 0.21051807E+01 0.13820112E+00 0.70730870E-03
+ 0.21062341E+01 0.13965748E+00 0.71315735E-03
+ 0.21072876E+01 0.13843502E+00 0.70650148E-03
+ 0.21083410E+01 0.13942766E+00 0.71326137E-03
+ 0.21093943E+01 0.13998419E+00 0.71138405E-03
+ 0.21104567E+01 0.13933367E+00 0.71544742E-03
+ 0.21115100E+01 0.14023305E+00 0.71880349E-03
+ 0.21125636E+01 0.13937803E+00 0.71364467E-03
+ 0.21136169E+01 0.13997167E+00 0.71437215E-03
+ 0.21146793E+01 0.14037371E+00 0.71933941E-03
+ 0.21157327E+01 0.14081253E+00 0.71833649E-03
+ 0.21167951E+01 0.14102359E+00 0.72218972E-03
+ 0.21178484E+01 0.13923416E+00 0.71452884E-03
+ 0.21189108E+01 0.14108175E+00 0.72358618E-03
+ 0.21199641E+01 0.14099401E+00 0.72001776E-03
+ 0.21210265E+01 0.13977985E+00 0.71348157E-03
+ 0.21220889E+01 0.14109847E+00 0.72174432E-03
+ 0.21231511E+01 0.14141437E+00 0.72371127E-03
+ 0.21242135E+01 0.13999391E+00 0.71493565E-03
+ 0.21252759E+01 0.14118908E+00 0.72350184E-03
+ 0.21263382E+01 0.13956203E+00 0.71426865E-03
+ 0.21274004E+01 0.14113611E+00 0.72562753E-03
+ 0.21284628E+01 0.14271235E+00 0.73154666E-03
+ 0.21295252E+01 0.14118850E+00 0.72043855E-03
+ 0.21305964E+01 0.14144863E+00 0.72872976E-03
+ 0.21316588E+01 0.14074694E+00 0.72209910E-03
+ 0.21327212E+01 0.14117920E+00 0.72225253E-03
+ 0.21337924E+01 0.14189890E+00 0.73104282E-03
+ 0.21348548E+01 0.14178917E+00 0.72639820E-03
+ 0.21359260E+01 0.14066567E+00 0.72361616E-03
+ 0.21369884E+01 0.14038010E+00 0.71676931E-03
+ 0.21380596E+01 0.14167815E+00 0.72947692E-03
+ 0.21391308E+01 0.14028820E+00 0.71917259E-03
+ 0.21402020E+01 0.13979995E+00 0.71853725E-03
+ 0.21412733E+01 0.13863520E+00 0.71710814E-03
+ 0.21423357E+01 0.13768439E+00 0.70813723E-03
+ 0.21434069E+01 0.13860507E+00 0.70514518E-03
+ 0.21444871E+01 0.13300709E+00 0.68650505E-03
+ 0.21455584E+01 0.13545729E+00 0.69593010E-03
+ 0.21466296E+01 0.13084792E+00 0.67617523E-03
+ 0.21477010E+01 0.12968107E+00 0.67176629E-03
+ 0.21487722E+01 0.12759194E+00 0.65829669E-03
+ 0.21498523E+01 0.12566140E+00 0.65227330E-03
+ 0.21509237E+01 0.12271857E+00 0.63839304E-03
+ 0.21520038E+01 0.12215710E+00 0.63648139E-03
+ 0.21530750E+01 0.12159357E+00 0.63396251E-03
+ 0.21541553E+01 0.11898430E+00 0.62360964E-03
+ 0.21552265E+01 0.12036462E+00 0.62474248E-03
+ 0.21563067E+01 0.11947687E+00 0.62407908E-03
+ 0.21573870E+01 0.11717554E+00 0.61371829E-03
+ 0.21584671E+01 0.11667948E+00 0.61132712E-03
+ 0.21595473E+01 0.11673639E+00 0.61464839E-03
+ 0.21606185E+01 0.11556622E+00 0.60707697E-03
+ 0.21617076E+01 0.11479458E+00 0.60763350E-03
+ 0.21627879E+01 0.11567068E+00 0.60887111E-03
+ 0.21638680E+01 0.11442997E+00 0.60350535E-03
+ 0.21649482E+01 0.11296959E+00 0.60048728E-03
+ 0.21660285E+01 0.11469632E+00 0.60621073E-03
+ 0.21671085E+01 0.11457396E+00 0.60319755E-03
+ 0.21681976E+01 0.11454005E+00 0.60470350E-03
+ 0.21692779E+01 0.11383753E+00 0.60071051E-03
+ 0.21703670E+01 0.11388019E+00 0.60490007E-03
+ 0.21714473E+01 0.11373945E+00 0.60028932E-03
+ 0.21725364E+01 0.11249647E+00 0.59955631E-03
+ 0.21736255E+01 0.11234677E+00 0.59875206E-03
+ 0.21747057E+01 0.11277749E+00 0.59830438E-03
+ 0.21757948E+01 0.11234095E+00 0.59686130E-03
+ 0.21768839E+01 0.11244733E+00 0.59616286E-03
+ 0.21779730E+01 0.11289378E+00 0.59885188E-03
+ 0.21790621E+01 0.11218835E+00 0.59675879E-03
+ 0.21801512E+01 0.11294421E+00 0.60039089E-03
+ 0.21812403E+01 0.11243204E+00 0.59982290E-03
+ 0.21823294E+01 0.11273754E+00 0.59790106E-03
+ 0.21834276E+01 0.11286859E+00 0.60099573E-03
+ 0.21845167E+01 0.11412261E+00 0.60432166E-03
+ 0.21856058E+01 0.11184651E+00 0.59526192E-03
+ 0.21867037E+01 0.11256139E+00 0.60165144E-03
+ 0.21877928E+01 0.11266222E+00 0.59841241E-03
+ 0.21888909E+01 0.11361954E+00 0.60466188E-03
+ 0.21899800E+01 0.11314891E+00 0.60148136E-03
+ 0.21910782E+01 0.11337835E+00 0.59896708E-03
+ 0.21921761E+01 0.11377058E+00 0.60598378E-03
+ 0.21932652E+01 0.11216608E+00 0.60151424E-03
+ 0.21943634E+01 0.11205882E+00 0.59833715E-03
+ 0.21954613E+01 0.11354800E+00 0.60407631E-03
+ 0.21965594E+01 0.11341907E+00 0.60417328E-03
+ 0.21976573E+01 0.11392710E+00 0.60726766E-03
+ 0.21987555E+01 0.11382996E+00 0.60575613E-03
+ 0.21998534E+01 0.11402497E+00 0.60396455E-03
+ 0.22009604E+01 0.11275271E+00 0.60335931E-03
+ 0.22020586E+01 0.11438707E+00 0.60845999E-03
+ 0.22031565E+01 0.11516089E+00 0.61046658E-03
+ 0.22042634E+01 0.11310577E+00 0.60575810E-03
+ 0.22053616E+01 0.11279010E+00 0.60421106E-03
+ 0.22064686E+01 0.11422416E+00 0.60995744E-03
+ 0.22075665E+01 0.11505948E+00 0.60987310E-03
+ 0.22086735E+01 0.11468557E+00 0.61337114E-03
+ 0.22097716E+01 0.11359676E+00 0.60680561E-03
+ 0.22108786E+01 0.11466724E+00 0.61032153E-03
+ 0.22119856E+01 0.11428350E+00 0.60944213E-03
+ 0.22130926E+01 0.11470396E+00 0.61350752E-03
+ 0.22141995E+01 0.11575480E+00 0.61550667E-03
+ 0.22153065E+01 0.11568493E+00 0.61541726E-03
+ 0.22164135E+01 0.11374979E+00 0.61146473E-03
+ 0.22175205E+01 0.11449093E+00 0.61063195E-03
+ 0.22186275E+01 0.11550713E+00 0.61376183E-03
+ 0.22197433E+01 0.11348472E+00 0.60778647E-03
+ 0.22208502E+01 0.11494251E+00 0.61620906E-03
+ 0.22219572E+01 0.11496661E+00 0.61340665E-03
+ 0.22230730E+01 0.11519002E+00 0.61579433E-03
+ 0.22241800E+01 0.11581554E+00 0.61639183E-03
+ 0.22252960E+01 0.11497971E+00 0.61498932E-03
+ 0.22264030E+01 0.11506364E+00 0.61583729E-03
+ 0.22275188E+01 0.11611249E+00 0.61602704E-03
+ 0.22286348E+01 0.11638231E+00 0.62025461E-03
+ 0.22297506E+01 0.11538520E+00 0.61571930E-03
+ 0.22308664E+01 0.11661468E+00 0.62356459E-03
+ 0.22319825E+01 0.11648392E+00 0.61971304E-03
+ 0.22330983E+01 0.11603794E+00 0.62117440E-03
+ 0.22342143E+01 0.11610616E+00 0.62094355E-03
+ 0.22353301E+01 0.11771107E+00 0.62744966E-03
+ 0.22364459E+01 0.11716691E+00 0.62576350E-03
+ 0.22375619E+01 0.11628658E+00 0.61906228E-03
+ 0.22386868E+01 0.11657786E+00 0.62466180E-03
+ 0.22398026E+01 0.11713861E+00 0.62401535E-03
+ 0.22409275E+01 0.11655395E+00 0.62686071E-03
+ 0.22420433E+01 0.11695656E+00 0.62392571E-03
+ 0.22431681E+01 0.11802926E+00 0.63415995E-03
+ 0.22442842E+01 0.11766127E+00 0.62619132E-03
+ 0.22454090E+01 0.11726282E+00 0.62663679E-03
+ 0.22465336E+01 0.11668978E+00 0.62386622E-03
+ 0.22476585E+01 0.11791059E+00 0.63127413E-03
+ 0.22487745E+01 0.11704267E+00 0.62640925E-03
+ 0.22498994E+01 0.11764908E+00 0.62976329E-03
+ 0.22510240E+01 0.11740796E+00 0.62716560E-03
+ 0.22521489E+01 0.11855964E+00 0.62945421E-03
+ 0.22532828E+01 0.11810469E+00 0.63328439E-03
+ 0.22544074E+01 0.11714941E+00 0.62862143E-03
+ 0.22555323E+01 0.11782682E+00 0.63338294E-03
+ 0.22566571E+01 0.11766827E+00 0.62555674E-03
+ 0.22577908E+01 0.11974658E+00 0.64088788E-03
+ 0.22589157E+01 0.11821289E+00 0.63259318E-03
+ 0.22600496E+01 0.11620162E+00 0.62701292E-03
+ 0.22611742E+01 0.11948337E+00 0.64009172E-03
+ 0.22623081E+01 0.11797920E+00 0.63283008E-03
+ 0.22634418E+01 0.11884379E+00 0.63855539E-03
+ 0.22645667E+01 0.11863477E+00 0.63318969E-03
+ 0.22657003E+01 0.11860640E+00 0.63605339E-03
+ 0.22668340E+01 0.11772217E+00 0.63486182E-03
+ 0.22679679E+01 0.12044011E+00 0.64301229E-03
+ 0.22691016E+01 0.11985848E+00 0.64017135E-03
+ 0.22702353E+01 0.11871564E+00 0.63792686E-03
+ 0.22713692E+01 0.11857261E+00 0.63543819E-03
+ 0.22725117E+01 0.11951752E+00 0.63984439E-03
+ 0.22736456E+01 0.11961338E+00 0.64325228E-03
+ 0.22747793E+01 0.12060705E+00 0.64334436E-03
+ 0.22759221E+01 0.11968193E+00 0.64386037E-03
+ 0.22770557E+01 0.11915196E+00 0.63870609E-03
+ 0.22781985E+01 0.12022953E+00 0.64560596E-03
+ 0.22793322E+01 0.12050600E+00 0.64598583E-03
+ 0.22804749E+01 0.12159665E+00 0.64999389E-03
+ 0.22816176E+01 0.11901600E+00 0.64339786E-03
+ 0.22827513E+01 0.12075892E+00 0.64634462E-03
+ 0.22838941E+01 0.12041068E+00 0.64664427E-03
+ 0.22850366E+01 0.12084263E+00 0.64948946E-03
+ 0.22861793E+01 0.11980272E+00 0.64469158E-03
+ 0.22873220E+01 0.12045169E+00 0.64570358E-03
+ 0.22884648E+01 0.12174261E+00 0.65127207E-03
+ 0.22896163E+01 0.12015124E+00 0.64945617E-03
+ 0.22907591E+01 0.11946762E+00 0.64521388E-03
+ 0.22919016E+01 0.12187291E+00 0.65540546E-03
+ 0.22930443E+01 0.12079247E+00 0.64667116E-03
+ 0.22941959E+01 0.12155359E+00 0.65263535E-03
+ 0.22953386E+01 0.12102890E+00 0.65317424E-03
+ 0.22964902E+01 0.12162199E+00 0.65382471E-03
+ 0.22976418E+01 0.12206982E+00 0.65723137E-03
+ 0.22987845E+01 0.12159417E+00 0.65601012E-03
+ 0.22999361E+01 0.12288948E+00 0.65908529E-03
+ 0.23010876E+01 0.12242059E+00 0.65667304E-03
+ 0.23022394E+01 0.12205926E+00 0.65657118E-03
+ 0.23033910E+01 0.12127713E+00 0.65517350E-03
+ 0.23045425E+01 0.12243018E+00 0.65991882E-03
+ 0.23056941E+01 0.12291042E+00 0.66221901E-03
+ 0.23068457E+01 0.12335040E+00 0.66414941E-03
+ 0.23079975E+01 0.12227479E+00 0.66081964E-03
+ 0.23091490E+01 0.12286355E+00 0.65865862E-03
+ 0.23103094E+01 0.12229090E+00 0.65834139E-03
+ 0.23114612E+01 0.12296599E+00 0.66349894E-03
+ 0.23126216E+01 0.12255922E+00 0.66465023E-03
+ 0.23137732E+01 0.12285318E+00 0.66467718E-03
+ 0.23149338E+01 0.12328770E+00 0.66582102E-03
+ 0.23160853E+01 0.12314513E+00 0.66565629E-03
+ 0.23172460E+01 0.12423596E+00 0.66995871E-03
+ 0.23184063E+01 0.12367796E+00 0.66895934E-03
+ 0.23195670E+01 0.12310434E+00 0.66425488E-03
+ 0.23207276E+01 0.12292152E+00 0.66602021E-03
+ 0.23218880E+01 0.12399218E+00 0.66891540E-03
+ 0.23230486E+01 0.12298889E+00 0.66562952E-03
+ 0.23242092E+01 0.12437817E+00 0.67310710E-03
+ 0.23253696E+01 0.12412859E+00 0.67130575E-03
+ 0.23265302E+01 0.12420330E+00 0.67193090E-03
+ 0.23276906E+01 0.12515058E+00 0.67457027E-03
+ 0.23288603E+01 0.12306166E+00 0.66813792E-03
+ 0.23300207E+01 0.12443187E+00 0.67009585E-03
+ 0.23311901E+01 0.12528448E+00 0.67850872E-03
+ 0.23323507E+01 0.12514877E+00 0.67680684E-03
+ 0.23335202E+01 0.12549460E+00 0.67566766E-03
+ 0.23346896E+01 0.12461850E+00 0.67615393E-03
+ 0.23358502E+01 0.12444071E+00 0.67605026E-03
+ 0.23370197E+01 0.12405262E+00 0.66917995E-03
+ 0.23381891E+01 0.12545574E+00 0.68001210E-03
+ 0.23393586E+01 0.12641019E+00 0.68145158E-03
+ 0.23405280E+01 0.12523475E+00 0.67648414E-03
+ 0.23416975E+01 0.12566963E+00 0.67815819E-03
+ 0.23428669E+01 0.12488977E+00 0.67445711E-03
+ 0.23440454E+01 0.12546194E+00 0.68009848E-03
+ 0.23452148E+01 0.12406663E+00 0.67168823E-03
+ 0.23463843E+01 0.12540729E+00 0.67430612E-03
+ 0.23475626E+01 0.12431469E+00 0.67534758E-03
+ 0.23487320E+01 0.12574320E+00 0.67860511E-03
+ 0.23499105E+01 0.12427493E+00 0.67812513E-03
+ 0.23510799E+01 0.12543103E+00 0.67954505E-03
+ 0.23522582E+01 0.12585710E+00 0.68242988E-03
+ 0.23534367E+01 0.12654147E+00 0.68130373E-03
+ 0.23546150E+01 0.12722145E+00 0.69206522E-03
+ 0.23557847E+01 0.12668563E+00 0.68427628E-03
+ 0.23569629E+01 0.12616368E+00 0.68572379E-03
+ 0.23581414E+01 0.12758596E+00 0.68823865E-03
+ 0.23593197E+01 0.12726478E+00 0.68703166E-03
+ 0.23605070E+01 0.12638806E+00 0.68593927E-03
+ 0.23616855E+01 0.12663847E+00 0.68764063E-03
+ 0.23628638E+01 0.12731287E+00 0.68851165E-03
+ 0.23640423E+01 0.12657772E+00 0.68490894E-03
+ 0.23652296E+01 0.12597018E+00 0.68813254E-03
+ 0.23664079E+01 0.12789257E+00 0.69033832E-03
+ 0.23675952E+01 0.12782802E+00 0.69493393E-03
+ 0.23687737E+01 0.12796998E+00 0.69060130E-03
+ 0.23699610E+01 0.12742591E+00 0.68918010E-03
+ 0.23711481E+01 0.12801988E+00 0.69649791E-03
+ 0.23723354E+01 0.12704958E+00 0.69123995E-03
+ 0.23735228E+01 0.12883452E+00 0.69977209E-03
+ 0.23747101E+01 0.12749325E+00 0.68865245E-03
+ 0.23758974E+01 0.12817459E+00 0.69670228E-03
+ 0.23770847E+01 0.12804611E+00 0.69459924E-03
+ 0.23782721E+01 0.12923777E+00 0.70217892E-03
+ 0.23794594E+01 0.12959167E+00 0.70286612E-03
+ 0.23806467E+01 0.12743282E+00 0.69077674E-03
+ 0.23818431E+01 0.12947072E+00 0.70690218E-03
+ 0.23830304E+01 0.12963429E+00 0.70013240E-03
+ 0.23842175E+01 0.13005286E+00 0.70696062E-03
+ 0.23854139E+01 0.13007735E+00 0.70714881E-03
+ 0.23866100E+01 0.12968771E+00 0.70716941E-03
+ 0.23877974E+01 0.12976821E+00 0.70448045E-03
+ 0.23889937E+01 0.13005182E+00 0.70694118E-03
+ 0.23901899E+01 0.12945160E+00 0.70431881E-03
+ 0.23913860E+01 0.12970491E+00 0.70753635E-03
+ 0.23925824E+01 0.13030799E+00 0.70740189E-03
+ 0.23937786E+01 0.12921137E+00 0.70674688E-03
+ 0.23949749E+01 0.12993327E+00 0.70802425E-03
+ 0.23961711E+01 0.13003384E+00 0.70883473E-03
+ 0.23973672E+01 0.13103758E+00 0.71565807E-03
+ 0.23985636E+01 0.13036443E+00 0.70723792E-03
+ 0.23997688E+01 0.13084221E+00 0.71547535E-03
+ 0.24009650E+01 0.13028479E+00 0.71032316E-03
+ 0.24021614E+01 0.13171788E+00 0.71870716E-03
+ 0.24033663E+01 0.13193408E+00 0.71817916E-03
+ 0.24045715E+01 0.13123713E+00 0.71941549E-03
+ 0.24057679E+01 0.13146563E+00 0.71773259E-03
+ 0.24069729E+01 0.12996647E+00 0.71437465E-03
+ 0.24081781E+01 0.13038515E+00 0.71026006E-03
+ 0.24093833E+01 0.13156822E+00 0.72076521E-03
+ 0.24105885E+01 0.13020624E+00 0.71531860E-03
+ 0.24117937E+01 0.13078766E+00 0.71948383E-03
+ 0.24129989E+01 0.13114889E+00 0.71864214E-03
+ 0.24142041E+01 0.13262142E+00 0.72648365E-03
+ 0.24154091E+01 0.13197592E+00 0.72433008E-03
+ 0.24166143E+01 0.13209449E+00 0.72548498E-03
+ 0.24178286E+01 0.13239412E+00 0.72487158E-03
+ 0.24190335E+01 0.13194911E+00 0.72394375E-03
+ 0.24202478E+01 0.13321291E+00 0.73253916E-03
+ 0.24214530E+01 0.13253134E+00 0.72614808E-03
+ 0.24226670E+01 0.13210131E+00 0.72690146E-03
+ 0.24238811E+01 0.13383020E+00 0.73895586E-03
+ 0.24250863E+01 0.13189411E+00 0.72675879E-03
+ 0.24263003E+01 0.13317323E+00 0.73404436E-03
+ 0.24275146E+01 0.13339868E+00 0.73441258E-03
+ 0.24287286E+01 0.13230787E+00 0.72928955E-03
+ 0.24299426E+01 0.13215408E+00 0.72871632E-03
+ 0.24311566E+01 0.13430478E+00 0.73965115E-03
+ 0.24323709E+01 0.13414203E+00 0.73924422E-03
+ 0.24335938E+01 0.13442871E+00 0.73944934E-03
+ 0.24348080E+01 0.13212004E+00 0.72945026E-03
+ 0.24360220E+01 0.13334750E+00 0.73385023E-03
+ 0.24372451E+01 0.13455074E+00 0.74056169E-03
+ 0.24384592E+01 0.13403332E+00 0.73693454E-03
+ 0.24396822E+01 0.13403009E+00 0.73785055E-03
+ 0.24408963E+01 0.13497432E+00 0.74056280E-03
+ 0.24421194E+01 0.13391331E+00 0.73793635E-03
+ 0.24433424E+01 0.13534164E+00 0.74181042E-03
+ 0.24445653E+01 0.13412537E+00 0.73615479E-03
+ 0.24457884E+01 0.13439228E+00 0.73820859E-03
+ 0.24470115E+01 0.13462794E+00 0.74055523E-03
+ 0.24482343E+01 0.13421720E+00 0.73699880E-03
+ 0.24494574E+01 0.13486093E+00 0.74027182E-03
+ 0.24506805E+01 0.13439360E+00 0.73459180E-03
+ 0.24519036E+01 0.13459839E+00 0.73731772E-03
+ 0.24531355E+01 0.13474837E+00 0.73884032E-03
+ 0.24543586E+01 0.13462998E+00 0.73724764E-03
+ 0.24555814E+01 0.13581771E+00 0.74196415E-03
+ 0.24568133E+01 0.13550960E+00 0.74015575E-03
+ 0.24580455E+01 0.13528882E+00 0.74082986E-03
+ 0.24592683E+01 0.13566270E+00 0.74304361E-03
+ 0.24605005E+01 0.13602164E+00 0.74202340E-03
+ 0.24617324E+01 0.13545582E+00 0.74132532E-03
+ 0.24629643E+01 0.13565817E+00 0.74313919E-03
+ 0.24641962E+01 0.13614321E+00 0.74589939E-03
+ 0.24654281E+01 0.13697401E+00 0.75042964E-03
+ 0.24666600E+01 0.13706581E+00 0.74781477E-03
+ 0.24678922E+01 0.13533311E+00 0.74356166E-03
+ 0.24691241E+01 0.13621856E+00 0.74947340E-03
+ 0.24703560E+01 0.13714138E+00 0.74772182E-03
+ 0.24715970E+01 0.13605431E+00 0.74709236E-03
+ 0.24728289E+01 0.13674097E+00 0.74567611E-03
+ 0.24740696E+01 0.13670781E+00 0.75010903E-03
+ 0.24753017E+01 0.13783157E+00 0.75563858E-03
+ 0.24765425E+01 0.13657595E+00 0.74839953E-03
+ 0.24777834E+01 0.13725497E+00 0.75583096E-03
+ 0.24790154E+01 0.13822885E+00 0.75388164E-03
+ 0.24802563E+01 0.13760723E+00 0.75416750E-03
+ 0.24814970E+01 0.13847330E+00 0.76236948E-03
+ 0.24827380E+01 0.13793829E+00 0.76166133E-03
+ 0.24839787E+01 0.13757099E+00 0.75456413E-03
+ 0.24852197E+01 0.13800615E+00 0.76006958E-03
+ 0.24864607E+01 0.13835929E+00 0.76005771E-03
+ 0.24877105E+01 0.13730432E+00 0.75558445E-03
+ 0.24889512E+01 0.13908659E+00 0.76703698E-03
+ 0.24901922E+01 0.13874596E+00 0.76145068E-03
+ 0.24914420E+01 0.13888575E+00 0.76387380E-03
+ 0.24926829E+01 0.13753769E+00 0.75758266E-03
+ 0.24939327E+01 0.13982634E+00 0.77220990E-03
+ 0.24951825E+01 0.13788894E+00 0.75927272E-03
+ 0.24964323E+01 0.13806422E+00 0.76689146E-03
+ 0.24976730E+01 0.13781172E+00 0.75887906E-03
+ 0.24989231E+01 0.13925961E+00 0.76765131E-03
+ 0.25001729E+01 0.13726006E+00 0.76076289E-03
+ 0.25014226E+01 0.13821141E+00 0.76881237E-03
+ 0.25026724E+01 0.13810493E+00 0.76262758E-03
+ 0.25039310E+01 0.13717155E+00 0.76082890E-03
+ 0.25051808E+01 0.13714953E+00 0.75731636E-03
+ 0.25064306E+01 0.13738704E+00 0.76270016E-03
+ 0.25076804E+01 0.13613047E+00 0.75235195E-03
+ 0.25089393E+01 0.13779573E+00 0.76328986E-03
+ 0.25101891E+01 0.13466458E+00 0.74888807E-03
+ 0.25114477E+01 0.13445291E+00 0.74813730E-03
+ 0.25127065E+01 0.13007657E+00 0.72477316E-03
+ 0.25139563E+01 0.12713276E+00 0.71181753E-03
+ 0.25152152E+01 0.12579735E+00 0.70182851E-03
+ 0.25164738E+01 0.12193389E+00 0.68481377E-03
+ 0.25177326E+01 0.11803266E+00 0.66753523E-03
+ 0.25189912E+01 0.11384087E+00 0.65019407E-03
+ 0.25202501E+01 0.11058710E+00 0.63454825E-03
+ 0.25215087E+01 0.10754993E+00 0.62359171E-03
+ 0.25227675E+01 0.10572804E+00 0.61220169E-03
+ 0.25240352E+01 0.10385400E+00 0.60710887E-03
+ 0.25252938E+01 0.99823818E-01 0.59049093E-03
+ 0.25265615E+01 0.98057881E-01 0.58537570E-03
+ 0.25278203E+01 0.97464167E-01 0.58169360E-03
+ 0.25290878E+01 0.95209606E-01 0.57778280E-03
+ 0.25303466E+01 0.94803348E-01 0.57241629E-03
+ 0.25316143E+01 0.93900383E-01 0.56985248E-03
+ 0.25328820E+01 0.94207332E-01 0.57038775E-03
+ 0.25341496E+01 0.92036709E-01 0.56343770E-03
+ 0.25354173E+01 0.91072977E-01 0.56108512E-03
+ 0.25366850E+01 0.90793997E-01 0.55814011E-03
+ 0.25379527E+01 0.90889856E-01 0.56056178E-03
+ 0.25392203E+01 0.88929556E-01 0.55411342E-03
+ 0.25404880E+01 0.89939259E-01 0.55703457E-03
+ 0.25417557E+01 0.89393832E-01 0.55474229E-03
+ 0.25430322E+01 0.89537799E-01 0.55628910E-03
+ 0.25442998E+01 0.88685028E-01 0.55228628E-03
+ 0.25455763E+01 0.88916317E-01 0.55589981E-03
+ 0.25468440E+01 0.88086598E-01 0.55029226E-03
+ 0.25481207E+01 0.88692062E-01 0.55342232E-03
+ 0.25493972E+01 0.88681638E-01 0.55459613E-03
+ 0.25506649E+01 0.88367276E-01 0.55397063E-03
+ 0.25519414E+01 0.89013569E-01 0.55473635E-03
+ 0.25532181E+01 0.87333746E-01 0.54988958E-03
+ 0.25544946E+01 0.88324867E-01 0.55331126E-03
+ 0.25557714E+01 0.87955184E-01 0.55371516E-03
+ 0.25570478E+01 0.87921552E-01 0.55102230E-03
+ 0.25583334E+01 0.87135859E-01 0.55279996E-03
+ 0.25596099E+01 0.87771207E-01 0.55150042E-03
+ 0.25608866E+01 0.88485152E-01 0.55482431E-03
+ 0.25621719E+01 0.87511301E-01 0.55445195E-03
+ 0.25634487E+01 0.87823711E-01 0.55342709E-03
+ 0.25647342E+01 0.87594740E-01 0.55352849E-03
+ 0.25660107E+01 0.87817989E-01 0.55373658E-03
+ 0.25672963E+01 0.87877698E-01 0.55351172E-03
+ 0.25685818E+01 0.87867409E-01 0.55679143E-03
+ 0.25698671E+01 0.88140987E-01 0.55558392E-03
+ 0.25711527E+01 0.87047234E-01 0.55300613E-03
+ 0.25724382E+01 0.87951973E-01 0.55574003E-03
+ 0.25737238E+01 0.87811992E-01 0.55551628E-03
+ 0.25750093E+01 0.88705920E-01 0.56089839E-03
+ 0.25762949E+01 0.88125728E-01 0.55480807E-03
+ 0.25775893E+01 0.86654097E-01 0.55430137E-03
+ 0.25788748E+01 0.88009350E-01 0.55892876E-03
+ 0.25801604E+01 0.88224478E-01 0.55471383E-03
+ 0.25814548E+01 0.88075347E-01 0.56057243E-03
+ 0.25827403E+01 0.88878885E-01 0.56037097E-03
+ 0.25840347E+01 0.87713331E-01 0.55675698E-03
+ 0.25853291E+01 0.87408215E-01 0.55768876E-03
+ 0.25866237E+01 0.88012971E-01 0.55789336E-03
+ 0.25879180E+01 0.88201039E-01 0.56179502E-03
+ 0.25892036E+01 0.88870600E-01 0.56257792E-03
+ 0.25904980E+01 0.88618547E-01 0.55891171E-03
+ 0.25918014E+01 0.88908739E-01 0.56318939E-03
+ 0.25930958E+01 0.89507192E-01 0.56626799E-03
+ 0.25943902E+01 0.89105360E-01 0.56619482E-03
+ 0.25956848E+01 0.89576185E-01 0.56221063E-03
+ 0.25969880E+01 0.87382607E-01 0.56157174E-03
+ 0.25982826E+01 0.89533493E-01 0.56543789E-03
+ 0.25995858E+01 0.89259103E-01 0.56598563E-03
+ 0.26008804E+01 0.89642584E-01 0.56780461E-03
+ 0.26021836E+01 0.88841572E-01 0.56426798E-03
+ 0.26034870E+01 0.88983797E-01 0.56529284E-03
+ 0.26047904E+01 0.89000896E-01 0.57042547E-03
+ 0.26060848E+01 0.89091547E-01 0.56681520E-03
+ 0.26073883E+01 0.89530163E-01 0.56839111E-03
+ 0.26086915E+01 0.89718893E-01 0.56639925E-03
+ 0.26100039E+01 0.89137040E-01 0.56915911E-03
+ 0.26113071E+01 0.89575134E-01 0.56798849E-03
+ 0.26126106E+01 0.89810811E-01 0.57223334E-03
+ 0.26139140E+01 0.90547822E-01 0.57136052E-03
+ 0.26152263E+01 0.89312427E-01 0.57091442E-03
+ 0.26165297E+01 0.90522230E-01 0.57324313E-03
+ 0.26178420E+01 0.89726120E-01 0.57297101E-03
+ 0.26191454E+01 0.89980446E-01 0.57028490E-03
+ 0.26204576E+01 0.90104505E-01 0.57222258E-03
+ 0.26217699E+01 0.88573739E-01 0.56761736E-03
+ 0.26230822E+01 0.89903668E-01 0.57442253E-03
+ 0.26243944E+01 0.89779139E-01 0.57491928E-03
+ 0.26257067E+01 0.89811653E-01 0.57495036E-03
+ 0.26270192E+01 0.90796307E-01 0.57998783E-03
+ 0.26283314E+01 0.90319201E-01 0.57450309E-03
+ 0.26296437E+01 0.90616219E-01 0.58139965E-03
+ 0.26309559E+01 0.89877173E-01 0.57242910E-03
+ 0.26322773E+01 0.89064300E-01 0.57356845E-03
+ 0.26335895E+01 0.90656407E-01 0.57917263E-03
+ 0.26349106E+01 0.89798525E-01 0.57646091E-03
+ 0.26362231E+01 0.91113143E-01 0.57821866E-03
+ 0.26375442E+01 0.90896182E-01 0.57926937E-03
+ 0.26388655E+01 0.90270683E-01 0.58102747E-03
+ 0.26401777E+01 0.90360828E-01 0.57976739E-03
+ 0.26414990E+01 0.90378471E-01 0.57901163E-03
+ 0.26428201E+01 0.91472261E-01 0.58371975E-03
+ 0.26441414E+01 0.92207976E-01 0.58517244E-03
+ 0.26454625E+01 0.90322599E-01 0.58157230E-03
+ 0.26467838E+01 0.91057144E-01 0.57868584E-03
+ 0.26481140E+01 0.91907583E-01 0.58696920E-03
+ 0.26494353E+01 0.90527713E-01 0.58278214E-03
+ 0.26507564E+01 0.90910725E-01 0.58190757E-03
+ 0.26520865E+01 0.90572610E-01 0.58322510E-03
+ 0.26534078E+01 0.90552203E-01 0.58421725E-03
+ 0.26547379E+01 0.91322809E-01 0.58716652E-03
+ 0.26560681E+01 0.90253383E-01 0.58276963E-03
+ 0.26573894E+01 0.91528535E-01 0.58832316E-03
+ 0.26587195E+01 0.91567524E-01 0.58627414E-03
+ 0.26600497E+01 0.91029733E-01 0.58791012E-03
+ 0.26613798E+01 0.91903977E-01 0.58701128E-03
+ 0.26627100E+01 0.92219681E-01 0.59069542E-03
+ 0.26640401E+01 0.92145428E-01 0.58825285E-03
+ 0.26653790E+01 0.93194358E-01 0.59386605E-03
+ 0.26667092E+01 0.90265043E-01 0.58475742E-03
+ 0.26680396E+01 0.92927575E-01 0.59300294E-03
+ 0.26693785E+01 0.91617636E-01 0.58858306E-03
+ 0.26707087E+01 0.91609024E-01 0.58960496E-03
+ 0.26720479E+01 0.92423126E-01 0.59721799E-03
+ 0.26733780E+01 0.92855215E-01 0.59489516E-03
+ 0.26747169E+01 0.92836142E-01 0.59441931E-03
+ 0.26760561E+01 0.93052007E-01 0.59766421E-03
+ 0.26773951E+01 0.92598692E-01 0.59604400E-03
+ 0.26787343E+01 0.92616536E-01 0.59492100E-03
+ 0.26800733E+01 0.91858461E-01 0.59203734E-03
+ 0.26814125E+01 0.92187829E-01 0.59456419E-03
+ 0.26827514E+01 0.92268169E-01 0.59530477E-03
+ 0.26840906E+01 0.92756875E-01 0.59536146E-03
+ 0.26854386E+01 0.91790900E-01 0.59709745E-03
+ 0.26867776E+01 0.94349965E-01 0.59829018E-03
+ 0.26881256E+01 0.92963174E-01 0.60073473E-03
+ 0.26894646E+01 0.94889715E-01 0.60695451E-03
+ 0.26908126E+01 0.92849761E-01 0.59932412E-03
+ 0.26921518E+01 0.93186527E-01 0.59995509E-03
+ 0.26934998E+01 0.93676046E-01 0.60147030E-03
+ 0.26948478E+01 0.93227170E-01 0.60202845E-03
+ 0.26961958E+01 0.92898391E-01 0.59962354E-03
+ 0.26975439E+01 0.92429541E-01 0.60027087E-03
+ 0.26988919E+01 0.92980333E-01 0.60017174E-03
+ 0.27002399E+01 0.93197390E-01 0.60225144E-03
+ 0.27015967E+01 0.94145425E-01 0.60752191E-03
+ 0.27029448E+01 0.94460964E-01 0.60788565E-03
+ 0.27042928E+01 0.93926363E-01 0.60634280E-03
+ 0.27056496E+01 0.95131688E-01 0.61015395E-03
+ 0.27069976E+01 0.93655169E-01 0.60693023E-03
+ 0.27083545E+01 0.93678340E-01 0.60767884E-03
+ 0.27097116E+01 0.94618186E-01 0.61124633E-03
+ 0.27110596E+01 0.93511693E-01 0.60535874E-03
+ 0.27124164E+01 0.94458118E-01 0.60888019E-03
+ 0.27137735E+01 0.95280796E-01 0.61227864E-03
+ 0.27151303E+01 0.92486955E-01 0.60272083E-03
+ 0.27164872E+01 0.95190041E-01 0.61342504E-03
+ 0.27178442E+01 0.94708800E-01 0.61164727E-03
+ 0.27192101E+01 0.95197655E-01 0.61190204E-03
+ 0.27205670E+01 0.94830833E-01 0.61488606E-03
+ 0.27219238E+01 0.95258720E-01 0.61571295E-03
+ 0.27232897E+01 0.95891736E-01 0.61688531E-03
+ 0.27246468E+01 0.94504192E-01 0.61245263E-03
+ 0.27260125E+01 0.96332453E-01 0.62205904E-03
+ 0.27273695E+01 0.94202183E-01 0.61346247E-03
+ 0.27287354E+01 0.95887154E-01 0.62008196E-03
+ 0.27301011E+01 0.95236532E-01 0.61647728E-03
+ 0.27314670E+01 0.95112398E-01 0.61795197E-03
+ 0.27328329E+01 0.95018074E-01 0.61649363E-03
+ 0.27341988E+01 0.94688043E-01 0.61907974E-03
+ 0.27355647E+01 0.95528729E-01 0.62031252E-03
+ 0.27369306E+01 0.95904335E-01 0.61807758E-03
+ 0.27383053E+01 0.95364772E-01 0.62326645E-03
+ 0.27396712E+01 0.96756034E-01 0.62494050E-03
+ 0.27410369E+01 0.95394835E-01 0.62083127E-03
+ 0.27424119E+01 0.96680060E-01 0.62363397E-03
+ 0.27437866E+01 0.95698252E-01 0.62529003E-03
+ 0.27451525E+01 0.96355587E-01 0.62589481E-03
+ 0.27465272E+01 0.96312150E-01 0.62760018E-03
+ 0.27479019E+01 0.95311716E-01 0.62218343E-03
+ 0.27492769E+01 0.96625522E-01 0.62736718E-03
+ 0.27506516E+01 0.95593132E-01 0.62450854E-03
+ 0.27520263E+01 0.96467175E-01 0.62609732E-03
+ 0.27534010E+01 0.96588172E-01 0.62880781E-03
+ 0.27547760E+01 0.96979521E-01 0.63034525E-03
+ 0.27561507E+01 0.96180357E-01 0.62602514E-03
+ 0.27575345E+01 0.96228808E-01 0.63104997E-03
+ 0.27589092E+01 0.96912786E-01 0.62874838E-03
+ 0.27602930E+01 0.97259663E-01 0.63386839E-03
+ 0.27616677E+01 0.96484631E-01 0.62909222E-03
+ 0.27630515E+01 0.96044049E-01 0.62894099E-03
+ 0.27644351E+01 0.97574912E-01 0.63323008E-03
+ 0.27658188E+01 0.97460225E-01 0.63276110E-03
+ 0.27672026E+01 0.96772753E-01 0.63298456E-03
+ 0.27685862E+01 0.97807176E-01 0.63596311E-03
+ 0.27699699E+01 0.96031226E-01 0.63146220E-03
+ 0.27713537E+01 0.96416980E-01 0.63410320E-03
+ 0.27727375E+01 0.96993886E-01 0.63246826E-03
+ 0.27741210E+01 0.97260281E-01 0.63547574E-03
+ 0.27755136E+01 0.97897679E-01 0.63729589E-03
+ 0.27768974E+01 0.97970366E-01 0.63925632E-03
+ 0.27782900E+01 0.97670905E-01 0.63916628E-03
+ 0.27796738E+01 0.97874299E-01 0.63740974E-03
+ 0.27810664E+01 0.97085118E-01 0.63742825E-03
+ 0.27824590E+01 0.97406179E-01 0.63856138E-03
+ 0.27838519E+01 0.98815210E-01 0.64510899E-03
+ 0.27852354E+01 0.98941736E-01 0.64247922E-03
+ 0.27866280E+01 0.98182097E-01 0.64118410E-03
+ 0.27880297E+01 0.96863188E-01 0.64077158E-03
+ 0.27894223E+01 0.99566236E-01 0.65036310E-03
+ 0.27908149E+01 0.98598644E-01 0.64451026E-03
+ 0.27922075E+01 0.98758385E-01 0.64601272E-03
+ 0.27936091E+01 0.98440938E-01 0.64685254E-03
+ 0.27950017E+01 0.98117962E-01 0.64462010E-03
+ 0.27964034E+01 0.97474366E-01 0.64436608E-03
+ 0.27977960E+01 0.99554583E-01 0.65119081E-03
+ 0.27991977E+01 0.98331369E-01 0.64703851E-03
+ 0.28005991E+01 0.97984336E-01 0.64543617E-03
+ 0.28020008E+01 0.98759152E-01 0.65044349E-03
+ 0.28033934E+01 0.99919006E-01 0.65207045E-03
+ 0.28047950E+01 0.98875336E-01 0.64936897E-03
+ 0.28062055E+01 0.99582866E-01 0.65444678E-03
+ 0.28076069E+01 0.98411255E-01 0.64790482E-03
+ 0.28090086E+01 0.98867238E-01 0.65251981E-03
+ 0.28104100E+01 0.99163078E-01 0.65102719E-03
+ 0.28118205E+01 0.99586770E-01 0.65557385E-03
+ 0.28132222E+01 0.10006434E+00 0.65579510E-03
+ 0.28146327E+01 0.99531695E-01 0.65968808E-03
+ 0.28160343E+01 0.99507883E-01 0.65428944E-03
+ 0.28174448E+01 0.99202648E-01 0.65612263E-03
+ 0.28188553E+01 0.10027429E+00 0.66014327E-03
+ 0.28202658E+01 0.99667318E-01 0.65699412E-03
+ 0.28216763E+01 0.10050472E+00 0.66280470E-03
+ 0.28230867E+01 0.99918514E-01 0.66077017E-03
+ 0.28244972E+01 0.10012050E+00 0.66034886E-03
+ 0.28259077E+01 0.10048211E+00 0.66228677E-03
+ 0.28273182E+01 0.10024756E+00 0.66131790E-03
+ 0.28287375E+01 0.99833280E-01 0.66122407E-03
+ 0.28301482E+01 0.10044662E+00 0.66332688E-03
+ 0.28315675E+01 0.99945411E-01 0.66495512E-03
+ 0.28329780E+01 0.99398576E-01 0.66143303E-03
+ 0.28343976E+01 0.99874444E-01 0.66080992E-03
+ 0.28358169E+01 0.10005207E+00 0.66384301E-03
+ 0.28372364E+01 0.10062829E+00 0.66818309E-03
+ 0.28386469E+01 0.10184924E+00 0.67254843E-03
+ 0.28400662E+01 0.10004807E+00 0.66586648E-03
+ 0.28414946E+01 0.10132357E+00 0.67125022E-03
+ 0.28429139E+01 0.10179194E+00 0.67393837E-03
+ 0.28443334E+01 0.10181427E+00 0.67297043E-03
+ 0.28457527E+01 0.10030585E+00 0.66802168E-03
+ 0.28471811E+01 0.10148039E+00 0.67419355E-03
+ 0.28486006E+01 0.10138322E+00 0.67396485E-03
+ 0.28500290E+01 0.10119908E+00 0.67336735E-03
+ 0.28514483E+01 0.10148767E+00 0.67218661E-03
+ 0.28528767E+01 0.10129827E+00 0.67462819E-03
+ 0.28543050E+01 0.10064400E+00 0.67060161E-03
+ 0.28557334E+01 0.10190229E+00 0.67847286E-03
+ 0.28571618E+01 0.10214017E+00 0.67825289E-03
+ 0.28585901E+01 0.10171916E+00 0.67700067E-03
+ 0.28600185E+01 0.10098646E+00 0.67407015E-03
+ 0.28614469E+01 0.99880219E-01 0.67294366E-03
+ 0.28628752E+01 0.10285045E+00 0.68197254E-03
+ 0.28643036E+01 0.10128329E+00 0.67555421E-03
+ 0.28657408E+01 0.10218032E+00 0.67978451E-03
+ 0.28671691E+01 0.10210599E+00 0.67797943E-03
+ 0.28686063E+01 0.10303450E+00 0.67887956E-03
+ 0.28700438E+01 0.10243466E+00 0.68224064E-03
+ 0.28714721E+01 0.10169011E+00 0.67491975E-03
+ 0.28729093E+01 0.10250382E+00 0.68107859E-03
+ 0.28743465E+01 0.10250283E+00 0.67715225E-03
+ 0.28757839E+01 0.10247654E+00 0.68011315E-03
+ 0.28772211E+01 0.10326765E+00 0.68219332E-03
+ 0.28786583E+01 0.10208479E+00 0.67596848E-03
+ 0.28801045E+01 0.10430522E+00 0.68533444E-03
+ 0.28815420E+01 0.10224286E+00 0.67709578E-03
+ 0.28829792E+01 0.10355210E+00 0.68405166E-03
+ 0.28844254E+01 0.10241377E+00 0.68291649E-03
+ 0.28858626E+01 0.10271983E+00 0.67856559E-03
+ 0.28873088E+01 0.10257883E+00 0.67785033E-03
+ 0.28887551E+01 0.10402247E+00 0.69030921E-03
+ 0.28901923E+01 0.10441253E+00 0.68917155E-03
+ 0.28916385E+01 0.10303193E+00 0.68343745E-03
+ 0.28930848E+01 0.10507689E+00 0.69216726E-03
+ 0.28945310E+01 0.10428954E+00 0.69008587E-03
+ 0.28959770E+01 0.10453014E+00 0.69001707E-03
+ 0.28974323E+01 0.10290391E+00 0.68691134E-03
+ 0.28988786E+01 0.10394645E+00 0.69060770E-03
+ 0.29003246E+01 0.10285116E+00 0.68521680E-03
+ 0.29017799E+01 0.10453742E+00 0.69030322E-03
+ 0.29032259E+01 0.10393944E+00 0.69051498E-03
+ 0.29046812E+01 0.10340706E+00 0.68795099E-03
+ 0.29061363E+01 0.10382061E+00 0.69048459E-03
+ 0.29075825E+01 0.10516407E+00 0.69498998E-03
+ 0.29090376E+01 0.10433397E+00 0.69001858E-03
+ 0.29104927E+01 0.10553125E+00 0.69362688E-03
+ 0.29119480E+01 0.10612541E+00 0.70238544E-03
+ 0.29134030E+01 0.10540017E+00 0.69786032E-03
+ 0.29148581E+01 0.10627615E+00 0.70172880E-03
+ 0.29163222E+01 0.10413013E+00 0.69563335E-03
+ 0.29177773E+01 0.10429597E+00 0.69590943E-03
+ 0.29192324E+01 0.10361923E+00 0.69375703E-03
+ 0.29206965E+01 0.10492875E+00 0.69780054E-03
+ 0.29221516E+01 0.10342706E+00 0.69390313E-03
+ 0.29236157E+01 0.10535123E+00 0.70182467E-03
+ 0.29250798E+01 0.10541468E+00 0.70199015E-03
+ 0.29265437E+01 0.10585129E+00 0.70625090E-03
+ 0.29280078E+01 0.10558072E+00 0.70873462E-03
+ 0.29294720E+01 0.10480323E+00 0.70165721E-03
+ 0.29309359E+01 0.10651274E+00 0.70859172E-03
+ 0.29324000E+01 0.10434298E+00 0.69989136E-03
+ 0.29338641E+01 0.10673459E+00 0.70795091E-03
+ 0.29353282E+01 0.10602128E+00 0.70430530E-03
+ 0.29368012E+01 0.10715070E+00 0.71203895E-03
+ 0.29382651E+01 0.10493856E+00 0.70231810E-03
+ 0.29397383E+01 0.10664801E+00 0.71026618E-03
+ 0.29412112E+01 0.10509096E+00 0.70895092E-03
+ 0.29426751E+01 0.10624835E+00 0.70986117E-03
+ 0.29441483E+01 0.10751793E+00 0.71483728E-03
+ 0.29456213E+01 0.10648330E+00 0.71210047E-03
+ 0.29470942E+01 0.10675856E+00 0.71415573E-03
+ 0.29485672E+01 0.10707276E+00 0.71801129E-03
+ 0.29500401E+01 0.10753523E+00 0.72110118E-03
+ 0.29515131E+01 0.10702553E+00 0.71679009E-03
+ 0.29529951E+01 0.10578938E+00 0.71196485E-03
+ 0.29544680E+01 0.10643625E+00 0.71255292E-03
+ 0.29559500E+01 0.10744051E+00 0.72503055E-03
+ 0.29574230E+01 0.10607389E+00 0.71432523E-03
+ 0.29589047E+01 0.10767231E+00 0.72171324E-03
+ 0.29603777E+01 0.10820643E+00 0.72280364E-03
+ 0.29618597E+01 0.10797218E+00 0.72315318E-03
+ 0.29633417E+01 0.10737062E+00 0.72158227E-03
+ 0.29648235E+01 0.10861285E+00 0.72549004E-03
+ 0.29663055E+01 0.10744434E+00 0.72405988E-03
+ 0.29677873E+01 0.10763910E+00 0.72500866E-03
+ 0.29692781E+01 0.10704423E+00 0.71921106E-03
+ 0.29707601E+01 0.10824870E+00 0.72870124E-03
+ 0.29722421E+01 0.10765865E+00 0.72688441E-03
+ 0.29737329E+01 0.10758599E+00 0.72856183E-03
+ 0.29752147E+01 0.10850440E+00 0.72920701E-03
+ 0.29767056E+01 0.10753611E+00 0.72621385E-03
+ 0.29781964E+01 0.10863182E+00 0.73361426E-03
+ 0.29796784E+01 0.10820355E+00 0.72940165E-03
+ 0.29811692E+01 0.10827083E+00 0.72980131E-03
+ 0.29826601E+01 0.10894991E+00 0.73528168E-03
+ 0.29841509E+01 0.10715065E+00 0.72794233E-03
+ 0.29856417E+01 0.10820297E+00 0.73194521E-03
+ 0.29871414E+01 0.10947385E+00 0.73847320E-03
+ 0.29886324E+01 0.10864969E+00 0.73667825E-03
+ 0.29901233E+01 0.10797365E+00 0.73009537E-03
+ 0.29916229E+01 0.10838540E+00 0.73542946E-03
+ 0.29931138E+01 0.10923544E+00 0.73900400E-03
+ 0.29946136E+01 0.10887630E+00 0.73769933E-03
+ 0.29961133E+01 0.10901871E+00 0.73962880E-03
+ 0.29976130E+01 0.10920347E+00 0.74058515E-03
+ 0.29991040E+01 0.10845005E+00 0.73644618E-03
+ 0.30006037E+01 0.10971758E+00 0.74627524E-03
+ 0.30021124E+01 0.10979346E+00 0.74504525E-03
+ 0.30036120E+01 0.10921070E+00 0.74237864E-03
+ 0.30051119E+01 0.10917143E+00 0.74357039E-03
+ 0.30066116E+01 0.10930423E+00 0.74454688E-03
+ 0.30081203E+01 0.10994011E+00 0.74845407E-03
+ 0.30096202E+01 0.10957231E+00 0.74525544E-03
+ 0.30111289E+01 0.11047362E+00 0.75048610E-03
+ 0.30126286E+01 0.11147646E+00 0.75365556E-03
+ 0.30141373E+01 0.11077037E+00 0.75258204E-03
+ 0.30156460E+01 0.11022452E+00 0.75486023E-03
+ 0.30171547E+01 0.10991985E+00 0.75269490E-03
+ 0.30186634E+01 0.11088739E+00 0.75638609E-03
+ 0.30201721E+01 0.11061738E+00 0.75515476E-03
+ 0.30216808E+01 0.11059770E+00 0.75383368E-03
+ 0.30231895E+01 0.10991158E+00 0.74954727E-03
+ 0.30247071E+01 0.11174545E+00 0.76153758E-03
+ 0.30262158E+01 0.11027668E+00 0.75725751E-03
+ 0.30277245E+01 0.11158610E+00 0.76201820E-03
+ 0.30292420E+01 0.11196817E+00 0.76614064E-03
+ 0.30307596E+01 0.11066368E+00 0.75796590E-03
+ 0.30322683E+01 0.11076382E+00 0.75587659E-03
+ 0.30337861E+01 0.11210696E+00 0.76786388E-03
+ 0.30353036E+01 0.10983586E+00 0.76047878E-03
+ 0.30368211E+01 0.11100114E+00 0.75945933E-03
+ 0.30383389E+01 0.11230819E+00 0.77161629E-03
+ 0.30398564E+01 0.11179049E+00 0.76597114E-03
+ 0.30413830E+01 0.11166246E+00 0.76967047E-03
+ 0.30429006E+01 0.11137342E+00 0.77036006E-03
+ 0.30444183E+01 0.11187131E+00 0.77335484E-03
+ 0.30459449E+01 0.11111277E+00 0.76556188E-03
+ 0.30474713E+01 0.11073318E+00 0.76666026E-03
+ 0.30489891E+01 0.11011402E+00 0.76290709E-03
+ 0.30505157E+01 0.11167818E+00 0.76788542E-03
+ 0.30520420E+01 0.11327861E+00 0.77961659E-03
+ 0.30535686E+01 0.11258130E+00 0.77614083E-03
+ 0.30550952E+01 0.11332802E+00 0.77720114E-03
+ 0.30566218E+01 0.11361912E+00 0.78268326E-03
+ 0.30581484E+01 0.11273279E+00 0.77870284E-03
+ 0.30596747E+01 0.11317194E+00 0.77866344E-03
+ 0.30612104E+01 0.11219214E+00 0.77774224E-03
+ 0.30627367E+01 0.11359028E+00 0.78295893E-03
+ 0.30642724E+01 0.11258237E+00 0.77959505E-03
+ 0.30657988E+01 0.11236480E+00 0.78054512E-03
+ 0.30673344E+01 0.11098229E+00 0.77390770E-03
+ 0.30688698E+01 0.11290161E+00 0.78290119E-03
+ 0.30704052E+01 0.11312056E+00 0.78687101E-03
+ 0.30719407E+01 0.11455959E+00 0.79099368E-03
+ 0.30734763E+01 0.11278614E+00 0.78231806E-03
+ 0.30750117E+01 0.11347347E+00 0.78569812E-03
+ 0.30765471E+01 0.11381983E+00 0.78475801E-03
+ 0.30780916E+01 0.11303681E+00 0.78812049E-03
+ 0.30796270E+01 0.11413334E+00 0.79315889E-03
+ 0.30811625E+01 0.11409841E+00 0.79304364E-03
+ 0.30827069E+01 0.11323658E+00 0.78622764E-03
+ 0.30842514E+01 0.11357097E+00 0.79213444E-03
+ 0.30857868E+01 0.11501983E+00 0.80181897E-03
+ 0.30873313E+01 0.11573372E+00 0.80168014E-03
+ 0.30888755E+01 0.11571036E+00 0.80055383E-03
+ 0.30904200E+01 0.11451330E+00 0.79584395E-03
+ 0.30919645E+01 0.11488077E+00 0.80087868E-03
+ 0.30935087E+01 0.11451367E+00 0.79805730E-03
+ 0.30950623E+01 0.11434302E+00 0.80204842E-03
+ 0.30966065E+01 0.11355168E+00 0.79875119E-03
+ 0.30981598E+01 0.11560261E+00 0.80791803E-03
+ 0.30997043E+01 0.11584620E+00 0.80663507E-03
+ 0.31012576E+01 0.11501817E+00 0.80682582E-03
+ 0.31028020E+01 0.11044671E+00 0.78572449E-03
+ 0.31043553E+01 0.11590848E+00 0.80717850E-03
+ 0.31059086E+01 0.11514786E+00 0.80711214E-03
+ 0.31074619E+01 0.11384321E+00 0.80123928E-03
+ 0.31090155E+01 0.11440910E+00 0.80023438E-03
+ 0.31105688E+01 0.11534148E+00 0.81196055E-03
+ 0.31121221E+01 0.11623389E+00 0.81373664E-03
+ 0.31136842E+01 0.11596824E+00 0.81413385E-03
+ 0.31152375E+01 0.11556413E+00 0.81083307E-03
+ 0.31167998E+01 0.11431178E+00 0.80715609E-03
+ 0.31183531E+01 0.11671907E+00 0.82204974E-03
+ 0.31199155E+01 0.11698702E+00 0.82131656E-03
+ 0.31214776E+01 0.11703081E+00 0.82370278E-03
+ 0.31230311E+01 0.11536416E+00 0.81314094E-03
+ 0.31245933E+01 0.11549681E+00 0.81834930E-03
+ 0.31261556E+01 0.11673696E+00 0.82357530E-03
+ 0.31277177E+01 0.11591422E+00 0.81734551E-03
+ 0.31292889E+01 0.11580829E+00 0.81771100E-03
+ 0.31308513E+01 0.11576544E+00 0.81776339E-03
+ 0.31324134E+01 0.11854263E+00 0.82967081E-03
+ 0.31339846E+01 0.11766066E+00 0.82884618E-03
+ 0.31355469E+01 0.11706153E+00 0.82959450E-03
+ 0.31371181E+01 0.11538105E+00 0.82209881E-03
+ 0.31386805E+01 0.11522266E+00 0.81806211E-03
+ 0.31402516E+01 0.11934830E+00 0.83868712E-03
+ 0.31418228E+01 0.11728982E+00 0.82784554E-03
+ 0.31433940E+01 0.11819985E+00 0.83280448E-03
+ 0.31449652E+01 0.11735393E+00 0.83459198E-03
+ 0.31465364E+01 0.11702022E+00 0.83162525E-03
+ 0.31481164E+01 0.11750928E+00 0.83566533E-03
+ 0.31496875E+01 0.11829066E+00 0.84156508E-03
+ 0.31512587E+01 0.11757433E+00 0.83681487E-03
+ 0.31528389E+01 0.11953904E+00 0.84875821E-03
+ 0.31544101E+01 0.11908445E+00 0.84456248E-03
+ 0.31559901E+01 0.11883979E+00 0.84639766E-03
+ 0.31575704E+01 0.11828405E+00 0.84098644E-03
+ 0.31591504E+01 0.11647058E+00 0.83618012E-03
+ 0.31607306E+01 0.12011369E+00 0.84992667E-03
+ 0.31623106E+01 0.11759491E+00 0.84166229E-03
+ 0.31638908E+01 0.11937629E+00 0.85040892E-03
+ 0.31654708E+01 0.11880036E+00 0.84951124E-03
+ 0.31670508E+01 0.11840793E+00 0.84717217E-03
+ 0.31686399E+01 0.11777497E+00 0.84559782E-03
+ 0.31702201E+01 0.11935684E+00 0.85178512E-03
+ 0.31718092E+01 0.11821380E+00 0.85158576E-03
+ 0.31733892E+01 0.11865586E+00 0.84944646E-03
+ 0.31749783E+01 0.11864473E+00 0.85035153E-03
+ 0.31765673E+01 0.11931785E+00 0.85513986E-03
+ 0.31781564E+01 0.12060571E+00 0.86235604E-03
+ 0.31797454E+01 0.11923647E+00 0.85622916E-03
+ 0.31813345E+01 0.11802987E+00 0.85238571E-03
+ 0.31829236E+01 0.12090385E+00 0.86280005E-03
+ 0.31845126E+01 0.12034106E+00 0.86322491E-03
+ 0.31861105E+01 0.11870773E+00 0.86249068E-03
+ 0.31876996E+01 0.11911491E+00 0.86128368E-03
+ 0.31892974E+01 0.12024818E+00 0.86657971E-03
+ 0.31908865E+01 0.11991763E+00 0.86229004E-03
+ 0.31924844E+01 0.12032671E+00 0.86580281E-03
+ 0.31940825E+01 0.11963280E+00 0.86361339E-03
+ 0.31956804E+01 0.12023075E+00 0.86915464E-03
+ 0.31972783E+01 0.11905731E+00 0.86035021E-03
+ 0.31988764E+01 0.11983877E+00 0.86948142E-03
+ 0.32004743E+01 0.12061824E+00 0.86899026E-03
+ 0.32020724E+01 0.12094838E+00 0.87215606E-03
+ 0.32036791E+01 0.12058594E+00 0.87786576E-03
+ 0.32052772E+01 0.12010285E+00 0.87330374E-03
+ 0.32068839E+01 0.12066782E+00 0.87479764E-03
+ 0.32084820E+01 0.11984388E+00 0.87070343E-03
+ 0.32100890E+01 0.11980914E+00 0.87329635E-03
+ 0.32116957E+01 0.12002842E+00 0.87539648E-03
+ 0.32132938E+01 0.12168291E+00 0.88357943E-03
+ 0.32149007E+01 0.12121768E+00 0.87944913E-03
+ 0.32165165E+01 0.12143540E+00 0.88222924E-03
+ 0.32181234E+01 0.11855824E+00 0.86656288E-03
+ 0.32197301E+01 0.12071902E+00 0.88081986E-03
+ 0.32213371E+01 0.11961855E+00 0.87467441E-03
+ 0.32229528E+01 0.12019934E+00 0.87800145E-03
+ 0.32245598E+01 0.12241493E+00 0.88987424E-03
+ 0.32261755E+01 0.12166347E+00 0.88818400E-03
+ 0.32277825E+01 0.12156069E+00 0.88412309E-03
+ 0.32293983E+01 0.12307592E+00 0.89654746E-03
+ 0.32310143E+01 0.12313148E+00 0.89662650E-03
+ 0.32326300E+01 0.12253176E+00 0.89792133E-03
+ 0.32342458E+01 0.12187059E+00 0.88815298E-03
+ 0.32358615E+01 0.12299944E+00 0.89612138E-03
+ 0.32374864E+01 0.12208903E+00 0.89810992E-03
+ 0.32391021E+01 0.12279487E+00 0.89846941E-03
+ 0.32407181E+01 0.12231331E+00 0.89616410E-03
+ 0.32423427E+01 0.12265595E+00 0.90216816E-03
+ 0.32439587E+01 0.12275999E+00 0.90049725E-03
+ 0.32455833E+01 0.12142587E+00 0.89231698E-03
+ 0.32472081E+01 0.12233258E+00 0.90378168E-03
+ 0.32488329E+01 0.12206318E+00 0.89940452E-03
+ 0.32504575E+01 0.12280400E+00 0.90073573E-03
+ 0.32520823E+01 0.12500462E+00 0.92000171E-03
+ 0.32537072E+01 0.12346347E+00 0.91365003E-03
+ 0.32553318E+01 0.12318555E+00 0.91054663E-03
+ 0.32569566E+01 0.12493140E+00 0.91416639E-03
+ 0.32585902E+01 0.12285515E+00 0.90868236E-03
+ 0.32602150E+01 0.12404844E+00 0.91656658E-03
+ 0.32618487E+01 0.12511848E+00 0.92926435E-03
+ 0.32634823E+01 0.12602778E+00 0.93318173E-03
+ 0.32651072E+01 0.12366695E+00 0.91926759E-03
+ 0.32667408E+01 0.12547815E+00 0.92390087E-03
+ 0.32683744E+01 0.12388139E+00 0.91603317E-03
+ 0.32700081E+01 0.12632245E+00 0.93504495E-03
+ 0.32716508E+01 0.12398522E+00 0.92248956E-03
+ 0.32732844E+01 0.12501690E+00 0.93121431E-03
+ 0.32749181E+01 0.12449261E+00 0.91973308E-03
+ 0.32765605E+01 0.12532136E+00 0.92911534E-03
+ 0.32781944E+01 0.12374971E+00 0.92342531E-03
+ 0.32798369E+01 0.12467165E+00 0.92612952E-03
+ 0.32814705E+01 0.12563731E+00 0.93380333E-03
+ 0.32831132E+01 0.12418614E+00 0.92636957E-03
+ 0.32847557E+01 0.12684163E+00 0.94597397E-03
+ 0.32863984E+01 0.12674522E+00 0.93646900E-03
+ 0.32880411E+01 0.12386328E+00 0.92500675E-03
+ 0.32896836E+01 0.12730238E+00 0.94968511E-03
+ 0.32913263E+01 0.12568426E+00 0.94411196E-03
+ 0.32929778E+01 0.12542544E+00 0.93822140E-03
+ 0.32946203E+01 0.12627348E+00 0.94328774E-03
+ 0.32962718E+01 0.12477823E+00 0.93851256E-03
+ 0.32979145E+01 0.12799788E+00 0.95312402E-03
+ 0.32995660E+01 0.12735365E+00 0.95219456E-03
+ 0.33012176E+01 0.12541188E+00 0.93743036E-03
+ 0.33028691E+01 0.12528619E+00 0.94145187E-03
+ 0.33045206E+01 0.12681086E+00 0.94838260E-03
+ 0.33061721E+01 0.12608908E+00 0.95151883E-03
+ 0.33078237E+01 0.12919831E+00 0.96792571E-03
+ 0.33094752E+01 0.12547770E+00 0.94612269E-03
+ 0.33111355E+01 0.12664714E+00 0.94872242E-03
+ 0.33127871E+01 0.12647395E+00 0.95025275E-03
+ 0.33144476E+01 0.12673110E+00 0.95867203E-03
+ 0.33160992E+01 0.12588672E+00 0.94805518E-03
+ 0.33177595E+01 0.12664954E+00 0.96020219E-03
+ 0.33194201E+01 0.12781709E+00 0.96218335E-03
+ 0.33210804E+01 0.12674448E+00 0.95999712E-03
+ 0.33227410E+01 0.12680551E+00 0.96486876E-03
+ 0.33244014E+01 0.12792416E+00 0.96547836E-03
+ 0.33260620E+01 0.12913756E+00 0.97805355E-03
+ 0.33277223E+01 0.12901783E+00 0.97042846E-03
+ 0.33293917E+01 0.12747996E+00 0.96637820E-03
+ 0.33310521E+01 0.12821475E+00 0.97243197E-03
+ 0.33327215E+01 0.12810099E+00 0.97038178E-03
+ 0.33343821E+01 0.12667672E+00 0.96284156E-03
+ 0.33360515E+01 0.12997182E+00 0.98495255E-03
+ 0.33377209E+01 0.12846157E+00 0.97677356E-03
+ 0.33393900E+01 0.12875643E+00 0.98245242E-03
+ 0.33410594E+01 0.12818395E+00 0.97345276E-03
+ 0.33427289E+01 0.12917937E+00 0.98492939E-03
+ 0.33443983E+01 0.12883811E+00 0.97840047E-03
+ 0.33460767E+01 0.12879337E+00 0.97741839E-03
+ 0.33477459E+01 0.13102189E+00 0.99535612E-03
+ 0.33494244E+01 0.13028739E+00 0.99613797E-03
+ 0.33510938E+01 0.12960014E+00 0.98853314E-03
+ 0.33527720E+01 0.12943178E+00 0.98876678E-03
+ 0.33544502E+01 0.12610884E+00 0.97091106E-03
+ 0.33561196E+01 0.12815847E+00 0.98163681E-03
+ 0.33577981E+01 0.12762466E+00 0.97893202E-03
+ 0.33594851E+01 0.13094217E+00 0.10004147E-02
+ 0.33611636E+01 0.12999637E+00 0.99821039E-03
+ 0.33628418E+01 0.12889600E+00 0.99298358E-03
+ 0.33645201E+01 0.12777948E+00 0.98197977E-03
+ 0.33662074E+01 0.13028988E+00 0.10000727E-02
+ 0.33678856E+01 0.13007520E+00 0.99536590E-03
+ 0.33695729E+01 0.12914847E+00 0.99140895E-03
+ 0.33712602E+01 0.13210666E+00 0.10114933E-02
+ 0.33729384E+01 0.13050669E+00 0.10059352E-02
+ 0.33746257E+01 0.13022898E+00 0.10103092E-02
+ 0.33763130E+01 0.13132779E+00 0.10130075E-02
+ 0.33780003E+01 0.12922639E+00 0.99194306E-03
+ 0.33796964E+01 0.13162121E+00 0.10172366E-02
+ 0.33813837E+01 0.13141003E+00 0.10192899E-02
+ 0.33830709E+01 0.13117488E+00 0.10164850E-02
+ 0.33847671E+01 0.13041803E+00 0.10090182E-02
+ 0.33864543E+01 0.13177048E+00 0.10204714E-02
+ 0.33881505E+01 0.13358329E+00 0.10327416E-02
+ 0.33898466E+01 0.13173421E+00 0.10181277E-02
+ 0.33915427E+01 0.13137870E+00 0.10247817E-02
+ 0.33932388E+01 0.13158113E+00 0.10215198E-02
+ 0.33949351E+01 0.13158281E+00 0.10238457E-02
+ 0.33966312E+01 0.13224439E+00 0.10263455E-02
+ 0.33983274E+01 0.13254181E+00 0.10352377E-02
+ 0.34000235E+01 0.13306761E+00 0.10326237E-02
+ 0.34017286E+01 0.13093118E+00 0.10277915E-02
+ 0.34034247E+01 0.13241065E+00 0.10308952E-02
+ 0.34051299E+01 0.13301340E+00 0.10339400E-02
+ 0.34068351E+01 0.13310392E+00 0.10390525E-02
+ 0.34085312E+01 0.13394964E+00 0.10465428E-02
+ 0.34102364E+01 0.13178943E+00 0.10356852E-02
+ 0.34119413E+01 0.13269189E+00 0.10425326E-02
+ 0.34136465E+01 0.13180700E+00 0.10285833E-02
+ 0.34153605E+01 0.13208991E+00 0.10324543E-02
+ 0.34170656E+01 0.13184622E+00 0.10315306E-02
+ 0.34187706E+01 0.13414054E+00 0.10539063E-02
+ 0.34204845E+01 0.13453594E+00 0.10533528E-02
+ 0.34221897E+01 0.13310248E+00 0.10497401E-02
+ 0.34239037E+01 0.13450490E+00 0.10552533E-02
+ 0.34256177E+01 0.13130262E+00 0.10365060E-02
+ 0.34273317E+01 0.13499844E+00 0.10662703E-02
+ 0.34290459E+01 0.13222025E+00 0.10397506E-02
+ 0.34307599E+01 0.13340779E+00 0.10525852E-02
+ 0.34324739E+01 0.13486718E+00 0.10690551E-02
+ 0.34341879E+01 0.13336074E+00 0.10559995E-02
+ 0.34359019E+01 0.13478534E+00 0.10610786E-02
+ 0.34376249E+01 0.13468918E+00 0.10679164E-02
+ 0.34393389E+01 0.13490798E+00 0.10684796E-02
+ 0.34410617E+01 0.13431998E+00 0.10599460E-02
+ 0.34427848E+01 0.13528387E+00 0.10730036E-02
+ 0.34445076E+01 0.13409838E+00 0.10674786E-02
+ 0.34462306E+01 0.13588203E+00 0.10786608E-02
+ 0.34479537E+01 0.13402642E+00 0.10691691E-02
+ 0.34496765E+01 0.13404827E+00 0.10681996E-02
+ 0.34513996E+01 0.13563940E+00 0.10777983E-02
+ 0.34531224E+01 0.13515761E+00 0.10790841E-02
+ 0.34548542E+01 0.13492742E+00 0.10729689E-02
+ 0.34565773E+01 0.13532619E+00 0.10727770E-02
+ 0.34583092E+01 0.13518007E+00 0.10778734E-02
+ 0.34600320E+01 0.13671668E+00 0.10901050E-02
+ 0.34617639E+01 0.13484687E+00 0.10746233E-02
+ 0.34634957E+01 0.13398406E+00 0.10763122E-02
+ 0.34652276E+01 0.13420299E+00 0.10834476E-02
+ 0.34669595E+01 0.13552685E+00 0.10866864E-02
+ 0.34686913E+01 0.13736348E+00 0.10950255E-02
+ 0.34704323E+01 0.13516334E+00 0.10927852E-02
+ 0.34721642E+01 0.13562679E+00 0.10885177E-02
+ 0.34738960E+01 0.13715988E+00 0.10960988E-02
+ 0.34756367E+01 0.13752508E+00 0.11050621E-02
+ 0.34773777E+01 0.13793823E+00 0.11144513E-02
+ 0.34791095E+01 0.13500041E+00 0.10879615E-02
+ 0.34808502E+01 0.13730167E+00 0.11127318E-02
+ 0.34825912E+01 0.13738118E+00 0.11044339E-02
+ 0.34843318E+01 0.13774240E+00 0.11022483E-02
+ 0.34860816E+01 0.13463445E+00 0.10915135E-02
+ 0.34878223E+01 0.13846783E+00 0.11154227E-02
+ 0.34895632E+01 0.13768865E+00 0.11135417E-02
+ 0.34913130E+01 0.13755767E+00 0.11151328E-02
+ 0.34930537E+01 0.13785937E+00 0.11195125E-02
+ 0.34948034E+01 0.13735369E+00 0.11140195E-02
+ 0.34965441E+01 0.13849504E+00 0.11206889E-02
+ 0.34982939E+01 0.13503863E+00 0.10946410E-02
+ 0.35000436E+01 0.13783211E+00 0.11219869E-02
+ 0.35017934E+01 0.13774645E+00 0.11204572E-02
+ 0.35035431E+01 0.14004399E+00 0.11377187E-02
+ 0.35053017E+01 0.13777700E+00 0.11165335E-02
+ 0.35070515E+01 0.13783902E+00 0.11332717E-02
+ 0.35088012E+01 0.13726699E+00 0.11190618E-02
+ 0.35105598E+01 0.13952482E+00 0.11318210E-02
+ 0.35123186E+01 0.14021710E+00 0.11482690E-02
+ 0.35140684E+01 0.14090025E+00 0.11476054E-02
+ 0.35158269E+01 0.13809250E+00 0.11260632E-02
+ 0.35175855E+01 0.13904443E+00 0.11323807E-02
+ 0.35193443E+01 0.13917775E+00 0.11390812E-02
+ 0.35211029E+01 0.13893744E+00 0.11420096E-02
+ 0.35228615E+01 0.13919400E+00 0.11447513E-02
+ 0.35246291E+01 0.14008656E+00 0.11507006E-02
+ 0.35263877E+01 0.13770510E+00 0.11312008E-02
+ 0.35281553E+01 0.13886450E+00 0.11482579E-02
+ 0.35299139E+01 0.14109418E+00 0.11531191E-02
+ 0.35316815E+01 0.13952236E+00 0.11467579E-02
+ 0.35334492E+01 0.13956358E+00 0.11498855E-02
+ 0.35352168E+01 0.14028144E+00 0.11526211E-02
+ 0.35369844E+01 0.14188474E+00 0.11664566E-02
+ 0.35387518E+01 0.14078306E+00 0.11568802E-02
+ 0.35405195E+01 0.14030445E+00 0.11651800E-02
+ 0.35422871E+01 0.14082937E+00 0.11624665E-02
+ 0.35440636E+01 0.13949275E+00 0.11614683E-02
+ 0.35458312E+01 0.13977334E+00 0.11580846E-02
+ 0.35476077E+01 0.14058162E+00 0.11661879E-02
+ 0.35493753E+01 0.14027676E+00 0.11652419E-02
+ 0.35511518E+01 0.14168216E+00 0.11695402E-02
+ 0.35529282E+01 0.14027542E+00 0.11688332E-02
+ 0.35547049E+01 0.13899824E+00 0.11602720E-02
+ 0.35564814E+01 0.14307615E+00 0.11842839E-02
+ 0.35582578E+01 0.14054751E+00 0.11679801E-02
+ 0.35600433E+01 0.14023344E+00 0.11756310E-02
+ 0.35618198E+01 0.14133568E+00 0.11791534E-02
+ 0.35636053E+01 0.14015016E+00 0.11654762E-02
+ 0.35653818E+01 0.14087282E+00 0.11792100E-02
+ 0.35671670E+01 0.14197575E+00 0.11812410E-02
+ 0.35689526E+01 0.14032535E+00 0.11793987E-02
+ 0.35707290E+01 0.14181075E+00 0.11892797E-02
+ 0.35725145E+01 0.14225611E+00 0.11788962E-02
+ 0.35743089E+01 0.14172724E+00 0.11904028E-02
+ 0.35760944E+01 0.14270076E+00 0.11983896E-02
+ 0.35778797E+01 0.14337642E+00 0.12054903E-02
+ 0.35796652E+01 0.14129458E+00 0.11901974E-02
+ 0.35814595E+01 0.14386782E+00 0.12143230E-02
+ 0.35832539E+01 0.14370897E+00 0.12152289E-02
+ 0.35850394E+01 0.14313784E+00 0.12074661E-02
+ 0.35868337E+01 0.14513217E+00 0.12278541E-02
+ 0.35886281E+01 0.14237934E+00 0.12076051E-02
+ 0.35904224E+01 0.14271276E+00 0.11998556E-02
+ 0.35922167E+01 0.14518477E+00 0.12303629E-02
+ 0.35940111E+01 0.14411251E+00 0.12192859E-02
+ 0.35958056E+01 0.14428397E+00 0.12190823E-02
+ 0.35976088E+01 0.14339195E+00 0.12075651E-02
+ 0.35994031E+01 0.14300716E+00 0.12114785E-02
+ 0.36012065E+01 0.14242660E+00 0.12029330E-02
+ 0.36030097E+01 0.14578706E+00 0.12392881E-02
+ 0.36048040E+01 0.14355838E+00 0.12200780E-02
+ 0.36066074E+01 0.14169775E+00 0.12080843E-02
+ 0.36084106E+01 0.14783162E+00 0.12544543E-02
+ 0.36102140E+01 0.14534409E+00 0.12312446E-02
+ 0.36120262E+01 0.14492007E+00 0.12326097E-02
+ 0.36138296E+01 0.14468454E+00 0.12368510E-02
+ 0.36156328E+01 0.14261155E+00 0.12164158E-02
+ 0.36174450E+01 0.14299907E+00 0.12223769E-02
+ 0.36192572E+01 0.14527598E+00 0.12397823E-02
+ 0.36210606E+01 0.14422102E+00 0.12365592E-02
+ 0.36228728E+01 0.14450547E+00 0.12398064E-02
+ 0.36246850E+01 0.14524166E+00 0.12440792E-02
+ 0.36264973E+01 0.14413127E+00 0.12435797E-02
+ 0.36283095E+01 0.14209561E+00 0.12262071E-02
+ 0.36301217E+01 0.14523850E+00 0.12396107E-02
+ 0.36319427E+01 0.14531425E+00 0.12469968E-02
+ 0.36337550E+01 0.14663529E+00 0.12666307E-02
+ 0.36355760E+01 0.14350550E+00 0.12448138E-02
+ 0.36373882E+01 0.14471690E+00 0.12477636E-02
+ 0.36392095E+01 0.14464858E+00 0.12441793E-02
+ 0.36410306E+01 0.14350827E+00 0.12379937E-02
+ 0.36428518E+01 0.14655012E+00 0.12711660E-02
+ 0.36446729E+01 0.14674778E+00 0.12728899E-02
+ 0.36464942E+01 0.14606418E+00 0.12651944E-02
+ 0.36483152E+01 0.14635192E+00 0.12712055E-02
+ 0.36501365E+01 0.14558916E+00 0.12634739E-02
+ 0.36519663E+01 0.14417087E+00 0.12612335E-02
+ 0.36537876E+01 0.14706515E+00 0.12819123E-02
+ 0.36556177E+01 0.14568533E+00 0.12726254E-02
+ 0.36574478E+01 0.14754835E+00 0.12882584E-02
+ 0.36592777E+01 0.14588813E+00 0.12712530E-02
+ 0.36611078E+01 0.14742358E+00 0.12853539E-02
+ 0.36629379E+01 0.14602014E+00 0.12751352E-02
+ 0.36647680E+01 0.14861993E+00 0.12977158E-02
+ 0.36665981E+01 0.14624535E+00 0.12869586E-02
+ 0.36684282E+01 0.14715442E+00 0.12822722E-02
+ 0.36702671E+01 0.14834704E+00 0.13042087E-02
+ 0.36720972E+01 0.14606281E+00 0.12764396E-02
+ 0.36739361E+01 0.14911294E+00 0.13093881E-02
+ 0.36757753E+01 0.14742024E+00 0.12947976E-02
+ 0.36776142E+01 0.14904697E+00 0.13125755E-02
+ 0.36794531E+01 0.14804737E+00 0.12976737E-02
+ 0.36812923E+01 0.14799884E+00 0.13043187E-02
+ 0.36831312E+01 0.14958173E+00 0.13155733E-02
+ 0.36849701E+01 0.15010628E+00 0.13184339E-02
+ 0.36868181E+01 0.15071382E+00 0.13214945E-02
+ 0.36886570E+01 0.14761928E+00 0.13068932E-02
+ 0.36905050E+01 0.14854626E+00 0.13179861E-02
+ 0.36923440E+01 0.14912848E+00 0.13262581E-02
+ 0.36941919E+01 0.14877811E+00 0.13160317E-02
+ 0.36960399E+01 0.14925249E+00 0.13240986E-02
+ 0.36978879E+01 0.14638983E+00 0.12988254E-02
+ 0.36997359E+01 0.14850715E+00 0.13241840E-02
+ 0.37015927E+01 0.14808255E+00 0.13189573E-02
+ 0.37034404E+01 0.14828351E+00 0.13167533E-02
+ 0.37052884E+01 0.14884892E+00 0.13257520E-02
+ 0.37071452E+01 0.14885858E+00 0.13270739E-02
+ 0.37089932E+01 0.15240397E+00 0.13561787E-02
+ 0.37108500E+01 0.15116073E+00 0.13451960E-02
+ 0.37127070E+01 0.15208471E+00 0.13574709E-02
+ 0.37145638E+01 0.14973672E+00 0.13385742E-02
+ 0.37164207E+01 0.14998126E+00 0.13477495E-02
+ 0.37182775E+01 0.15064532E+00 0.13468651E-02
+ 0.37201343E+01 0.15006699E+00 0.13429454E-02
+ 0.37220001E+01 0.15098599E+00 0.13615674E-02
+ 0.37238569E+01 0.14878933E+00 0.13297249E-02
+ 0.37257228E+01 0.15260796E+00 0.13820971E-02
+ 0.37275887E+01 0.15180829E+00 0.13681552E-02
+ 0.37294455E+01 0.15218048E+00 0.13667042E-02
+ 0.37313111E+01 0.15077384E+00 0.13683094E-02
+ 0.37331769E+01 0.15206544E+00 0.13728549E-02
+ 0.37350428E+01 0.15059471E+00 0.13642345E-02
+ 0.37369084E+01 0.15181209E+00 0.13638220E-02
+ 0.37387834E+01 0.15142761E+00 0.13802946E-02
+ 0.37406490E+01 0.15302640E+00 0.13933622E-02
+ 0.37425237E+01 0.15065224E+00 0.13722548E-02
+ 0.37443895E+01 0.14935483E+00 0.13538046E-02
+ 0.37462642E+01 0.15398851E+00 0.13964470E-02
+ 0.37481389E+01 0.14921412E+00 0.13585029E-02
+ 0.37500136E+01 0.15284033E+00 0.13860939E-02
+ 0.37518883E+01 0.15357441E+00 0.13990917E-02
+ 0.37537630E+01 0.15135406E+00 0.13849017E-02
+ 0.37556376E+01 0.15451485E+00 0.14021186E-02
+ 0.37575214E+01 0.15401182E+00 0.14124217E-02
+ 0.37593961E+01 0.15335697E+00 0.14175979E-02
+ 0.37612798E+01 0.15178803E+00 0.13878572E-02
+ 0.37631545E+01 0.15271452E+00 0.13935567E-02
+ 0.37650380E+01 0.15402576E+00 0.14023799E-02
+ 0.37669218E+01 0.15551788E+00 0.14289626E-02
+ 0.37688053E+01 0.15436129E+00 0.14223148E-02
+ 0.37706890E+01 0.15558358E+00 0.14276609E-02
+ 0.37725725E+01 0.15380371E+00 0.14171089E-02
+ 0.37744563E+01 0.15387233E+00 0.14101791E-02
+ 0.37763488E+01 0.15706235E+00 0.14478634E-02
+ 0.37782323E+01 0.15275683E+00 0.14072628E-02
+ 0.37801249E+01 0.15378290E+00 0.14172782E-02
+ 0.37820175E+01 0.15591693E+00 0.14408167E-02
+ 0.37839012E+01 0.15433018E+00 0.14103339E-02
+ 0.37857938E+01 0.15459852E+00 0.14249848E-02
+ 0.37876863E+01 0.15224813E+00 0.14183921E-02
+ 0.37895877E+01 0.15307137E+00 0.14152218E-02
+ 0.37914803E+01 0.15651333E+00 0.14525044E-02
+ 0.37933729E+01 0.15470441E+00 0.14335227E-02
+ 0.37952745E+01 0.15418729E+00 0.14289640E-02
+ 0.37971671E+01 0.15642595E+00 0.14554170E-02
+ 0.37990685E+01 0.15525530E+00 0.14466268E-02
+ 0.38009701E+01 0.15516135E+00 0.14502704E-02
+ 0.38028715E+01 0.15562542E+00 0.14520300E-02
+ 0.38047729E+01 0.15781496E+00 0.14697758E-02
+ 0.38066745E+01 0.15644087E+00 0.14595035E-02
+ 0.38085759E+01 0.15704013E+00 0.14568274E-02
+ 0.38104775E+01 0.15500458E+00 0.14416814E-02
+ 0.38123879E+01 0.15597470E+00 0.14666381E-02
+ 0.38142893E+01 0.15656658E+00 0.14680788E-02
+ 0.38161998E+01 0.16032682E+00 0.15062696E-02
+ 0.38181102E+01 0.15458874E+00 0.14521682E-02
+ 0.38200116E+01 0.15772112E+00 0.14831800E-02
+ 0.38219221E+01 0.15785150E+00 0.14949192E-02
+ 0.38238325E+01 0.15682726E+00 0.14731823E-02
+ 0.38257518E+01 0.15732701E+00 0.14703200E-02
+ 0.38276622E+01 0.15915655E+00 0.15084522E-02
+ 0.38295727E+01 0.15757617E+00 0.14917436E-02
+ 0.38314919E+01 0.15686105E+00 0.14829816E-02
+ 0.38334024E+01 0.15570916E+00 0.14727631E-02
+ 0.38353217E+01 0.15939325E+00 0.15080628E-02
+ 0.38372412E+01 0.16108923E+00 0.15348925E-02
+ 0.38391604E+01 0.16002642E+00 0.15283470E-02
+ 0.38410797E+01 0.15609814E+00 0.14760507E-02
+ 0.38429992E+01 0.16015808E+00 0.15228450E-02
+ 0.38449185E+01 0.15785761E+00 0.15115256E-02
+ 0.38468378E+01 0.15751398E+00 0.15010635E-02
+ 0.38487661E+01 0.15838550E+00 0.15056484E-02
+ 0.38506944E+01 0.15959257E+00 0.15227629E-02
+ 0.38526137E+01 0.15820506E+00 0.14988635E-02
+ 0.38545420E+01 0.15868376E+00 0.15159518E-02
+ 0.38564703E+01 0.15910055E+00 0.15213490E-02
+ 0.38583984E+01 0.15508541E+00 0.14895350E-02
+ 0.38603268E+01 0.15943293E+00 0.15353130E-02
+ 0.38622551E+01 0.15975010E+00 0.15313046E-02
+ 0.38641834E+01 0.16008499E+00 0.15392944E-02
+ 0.38661206E+01 0.15967932E+00 0.15520061E-02
+ 0.38680489E+01 0.15789552E+00 0.15197162E-02
+ 0.38699861E+01 0.15831117E+00 0.15201018E-02
+ 0.38719232E+01 0.15971208E+00 0.15327344E-02
+ 0.38738604E+01 0.16016607E+00 0.15486098E-02
+ 0.38757975E+01 0.15968756E+00 0.15393592E-02
+ 0.38777349E+01 0.16044059E+00 0.15561114E-02
+ 0.38796721E+01 0.16160670E+00 0.15592104E-02
+ 0.38816092E+01 0.16167210E+00 0.15573722E-02
+ 0.38835554E+01 0.15889828E+00 0.15322596E-02
+ 0.38854926E+01 0.16032273E+00 0.15474618E-02
+ 0.38874385E+01 0.16055119E+00 0.15559113E-02
+ 0.38893847E+01 0.15868159E+00 0.15455077E-02
+ 0.38913219E+01 0.15948465E+00 0.15462284E-02
+ 0.38932681E+01 0.16305214E+00 0.15858928E-02
+ 0.38952143E+01 0.16211486E+00 0.15834336E-02
+ 0.38971694E+01 0.15992349E+00 0.15614640E-02
+ 0.38991153E+01 0.15993430E+00 0.15623856E-02
+ 0.39010615E+01 0.16296661E+00 0.15858309E-02
+ 0.39030166E+01 0.16296357E+00 0.16015897E-02
+ 0.39049628E+01 0.16026697E+00 0.15810282E-02
+ 0.39069178E+01 0.16190688E+00 0.15908512E-02
+ 0.39088728E+01 0.16227236E+00 0.15938575E-02
+ 0.39108279E+01 0.16437797E+00 0.16302028E-02
+ 0.39127829E+01 0.16362661E+00 0.16173668E-02
+ 0.39147379E+01 0.16280153E+00 0.15964769E-02
+ 0.39166930E+01 0.16312231E+00 0.16117853E-02
+ 0.39186571E+01 0.16548240E+00 0.16322481E-02
+ 0.39206121E+01 0.16350804E+00 0.16231725E-02
+ 0.39225760E+01 0.16068070E+00 0.15803776E-02
+ 0.39245310E+01 0.15914245E+00 0.15762295E-02
+ 0.39264951E+01 0.16386177E+00 0.16201325E-02
+ 0.39284589E+01 0.16178718E+00 0.16047161E-02
+ 0.39304230E+01 0.16332562E+00 0.16258444E-02
+ 0.39323871E+01 0.16347887E+00 0.16213942E-02
+ 0.39343510E+01 0.16246641E+00 0.16194574E-02
+ 0.39363239E+01 0.16354918E+00 0.16394614E-02
+ 0.39382880E+01 0.16329677E+00 0.16310981E-02
+ 0.39402609E+01 0.16342382E+00 0.16256656E-02
+ 0.39422336E+01 0.16845171E+00 0.16923699E-02
+ 0.39441977E+01 0.16352257E+00 0.16420776E-02
+ 0.39461706E+01 0.16541928E+00 0.16675837E-02
+ 0.39481435E+01 0.16669907E+00 0.16750926E-02
+ 0.39501164E+01 0.16505146E+00 0.16449895E-02
+ 0.39520981E+01 0.16700365E+00 0.16896534E-02
+ 0.39540710E+01 0.16060618E+00 0.16100265E-02
+ 0.39560440E+01 0.16114910E+00 0.16167399E-02
+ 0.39580259E+01 0.16220368E+00 0.16291345E-02
+ 0.39600077E+01 0.16410911E+00 0.16604223E-02
+ 0.39619806E+01 0.16243540E+00 0.16375881E-02
+ 0.39639623E+01 0.16320589E+00 0.16571274E-02
+ 0.39659443E+01 0.16778052E+00 0.16899608E-02
+ 0.39679351E+01 0.16572534E+00 0.16747162E-02
+ 0.39699168E+01 0.16670312E+00 0.17014787E-02
+ 0.39718988E+01 0.16173221E+00 0.16359269E-02
+ 0.39738894E+01 0.16551830E+00 0.16850446E-02
+ 0.39758713E+01 0.16577502E+00 0.16804942E-02
+ 0.39778621E+01 0.16422306E+00 0.16731052E-02
+ 0.39798529E+01 0.16563137E+00 0.16835009E-02
+ 0.39818435E+01 0.16816235E+00 0.17165184E-02
+ 0.39838343E+01 0.16505060E+00 0.16826534E-02
+ 0.39858251E+01 0.16904277E+00 0.17366519E-02
+ 0.39878159E+01 0.16880913E+00 0.17311175E-02
+ 0.39898067E+01 0.16587642E+00 0.16909259E-02
+ 0.39918063E+01 0.16570617E+00 0.17169007E-02
+ 0.39937971E+01 0.16958098E+00 0.17524686E-02
+ 0.39957967E+01 0.16554299E+00 0.17036353E-02
+ 0.39977965E+01 0.16594018E+00 0.17091009E-02
+ 0.39997962E+01 0.16579174E+00 0.17165334E-02
+ 0.40017958E+01 0.16714706E+00 0.17162642E-02
+ 0.40037956E+01 0.16647486E+00 0.17235985E-02
+ 0.40057950E+01 0.16835600E+00 0.17478695E-02
+ 0.40078039E+01 0.16624212E+00 0.17241549E-02
+ 0.40098033E+01 0.16598707E+00 0.17170394E-02
+ 0.40118122E+01 0.16607419E+00 0.17324213E-02
+ 0.40138116E+01 0.16417433E+00 0.17129185E-02
+ 0.40158205E+01 0.17016932E+00 0.17971605E-02
+ 0.40178289E+01 0.16710889E+00 0.17394194E-02
+ 0.40198379E+01 0.17047255E+00 0.17842031E-02
+ 0.40218463E+01 0.16580170E+00 0.17324516E-02
+ 0.40238547E+01 0.16725563E+00 0.17492983E-02
+ 0.40258722E+01 0.16689995E+00 0.17465720E-02
+ 0.40278811E+01 0.16970292E+00 0.17618076E-02
+ 0.40298986E+01 0.16941927E+00 0.17755069E-02
+ 0.40319161E+01 0.16685258E+00 0.17587603E-02
+ 0.40339246E+01 0.17005175E+00 0.17904458E-02
+ 0.40359421E+01 0.16830933E+00 0.17682194E-02
+ 0.40379601E+01 0.16777362E+00 0.17698726E-02
+ 0.40399861E+01 0.17022398E+00 0.17861102E-02
+ 0.40420036E+01 0.17207295E+00 0.18102556E-02
+ 0.40440216E+01 0.17156489E+00 0.17932247E-02
+ 0.40460477E+01 0.16704394E+00 0.17536947E-02
+ 0.40480652E+01 0.17305906E+00 0.18178968E-02
+ 0.40500917E+01 0.17081665E+00 0.17924175E-02
+ 0.40521183E+01 0.16972543E+00 0.17784884E-02
+ 0.40541449E+01 0.17232484E+00 0.18021675E-02
+ 0.40561714E+01 0.16674577E+00 0.17357600E-02
+ 0.40581980E+01 0.16975720E+00 0.17740043E-02
+ 0.40602241E+01 0.17137593E+00 0.17884347E-02
+ 0.40622597E+01 0.17022170E+00 0.17805024E-02
+ 0.40642862E+01 0.16987415E+00 0.17750484E-02
+ 0.40663214E+01 0.16881996E+00 0.17462306E-02
+ 0.40683570E+01 0.16660054E+00 0.17300830E-02
+ 0.40703921E+01 0.16897599E+00 0.17470383E-02
+ 0.40724277E+01 0.16930224E+00 0.17622791E-02
+ 0.40744629E+01 0.17026560E+00 0.17678633E-02
+ 0.40764985E+01 0.16850989E+00 0.17660882E-02
+ 0.40785336E+01 0.17143020E+00 0.17801812E-02
+ 0.40805783E+01 0.17278609E+00 0.18088964E-02
+ 0.40826135E+01 0.17478189E+00 0.18238745E-02
+ 0.40846577E+01 0.16718808E+00 0.17315861E-02
+ 0.40867023E+01 0.16590452E+00 0.17130525E-02
+ 0.40887465E+01 0.17025590E+00 0.17704712E-02
+ 0.40907907E+01 0.16831668E+00 0.17599012E-02
+ 0.40928354E+01 0.16784467E+00 0.17408663E-02
+ 0.40948796E+01 0.16719244E+00 0.17428994E-02
+ 0.40969238E+01 0.16382726E+00 0.16922405E-02
+ 0.40989771E+01 0.16397217E+00 0.16985836E-02
+ 0.41010213E+01 0.16013870E+00 0.16676416E-02
+ 0.41030746E+01 0.15354128E+00 0.15773514E-02
+ 0.41051278E+01 0.14906010E+00 0.15191142E-02
+ 0.41071811E+01 0.14346801E+00 0.14707069E-02
+ 0.41092343E+01 0.13796619E+00 0.14267896E-02
+ 0.41112876E+01 0.12993769E+00 0.13441612E-02
+ 0.41133409E+01 0.12571137E+00 0.12992016E-02
+ 0.41154032E+01 0.11961717E+00 0.12435741E-02
+ 0.41174564E+01 0.11700027E+00 0.12245388E-02
+ 0.41195188E+01 0.11553824E+00 0.12092360E-02
+ 0.41215720E+01 0.11012717E+00 0.11793146E-02
+ 0.41236339E+01 0.10689957E+00 0.11451042E-02
+ 0.41256962E+01 0.10435031E+00 0.11363334E-02
+ 0.41277585E+01 0.10419326E+00 0.11342803E-02
+ 0.41298203E+01 0.10038291E+00 0.11085841E-02
+ 0.41318917E+01 0.10215858E+00 0.11158714E-02
+ 0.41339536E+01 0.99884048E-01 0.10969678E-02
+ 0.41360250E+01 0.10075844E+00 0.11102959E-02
+ 0.41380873E+01 0.97847916E-01 0.10873325E-02
+ 0.41401582E+01 0.96215911E-01 0.10787065E-02
+ 0.41422291E+01 0.97449318E-01 0.10874865E-02
+ 0.41443005E+01 0.98735459E-01 0.10897182E-02
+ 0.41463714E+01 0.98328337E-01 0.10941186E-02
+ 0.41484427E+01 0.95069237E-01 0.10724615E-02
+ 0.41505227E+01 0.95872879E-01 0.10777821E-02
+ 0.41525936E+01 0.98551229E-01 0.10882535E-02
+ 0.41546736E+01 0.96606240E-01 0.10812778E-02
+ 0.41567450E+01 0.94872274E-01 0.10697143E-02
+ 0.41588249E+01 0.95226645E-01 0.10797603E-02
+ 0.41609049E+01 0.94923139E-01 0.10761363E-02
+ 0.41629848E+01 0.95695198E-01 0.10768696E-02
+ 0.41650648E+01 0.95389687E-01 0.10771247E-02
+ 0.41671538E+01 0.97057492E-01 0.10879145E-02
+ 0.41692338E+01 0.94102859E-01 0.10717552E-02
+ 0.41713228E+01 0.95392682E-01 0.10748924E-02
+ 0.41734028E+01 0.97250521E-01 0.10950705E-02
+ 0.41754918E+01 0.97357623E-01 0.10885299E-02
+ 0.41775808E+01 0.96933395E-01 0.10902369E-02
+ 0.41796699E+01 0.96783362E-01 0.10906603E-02
+ 0.41817589E+01 0.96827164E-01 0.10940650E-02
+ 0.41838479E+01 0.96200943E-01 0.10885244E-02
+ 0.41859455E+01 0.98663881E-01 0.11046450E-02
+ 0.41880345E+01 0.96761584E-01 0.10866971E-02
+ 0.41901326E+01 0.97671695E-01 0.11059131E-02
+ 0.41922216E+01 0.96453577E-01 0.10997095E-02
+ 0.41943192E+01 0.93835331E-01 0.10777573E-02
+ 0.41964173E+01 0.97788334E-01 0.11025988E-02
+ 0.41985149E+01 0.96252173E-01 0.10925573E-02
+ 0.42006130E+01 0.95767960E-01 0.10859517E-02
+ 0.42027111E+01 0.95689990E-01 0.10934403E-02
+ 0.42048178E+01 0.94745718E-01 0.10890354E-02
+ 0.42069159E+01 0.95155902E-01 0.11000850E-02
+ 0.42090225E+01 0.95548645E-01 0.10980404E-02
+ 0.42111292E+01 0.96955918E-01 0.11070881E-02
+ 0.42132359E+01 0.95940396E-01 0.11088012E-02
+ 0.42153339E+01 0.96672550E-01 0.11080216E-02
+ 0.42174497E+01 0.97804315E-01 0.11182197E-02
+ 0.42195563E+01 0.96847653E-01 0.11200689E-02
+ 0.42216635E+01 0.96486449E-01 0.11057701E-02
+ 0.42237792E+01 0.95158875E-01 0.11095094E-02
+ 0.42258859E+01 0.96858390E-01 0.11105618E-02
+ 0.42280016E+01 0.96178330E-01 0.11129548E-02
+ 0.42301173E+01 0.96768655E-01 0.11190419E-02
+ 0.42322330E+01 0.96111685E-01 0.11152355E-02
+ 0.42343488E+01 0.93441173E-01 0.10979497E-02
+ 0.42364645E+01 0.96454106E-01 0.11198679E-02
+ 0.42385802E+01 0.97258009E-01 0.11187685E-02
+ 0.42406960E+01 0.95008723E-01 0.11104336E-02
+ 0.42428207E+01 0.98178111E-01 0.11267941E-02
+ 0.42449455E+01 0.95551312E-01 0.11183931E-02
+ 0.42470613E+01 0.97664580E-01 0.11285848E-02
+ 0.42491860E+01 0.97119726E-01 0.11264688E-02
+ 0.42513103E+01 0.97178228E-01 0.11321619E-02
+ 0.42534351E+01 0.95893934E-01 0.11271925E-02
+ 0.42555690E+01 0.99605799E-01 0.11480805E-02
+ 0.42576933E+01 0.97550862E-01 0.11276338E-02
+ 0.42598181E+01 0.96748896E-01 0.11350939E-02
+ 0.42619519E+01 0.97728550E-01 0.11377813E-02
+ 0.42640853E+01 0.95884904E-01 0.11302364E-02
+ 0.42662187E+01 0.99289559E-01 0.11418936E-02
+ 0.42683434E+01 0.98656707E-01 0.11479084E-02
+ 0.42704859E+01 0.99670641E-01 0.11412548E-02
+ 0.42726197E+01 0.98537706E-01 0.11450867E-02
+ 0.42747531E+01 0.97220905E-01 0.11392434E-02
+ 0.42768869E+01 0.99509254E-01 0.11489684E-02
+ 0.42790294E+01 0.99643685E-01 0.11569189E-02
+ 0.42811718E+01 0.99316895E-01 0.11551464E-02
+ 0.42833056E+01 0.99408098E-01 0.11620850E-02
+ 0.42854481E+01 0.97363651E-01 0.11556636E-02
+ 0.42875905E+01 0.99610813E-01 0.11576329E-02
+ 0.42897420E+01 0.98388098E-01 0.11550422E-02
+ 0.42918844E+01 0.99373579E-01 0.11593061E-02
+ 0.42940269E+01 0.96819103E-01 0.11454473E-02
+ 0.42961783E+01 0.98525256E-01 0.11605828E-02
+ 0.42983212E+01 0.97358927E-01 0.11486588E-02
+ 0.43004723E+01 0.97643994E-01 0.11516748E-02
+ 0.43026237E+01 0.96535027E-01 0.11469255E-02
+ 0.43047752E+01 0.98881446E-01 0.11632615E-02
+ 0.43069267E+01 0.97164847E-01 0.11551066E-02
+ 0.43090782E+01 0.10061494E+00 0.11747979E-02
+ 0.43112388E+01 0.10064222E+00 0.11802147E-02
+ 0.43133903E+01 0.99434890E-01 0.11756641E-02
+ 0.43155503E+01 0.99242941E-01 0.11654574E-02
+ 0.43177018E+01 0.96390732E-01 0.11557058E-02
+ 0.43198624E+01 0.97537048E-01 0.11624363E-02
+ 0.43220229E+01 0.99715382E-01 0.11740335E-02
+ 0.43241830E+01 0.10011690E+00 0.11886468E-02
+ 0.43263435E+01 0.98850429E-01 0.11621441E-02
+ 0.43285127E+01 0.99648438E-01 0.11862227E-02
+ 0.43306732E+01 0.98456651E-01 0.11706991E-02
+ 0.43328424E+01 0.10075480E+00 0.11829489E-02
+ 0.43350029E+01 0.97452082E-01 0.11679643E-02
+ 0.43371720E+01 0.98008588E-01 0.11800826E-02
+ 0.43393416E+01 0.99473685E-01 0.11843690E-02
+ 0.43415108E+01 0.98917626E-01 0.11747034E-02
+ 0.43436799E+01 0.99601015E-01 0.11798160E-02
+ 0.43458581E+01 0.98211721E-01 0.11702975E-02
+ 0.43480277E+01 0.99323243E-01 0.11882295E-02
+ 0.43501968E+01 0.10084289E+00 0.11931011E-02
+ 0.43523750E+01 0.10231698E+00 0.12055740E-02
+ 0.43545532E+01 0.10043618E+00 0.12083647E-02
+ 0.43567314E+01 0.10014302E+00 0.11879242E-02
+ 0.43589096E+01 0.10073199E+00 0.11952729E-02
+ 0.43610878E+01 0.10029105E+00 0.11959263E-02
+ 0.43632665E+01 0.10122268E+00 0.12035568E-02
+ 0.43654532E+01 0.99431999E-01 0.11894325E-02
+ 0.43676314E+01 0.10196010E+00 0.12102526E-02
+ 0.43698187E+01 0.97356185E-01 0.11811925E-02
+ 0.43719969E+01 0.10213911E+00 0.12051129E-02
+ 0.43741841E+01 0.99396035E-01 0.11977964E-02
+ 0.43763714E+01 0.10268874E+00 0.12253673E-02
+ 0.43785586E+01 0.10327945E+00 0.12287404E-02
+ 0.43807545E+01 0.10268832E+00 0.12268133E-02
+ 0.43829417E+01 0.99890120E-01 0.12051649E-02
+ 0.43851380E+01 0.10094344E+00 0.12185826E-02
+ 0.43873248E+01 0.10169756E+00 0.12236467E-02
+ 0.43895211E+01 0.10077228E+00 0.12140176E-02
+ 0.43917170E+01 0.10235472E+00 0.12243934E-02
+ 0.43939133E+01 0.10287273E+00 0.12303501E-02
+ 0.43961096E+01 0.10262948E+00 0.12317733E-02
+ 0.43983054E+01 0.99400759E-01 0.12169338E-02
+ 0.44005017E+01 0.10450307E+00 0.12366967E-02
+ 0.44027066E+01 0.10073315E+00 0.12167350E-02
+ 0.44049025E+01 0.10490778E+00 0.12531022E-02
+ 0.44071078E+01 0.10399244E+00 0.12410926E-02
+ 0.44093127E+01 0.10195734E+00 0.12390736E-02
+ 0.44115176E+01 0.10205412E+00 0.12306760E-02
+ 0.44137225E+01 0.10073525E+00 0.12308066E-02
+ 0.44159279E+01 0.10452935E+00 0.12508478E-02
+ 0.44181418E+01 0.10174594E+00 0.12416401E-02
+ 0.44203467E+01 0.10194684E+00 0.12347010E-02
+ 0.44225607E+01 0.10140413E+00 0.12341102E-02
+ 0.44247656E+01 0.10276143E+00 0.12426118E-02
+ 0.44269795E+01 0.10157289E+00 0.12409451E-02
+ 0.44291935E+01 0.10349940E+00 0.12413246E-02
+ 0.44314075E+01 0.10180313E+00 0.12458332E-02
+ 0.44336214E+01 0.10275649E+00 0.12441684E-02
+ 0.44358444E+01 0.10329159E+00 0.12594307E-02
+ 0.44380584E+01 0.10529595E+00 0.12705775E-02
+ 0.44402809E+01 0.10368622E+00 0.12663022E-02
+ 0.44424949E+01 0.10311300E+00 0.12646606E-02
+ 0.44447179E+01 0.10213213E+00 0.12516472E-02
+ 0.44469409E+01 0.10444988E+00 0.12563415E-02
+ 0.44491634E+01 0.10313240E+00 0.12732855E-02
+ 0.44513865E+01 0.10285341E+00 0.12658279E-02
+ 0.44536180E+01 0.10693157E+00 0.12855524E-02
+ 0.44558411E+01 0.10527285E+00 0.12759357E-02
+ 0.44580731E+01 0.10158201E+00 0.12617897E-02
+ 0.44602957E+01 0.10223538E+00 0.12633140E-02
+ 0.44625278E+01 0.10264208E+00 0.12557771E-02
+ 0.44647593E+01 0.10233522E+00 0.12654862E-02
+ 0.44669909E+01 0.10366013E+00 0.12733339E-02
+ 0.44692230E+01 0.10283357E+00 0.12767417E-02
+ 0.44714637E+01 0.10169721E+00 0.12625320E-02
+ 0.44736953E+01 0.10460514E+00 0.12885559E-02
+ 0.44759364E+01 0.10527424E+00 0.12934665E-02
+ 0.44781680E+01 0.10457740E+00 0.12886957E-02
+ 0.44804087E+01 0.10172511E+00 0.12689807E-02
+ 0.44826493E+01 0.10778522E+00 0.13174056E-02
+ 0.44848900E+01 0.10558411E+00 0.12843983E-02
+ 0.44871306E+01 0.10308979E+00 0.12863083E-02
+ 0.44893804E+01 0.10582697E+00 0.12969023E-02
+ 0.44916210E+01 0.10608926E+00 0.12980337E-02
+ 0.44938707E+01 0.10347626E+00 0.12954997E-02
+ 0.44961114E+01 0.10441747E+00 0.12994156E-02
+ 0.44983611E+01 0.10518637E+00 0.13045416E-02
+ 0.45006108E+01 0.10400558E+00 0.12985965E-02
+ 0.45028605E+01 0.10614957E+00 0.13255432E-02
+ 0.45051103E+01 0.10357645E+00 0.13023833E-02
+ 0.45073686E+01 0.10672489E+00 0.13228022E-02
+ 0.45096183E+01 0.10422367E+00 0.12955880E-02
+ 0.45118771E+01 0.10339563E+00 0.13014496E-02
+ 0.45141268E+01 0.10348001E+00 0.12976733E-02
+ 0.45163851E+01 0.10555474E+00 0.13011541E-02
+ 0.45186439E+01 0.10538886E+00 0.13215786E-02
+ 0.45209026E+01 0.10457244E+00 0.13114308E-02
+ 0.45231609E+01 0.10469613E+00 0.13031760E-02
+ 0.45254283E+01 0.10574590E+00 0.13202446E-02
+ 0.45276871E+01 0.10631217E+00 0.13183616E-02
+ 0.45299544E+01 0.10817757E+00 0.13387912E-02
+ 0.45322223E+01 0.10574285E+00 0.13263231E-02
+ 0.45344806E+01 0.10445447E+00 0.13176003E-02
+ 0.45367479E+01 0.10480592E+00 0.13294809E-02
+ 0.45390158E+01 0.10712015E+00 0.13345502E-02
+ 0.45412922E+01 0.10462170E+00 0.13262854E-02
+ 0.45435596E+01 0.10532317E+00 0.13326367E-02
+ 0.45458360E+01 0.10668670E+00 0.13420054E-02
+ 0.45481033E+01 0.10718040E+00 0.13397222E-02
+ 0.45503798E+01 0.10468674E+00 0.13282654E-02
+ 0.45526562E+01 0.10475247E+00 0.13273244E-02
+ 0.45549326E+01 0.10573711E+00 0.13384243E-02
+ 0.45572090E+01 0.10490718E+00 0.13330369E-02
+ 0.45594854E+01 0.10937058E+00 0.13605838E-02
+ 0.45617623E+01 0.10596737E+00 0.13437170E-02
+ 0.45640473E+01 0.10582003E+00 0.13452866E-02
+ 0.45663328E+01 0.10603781E+00 0.13460506E-02
+ 0.45686092E+01 0.10532833E+00 0.13482053E-02
+ 0.45708947E+01 0.10742024E+00 0.13603452E-02
+ 0.45731802E+01 0.10689918E+00 0.13480848E-02
+ 0.45754652E+01 0.10721100E+00 0.13441561E-02
+ 0.45777597E+01 0.10790641E+00 0.13754983E-02
+ 0.45800447E+01 0.10634765E+00 0.13629136E-02
+ 0.45823393E+01 0.10770176E+00 0.13763732E-02
+ 0.45846248E+01 0.10866213E+00 0.13822650E-02
+ 0.45869188E+01 0.10845456E+00 0.13825409E-02
+ 0.45892134E+01 0.10823698E+00 0.13773465E-02
+ 0.45915074E+01 0.10672075E+00 0.13671321E-02
+ 0.45938020E+01 0.10908814E+00 0.13870548E-02
+ 0.45960960E+01 0.10833314E+00 0.13910495E-02
+ 0.45983992E+01 0.11021715E+00 0.14094674E-02
+ 0.46006937E+01 0.10933401E+00 0.13860717E-02
+ 0.46029968E+01 0.10717514E+00 0.13755141E-02
+ 0.46052999E+01 0.10921866E+00 0.14144657E-02
+ 0.46076031E+01 0.10770988E+00 0.14000027E-02
+ 0.46099062E+01 0.10708495E+00 0.13818576E-02
+ 0.46122098E+01 0.10932769E+00 0.14079475E-02
+ 0.46145129E+01 0.10776315E+00 0.13958403E-02
+ 0.46168251E+01 0.10797963E+00 0.13954730E-02
+ 0.46191282E+01 0.10712731E+00 0.13845289E-02
+ 0.46214404E+01 0.11252153E+00 0.14247218E-02
+ 0.46237526E+01 0.11037877E+00 0.14196977E-02
+ 0.46260648E+01 0.10929816E+00 0.14169888E-02
+ 0.46283765E+01 0.10893404E+00 0.14059435E-02
+ 0.46306887E+01 0.11042191E+00 0.14216962E-02
+ 0.46330099E+01 0.10742504E+00 0.14037458E-02
+ 0.46353221E+01 0.10681849E+00 0.13962570E-02
+ 0.46376433E+01 0.10900161E+00 0.14218239E-02
+ 0.46399550E+01 0.10877009E+00 0.14205223E-02
+ 0.46422763E+01 0.10911537E+00 0.14141304E-02
+ 0.46445975E+01 0.10830976E+00 0.14228496E-02
+ 0.46469183E+01 0.10755359E+00 0.14075321E-02
+ 0.46492486E+01 0.10827036E+00 0.14212196E-02
+ 0.46515694E+01 0.11042901E+00 0.14339809E-02
+ 0.46538997E+01 0.11117915E+00 0.14542908E-02
+ 0.46562204E+01 0.11093555E+00 0.14409056E-02
+ 0.46585507E+01 0.11076516E+00 0.14327256E-02
+ 0.46608806E+01 0.11088207E+00 0.14321880E-02
+ 0.46632104E+01 0.10994942E+00 0.14319379E-02
+ 0.46655407E+01 0.11006933E+00 0.14375176E-02
+ 0.46678796E+01 0.11088418E+00 0.14463372E-02
+ 0.46702094E+01 0.10679181E+00 0.14023390E-02
+ 0.46725483E+01 0.11056914E+00 0.14316441E-02
+ 0.46748786E+01 0.11161278E+00 0.14306183E-02
+ 0.46772175E+01 0.10826629E+00 0.14091124E-02
+ 0.46795564E+01 0.10820853E+00 0.14078616E-02
+ 0.46818953E+01 0.11377641E+00 0.14483749E-02
+ 0.46842341E+01 0.10899840E+00 0.14212780E-02
+ 0.46865821E+01 0.11074457E+00 0.14172499E-02
+ 0.46889210E+01 0.11162980E+00 0.14220021E-02
+ 0.46912689E+01 0.11000792E+00 0.14207722E-02
+ 0.46936164E+01 0.10961706E+00 0.14185930E-02
+ 0.46959643E+01 0.11134548E+00 0.14184975E-02
+ 0.46983123E+01 0.11354685E+00 0.14480271E-02
+ 0.47006602E+01 0.11061306E+00 0.14178047E-02
+ 0.47030082E+01 0.10917635E+00 0.14085203E-02
+ 0.47053556E+01 0.11018829E+00 0.14233809E-02
+ 0.47077127E+01 0.10872607E+00 0.14134592E-02
+ 0.47100692E+01 0.11203050E+00 0.14374006E-02
+ 0.47124171E+01 0.10790291E+00 0.14164123E-02
+ 0.47147741E+01 0.10857053E+00 0.14235327E-02
+ 0.47171307E+01 0.11072707E+00 0.14330820E-02
+ 0.47194963E+01 0.10999953E+00 0.14155370E-02
+ 0.47218533E+01 0.11155631E+00 0.14451873E-02
+ 0.47242098E+01 0.11172376E+00 0.14368027E-02
+ 0.47265759E+01 0.11331947E+00 0.14574800E-02
+ 0.47289414E+01 0.11304035E+00 0.14550156E-02
+ 0.47313070E+01 0.11068735E+00 0.14433971E-02
+ 0.47336726E+01 0.11018596E+00 0.14421418E-02
+ 0.47360387E+01 0.11039395E+00 0.14433482E-02
+ 0.47384043E+01 0.11173563E+00 0.14552214E-02
+ 0.47407699E+01 0.11327840E+00 0.14623888E-02
+ 0.47431445E+01 0.11289833E+00 0.14513064E-02
+ 0.47455192E+01 0.11367521E+00 0.14664609E-02
+ 0.47478848E+01 0.11065334E+00 0.14407791E-02
+ 0.47502594E+01 0.11587965E+00 0.14908963E-02
+ 0.47526340E+01 0.11467430E+00 0.14832398E-02
+ 0.47550178E+01 0.11496633E+00 0.14859675E-02
+ 0.47573924E+01 0.11142725E+00 0.14512575E-02
+ 0.47597671E+01 0.11121885E+00 0.14762613E-02
+ 0.47621503E+01 0.11224160E+00 0.14652152E-02
+ 0.47645340E+01 0.11358399E+00 0.14870395E-02
+ 0.47669086E+01 0.11382211E+00 0.14858949E-02
+ 0.47692924E+01 0.11307683E+00 0.14875365E-02
+ 0.47716846E+01 0.11394599E+00 0.14921526E-02
+ 0.47740684E+01 0.11340371E+00 0.14928844E-02
+ 0.47764521E+01 0.11340722E+00 0.14916190E-02
+ 0.47788444E+01 0.11298268E+00 0.15033858E-02
+ 0.47812281E+01 0.11227515E+00 0.14785358E-02
+ 0.47836204E+01 0.11353119E+00 0.15105502E-02
+ 0.47860126E+01 0.11182536E+00 0.14873096E-02
+ 0.47884054E+01 0.11534391E+00 0.15012441E-02
+ 0.47907977E+01 0.11449978E+00 0.15036776E-02
+ 0.47931991E+01 0.11165600E+00 0.14904473E-02
+ 0.47955918E+01 0.11586705E+00 0.15198113E-02
+ 0.47979932E+01 0.11402591E+00 0.15139795E-02
+ 0.48003945E+01 0.11541751E+00 0.15244466E-02
+ 0.48027868E+01 0.11086021E+00 0.14805641E-02
+ 0.48051887E+01 0.11472467E+00 0.15220395E-02
+ 0.48075986E+01 0.11353619E+00 0.15028684E-02
+ 0.48100004E+01 0.11186524E+00 0.15012226E-02
+ 0.48124018E+01 0.11464002E+00 0.15189946E-02
+ 0.48148117E+01 0.11376733E+00 0.15327680E-02
+ 0.48172135E+01 0.11211095E+00 0.14906353E-02
+ 0.48196235E+01 0.11526692E+00 0.15272381E-02
+ 0.48220339E+01 0.11486351E+00 0.15352283E-02
+ 0.48244443E+01 0.11634187E+00 0.15415672E-02
+ 0.48268547E+01 0.11470512E+00 0.15241517E-02
+ 0.48292742E+01 0.11792102E+00 0.15648593E-02
+ 0.48316841E+01 0.11446124E+00 0.15281466E-02
+ 0.48341036E+01 0.11322001E+00 0.15152101E-02
+ 0.48365231E+01 0.11554719E+00 0.15292459E-02
+ 0.48389421E+01 0.11837123E+00 0.15792468E-02
+ 0.48413615E+01 0.11382434E+00 0.15361628E-02
+ 0.48437805E+01 0.11582071E+00 0.15475242E-02
+ 0.48462000E+01 0.11675652E+00 0.15621795E-02
+ 0.48486190E+01 0.11541963E+00 0.15559146E-02
+ 0.48510475E+01 0.11316352E+00 0.15304002E-02
+ 0.48534756E+01 0.11618705E+00 0.15499052E-02
+ 0.48559036E+01 0.11758675E+00 0.15781299E-02
+ 0.48583322E+01 0.11809788E+00 0.15825762E-02
+ 0.48607602E+01 0.11670353E+00 0.15636464E-02
+ 0.48631883E+01 0.11782046E+00 0.15933634E-02
+ 0.48656163E+01 0.11747684E+00 0.15824258E-02
+ 0.48680534E+01 0.11760446E+00 0.15828547E-02
+ 0.48704820E+01 0.11753105E+00 0.15866443E-02
+ 0.48729191E+01 0.11841938E+00 0.15973866E-02
+ 0.48753562E+01 0.11477482E+00 0.15710351E-02
+ 0.48777933E+01 0.11984675E+00 0.16219821E-02
+ 0.48802304E+01 0.11418576E+00 0.15587105E-02
+ 0.48826761E+01 0.11367236E+00 0.15730414E-02
+ 0.48851137E+01 0.11745377E+00 0.15911994E-02
+ 0.48875594E+01 0.11957674E+00 0.16054717E-02
+ 0.48900056E+01 0.11782039E+00 0.16056038E-02
+ 0.48924427E+01 0.11955894E+00 0.16235434E-02
+ 0.48948889E+01 0.11819688E+00 0.16041645E-02
+ 0.48973436E+01 0.11739524E+00 0.15916008E-02
+ 0.48997898E+01 0.11743423E+00 0.16187247E-02
+ 0.49022360E+01 0.11748321E+00 0.16054895E-02
+ 0.49046907E+01 0.11742450E+00 0.16043377E-02
+ 0.49071460E+01 0.11812641E+00 0.15996621E-02
+ 0.49095917E+01 0.11734103E+00 0.16104883E-02
+ 0.49120469E+01 0.11718892E+00 0.16072621E-02
+ 0.49145107E+01 0.11618012E+00 0.15926235E-02
+ 0.49169655E+01 0.11718988E+00 0.16006455E-02
+ 0.49194207E+01 0.11760937E+00 0.16296210E-02
+ 0.49218845E+01 0.11936704E+00 0.16506503E-02
+ 0.49243393E+01 0.11833484E+00 0.16197284E-02
+ 0.49268036E+01 0.11647636E+00 0.16090185E-02
+ 0.49292674E+01 0.12057132E+00 0.16370346E-02
+ 0.49317312E+01 0.11816760E+00 0.16537029E-02
+ 0.49341950E+01 0.11864135E+00 0.16358643E-02
+ 0.49366679E+01 0.12103798E+00 0.16652950E-02
+ 0.49391317E+01 0.11870079E+00 0.16543600E-02
+ 0.49416046E+01 0.11887121E+00 0.16388698E-02
+ 0.49440775E+01 0.11974858E+00 0.16661243E-02
+ 0.49465504E+01 0.11943872E+00 0.16510165E-02
+ 0.49490232E+01 0.11954926E+00 0.16557634E-02
+ 0.49514961E+01 0.12113418E+00 0.16774277E-02
+ 0.49539690E+01 0.12017750E+00 0.16546677E-02
+ 0.49564505E+01 0.11895346E+00 0.16809221E-02
+ 0.49589233E+01 0.12160680E+00 0.16721149E-02
+ 0.49614053E+01 0.11897745E+00 0.16568223E-02
+ 0.49638867E+01 0.11956444E+00 0.16636080E-02
+ 0.49663687E+01 0.12028404E+00 0.16898382E-02
+ 0.49688506E+01 0.11915293E+00 0.16680086E-02
+ 0.49713321E+01 0.12126499E+00 0.16868677E-02
+ 0.49738231E+01 0.11874142E+00 0.16629065E-02
+ 0.49763045E+01 0.12130816E+00 0.16857832E-02
+ 0.49787955E+01 0.12113185E+00 0.16847401E-02
+ 0.49812860E+01 0.12224215E+00 0.17141287E-02
+ 0.49837766E+01 0.11829363E+00 0.16824401E-02
+ 0.49862676E+01 0.12173709E+00 0.17109694E-02
+ 0.49887581E+01 0.11976048E+00 0.16753387E-02
+ 0.49912577E+01 0.11961904E+00 0.16829438E-02
+ 0.49937482E+01 0.11836706E+00 0.16753390E-02
+ 0.49962478E+01 0.12293932E+00 0.17083313E-02
+ 0.49987473E+01 0.12124234E+00 0.17107180E-02
+ 0.50012469E+01 0.12528162E+00 0.17428087E-02
+ 0.50037470E+01 0.12045500E+00 0.17135914E-02
+ 0.50062466E+01 0.12404773E+00 0.17341517E-02
+ 0.50087547E+01 0.12266870E+00 0.17337720E-02
+ 0.50112543E+01 0.12434673E+00 0.17453291E-02
+ 0.50137630E+01 0.12519337E+00 0.17400910E-02
+ 0.50162716E+01 0.12279755E+00 0.17325662E-02
+ 0.50187802E+01 0.12208491E+00 0.17244704E-02
+ 0.50212889E+01 0.12045293E+00 0.17279092E-02
+ 0.50237970E+01 0.12007361E+00 0.17097429E-02
+ 0.50263057E+01 0.12237593E+00 0.17143541E-02
+ 0.50288234E+01 0.12379970E+00 0.17497235E-02
+ 0.50313406E+01 0.12070776E+00 0.17200019E-02
+ 0.50338492E+01 0.12441999E+00 0.17660998E-02
+ 0.50363665E+01 0.11985618E+00 0.17367818E-02
+ 0.50388842E+01 0.12100467E+00 0.17303742E-02
+ 0.50414104E+01 0.11886369E+00 0.17252654E-02
+ 0.50439281E+01 0.12426268E+00 0.17744614E-02
+ 0.50464454E+01 0.12036617E+00 0.17403027E-02
+ 0.50489717E+01 0.12209539E+00 0.17524157E-02
+ 0.50514984E+01 0.12030660E+00 0.17355337E-02
+ 0.50540247E+01 0.12102151E+00 0.17477828E-02
+ 0.50565510E+01 0.12281653E+00 0.17605086E-02
+ 0.50590773E+01 0.11984974E+00 0.17283265E-02
+ 0.50616040E+01 0.12402479E+00 0.17784263E-02
+ 0.50641394E+01 0.12278093E+00 0.17744874E-02
+ 0.50666742E+01 0.12173842E+00 0.17463241E-02
+ 0.50692010E+01 0.12460644E+00 0.17901069E-02
+ 0.50717363E+01 0.12219140E+00 0.17585984E-02
+ 0.50742717E+01 0.12243882E+00 0.17683797E-02
+ 0.50768156E+01 0.12650581E+00 0.18166451E-02
+ 0.50793509E+01 0.12508367E+00 0.18044113E-02
+ 0.50818863E+01 0.12374143E+00 0.17876164E-02
+ 0.50844307E+01 0.12477788E+00 0.18040398E-02
+ 0.50869751E+01 0.12415484E+00 0.18060907E-02
+ 0.50895190E+01 0.12376130E+00 0.18047086E-02
+ 0.50920634E+01 0.12640586E+00 0.18172171E-02
+ 0.50946078E+01 0.12504557E+00 0.18017255E-02
+ 0.50971518E+01 0.12723623E+00 0.18323105E-02
+ 0.50997052E+01 0.12775949E+00 0.18334287E-02
+ 0.51022491E+01 0.12712854E+00 0.18613010E-02
+ 0.51048026E+01 0.12397072E+00 0.18196460E-02
+ 0.51073556E+01 0.12474235E+00 0.18148507E-02
+ 0.51099086E+01 0.12591159E+00 0.18405328E-02
+ 0.51124620E+01 0.12573077E+00 0.18366643E-02
+ 0.51150241E+01 0.12389890E+00 0.18088920E-02
+ 0.51175771E+01 0.12359846E+00 0.17902671E-02
+ 0.51201391E+01 0.12475377E+00 0.18282259E-02
+ 0.51227016E+01 0.12739812E+00 0.18750700E-02
+ 0.51252546E+01 0.12630418E+00 0.18453541E-02
+ 0.51278257E+01 0.12452083E+00 0.18331632E-02
+ 0.51303878E+01 0.12670153E+00 0.18598188E-02
+ 0.51329498E+01 0.12739176E+00 0.18524938E-02
+ 0.51355209E+01 0.12499506E+00 0.18446755E-02
+ 0.51380830E+01 0.12567532E+00 0.18551239E-02
+ 0.51406541E+01 0.12951675E+00 0.19120977E-02
+ 0.51432252E+01 0.12632325E+00 0.18559950E-02
+ 0.51457958E+01 0.12414529E+00 0.18285442E-02
+ 0.51483669E+01 0.12777779E+00 0.18750629E-02
+ 0.51509471E+01 0.12766936E+00 0.18896912E-02
+ 0.51535182E+01 0.12964933E+00 0.18799047E-02
+ 0.51560979E+01 0.12534283E+00 0.18951354E-02
+ 0.51586690E+01 0.12646480E+00 0.18765546E-02
+ 0.51612492E+01 0.12847868E+00 0.18761354E-02
+ 0.51638288E+01 0.12351935E+00 0.18386666E-02
+ 0.51664181E+01 0.12764928E+00 0.19076304E-02
+ 0.51689978E+01 0.13062690E+00 0.19286188E-02
+ 0.51715865E+01 0.12677671E+00 0.19063945E-02
+ 0.51741667E+01 0.13088758E+00 0.19399816E-02
+ 0.51767554E+01 0.12526456E+00 0.18938943E-02
+ 0.51793442E+01 0.12587766E+00 0.18984170E-02
+ 0.51819334E+01 0.12584904E+00 0.18965550E-02
+ 0.51845222E+01 0.12759852E+00 0.19085603E-02
+ 0.51871200E+01 0.12862515E+00 0.19139128E-02
+ 0.51897087E+01 0.12725782E+00 0.19106215E-02
+ 0.51923065E+01 0.12857534E+00 0.19239938E-02
+ 0.51949043E+01 0.12870920E+00 0.19106268E-02
+ 0.51975021E+01 0.12971167E+00 0.19409093E-02
+ 0.52000999E+01 0.12819651E+00 0.19467958E-02
+ 0.52026978E+01 0.12351721E+00 0.18833694E-02
+ 0.52052956E+01 0.13118266E+00 0.19698231E-02
+ 0.52079024E+01 0.12660715E+00 0.19089399E-02
+ 0.52105093E+01 0.12488360E+00 0.18878673E-02
+ 0.52131071E+01 0.13429816E+00 0.20172892E-02
+ 0.52157135E+01 0.12696031E+00 0.19252639E-02
+ 0.52183294E+01 0.13165337E+00 0.19872054E-02
+ 0.52209363E+01 0.12352873E+00 0.18999433E-02
+ 0.52235427E+01 0.12916464E+00 0.19560165E-02
+ 0.52261586E+01 0.13134974E+00 0.19633744E-02
+ 0.52287655E+01 0.12425059E+00 0.19073989E-02
+ 0.52313809E+01 0.12682149E+00 0.19594561E-02
+ 0.52339964E+01 0.12580620E+00 0.19284915E-02
+ 0.52366123E+01 0.12675200E+00 0.19363516E-02
+ 0.52392368E+01 0.12674277E+00 0.19559260E-02
+ 0.52418523E+01 0.12887558E+00 0.19519978E-02
+ 0.52444773E+01 0.12846319E+00 0.19654948E-02
+ 0.52471018E+01 0.12809424E+00 0.19600005E-02
+ 0.52497172E+01 0.13044490E+00 0.19826801E-02
+ 0.52523417E+01 0.13299723E+00 0.19964899E-02
+ 0.52549753E+01 0.12668382E+00 0.19413331E-02
+ 0.52575998E+01 0.12859702E+00 0.19681521E-02
+ 0.52602248E+01 0.13221833E+00 0.20148263E-02
+ 0.52628584E+01 0.12985480E+00 0.19887150E-02
+ 0.52654915E+01 0.12983127E+00 0.19968513E-02
+ 0.52681251E+01 0.13082363E+00 0.20109550E-02
+ 0.52707586E+01 0.12603287E+00 0.19639621E-02
+ 0.52733922E+01 0.13156721E+00 0.20260299E-02
+ 0.52760258E+01 0.13113537E+00 0.19941947E-02
+ 0.52786684E+01 0.12868820E+00 0.19868610E-02
+ 0.52813015E+01 0.12832090E+00 0.19889604E-02
+ 0.52839441E+01 0.13081899E+00 0.19960031E-02
+ 0.52865868E+01 0.13158485E+00 0.20327359E-02
+ 0.52892289E+01 0.12929307E+00 0.20054567E-02
+ 0.52918806E+01 0.13089077E+00 0.20199933E-02
+ 0.52945228E+01 0.13023341E+00 0.20301505E-02
+ 0.52971745E+01 0.12848413E+00 0.20071641E-02
+ 0.52998166E+01 0.12881131E+00 0.20155720E-02
+ 0.53024683E+01 0.13144514E+00 0.20485849E-02
+ 0.53051195E+01 0.13111985E+00 0.20642476E-02
+ 0.53077707E+01 0.13068217E+00 0.20346532E-02
+ 0.53104219E+01 0.13141586E+00 0.20603358E-02
+ 0.53130827E+01 0.13216722E+00 0.20485006E-02
+ 0.53157339E+01 0.13182954E+00 0.20385778E-02
+ 0.53183942E+01 0.12859502E+00 0.20185532E-02
+ 0.53210545E+01 0.13173792E+00 0.20706111E-02
+ 0.53237147E+01 0.13403283E+00 0.21080845E-02
+ 0.53263750E+01 0.13317385E+00 0.20882324E-02
+ 0.53290443E+01 0.13228373E+00 0.20887633E-02
+ 0.53317046E+01 0.12810613E+00 0.20392400E-02
+ 0.53343740E+01 0.13251440E+00 0.20921521E-02
+ 0.53370342E+01 0.13437037E+00 0.21098126E-02
+ 0.53397036E+01 0.13455589E+00 0.21234513E-02
+ 0.53423724E+01 0.13518247E+00 0.21138149E-02
+ 0.53450508E+01 0.13434933E+00 0.21124471E-02
+ 0.53477201E+01 0.13169527E+00 0.20569898E-02
+ 0.53503981E+01 0.13084233E+00 0.21012817E-02
+ 0.53530674E+01 0.13731165E+00 0.21512394E-02
+ 0.53557453E+01 0.13223578E+00 0.21120394E-02
+ 0.53584237E+01 0.13417065E+00 0.21297494E-02
+ 0.53611016E+01 0.13198426E+00 0.20991680E-02
+ 0.53637800E+01 0.13011414E+00 0.20619368E-02
+ 0.53664670E+01 0.13482711E+00 0.21316111E-02
+ 0.53691454E+01 0.13392445E+00 0.21336407E-02
+ 0.53718324E+01 0.13298561E+00 0.21184366E-02
+ 0.53745193E+01 0.13603045E+00 0.21613892E-02
+ 0.53772063E+01 0.13745201E+00 0.21625187E-02
+ 0.53798933E+01 0.13508704E+00 0.21269482E-02
+ 0.53825893E+01 0.13372952E+00 0.21523181E-02
+ 0.53852768E+01 0.13494579E+00 0.21498371E-02
+ 0.53879724E+01 0.13116764E+00 0.21032130E-02
+ 0.53906598E+01 0.13725302E+00 0.21926998E-02
+ 0.53933558E+01 0.13057028E+00 0.21010204E-02
+ 0.53960519E+01 0.13128483E+00 0.21162129E-02
+ 0.53987565E+01 0.13468012E+00 0.21529931E-02
+ 0.54014525E+01 0.13596953E+00 0.22097714E-02
+ 0.54041576E+01 0.13450012E+00 0.21959210E-02
+ 0.54068537E+01 0.13559844E+00 0.21557070E-02
+ 0.54095583E+01 0.13447651E+00 0.21735735E-02
+ 0.54122634E+01 0.13576761E+00 0.21566132E-02
+ 0.54149685E+01 0.13726172E+00 0.22134613E-02
+ 0.54176731E+01 0.13294470E+00 0.21448529E-02
+ 0.54203873E+01 0.13846001E+00 0.22481584E-02
+ 0.54230919E+01 0.13329837E+00 0.21776217E-02
+ 0.54258060E+01 0.13244458E+00 0.21380775E-02
+ 0.54285197E+01 0.13307914E+00 0.21376081E-02
+ 0.54312339E+01 0.13502204E+00 0.21802438E-02
+ 0.54339476E+01 0.13349639E+00 0.21744000E-02
+ 0.54366703E+01 0.13435957E+00 0.21775314E-02
+ 0.54393840E+01 0.13529961E+00 0.21844159E-02
+ 0.54421072E+01 0.13445176E+00 0.21826953E-02
+ 0.54448299E+01 0.13355683E+00 0.21858853E-02
+ 0.54475527E+01 0.14111641E+00 0.22830903E-02
+ 0.54502754E+01 0.13491382E+00 0.21839465E-02
+ 0.54529982E+01 0.13574140E+00 0.22027513E-02
+ 0.54557209E+01 0.13473928E+00 0.22062191E-02
+ 0.54584527E+01 0.13406120E+00 0.21893708E-02
+ 0.54611845E+01 0.13310297E+00 0.21890181E-02
+ 0.54639163E+01 0.13641940E+00 0.22588100E-02
+ 0.54666476E+01 0.13491842E+00 0.22019958E-02
+ 0.54693794E+01 0.13823344E+00 0.22554046E-02
+ 0.54721112E+01 0.13784131E+00 0.22708855E-02
+ 0.54748521E+01 0.13427472E+00 0.22054065E-02
+ 0.54775834E+01 0.13517115E+00 0.22284877E-02
+ 0.54803243E+01 0.13947223E+00 0.22808108E-02
+ 0.54830651E+01 0.13594534E+00 0.22332603E-02
+ 0.54858055E+01 0.13518487E+00 0.22378732E-02
+ 0.54885464E+01 0.14063221E+00 0.23241846E-02
+ 0.54912958E+01 0.13671428E+00 0.22592826E-02
+ 0.54940362E+01 0.13404827E+00 0.22175817E-02
+ 0.54967861E+01 0.13914229E+00 0.22919963E-02
+ 0.55686946E+01 0.14322965E+00 0.29458506E-02
\ No newline at end of file
diff --git a/instrument/sampleenvironments/ISIS/Pearl.xml b/instrument/sampleenvironments/ISIS/Pearl.xml
index 3cb2b9746bbbd6d09db4ade04eb6430d63a977f3..cccda062b628fed0ee7c823550d56e2ae9526f98 100644
--- a/instrument/sampleenvironments/ISIS/Pearl.xml
+++ b/instrument/sampleenvironments/ISIS/Pearl.xml
@@ -1,7 +1,7 @@
<environmentspec>
<materials>
<material id="Boron S-dough" formula="(B10)4-C" massdensity="2.52"/>
- <material id="Sintered Diamond" formula="C0.8 Co0.2" massdensity="3.51"/>
+ <material id="Sintered Diamond" formula="C0.8 Co0.2" massdensity="3.51" attenuationprofile="DIAM_DEBEERS_MU.DAT"/>
<material id="TiZr Alloy" formula="Ti0.522 Zr0.478" massdensity="5.23"/>
<material id="Steel" formula="Fe" massdensity="8"/>
</materials>
diff --git a/qt/applications/workbench/workbench/app/mainwindow.py b/qt/applications/workbench/workbench/app/mainwindow.py
index a9488f0aa0dd10c1e4d17b0bcb73cf1e0a63596d..c856a544d2cefb06f16b0ecb5d1891ea80666e1e 100644
--- a/qt/applications/workbench/workbench/app/mainwindow.py
+++ b/qt/applications/workbench/workbench/app/mainwindow.py
@@ -10,8 +10,6 @@
"""
Defines the QMainWindow of the application and the main() entry point.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import argparse
import atexit
import importlib
@@ -21,7 +19,7 @@ from functools import partial
from mantid.api import FrameworkManagerImpl
from mantid.kernel import (ConfigService, UsageService, logger, version_str as mantid_version_str)
-from mantid.py3compat import setswitchinterval
+from sys import setswitchinterval
from mantid.utils import is_required_version
from workbench.app import MAIN_WINDOW_OBJECT_NAME, MAIN_WINDOW_TITLE
from workbench.plugins.exception_handler import exception_logger
diff --git a/qt/applications/workbench/workbench/config/__init__.py b/qt/applications/workbench/workbench/config/__init__.py
index b5128ff08f2bb398b3b66816bfe987f2165da868..9dfdac28ee5298b3fca72d9bd6e1c5ad7059afbe 100644
--- a/qt/applications/workbench/workbench/config/__init__.py
+++ b/qt/applications/workbench/workbench/config/__init__.py
@@ -16,8 +16,6 @@ should import the CONF object as
and use it to access the settings
"""
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
from collections import namedtuple
import os
diff --git a/qt/applications/workbench/workbench/config/fonts.py b/qt/applications/workbench/workbench/config/fonts.py
index 785a1eb6f0de982d4df811e056f9f684ce53cd85..e714b2047dfcf826dcb3e90f8fb2efb5e732c5c9 100644
--- a/qt/applications/workbench/workbench/config/fonts.py
+++ b/qt/applications/workbench/workbench/config/fonts.py
@@ -9,8 +9,6 @@
#
""" Utility functions to deal with fetching fonts
"""
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import os
import os.path as osp
diff --git a/qt/applications/workbench/workbench/config/test/test_user.py b/qt/applications/workbench/workbench/config/test/test_user.py
index 2dea80396b964ec3c5489937f6f26600276b2066..f10164855d6e5bca7f645c4fa5cfef18178ba5d5 100644
--- a/qt/applications/workbench/workbench/config/test/test_user.py
+++ b/qt/applications/workbench/workbench/config/test/test_user.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
import os
from unittest import TestCase, main
diff --git a/qt/applications/workbench/workbench/config/user.py b/qt/applications/workbench/workbench/config/user.py
index f38d73d8d9e6fa6144d11d622f397f06f9078b97..daa70465b1e87080bcccf7e0d5d834f546effb9e 100644
--- a/qt/applications/workbench/workbench/config/user.py
+++ b/qt/applications/workbench/workbench/config/user.py
@@ -7,10 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
-
-from mantid.py3compat import is_text_string
from posixpath import join as joinsettings
from qtpy.QtCore import QSettings
@@ -158,13 +154,13 @@ class UserConfig(object):
Sanity check the section and option are strings and return the flattened option key
"""
if second is None:
- if not is_text_string(option):
+ if not isinstance(option, str):
raise TypeError('Found invalid type ({}) for option ({}) must be a string'.format(type(option), option))
return option
- else: # fist argument is actually the section/group
- if not is_text_string(option):
+ else: # first argument is actually the section/group
+ if not isinstance(option, str):
raise TypeError(
'Found invalid type ({}) for section ({}) must be a string'.format(type(option), option))
- if not is_text_string(second):
+ if not isinstance(second, str):
raise TypeError('Found invalid type ({}) for option ({}) must be a string'.format(type(second), second))
return joinsettings(option, second)
diff --git a/qt/applications/workbench/workbench/plotting/backend_workbench.py b/qt/applications/workbench/workbench/plotting/backend_workbench.py
index 7193035b7a41ec229d6c38e024f198df74932a91..ce0c24fe39e5f704640507b42d85ee1c4b331080 100644
--- a/qt/applications/workbench/workbench/plotting/backend_workbench.py
+++ b/qt/applications/workbench/workbench/plotting/backend_workbench.py
@@ -13,8 +13,7 @@ Qt-based matplotlib backend that can operate when called from non-gui threads.
It uses qtagg for rendering but the ensures that any rendering calls
are done on the main thread of the application as the default
"""
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
# std imports
import importlib
diff --git a/qt/applications/workbench/workbench/plotting/config.py b/qt/applications/workbench/workbench/plotting/config.py
index 5b9733fceab215b67d45b01ce89648a78d88ead4..87da32bd242b811e613dd11f1632b5cf87d47408 100644
--- a/qt/applications/workbench/workbench/plotting/config.py
+++ b/qt/applications/workbench/workbench/plotting/config.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
# system imports
# 3rd-party imports
diff --git a/qt/applications/workbench/workbench/plotting/figureinteraction.py b/qt/applications/workbench/workbench/plotting/figureinteraction.py
index a23811d34f04cf233a7fa7f2688fcbd637d5969d..f54cdce9b624002606d9319020049da9fa2f6f4e 100644
--- a/qt/applications/workbench/workbench/plotting/figureinteraction.py
+++ b/qt/applications/workbench/workbench/plotting/figureinteraction.py
@@ -9,9 +9,8 @@
"""
Defines interaction behaviour for plotting.
"""
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
+import numpy as np
from collections import OrderedDict
from copy import copy
from functools import partial
@@ -26,7 +25,6 @@ from matplotlib.collections import Collection
from mantid.api import AnalysisDataService as ads
from mantid.plots import datafunctions, MantidAxes
from mantid.plots.utility import zoom, MantidAxType
-from mantid.py3compat import iteritems
from mantidqt.plotting.figuretype import FigureType, figure_type
from mantidqt.plotting.markers import SingleMarker
from mantidqt.widgets.plotconfigdialog.curvestabwidget import curve_has_errors, CurveProperties
@@ -308,7 +306,7 @@ class FigureInteraction(object):
axes_menu = QMenu("Axes", menu)
axes_actions = QActionGroup(axes_menu)
current_scale_types = (ax.get_xscale(), ax.get_yscale())
- for label, scale_types in iteritems(AXES_SCALE_MENU_OPTS):
+ for label, scale_types in AXES_SCALE_MENU_OPTS.items():
action = axes_menu.addAction(label, partial(self._quick_change_axes, scale_types, ax))
if current_scale_types == scale_types:
action.setCheckable(True)
@@ -346,7 +344,7 @@ class FigureInteraction(object):
axes_menu = QMenu("Color bar", menu)
axes_actions = QActionGroup(axes_menu)
images = ax.get_images() + [col for col in ax.collections if isinstance(col, Collection)]
- for label, scale_type in iteritems(COLORBAR_SCALE_MENU_OPTS):
+ for label, scale_type in COLORBAR_SCALE_MENU_OPTS.items():
action = axes_menu.addAction(label, partial(self._change_colorbar_axes, scale_type))
if type(images[0].norm) == scale_type:
action.setCheckable(True)
@@ -704,6 +702,12 @@ class FigureInteraction(object):
if ax.lines: # Relim causes issues with colour plots, which have no lines.
ax.relim()
+ if ax.images: # Colour bar limits are wrong if workspace is ragged. Set them manually.
+ colorbar_min = np.nanmin(ax.images[-1].get_array())
+ colorbar_max = np.nanmax(ax.images[-1].get_array())
+ for image in ax.images:
+ image.set_clim(colorbar_min, colorbar_max)
+
ax.autoscale()
datafunctions.set_initial_dimensions(ax)
diff --git a/qt/applications/workbench/workbench/plotting/figuremanager.py b/qt/applications/workbench/workbench/plotting/figuremanager.py
index 7201eade9b7323e2bcafce57b9f529fa4716b849..2f877a1668823f81d43fcecc469c727165e313cf 100644
--- a/qt/applications/workbench/workbench/plotting/figuremanager.py
+++ b/qt/applications/workbench/workbench/plotting/figuremanager.py
@@ -8,8 +8,6 @@
#
#
"""Provides our custom figure manager to wrap the canvas, window and our custom toolbar"""
-from __future__ import (absolute_import, unicode_literals)
-
import sys
from functools import wraps
@@ -24,7 +22,6 @@ from qtpy.QtWidgets import QApplication, QLabel, QFileDialog
from mantid.api import AnalysisDataService, AnalysisDataServiceObserver, ITableWorkspace, MatrixWorkspace
from mantid.kernel import logger
from mantid.plots import datafunctions, MantidAxes
-from mantid.py3compat import text_type
from mantidqt.io import open_a_file_dialog
from mantidqt.plotting.figuretype import FigureType, figure_type
from mantidqt.utils.qt.qappthreadcall import QAppThreadCall
@@ -92,9 +89,12 @@ class FigureManagerADSObserver(AnalysisDataServiceObserver):
# managed via a workspace.
# See https://github.com/mantidproject/mantid/issues/25135.
empty_axes = []
+ redraw = False
for ax in all_axes:
if isinstance(ax, MantidAxes):
- ax.remove_workspace_artists(workspace)
+ to_redraw = ax.remove_workspace_artists(workspace)
+ else:
+ to_redraw = False
# We check for axes type below as a pseudo check for an axes being
# a colorbar. Creating a colorfill plot creates 2 axes: one linked
# to a workspace, the other a colorbar. Deleting the workspace
@@ -104,10 +104,11 @@ class FigureManagerADSObserver(AnalysisDataServiceObserver):
# Axes object being closed.
if type(ax) is not Axes:
empty_axes.append(MantidAxes.is_empty(ax))
+ redraw = redraw | to_redraw
if all(empty_axes):
self.window.emit_close()
- else:
+ elif redraw:
self.canvas.draw()
@_catch_exceptions
@@ -367,7 +368,7 @@ class FigureManagerWorkbench(FigureManagerBase, QObject):
self.toolbar.hold()
def get_window_title(self):
- return text_type(self.window.windowTitle())
+ return isinstance(self.window.windowTitle(), str)
def set_window_title(self, title):
self.window.setWindowTitle(title)
diff --git a/qt/applications/workbench/workbench/plotting/figurewindow.py b/qt/applications/workbench/workbench/plotting/figurewindow.py
index 2062f268634d3ba1055f8c92a6a932a0d85c117e..d51ba6b183762ce78a96bbc0b1ce2fbf93398e78 100644
--- a/qt/applications/workbench/workbench/plotting/figurewindow.py
+++ b/qt/applications/workbench/workbench/plotting/figurewindow.py
@@ -8,8 +8,6 @@
#
#
"""Provides the QMainWindow subclass for a plotting window"""
-from __future__ import absolute_import
-
# std imports
import weakref
diff --git a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py b/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
index 7f0c8cf2f2973e1f77545dab19317a271856d08d..6443f24728443305c0a0765b4ed2e901e2c97619 100644
--- a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
+++ b/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
@@ -7,14 +7,11 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
import atexit
import gc
# 3rd party imports
-import six
from enum import Enum
from .observabledictionary import DictionaryAction, ObservableDictionary
@@ -131,7 +128,7 @@ class GlobalFigureManager(object):
def destroy_fig(cls, fig):
"*fig* is a Figure instance"
num = None
- for manager in six.itervalues(cls.figs):
+ for manager in cls.figs.values():
if manager.canvas.figure == fig:
num = manager.num
break
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/__init__.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/__init__.py
index 7e74ab9d98555b862261ff62c6767055d28b840b..ab55a883fd4abadde69e1199b7f1ba744fbbce37 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/__init__.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/__init__.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantid.plots.mantidaxes import MantidAxes
from mantidqt.widgets.plotconfigdialog import curve_in_ax
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/axes.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/axes.py
index 3032199f3e1c34401c2aacbbf53b1adcb69b54eb..54cd3158ac71bafe48b311015904b9ae191eb04d 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/axes.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/axes.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from numpy import isclose
from mantid.plots.utility import get_autoscale_limits
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/figure.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/figure.py
index ed257509c1bd26744351666ca22186d14ab1cf6d..56c506aa5358b8458572214f56d78a7404c6dd73 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/figure.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/figure.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib import rcParams
from numpy import isclose
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/lines.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/lines.py
index e218c4e03500140e27d258a9e18a20983478045e..553b4e50256fba420f899fbe81e2f34e4f359c25 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/lines.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/lines.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib import rcParams
from matplotlib.container import ErrorbarContainer
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgenerator.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgenerator.py
index 8978bd8958801e8eb435ca4764a0627aa8bc8d19..d9b298aef94ee50ac99bc4a6f8fc9b7b0e5c4a19 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgenerator.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgenerator.py
@@ -14,7 +14,7 @@ from matplotlib.axes import Axes
from matplotlib.legend import Legend
from mantid.plots import MantidAxes
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantid.simpleapi import CreateWorkspace
from workbench.plotting.plotscriptgenerator import generate_script
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py
index 4f84bbd28266ed52138fd8aae8b3e57958317b01..f844f5c3762feddc3a34d6ba0bfc79e7ba7f8890 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py
@@ -6,15 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
import matplotlib as mpl
mpl.use('Agg') # noqa
import matplotlib.pyplot as plt
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from workbench.plotting.plotscriptgenerator.axes import (generate_axis_limit_commands,
generate_axis_label_commands)
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorlines.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorlines.py
index 3dfbe5bf4f38823dea672cdbebbd6705d347d7b2..5353e6b143c11b7f3ce33ab6358bb8354edbf151 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorlines.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorlines.py
@@ -14,7 +14,7 @@ import matplotlib.pyplot as plt
from copy import copy
from matplotlib.container import ErrorbarContainer
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantid.simpleapi import CreateWorkspace
from workbench.plotting.plotscriptgenerator.lines import (_get_plot_command_kwargs_from_line2d,
_get_errorbar_specific_plot_kwargs,
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorutils.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorutils.py
index 6416f144dca0b07cf73f11b950ccbccdfe0ae5c8..96f51807c17a283991196496ecfab6113cca0e84 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorutils.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorutils.py
@@ -12,7 +12,7 @@ from ast import parse
from collections import OrderedDict
from numpy import array
-from mantid.py3compat.mock import patch, Mock
+from unittest.mock import patch, Mock
from workbench.plotting.plotscriptgenerator.utils import (convert_args_to_string,
get_plotted_workspaces_names,
clean_variable_name,
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py
index 2a6cef17e959a3a9b5b87db65b3a8b139752125d..3f17ee1dd5fc1e5b4e666c8ca741519e02e32735 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py
@@ -6,15 +6,11 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import re
import numpy as np
from matplotlib.container import ErrorbarContainer
-from mantid.py3compat import is_text_string
-
def round_to_sig_figs(number, sig_figs):
if np.isclose(number, 0):
@@ -28,7 +24,7 @@ def convert_value_to_arg_string(value):
which can be passed to a function. It is recursive so works on objects
such as lists.
"""
- if is_text_string(value):
+ if isinstance(value, str):
return "'{}'".format(value)
if isinstance(value, (list, np.ndarray, tuple)):
return "[{}]".format(', '.join([convert_value_to_arg_string(v) for v in value]))
diff --git a/qt/applications/workbench/workbench/plotting/propertiesdialog.py b/qt/applications/workbench/workbench/plotting/propertiesdialog.py
index f814e7f8796821dc8d7928e3cf2a7941782d7da4..ba10e60d7be6d408c11ffd2b78d31a8520d1d12b 100644
--- a/qt/applications/workbench/workbench/plotting/propertiesdialog.py
+++ b/qt/applications/workbench/workbench/plotting/propertiesdialog.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
# 3rdparty imports
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py b/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py
index b6b9e9cd0b1f836608b9fc7784ecf98347530240..ed27ed4cf6a9691be1efbca4cedf57bc955f01e3 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
-
import unittest
import matplotlib
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py b/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py
index 3c54cd45f94d3a4ec4ad177f457df61893c06f03..fe5915fc324d1024f2e710455a132a5c85147a05 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py
@@ -6,8 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
# system imports
import unittest
@@ -24,10 +23,10 @@ from testhelpers import assert_almost_equal
# local package imports
from mantid.plots import MantidAxes
-from mantid.py3compat.mock import MagicMock, PropertyMock, call, patch
+from unittest.mock import MagicMock, PropertyMock, call, patch
from mantid.simpleapi import CreateWorkspace
from mantidqt.plotting.figuretype import FigureType
-from mantidqt.plotting.functions import plot
+from mantidqt.plotting.functions import plot, pcolormesh_from_names
from mantidqt.utils.qt.testing import start_qapplication
from workbench.plotting.figureinteraction import FigureInteraction
@@ -378,6 +377,19 @@ class FigureInteractionTest(unittest.TestCase):
current_scale_types2 = (ax.get_xscale(), ax.get_yscale())
self.assertNotEqual(current_scale_types2, current_scale_types1)
+ def test_scale_on_ragged_workspaces_maintained_when_toggling_normalisation(self):
+ ws = CreateWorkspace(DataX=[1, 2, 3, 4, 2, 4, 6, 8], DataY=[2] * 8, NSpec=2, OutputWorkspace="ragged_ws")
+ fig = pcolormesh_from_names([ws])
+ mock_canvas = MagicMock(figure=fig)
+ fig_manager_mock = MagicMock(canvas=mock_canvas)
+ fig_interactor = FigureInteraction(fig_manager_mock)
+ fig_interactor._toggle_normalization(fig.axes[0])
+
+ clim = fig.axes[0].images[0].get_clim()
+ fig_interactor._toggle_normalization(fig.axes[0])
+ self.assertEqual(clim, fig.axes[0].images[0].get_clim())
+ self.assertNotEqual((-0.1, 0.1), fig.axes[0].images[0].get_clim())
+
# Private methods
def _create_mock_fig_manager_to_accept_right_click(self):
fig_manager = MagicMock()
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figuremanager.py b/qt/applications/workbench/workbench/plotting/test/test_figuremanager.py
index 2866b3ddd01086ca6872119d2e0ad838bc7263f6..a4ef45de703e97bc6e1acdb63293766a9d9098c4 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figuremanager.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figuremanager.py
@@ -7,7 +7,7 @@
# This file is part of the mantid workbench.
import unittest
-from mantid.py3compat.mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
from mantidqt.utils.qt.testing import start_qapplication
from workbench.plotting.figuremanager import FigureCanvasQTAgg, FigureManagerWorkbench
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figurewindow.py b/qt/applications/workbench/workbench/plotting/test/test_figurewindow.py
index 99a46a4a016314ae8204981e7febdb1e3a0d2e74..b112c68cf8962523bbc724a3a4b44290dfbc54e5 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figurewindow.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figurewindow.py
@@ -13,7 +13,7 @@ matplotlib.use('Qt5Agg') # noqa # we need Qt for events to work
import matplotlib.pyplot as plt
from mantid import plots # noqa # register mantid projection
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantid.simpleapi import CreateWorkspace
from mantidqt.utils.qt.testing import start_qapplication
from workbench.plotting.figurewindow import FigureWindow
diff --git a/qt/applications/workbench/workbench/plotting/test/test_globalfiguremanager.py b/qt/applications/workbench/workbench/plotting/test/test_globalfiguremanager.py
index 25782ac4ff5863475f51aa08b7864d1b8c73a0f1..a0ec1c6d751b6455dfdc9074184ce62b04a9e8fe 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_globalfiguremanager.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_globalfiguremanager.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat.mock import Mock, call, patch
+from unittest.mock import Mock, call, patch
from workbench.plotting.globalfiguremanager import FigureAction, GlobalFigureManager, GlobalFigureManagerObserver
from workbench.plotting.observabledictionary import DictionaryAction
diff --git a/qt/applications/workbench/workbench/plotting/test/test_propertiesdialog.py b/qt/applications/workbench/workbench/plotting/test/test_propertiesdialog.py
index a7b9545e066c43747f883f7e345cd6a467771e13..cf3275899d7dcd100c5db261f6db915f204c52d7 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_propertiesdialog.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_propertiesdialog.py
@@ -6,8 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
# system imports
import unittest
diff --git a/qt/applications/workbench/workbench/plotting/test/test_utility.py b/qt/applications/workbench/workbench/plotting/test/test_utility.py
index 9927c34aa0d07e0379dd413b67dc75c260adb05f..d4e3fc6c4afe16c44acb7c2e64dca5edbadd93c5 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_utility.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_utility.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid package
-from __future__ import absolute_import
-
import unittest
import matplotlib.pyplot as plt
diff --git a/qt/applications/workbench/workbench/plotting/toolbar.py b/qt/applications/workbench/workbench/plotting/toolbar.py
index 34e050eba708c07d9a8f947ed0860534abbd62a1..e1073d6510029103d0c1cb4168a0b26e7097003b 100644
--- a/qt/applications/workbench/workbench/plotting/toolbar.py
+++ b/qt/applications/workbench/workbench/plotting/toolbar.py
@@ -8,8 +8,6 @@
#
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from matplotlib.backends.backend_qt5 import NavigationToolbar2QT
from qtpy import QtCore, QtGui, QtPrintSupport, QtWidgets
diff --git a/qt/applications/workbench/workbench/plugins/algorithmselectorwidget.py b/qt/applications/workbench/workbench/plugins/algorithmselectorwidget.py
index 58972040250f607d7b368c3060eab1d236ab5ddd..7814524100a2afdacb7e94ae6005e0cd09bd6bd0 100644
--- a/qt/applications/workbench/workbench/plugins/algorithmselectorwidget.py
+++ b/qt/applications/workbench/workbench/plugins/algorithmselectorwidget.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from contextlib import contextmanager
from qtpy.QtWidgets import QVBoxLayout
diff --git a/qt/applications/workbench/workbench/plugins/base.py b/qt/applications/workbench/workbench/plugins/base.py
index 3701a411db137cf8d602479c21f20b72d1bc16c4..ee978e9f9b7148a4ad77faffcb30a4e51d5e89e8 100644
--- a/qt/applications/workbench/workbench/plugins/base.py
+++ b/qt/applications/workbench/workbench/plugins/base.py
@@ -8,8 +8,6 @@
#
#
"""Provides a widget to wrap common behaviour for all plugins"""
-from __future__ import absolute_import
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QDockWidget, QMainWindow, QWidget
diff --git a/qt/applications/workbench/workbench/plugins/editor.py b/qt/applications/workbench/workbench/plugins/editor.py
index f34125a26c9fdb905e7d15c17224c703da277027..8daf4773bb6be05da8d018a698cafd40fe05b92e 100644
--- a/qt/applications/workbench/workbench/plugins/editor.py
+++ b/qt/applications/workbench/workbench/plugins/editor.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
import os.path as osp
diff --git a/qt/applications/workbench/workbench/plugins/exception_handler/__init__.py b/qt/applications/workbench/workbench/plugins/exception_handler/__init__.py
index a2cbe241dd56caebdcd443639d8be278c5036742..f0aa51665beaa0f76ef97508f46786e90c9190bd 100644
--- a/qt/applications/workbench/workbench/plugins/exception_handler/__init__.py
+++ b/qt/applications/workbench/workbench/plugins/exception_handler/__init__.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import traceback
from ErrorReporter.error_report_presenter import ErrorReporterPresenter
diff --git a/qt/applications/workbench/workbench/plugins/exception_handler/error_messagebox.py b/qt/applications/workbench/workbench/plugins/exception_handler/error_messagebox.py
index d7eac019918910e223f79d89c59cbfd273dfac48..3d3d4c0eb985c394252c7489454e40016a5b48ce 100644
--- a/qt/applications/workbench/workbench/plugins/exception_handler/error_messagebox.py
+++ b/qt/applications/workbench/workbench/plugins/exception_handler/error_messagebox.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QMessageBox
diff --git a/qt/applications/workbench/workbench/plugins/jupyterconsole.py b/qt/applications/workbench/workbench/plugins/jupyterconsole.py
index 10737d2c9f010addcc5d64ca4b555eda6c1143e0..5f8f599f011781256ff6f38b5686a4109ea4e4ba 100644
--- a/qt/applications/workbench/workbench/plugins/jupyterconsole.py
+++ b/qt/applications/workbench/workbench/plugins/jupyterconsole.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
import warnings
warnings.filterwarnings(action='ignore',
diff --git a/qt/applications/workbench/workbench/plugins/logmessagedisplay.py b/qt/applications/workbench/workbench/plugins/logmessagedisplay.py
index c9e431a22e5e292cd6989165d4784b13f0baeeea..24bd3230f3728f9850f71471bd1cb7c14a55fa55 100644
--- a/qt/applications/workbench/workbench/plugins/logmessagedisplay.py
+++ b/qt/applications/workbench/workbench/plugins/logmessagedisplay.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import sys
from qtpy.QtWidgets import QHBoxLayout
diff --git a/qt/applications/workbench/workbench/plugins/plotselectorwidget.py b/qt/applications/workbench/workbench/plugins/plotselectorwidget.py
index 81618bca7337e7ac327a0cf29407a0abf0416c4a..9aafffff6367a40a286d69847d41ff1b65d74e70 100644
--- a/qt/applications/workbench/workbench/plugins/plotselectorwidget.py
+++ b/qt/applications/workbench/workbench/plugins/plotselectorwidget.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
# third-party library imports
diff --git a/qt/applications/workbench/workbench/plugins/test/test_editor.py b/qt/applications/workbench/workbench/plugins/test/test_editor.py
index 39136a392cb8d90ab68dd4da6890751cfc86eb45..6b10feff66a13a4e567ea76192e655d86c020470 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_editor.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_editor.py
@@ -11,7 +11,7 @@ import os
from qtpy.QtWidgets import QMainWindow
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from workbench.plugins.editor import MultiFileEditor
diff --git a/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py b/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py
index 378cd501cefcbd3c15b1e98a4562efd02142e242..b8df7a21d1de23f42836ebe6f69c82a9e79e353a 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, unicode_literals
-
import unittest
from mantid import UsageService
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.testing.mocks.mock_qt import MockQWidget
from workbench.plugins.exception_handler import exception_logger
diff --git a/qt/applications/workbench/workbench/plugins/test/test_jupyterconsole.py b/qt/applications/workbench/workbench/plugins/test/test_jupyterconsole.py
index 3b267279d7711caa8095c2e7a430c23ec8d3c008..c5575730891ef8a5e7199f06cb4cabd83f845fe1 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_jupyterconsole.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_jupyterconsole.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
# system imports
import unittest
diff --git a/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py b/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py
index 12ac4b7b71c0975945cbdbd91060d07da731e7ae..800394274f8e30c9cd2a457179214ed0e0b1e1c0 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py
@@ -7,14 +7,12 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division)
-
import unittest
import matplotlib as mpl
mpl.use('Agg') # noqa
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import (CreateEmptyTableWorkspace, CreateSampleWorkspace,
GroupWorkspaces)
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/applications/workbench/workbench/plugins/workspacewidget.py b/qt/applications/workbench/workbench/plugins/workspacewidget.py
index b3af9a0989b521671a13ca9fe2062eb6eeceb956..5e3782a33497f778dc57991591af7597b55d5c26 100644
--- a/qt/applications/workbench/workbench/plugins/workspacewidget.py
+++ b/qt/applications/workbench/workbench/plugins/workspacewidget.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from functools import partial
from qtpy.QtWidgets import QApplication, QMessageBox, QVBoxLayout
@@ -92,8 +90,10 @@ class WorkspaceWidget(PluginWidget):
if not compatible:
QMessageBox.warning(self, "", error_msg)
return
-
- plot_from_names(names, errors, overplot)
+ try:
+ plot_from_names(names, errors, overplot)
+ except RuntimeError as re:
+ logger.error(str(re))
def _do_plot_bin(self, names, errors, overplot):
"""
diff --git a/qt/applications/workbench/workbench/projectrecovery/projectrecovery.py b/qt/applications/workbench/workbench/projectrecovery/projectrecovery.py
index 3bd71ff6e5bcb90910ccb7fb7fec0d7f43749624..f6414aa370b500c09edf4a5454518ae3f1203bd5 100644
--- a/qt/applications/workbench/workbench/projectrecovery/projectrecovery.py
+++ b/qt/applications/workbench/workbench/projectrecovery/projectrecovery.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
import shutil
import socket
diff --git a/qt/applications/workbench/workbench/projectrecovery/projectrecoveryloader.py b/qt/applications/workbench/workbench/projectrecovery/projectrecoveryloader.py
index 6ffa0a9ca44c86dcfa54658463ad379961308939..a11b152d4fb55a79ebd4ef955ac7dc63234d9771 100644
--- a/qt/applications/workbench/workbench/projectrecovery/projectrecoveryloader.py
+++ b/qt/applications/workbench/workbench/projectrecovery/projectrecoveryloader.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
from qtpy.QtWidgets import QApplication
diff --git a/qt/applications/workbench/workbench/projectrecovery/projectrecoverysaver.py b/qt/applications/workbench/workbench/projectrecovery/projectrecoverysaver.py
index 40bfa90c672abc10b95c9bfaf5d0e9060ec26abe..6d449d63fdbb33871e1be6f48f1afdb873d768bc 100644
--- a/qt/applications/workbench/workbench/projectrecovery/projectrecoverysaver.py
+++ b/qt/applications/workbench/workbench/projectrecovery/projectrecoverysaver.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import datetime
import os
from threading import Timer
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
index 0d4b442363cbc00130beeb6426cb808990d4ff5b..e6a9a893488521d36a82d6f791955959424c6ca1 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
@@ -7,10 +7,7 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
-import six
from qtpy.QtCore import Slot, QObject
@@ -59,7 +56,7 @@ class ProjectRecoveryModel(QObject):
:return: List of 3 Strings; [0] Checkpoint name, [1] Number of workspaces, [2] Whether checkpoint has been tried
or not
"""
- if isinstance(checkpoint, six.string_types):
+ if isinstance(checkpoint, str):
# Assume if there is a T then it is a checkpoint and it needs to be replaced with a space
checkpoint = checkpoint.replace("T", " ")
for index in self.rows:
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverypresenter.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverypresenter.py
index 87190845e09b2cd23505a23bae8fac148ba2824e..07b413bfe86f4bf1f2356eb125e12d62570b1786 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverypresenter.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverypresenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
from workbench.projectrecovery.recoverygui.projectrecoverymodel import ProjectRecoveryModel
from workbench.projectrecovery.recoverygui.projectrecoverywidgetview import ProjectRecoveryWidgetView
from workbench.projectrecovery.recoverygui.recoveryfailureview import RecoveryFailureView
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverywidgetview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverywidgetview.py
index 1d80cbdd9a22c8f9fabb9b2f865d38cfd4f41036..db0dffdb22081582e46af81e25cadf7efa4ce931 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverywidgetview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverywidgetview.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Signal, Slot, Qt
from qtpy.QtWidgets import QDialog, QHeaderView, QTableWidgetItem
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/recoveryfailureview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/recoveryfailureview.py
index ea28b892ffe8a8fadeb1595c5b0d5f19d7ba8a2e..0d7a670e4e21f955faf20bbd426b21fb93b2c9a1 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/recoveryfailureview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/recoveryfailureview.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Signal, Slot, Qt
from qtpy.QtWidgets import QDialog, QHeaderView, QTableWidgetItem
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py
index 1fa778efbdcf061c6aa2a681a0acebef251d8be1..713ef87a77a762b7325fe757ed206602c43a6f3c 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
import shutil
import time
@@ -17,7 +15,7 @@ import unittest
from mantid.api import AnalysisDataService as ADS
from mantid.kernel import ConfigService
from mantid.simpleapi import CreateSampleWorkspace
-from mantid.py3compat import mock
+from unittest import mock
from workbench.projectrecovery.projectrecovery import ProjectRecovery, NO_OF_CHECKPOINTS_KEY
from workbench.projectrecovery.recoverygui.projectrecoverymodel import ProjectRecoveryModel
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py
index 9ac771a46cc9ff06f23bb5f1cf6a0e207f325210..d1870cf8f33f03b6faae16d4a11292b9a3f36325 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py
@@ -7,11 +7,9 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from workbench.projectrecovery.recoverygui.projectrecoverypresenter import ProjectRecoveryPresenter
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py
index fa6aee88220436f7117d3568e3666d71d2549b5b..6c5f8b035c4a38d9611c70cb3166ac3e74d8a6da 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py
@@ -7,11 +7,9 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from workbench.projectrecovery.recoverygui.projectrecoverywidgetview import ProjectRecoveryWidgetView
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py
index c9601cbe8f2380d415f4e0ecea5405c162e1b603..2f443db90b9ee5c519d8165fbb856a0a34991b4a 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py
@@ -7,13 +7,11 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from qtpy.QtWidgets import QTableWidgetItem
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from workbench.projectrecovery.recoverygui.recoveryfailureview import RecoveryFailureView
diff --git a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
index 88d5e895516a66a8c20dd730586ce4cb8c3bb519..eb5d56e0c07507df5c22e4e0783862bf0a1b8535 100644
--- a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
+++ b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
import shutil
import socket
@@ -20,7 +18,7 @@ import datetime
from mantid.api import AnalysisDataService as ADS
from mantid.kernel import ConfigService
-from mantid.py3compat import mock
+from unittest import mock
from workbench.projectrecovery.projectrecovery import ProjectRecovery, SAVING_TIME_KEY, NO_OF_CHECKPOINTS_KEY, \
RECOVERY_ENABLED_KEY
diff --git a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py
index 6ad9ca74a3c56b37c4f30741105a3a88b7b4eaf4..5c964f38073148d129e0aa5784242dab56520cc0 100644
--- a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py
+++ b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
import shutil
import sys
@@ -16,7 +14,7 @@ import tempfile
import unittest
from mantid.api import AnalysisDataService as ADS
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import CreateSampleWorkspace
from mantidqt.utils.testing.strict_mock import StrictContextManagerMock
diff --git a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py
index 50dd04418d73a5e2d6c43b31e62bb2d842e7777a..1f3ecd7ddb7f1d5cef0f371e662d987a75168c7e 100644
--- a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py
+++ b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import json
import os
import shutil
@@ -18,7 +16,7 @@ import unittest
from mantid.api import AnalysisDataService as ADS
from mantid.simpleapi import CreateSampleWorkspace, GroupWorkspaces
-from mantid.py3compat import mock
+from unittest import mock
from workbench.projectrecovery.projectrecovery import ProjectRecovery
if sys.version_info.major >= 3:
diff --git a/qt/applications/workbench/workbench/requirements.py b/qt/applications/workbench/workbench/requirements.py
index a695991d216800cd39c72562896a54ff778e79fe..47dade02d6552c091e8e24ce991c99567c71ac41 100644
--- a/qt/applications/workbench/workbench/requirements.py
+++ b/qt/applications/workbench/workbench/requirements.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Defines methods to check requirements for the application
"""
-from __future__ import absolute_import
-
from distutils.version import LooseVersion
diff --git a/qt/applications/workbench/workbench/test/mainwindowtest.py b/qt/applications/workbench/workbench/test/mainwindowtest.py
index 3c2cd0b2a36672f02627077b43bc2c9e71ff7215..5373ee24bbe237b119a079e74ac4d80a6509dbb3 100644
--- a/qt/applications/workbench/workbench/test/mainwindowtest.py
+++ b/qt/applications/workbench/workbench/test/mainwindowtest.py
@@ -10,11 +10,9 @@
"""
Defines the QMainWindow of the application and the main() entry point.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from workbench.app.mainwindow import MainWindow
diff --git a/qt/applications/workbench/workbench/test/test_import.py b/qt/applications/workbench/workbench/test/test_import.py
index ee6db74c54a86081f520e9ec4e7822724e6731c6..2ebd5ef463a2389d4394671c5cf95c3fa1bea373 100644
--- a/qt/applications/workbench/workbench/test/test_import.py
+++ b/qt/applications/workbench/workbench/test/test_import.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/applications/workbench/workbench/utils/test/windowfindertest.py b/qt/applications/workbench/workbench/utils/test/windowfindertest.py
index f9ac6f7b92656171eca11c87366b48b228170820..8cc1a5e005a139fa2228248fda2541cc16687b5b 100644
--- a/qt/applications/workbench/workbench/utils/test/windowfindertest.py
+++ b/qt/applications/workbench/workbench/utils/test/windowfindertest.py
@@ -10,8 +10,6 @@
"""
Defines the QMainWindow of the application and the main() entry point.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from workbench.app.mainwindow import MainWindow
diff --git a/qt/applications/workbench/workbench/utils/windowfinder.py b/qt/applications/workbench/workbench/utils/windowfinder.py
index cd60ad7a56bba68890976531c857bf7855516ce1..eb40b707beff6a23920b1d5ac4aabf8210c91275 100644
--- a/qt/applications/workbench/workbench/utils/windowfinder.py
+++ b/qt/applications/workbench/workbench/utils/windowfinder.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from qtpy.QtWidgets import QApplication
from mantidqt.project.encoderfactory import EncoderFactory
diff --git a/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py b/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py
index 71270b07c6a01ad913389b5e94dda12e44bfec4f..cf0b3187da6de2ebce386b020a67a5e4efb628ef 100644
--- a/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py
+++ b/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidworkbench package
-import six
from mantid.api import AlgorithmManager, AnalysisDataService as ADS
from workbench.projectrecovery.projectrecoverysaver import ALGS_TO_IGNORE, ALG_PROPERTIES_TO_IGNORE
@@ -36,7 +35,7 @@ def get_workspace_history_list(workspace):
def convert_list_to_string(to_convert, add_new_line=True, fix_comments=False):
string = ""
for line in to_convert:
- if isinstance(line, six.string_types):
+ if isinstance(line, str):
string += line
elif fix_comments and isinstance(line, tuple):
string += line[0]
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/model.py b/qt/applications/workbench/workbench/widgets/plotselector/model.py
index 8a9824d7669cb70c08a700fe8199b48a7271209a..e172968e92c0157bb74bce5d53168eacdff3d160 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/model.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
from workbench.plotting.globalfiguremanager import FigureAction
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/presenter.py b/qt/applications/workbench/workbench/widgets/plotselector/presenter.py
index ae58ca8efbee6ad881bea863e7e7c784daacc4ce..cafb3f897c827d3725e998a85a86adec67166c2a 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
import os
import re
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py
index 00c53750415967b83630ce8c91249cf5d0e0ad45..781ba002958b166020ec396b2ef4bbb5dbcda001 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py
@@ -7,11 +7,9 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, division, print_function
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from workbench.plotting.globalfiguremanager import FigureAction
from workbench.widgets.plotselector.model import PlotSelectorModel
from workbench.widgets.plotselector.presenter import PlotSelectorPresenter
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py
index c1cc8e2e4ab5455a19f2fe1e5567a70c877284ab..1615401b2e6f0ae34d16e1ea8932956266ccd332 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py
@@ -7,12 +7,10 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, division, print_function
-
import os
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from workbench.widgets.plotselector.model import PlotSelectorModel
from workbench.widgets.plotselector.presenter import PlotSelectorPresenter
from workbench.widgets.plotselector.view import PlotSelectorView, Column
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py
index d413a60e1a5a134a9564816835be6079f78f70f1..acf545aa5d2b1947262cb822794cea930173790a 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py
@@ -7,14 +7,12 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, division, print_function
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtTest import QTest
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from workbench.widgets.plotselector.presenter import PlotSelectorPresenter
from workbench.widgets.plotselector.view import EXPORT_TYPES, PlotSelectorView, Column
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/view.py b/qt/applications/workbench/workbench/widgets/plotselector/view.py
index 9f7c32e2e1abf5f769b659747a3e0b65e8921204..667bb57155c8fd67db2ef80ffa45212ae2efd92a 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/view.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/view.py
@@ -7,14 +7,12 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
import re
from qtpy.QtCore import Qt, Signal, QMutex, QMutexLocker
from qtpy.QtWidgets import (QAbstractItemView, QAction, QActionGroup, QFileDialog, QHBoxLayout, QHeaderView, QLineEdit,
QMenu, QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget)
-from mantid.py3compat.enum import IntEnum
+from enum import IntEnum
from mantidqt.icons import get_icon
from mantidqt.utils.flowlayout import FlowLayout
diff --git a/qt/applications/workbench/workbench/widgets/settings/categories/presenter.py b/qt/applications/workbench/workbench/widgets/settings/categories/presenter.py
index 8071f360fcc4c109a9fb73f00743aed9c7dab78e..e0efb728e115de26f7899f22f4b72d3d759ea924 100644
--- a/qt/applications/workbench/workbench/widgets/settings/categories/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/categories/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench
#
#
-from __future__ import absolute_import, unicode_literals
-
from mantid.api import AlgorithmFactory
from mantid.kernel import ConfigService
from workbench.widgets.settings.categories.view import CategoriesSettingsView
diff --git a/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py b/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py
index 0b06caf05642f06475fe59cbc85a0981c66f2024..ce3021ee42b1af552a062da7f00f4ea4d5918013 100644
--- a/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
-from mantid.py3compat.mock import call, Mock, patch, ANY
+from unittest.mock import call, Mock, patch, ANY
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.testing.mocks.mock_qt import MockQWidget
from mantidqt.utils.testing.strict_mock import StrictMock
diff --git a/qt/applications/workbench/workbench/widgets/settings/categories/view.py b/qt/applications/workbench/workbench/widgets/settings/categories/view.py
index 3b38e107e8c2189d3dc07e81ad85583462ee1e63..e10e2f3d7e59a319fab06d2c0a105f1c6ae890b6 100644
--- a/qt/applications/workbench/workbench/widgets/settings/categories/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/categories/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QTreeWidgetItem
diff --git a/qt/applications/workbench/workbench/widgets/settings/fitting/presenter.py b/qt/applications/workbench/workbench/widgets/settings/fitting/presenter.py
index a674816ec97b256dde4b108756134f199eed4ca3..dadc238455034d05a8c6f0fa99f6f8839cb1f845 100644
--- a/qt/applications/workbench/workbench/widgets/settings/fitting/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/fitting/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench
#
#
-from __future__ import absolute_import, unicode_literals
-
from mantid.api import FunctionFactory
from mantid.kernel import ConfigService
from workbench.widgets.settings.fitting.view import FittingSettingsView
diff --git a/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py b/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py
index d0c762435d808ebccfcf243b098ddb71f08c72e8..3e17e10da48ce9ac741deb61b60b82114e609f46 100644
--- a/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.testing.strict_mock import StrictMock
from workbench.widgets.settings.fitting.presenter import FittingSettings
diff --git a/qt/applications/workbench/workbench/widgets/settings/fitting/view.py b/qt/applications/workbench/workbench/widgets/settings/fitting/view.py
index b1b34c71bf00fce150405ded5f2115e4a1cc24ec..e1782b8d70983e6cef90b9d8efb1f5c90db2bfa3 100644
--- a/qt/applications/workbench/workbench/widgets/settings/fitting/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/fitting/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from mantidqt.utils.qt import load_ui
diff --git a/qt/applications/workbench/workbench/widgets/settings/general/presenter.py b/qt/applications/workbench/workbench/widgets/settings/general/presenter.py
index d978f76115c497137e56c38ca720bae35e2d5bea..a40bab6af100dc698dc32e1d6cb93c54d92beacc 100644
--- a/qt/applications/workbench/workbench/widgets/settings/general/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/general/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench
#
#
-from __future__ import absolute_import, unicode_literals
-
from mantid.kernel import ConfigService
from workbench.config import CONF
from workbench.widgets.settings.general.view import GeneralSettingsView
diff --git a/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py b/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py
index ffc88ebd93ff5e9a39c689aab1dfe775f17fd3c5..4836ef1318f7de5da689ecd9652d3c60ff42b2cb 100644
--- a/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py
@@ -5,12 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
import sys
-from mantid.py3compat.mock import call, patch, MagicMock, Mock
+from unittest.mock import call, patch, MagicMock, Mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.testing.strict_mock import StrictMock
from workbench.widgets.settings.general.presenter import GeneralSettings
diff --git a/qt/applications/workbench/workbench/widgets/settings/general/view.py b/qt/applications/workbench/workbench/widgets/settings/general/view.py
index 37dee2ea68d2af805ed17a746a1016f25b0035f8..e740ff56c44d3e17a7891dad8e9c472302d1a97f 100644
--- a/qt/applications/workbench/workbench/widgets/settings/general/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/general/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QFontDialog
diff --git a/qt/applications/workbench/workbench/widgets/settings/plots/presenter.py b/qt/applications/workbench/workbench/widgets/settings/plots/presenter.py
index d14e3dc071540e9c02f26df4fbce426005326fd2..644082ca0857ae5897c32cb766815c93e0d939d6 100644
--- a/qt/applications/workbench/workbench/widgets/settings/plots/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/plots/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench
#
#
-from __future__ import absolute_import, unicode_literals
-
from mantid.kernel import ConfigService
from workbench.widgets.settings.plots.view import PlotsSettingsView
from workbench.plotting.style import VALID_LINE_STYLE
diff --git a/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py b/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py
index 4e620ea673e41ad289eceab1498b17d69fc0a8ea..27e9deb552afff78986a8f0ac64bcccef3bce30b 100644
--- a/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
-from mantid.py3compat.mock import call, patch
+from unittest.mock import call, patch
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.testing.strict_mock import StrictMock
from workbench.widgets.settings.plots.presenter import PlotSettings
diff --git a/qt/applications/workbench/workbench/widgets/settings/plots/view.py b/qt/applications/workbench/workbench/widgets/settings/plots/view.py
index 3825049b5ab5780e09046b519f31c16798a97034..4191bbbe09805448e84821ff759ecc8da77667fd 100644
--- a/qt/applications/workbench/workbench/widgets/settings/plots/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/plots/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from mantidqt.utils.qt import load_ui
diff --git a/qt/applications/workbench/workbench/widgets/settings/presenter.py b/qt/applications/workbench/workbench/widgets/settings/presenter.py
index 9d0ca53319953b247e5270b1c7121865e0f362e4..ef12d81f791d088a383b471d91b06ee91f766076 100644
--- a/qt/applications/workbench/workbench/widgets/settings/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from mantid import ConfigService
diff --git a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py
index 1e84dec45b2647aa40978f2e0c59f4cb1d01ff57..967317b8792b7c8e7fbe4003ab25d61f2c62fac2 100644
--- a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from unittest import TestCase
-from mantid.py3compat.mock import call, Mock
+from unittest.mock import call, Mock
from mantidqt.utils.testing.mocks.mock_qt import MockQButton, MockQWidget
from mantidqt.utils.testing.strict_mock import StrictPropertyMock
from workbench.widgets.settings.presenter import SettingsPresenter
diff --git a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py
index 181b5935650dd9e9f8210b4ae8b043fba397ab23..ffa1244fccc6f5f4f5667b31fa0651e542e65d8b 100644
--- a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py
@@ -5,13 +5,11 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
from qtpy.QtWidgets import QApplication, QWidget
-from mantid.py3compat.mock import MagicMock
+from unittest.mock import MagicMock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.qt.testing.qt_widget_finder import QtWidgetFinder
from workbench.widgets.settings.presenter import SettingsPresenter
diff --git a/qt/applications/workbench/workbench/widgets/settings/view.py b/qt/applications/workbench/workbench/widgets/settings/view.py
index 68a36a91350b1265065114bbcab6cc3b5eacf3ed..a4431b901a8234d7232fa7a0b8ba079d2c7eee50 100644
--- a/qt/applications/workbench/workbench/widgets/settings/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QMessageBox
diff --git a/qt/python/mantidqt/MPLwidgets.py b/qt/python/mantidqt/MPLwidgets.py
index f28eb9bdabed10d6790dbc3b425cf0216048af4d..cf1435a64307de38587eba3d515067df542d775b 100644
--- a/qt/python/mantidqt/MPLwidgets.py
+++ b/qt/python/mantidqt/MPLwidgets.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from .gui_helper import set_matplotlib_backend
backend = set_matplotlib_backend() # must be at the top of this file
diff --git a/qt/python/mantidqt/algorithminputhistory.py b/qt/python/mantidqt/algorithminputhistory.py
index c95a5f67a4177d34a738652010115a075ed705a2..4132de0cdc125ed944e7fa22aa9da1e9a7fe6007 100644
--- a/qt/python/mantidqt/algorithminputhistory.py
+++ b/qt/python/mantidqt/algorithminputhistory.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt, toQSettings
diff --git a/qt/python/mantidqt/dialogs/algorithmdialog.py b/qt/python/mantidqt/dialogs/algorithmdialog.py
index 42f9d3a2812db697a327eb7651143ee415564d74..533efdaa6f6333772f11aba77b7462dc9b630452 100644
--- a/qt/python/mantidqt/dialogs/algorithmdialog.py
+++ b/qt/python/mantidqt/dialogs/algorithmdialog.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/dialogs/genericdialog.py b/qt/python/mantidqt/dialogs/genericdialog.py
index 94d24f2e31c0ce62a3fca4dfad4690ee39dcb02d..1e29fadc9a16c6be41f073054d2e3193558dc84f 100644
--- a/qt/python/mantidqt/dialogs/genericdialog.py
+++ b/qt/python/mantidqt/dialogs/genericdialog.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/dialogs/spectraselectordialog.py b/qt/python/mantidqt/dialogs/spectraselectordialog.py
index 0612be9821165bd24a1aa503112156cf7d106c87..dbbe37900a586c118fec22d1e97eebfa20158ea9 100644
--- a/qt/python/mantidqt/dialogs/spectraselectordialog.py
+++ b/qt/python/mantidqt/dialogs/spectraselectordialog.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialogButtonBox, QMessageBox
@@ -22,6 +20,7 @@ from mantidqt.utils.qt import load_ui
# Constants
RANGE_SPECIFIER = '-'
PLACEHOLDER_FORMAT = 'valid range: {}' + RANGE_SPECIFIER + '{}'
+PLACEHOLDER_FORMAT_SINGLE_INPUT = 'valid range: {}'
RED_ASTERISK = None
@@ -69,12 +68,12 @@ class SpectraSelectionDialog(SpectraSelectionDialogUIBase):
# attributes
self._workspaces = workspaces
- self.spec_min, self.spec_max = None, None
self.wi_min, self.wi_max = None, None
self.selection = None
self._ui = None
self._show_colorfill_button = show_colorfill_btn
self._overplot = overplot
+ self._plottable_spectra = None
self._init_ui()
self._set_placeholder_text()
@@ -99,7 +98,6 @@ class SpectraSelectionDialog(SpectraSelectionDialogUIBase):
self.accept()
# ------------------- Private -------------------------
-
def _check_number_of_plots(self, selection):
index_length = len(selection.wksp_indices) if selection.wksp_indices else len(selection.spectra)
number_of_lines_to_plot = len(selection.workspaces) * index_length
@@ -147,9 +145,24 @@ class SpectraSelectionDialog(SpectraSelectionDialogUIBase):
plottable = sorted(plottable)
if len(plottable) == 0:
raise Exception('Error: Workspaces have no common spectra.')
- spec_min, spec_max = min(plottable), max(plottable)
- self._ui.specNums.setPlaceholderText(PLACEHOLDER_FORMAT.format(spec_min, spec_max))
- self.spec_min, self.spec_max = spec_min, spec_max
+ #store the plottable list for use later
+ self._plottable_spectra = plottable
+ self._ui.specNums.setPlaceholderText(PLACEHOLDER_FORMAT_SINGLE_INPUT.format(self._list_to_ranges(plottable)))
+
+ def _list_to_ranges(self, input):
+ ranges = []
+ first = last = None # first and last number of current consecutive range
+ for item in sorted(input):
+ if first is None:
+ first = last = item # bootstrap
+ elif item == last + 1: # consecutive
+ last = item # extend the range
+ else: # not consecutive
+ ranges.append("{0}{1}{2}".format(first, RANGE_SPECIFIER, last) if last > first else "{0}".format(first))
+ first = last = item
+ # the last range ended by iteration end
+ ranges.append("{0}{1}{2}".format(first, RANGE_SPECIFIER, last) if last > first else "{0}".format(first))
+ return ', '.join(ranges)
def _setup_connections(self):
ui = self._ui
@@ -214,7 +227,7 @@ class SpectraSelectionDialog(SpectraSelectionDialogUIBase):
self.selection = selection
def _parse_spec_nums(self):
- spec_nums = parse_selection_str(self._ui.specNums.text(), self.spec_min, self.spec_max)
+ spec_nums = parse_selection_str(self._ui.specNums.text(), allowed_values=self._plottable_spectra)
if spec_nums:
selection = SpectraSelection(self._workspaces)
selection.spectra = spec_nums
@@ -227,13 +240,14 @@ class SpectraSelectionDialog(SpectraSelectionDialogUIBase):
return self.selection is not None
-def parse_selection_str(txt, min_val, max_val):
+def parse_selection_str(txt, min_val=None, max_val=None, allowed_values=None):
"""Parse an input string containing plot index selection.
:param txt: A single line of text containing a comma-separated list of values or range of values, i.e.
3-4,5,6,8,10-11
:param min_val: The minimum allowed value
:param max_val: The maximum allowed value
+ :param allowed_values: The list of allowed values, if this is provided then max and min will be ignored
:returns A list containing each value in the range or None if the string is invalid
"""
@@ -249,7 +263,10 @@ def parse_selection_str(txt, min_val, max_val):
return True
def is_in_range(val):
- return min_val <= val <= max_val
+ if allowed_values is not None:
+ return val in allowed_values
+ else:
+ return min_val <= val <= max_val
# split up any commas
comma_separated = txt.split(',')
diff --git a/qt/python/mantidqt/dialogs/test/__init__.py b/qt/python/mantidqt/dialogs/test/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/dialogs/test/__init__.py
+++ b/qt/python/mantidqt/dialogs/test/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/dialogs/test/test_spectraselectiondialog.py b/qt/python/mantidqt/dialogs/test/test_spectraselectiondialog.py
index e4a125f39fd6f7be656f047699ba9459c96d325c..fc789fece69fa02c340e10bbb7a81f39bae8d394 100644
--- a/qt/python/mantidqt/dialogs/test/test_spectraselectiondialog.py
+++ b/qt/python/mantidqt/dialogs/test/test_spectraselectiondialog.py
@@ -10,7 +10,7 @@ from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialogButtonBox
from mantid.api import WorkspaceFactory
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import ExtractSpectra
from mantidqt.dialogs import spectraselectordialog
from mantidqt.dialogs.spectraselectordialog import parse_selection_str, SpectraSelectionDialog
@@ -64,6 +64,30 @@ class SpectraSelectionDialogTest(unittest.TestCase):
self.assertEqual("valid range: 51-100", dlg._ui.specNums.placeholderText())
self.assertEqual("valid range: 0-49", dlg._ui.wkspIndices.placeholderText())
+ def test_filling_workspace_details_single_workspace_with_spectra_gaps(self):
+ gappy_ws = WorkspaceFactory.Instance().create("Workspace2D", NVectors=50, XLength=1, YLength=1)
+ for i in range(10):
+ gappy_ws.getSpectrum(i).setSpectrumNo(1 + i)
+ for i in range(10, 16):
+ gappy_ws.getSpectrum(i).setSpectrumNo(1 + (2*i))
+ for i in range(17, 20):
+ gappy_ws.getSpectrum(i).setSpectrumNo(1 + i)
+ for i in range(20, gappy_ws.getNumberHistograms()):
+ gappy_ws.getSpectrum(i).setSpectrumNo(51 + i)
+ dlg = SpectraSelectionDialog([gappy_ws])
+ self.assertEqual("valid range: 1-10, 17-21, 23, 25, 27, 29, 31, 71-100", dlg._ui.specNums.placeholderText())
+ self.assertEqual("valid range: 0-49", dlg._ui.wkspIndices.placeholderText())
+
+ def test_filling_workspace_details_multiple_workspace_with_spectra_gaps(self):
+ gappy_ws = WorkspaceFactory.Instance().create("Workspace2D", NVectors=50, XLength=1, YLength=1)
+ for i in range(20):
+ gappy_ws.getSpectrum(i).setSpectrumNo(1 + i)
+ for i in range(20,gappy_ws.getNumberHistograms()):
+ gappy_ws.getSpectrum(i).setSpectrumNo(161 + i)
+ dlg = SpectraSelectionDialog([gappy_ws, self._multi_spec_ws])
+ self.assertEqual("valid range: 1-20, 181-200", dlg._ui.specNums.placeholderText())
+ self.assertEqual("valid range: 0-49", dlg._ui.wkspIndices.placeholderText())
+
def test_valid_text_in_boxes_activates_ok(self):
dlg = SpectraSelectionDialog([self._multi_spec_ws])
diff --git a/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py b/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py
index 7511ec7faffeee90da3eef12d01be562569c3e61..37a00369405c5d7a7220f52149fd9fc6e949e975 100644
--- a/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py
+++ b/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py
@@ -5,12 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import unittest
from mantid.api import WorkspaceFactory
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import ExtractSpectra
from mantidqt.dialogs.spectraselectorutils import get_spectra_selection
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/gui_helper.py b/qt/python/mantidqt/gui_helper.py
index 8c5c79c88265855eead6fe5fc194271d79436dd5..fbca12f7572d72f6cdff5aa31b5e7577ce770604 100644
--- a/qt/python/mantidqt/gui_helper.py
+++ b/qt/python/mantidqt/gui_helper.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QApplication) # noqa
from qtpy import QtCore, QtGui
import matplotlib
diff --git a/qt/python/mantidqt/hint.py b/qt/python/mantidqt/hint.py
index c9a518338a64248f874d3298162f50174f951322..cfbe8fc4a67ab8ec3c97517a8f18bf7b2d380b29 100644
--- a/qt/python/mantidqt/hint.py
+++ b/qt/python/mantidqt/hint.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
Hint = import_qt('._common', 'mantidqt', 'Hint')
diff --git a/qt/python/mantidqt/icons/__init__.py b/qt/python/mantidqt/icons/__init__.py
index 2c651b80a4fa0852ea1744323a7e340d54ad9506..963438d8cf778c35e5ef1790fd60f7c247c146a6 100644
--- a/qt/python/mantidqt/icons/__init__.py
+++ b/qt/python/mantidqt/icons/__init__.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
get_icon = import_qt('._icons', 'mantidqt.icons', 'getIcon')
diff --git a/qt/python/mantidqt/icons/test/test_icons.py b/qt/python/mantidqt/icons/test/test_icons.py
index aea93d1a5b9ad6999d814649ae73b5842525110f..b6317343dd7fa6b59d390c05c39a2ee09ad7e4a8 100644
--- a/qt/python/mantidqt/icons/test/test_icons.py
+++ b/qt/python/mantidqt/icons/test/test_icons.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantidqt.icons import get_icon
diff --git a/qt/python/mantidqt/interfacemanager.py b/qt/python/mantidqt/interfacemanager.py
index 199cb4f8c90e72da1eb6d98b662cd48ab0765d92..123920569122e5f9a30749b7c86760b9d3f5d16e 100644
--- a/qt/python/mantidqt/interfacemanager.py
+++ b/qt/python/mantidqt/interfacemanager.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/plotting/figuretype.py b/qt/python/mantidqt/plotting/figuretype.py
index d2576f307f2f316db1cba1e87b3146a98a604722..b1590a40103110d843f13380f898498d8f618d9c 100644
--- a/qt/python/mantidqt/plotting/figuretype.py
+++ b/qt/python/mantidqt/plotting/figuretype.py
@@ -10,8 +10,6 @@
"""
Provides facilities to check plot types
"""
-from __future__ import absolute_import
-
# third party
from enum import Enum
from matplotlib.container import ErrorbarContainer
diff --git a/qt/python/mantidqt/plotting/functions.py b/qt/python/mantidqt/plotting/functions.py
index 71f85df551006bfe6456286c24e026de33149de0..6be1029037a8bf881f643bf294399a838abbf916 100644
--- a/qt/python/mantidqt/plotting/functions.py
+++ b/qt/python/mantidqt/plotting/functions.py
@@ -162,6 +162,10 @@ def pcolormesh(workspaces, fig=None):
if subplot_idx < workspaces_len:
ws = workspaces[subplot_idx]
pcm = pcolormesh_on_axis(ax, ws)
+ if pcm: # Colour bar limits are wrong if workspace is ragged. Set them manually.
+ colorbar_min = np.nanmin(pcm.get_array())
+ colorbar_max = np.nanmax(pcm.get_array())
+ pcm.set_clim(colorbar_min, colorbar_max)
if col_idx < ncols - 1:
col_idx += 1
else:
diff --git a/qt/python/mantidqt/plotting/test/test_functions.py b/qt/python/mantidqt/plotting/test/test_functions.py
index 6dcd7c66a005a2b2c6bb62b31eed3ea5d26e949c..e24c7a0d88d7852c2aa9011ba31b1ba0e0f9892b 100644
--- a/qt/python/mantidqt/plotting/test/test_functions.py
+++ b/qt/python/mantidqt/plotting/test/test_functions.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
from unittest import TestCase, main
@@ -23,9 +21,10 @@ import numpy as np
# register mantid projection
import mantid.plots # noqa
from mantid.api import AnalysisDataService, WorkspaceFactory
+from mantid.simpleapi import CreateWorkspace
from mantid.kernel import config
from mantid.plots import MantidAxes
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.dialogs.spectraselectordialog import SpectraSelection
from mantidqt.plotting.functions import (can_overplot, current_figure_or_none, figure_title,
manage_workspace_names, plot, plot_from_names,
@@ -151,6 +150,11 @@ class FunctionsTest(TestCase):
pcolormesh_from_names([ws_name])
self.assertEqual(1, pcolormesh_mock.call_count)
+ def test_scale_is_correct_on_pcolourmesh_of_ragged_workspace(self):
+ ws = CreateWorkspace(DataX=[1, 2, 3, 4, 2, 4, 6, 8], DataY=[2] * 8, NSpec=2)
+ fig = pcolormesh_from_names([ws])
+ self.assertEqual((1.8, 2.2), fig.axes[0].images[0].get_clim())
+
def test_pcolormesh_from_names(self):
ws_name = 'test_pcolormesh_from_names-1'
AnalysisDataService.Instance().addOrReplace(ws_name, self._test_ws)
diff --git a/qt/python/mantidqt/plotting/test/test_tiledplots.py b/qt/python/mantidqt/plotting/test/test_tiledplots.py
index cd2c6e2856ac42311175642ec02a35f0ac52d725..21c68ca124aa51b10427aa7da4a1731cfcb79fe5 100644
--- a/qt/python/mantidqt/plotting/test/test_tiledplots.py
+++ b/qt/python/mantidqt/plotting/test/test_tiledplots.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
from unittest import TestCase, main
@@ -22,7 +20,7 @@ from matplotlib import _pylab_helpers
# register mantid projection
import mantid.plots # noqa
from mantid.api import AnalysisDataService, WorkspaceFactory
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.dialogs.spectraselectordialog import SpectraSelection
from mantid.plots.plotfunctions import manage_workspace_names, get_plot_fig
from mantidqt.plotting.functions import plot_from_names
diff --git a/qt/python/mantidqt/project/basedecoder.py b/qt/python/mantidqt/project/basedecoder.py
index e5da77ba147f28305cfeb78db9bc4e88b44f1324..0f13d26817dd589af36d45c116b4bc2ca65aa482 100644
--- a/qt/python/mantidqt/project/basedecoder.py
+++ b/qt/python/mantidqt/project/basedecoder.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantidqt.utils.qt import import_qt
BaseDecoder = import_qt('._common', 'mantidqt', 'BaseDecoder')
diff --git a/qt/python/mantidqt/project/baseencoder.py b/qt/python/mantidqt/project/baseencoder.py
index ba1426a0d598137ad67e006d68a73df6602bf4c3..fa61ae7388604f52762b361d763b9b27f068c654 100644
--- a/qt/python/mantidqt/project/baseencoder.py
+++ b/qt/python/mantidqt/project/baseencoder.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantidqt.utils.qt import import_qt
BaseEncoder = import_qt('._common', 'mantidqt', 'BaseEncoder')
diff --git a/qt/python/mantidqt/project/decoderfactory.py b/qt/python/mantidqt/project/decoderfactory.py
index d1d80f5df93c9a545f44c0631d77a679c0e446d1..e96800297a2ef9a9f27652368f7924fe2a5c573a 100644
--- a/qt/python/mantidqt/project/decoderfactory.py
+++ b/qt/python/mantidqt/project/decoderfactory.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantidqt.usersubwindowfactory import UserSubWindowFactory
diff --git a/qt/python/mantidqt/project/encoderfactory.py b/qt/python/mantidqt/project/encoderfactory.py
index 1cb5b0426a88af36956397670a77684f1e0483ee..c7718d7ea3f6f32468b6049b512fc38951c80dda 100644
--- a/qt/python/mantidqt/project/encoderfactory.py
+++ b/qt/python/mantidqt/project/encoderfactory.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantidqt.usersubwindowfactory import UserSubWindowFactory
diff --git a/qt/python/mantidqt/project/plotsloader.py b/qt/python/mantidqt/project/plotsloader.py
index 4b94e6fb50e0f0e9cedaf0c84081ee18d8d44f1c..83d8be21902f6092e2a61bdd36df991323e34ce7 100644
--- a/qt/python/mantidqt/project/plotsloader.py
+++ b/qt/python/mantidqt/project/plotsloader.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import copy
import matplotlib.axes
import matplotlib.cm as cm
diff --git a/qt/python/mantidqt/project/plotssaver.py b/qt/python/mantidqt/project/plotssaver.py
index 35c8f515006805ffbb855b5e4d16c69c2db5673e..81b97cfb8a6c1600daf0560621dc39e80b26b393 100644
--- a/qt/python/mantidqt/project/plotssaver.py
+++ b/qt/python/mantidqt/project/plotssaver.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import matplotlib.axis
from matplotlib import ticker
from matplotlib.image import AxesImage
diff --git a/qt/python/mantidqt/project/project.py b/qt/python/mantidqt/project/project.py
index ad6479ca6781a072e13bcfeded9cc08537e8ef5c..69b99364abecac623402022c6c469897c5150af3 100644
--- a/qt/python/mantidqt/project/project.py
+++ b/qt/python/mantidqt/project/project.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import os
from qtpy.QtWidgets import QApplication, QFileDialog, QMessageBox
diff --git a/qt/python/mantidqt/project/projectloader.py b/qt/python/mantidqt/project/projectloader.py
index ddbeb37fdf1a788427764a9a8d2c4b513811d8a1..20ff31c7eb7d84160f6aa20fa097afa6f2fef0cc 100644
--- a/qt/python/mantidqt/project/projectloader.py
+++ b/qt/python/mantidqt/project/projectloader.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import json
import os
import re
diff --git a/qt/python/mantidqt/project/projectsaver.py b/qt/python/mantidqt/project/projectsaver.py
index 1e776b4d9e3d28315cdf8dfcefc6c78a139e9eea..8f7ad52d68616f14537e88f19bf910e10d34f792 100644
--- a/qt/python/mantidqt/project/projectsaver.py
+++ b/qt/python/mantidqt/project/projectsaver.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import os
from json import dump
diff --git a/qt/python/mantidqt/project/test/test_decoderfactory.py b/qt/python/mantidqt/project/test/test_decoderfactory.py
index 6310b24af6cfd1106dc1eb11cb80017afca3909c..a56e0b33877cdb7211936838139a4493859a9dc7 100644
--- a/qt/python/mantidqt/project/test/test_decoderfactory.py
+++ b/qt/python/mantidqt/project/test/test_decoderfactory.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantidqt.project.decoderfactory import DecoderFactory
diff --git a/qt/python/mantidqt/project/test/test_encoderfactory.py b/qt/python/mantidqt/project/test/test_encoderfactory.py
index 86b4503dc51bf676284d876025820bb0f9885836..4a202d2e17734b3072c36f327bd4c15a6dc0987f 100644
--- a/qt/python/mantidqt/project/test/test_encoderfactory.py
+++ b/qt/python/mantidqt/project/test/test_encoderfactory.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantidqt.project.encoderfactory import EncoderFactory
diff --git a/qt/python/mantidqt/project/test/test_plotsloader.py b/qt/python/mantidqt/project/test/test_plotsloader.py
index 68ed084547a8ec332deb12bfbe48a70fe386cf8d..b0cf4ca42fb819007cb90038385bc92a84b4c4b1 100644
--- a/qt/python/mantidqt/project/test/test_plotsloader.py
+++ b/qt/python/mantidqt/project/test/test_plotsloader.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import matplotlib
matplotlib.use('AGG')
@@ -20,7 +18,7 @@ from mantidqt.project.plotsloader import PlotsLoader # noqa
import mantid.plots.axesfunctions # noqa
from mantid.api import AnalysisDataService as ADS # noqa
from mantid.dataobjects import Workspace2D # noqa
-from mantid.py3compat import mock # noqa
+from unittest import mock # noqa
def pass_func():
diff --git a/qt/python/mantidqt/project/test/test_plotssaver.py b/qt/python/mantidqt/project/test/test_plotssaver.py
index 36c1bbe11a39ebb19b8fe755c213e8c02032bbe2..50da81010c370d4937194a3755fbd4f17c26d5c7 100644
--- a/qt/python/mantidqt/project/test/test_plotssaver.py
+++ b/qt/python/mantidqt/project/test/test_plotssaver.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import matplotlib
import unittest
diff --git a/qt/python/mantidqt/project/test/test_project.py b/qt/python/mantidqt/project/test/test_project.py
index fc1f3a383b6d65f18283aec522253be542127345..038f223090579e618520911fc698481ffbe7118b 100644
--- a/qt/python/mantidqt/project/test/test_project.py
+++ b/qt/python/mantidqt/project/test/test_project.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import os
import tempfile
import unittest
@@ -19,7 +17,7 @@ from qtpy.QtWidgets import QMessageBox
from mantid.api import AnalysisDataService as ADS
from mantid.kernel import ConfigService
from mantid.simpleapi import CreateSampleWorkspace, GroupWorkspaces, RenameWorkspace, UnGroupWorkspace
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.project.project import Project
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/project/test/test_projectloader.py b/qt/python/mantidqt/project/test/test_projectloader.py
index 1870ad4ede0da0f788a6442a48dd0196c52bd8ac..7517e36915176d4b2b164855d3a125839c7b368b 100644
--- a/qt/python/mantidqt/project/test/test_projectloader.py
+++ b/qt/python/mantidqt/project/test/test_projectloader.py
@@ -20,7 +20,7 @@ import tempfile # noqa
from mantid.api import AnalysisDataService as ADS # noqa
from mantid.simpleapi import CreateSampleWorkspace # noqa
-from mantid.py3compat import mock # noqa
+from unittest import mock # noqa
from mantidqt.project import projectloader, projectsaver # noqa
from mantidqt.utils.qt.testing import start_qapplication # noqa
diff --git a/qt/python/mantidqt/project/test/test_projectsaver.py b/qt/python/mantidqt/project/test/test_projectsaver.py
index 40e7725c5bb4d4d72323dd9a72c8fe373b7561cf..30292a2d11c96af6ddeaa24bf26fc5e4b0b4a407 100644
--- a/qt/python/mantidqt/project/test/test_projectsaver.py
+++ b/qt/python/mantidqt/project/test/test_projectsaver.py
@@ -16,7 +16,7 @@ from shutil import rmtree
from mantid.api import AnalysisDataService as ADS
from mantid.simpleapi import CreateSampleWorkspace
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.project import projectsaver
diff --git a/qt/python/mantidqt/project/test/test_workspacesaver.py b/qt/python/mantidqt/project/test/test_workspacesaver.py
index bc4fde63330aa2d21cdcd32864df35f5058a66dc..fe18900e2ad28147fdbe77cf701aa281609066e6 100644
--- a/qt/python/mantidqt/project/test/test_workspacesaver.py
+++ b/qt/python/mantidqt/project/test/test_workspacesaver.py
@@ -17,7 +17,7 @@ import tempfile
from mantid.api import AnalysisDataService as ADS, IMDEventWorkspace # noqa
from mantid.dataobjects import MDHistoWorkspace, MaskWorkspace # noqa
from mantidqt.project import workspacesaver
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import (CreateSampleWorkspace, CreateMDHistoWorkspace, LoadMD, LoadMask, MaskDetectors, # noqa
ExtractMask, GroupWorkspaces) # noqa
diff --git a/qt/python/mantidqt/project/workspaceloader.py b/qt/python/mantidqt/project/workspaceloader.py
index 4a4fe5ef9aa50ae9bd9e7fee33990dec1300a160..9d608aff7323cfcf7e23b8ecd8ec1aa4fce462be 100644
--- a/qt/python/mantidqt/project/workspaceloader.py
+++ b/qt/python/mantidqt/project/workspaceloader.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from os import path
from mantid import logger
diff --git a/qt/python/mantidqt/project/workspacesaver.py b/qt/python/mantidqt/project/workspacesaver.py
index c8acb87604ce1ba5eeec05ee0bcccc253302e04c..c3167fdcbad48614c792d3b4cb86a5b013f1925e 100644
--- a/qt/python/mantidqt/project/workspacesaver.py
+++ b/qt/python/mantidqt/project/workspacesaver.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import os.path
from mantid.api import AnalysisDataService as ADS, IMDEventWorkspace
diff --git a/qt/python/mantidqt/test/test_algorithm_observer.py b/qt/python/mantidqt/test/test_algorithm_observer.py
index 6d3af4559e8ce450ac5589c7858f6ee21f4127e8..107a40035fa4c606ed8201181c93af2374dd98d9 100644
--- a/qt/python/mantidqt/test/test_algorithm_observer.py
+++ b/qt/python/mantidqt/test/test_algorithm_observer.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
import unittest
from mantid.api import AlgorithmObserver, AlgorithmManager, AlgorithmFactory, PythonAlgorithm, Progress
diff --git a/qt/python/mantidqt/test/test_import.py b/qt/python/mantidqt/test/test_import.py
index ff8010718597309270a4cf8f04af4a3d766191e8..f17fe305259f2d524c3784eb007a1aae76ca5ca2 100644
--- a/qt/python/mantidqt/test/test_import.py
+++ b/qt/python/mantidqt/test/test_import.py
@@ -4,8 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/python/mantidqt/usersubwindow.py b/qt/python/mantidqt/usersubwindow.py
index 5b9ebbc53306bccde428f6a36d28d882e2fa72ef..de1ffec1452a1c62ba084cb4750d8d8344f4b7ba 100644
--- a/qt/python/mantidqt/usersubwindow.py
+++ b/qt/python/mantidqt/usersubwindow.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/usersubwindowfactory.py b/qt/python/mantidqt/usersubwindowfactory.py
index a945d40c4c60ff7656c068330ec7e3fc4ba3f100..898c6ebb56ee58a55e73cd07fb460ea399ace708 100644
--- a/qt/python/mantidqt/usersubwindowfactory.py
+++ b/qt/python/mantidqt/usersubwindowfactory.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/utils/asynchronous.py b/qt/python/mantidqt/utils/asynchronous.py
index de0c478de3d41a9383e742f020f3491151c48c8a..bdaa790b1ad6c149f06fb878f0ba71efb8be7380 100644
--- a/qt/python/mantidqt/utils/asynchronous.py
+++ b/qt/python/mantidqt/utils/asynchronous.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
import ctypes
import sys
@@ -16,7 +14,7 @@ import threading
import time
from traceback import extract_tb
-from mantid.py3compat.enum import Enum
+from enum import Enum
class TaskExitCode(Enum):
diff --git a/qt/python/mantidqt/utils/observer_pattern.py b/qt/python/mantidqt/utils/observer_pattern.py
index cf931b255e950eaae9db01964d989caa3f5cae52..eb7b4fc47b864979ead990cd668708a3d02068d1 100644
--- a/qt/python/mantidqt/utils/observer_pattern.py
+++ b/qt/python/mantidqt/utils/observer_pattern.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantidqt.utils.qt.qappthreadcall import QAppThreadCall
diff --git a/qt/python/mantidqt/utils/qt/__init__.py b/qt/python/mantidqt/utils/qt/__init__.py
index 1d6d36c2707b5c7a1d30b4ce244babca2aa7bef2..190bf85e34490c1e6056ca8b52e606a9a2990754 100644
--- a/qt/python/mantidqt/utils/qt/__init__.py
+++ b/qt/python/mantidqt/utils/qt/__init__.py
@@ -9,8 +9,6 @@
#
"""A selection of utility functions related to Qt functionality
"""
-from __future__ import absolute_import
-
# stdlib modules
import os.path as osp
from contextlib import contextmanager
diff --git a/qt/python/mantidqt/utils/qt/qappthreadcall.py b/qt/python/mantidqt/utils/qt/qappthreadcall.py
index ffa370049b20a8edc60ea5a3a2e860ba456f8798..d08e02b9aece44584651718743b7a40c27db7950 100644
--- a/qt/python/mantidqt/utils/qt/qappthreadcall.py
+++ b/qt/python/mantidqt/utils/qt/qappthreadcall.py
@@ -13,8 +13,6 @@ import sys
from qtpy.QtCore import Qt, QMetaObject, QObject, QThread, Slot
from qtpy.QtWidgets import QApplication
-from six import reraise
-
class QAppThreadCall(QObject):
"""
@@ -51,7 +49,7 @@ class QAppThreadCall(QObject):
QMetaObject.invokeMethod(self, "on_call",
Qt.BlockingQueuedConnection)
if self._exc_info is not None:
- reraise(*self._exc_info)
+ raise self._exc_info[1].with_traceback(self._exc_info[2])
return self._result
@Slot()
diff --git a/qt/python/mantidqt/utils/qt/test/__init__.py b/qt/python/mantidqt/utils/qt/test/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py b/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
new file mode 100644
index 0000000000000000000000000000000000000000..ffdd23eede192173d8dd1ab4afde59b4c05b6889
--- /dev/null
+++ b/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
@@ -0,0 +1,50 @@
+# Mantid Repository : https://github.com/mantidproject/mantid
+#
+# Copyright © 2020 ISIS Rutherford Appleton Laboratory UKRI,
+# NScD Oak Ridge National Laboratory, European Spallation Source
+# & Institut Laue - Langevin
+# SPDX - License - Identifier: GPL - 3.0 +
+# This file is part of the mantid workbench.
+#
+#
+import unittest
+
+from qtpy.QtWidgets import QApplication
+
+from mantidqt.utils.asynchronous import AsyncTask, TaskExitCode
+from mantidqt.utils.qt.qappthreadcall import QAppThreadCall
+from mantidqt.utils.qt.testing import start_qapplication
+
+
+class CustomException(Exception):
+ pass
+
+
+@start_qapplication
+class QAppThreadCallTest(unittest.TestCase):
+ def test_correct_exception_is_raised_when_called_on_main_thread(self):
+ qappthread_wrap = QAppThreadCall(self.raises_exception)
+
+ self.assertRaises(CustomException, qappthread_wrap)
+
+ def test_correct_exception_is_raised_when_called_on_other_thread(self):
+ self.exc = None
+ self.exit_code = None
+
+ def collect_error(e):
+ self.exc = e
+
+ thread = AsyncTask(self.task, error_cb=collect_error)
+ thread.start()
+ while thread.is_alive():
+ QApplication.processEvents()
+ thread.join(0.5)
+ self.assertTrue(isinstance(self.exc.exc_value, CustomException))
+ self.assertEqual(TaskExitCode.ERROR, thread.exit_code)
+
+ def raises_exception(self):
+ raise CustomException()
+
+ def task(self):
+ qappthread_wrap = QAppThreadCall(self.raises_exception)
+ qappthread_wrap()
diff --git a/qt/python/mantidqt/utils/qt/testing/__init__.py b/qt/python/mantidqt/utils/qt/testing/__init__.py
index 7ff5da2bc57b4da3a9b97e0c05a4d57485484d17..e44f45c6cdae65cd8ab3337b1f1900c1aacf6eeb 100644
--- a/qt/python/mantidqt/utils/qt/testing/__init__.py
+++ b/qt/python/mantidqt/utils/qt/testing/__init__.py
@@ -10,8 +10,6 @@
# flake8: noqa
"""A selection of utility functions related to testing of Qt-based GUI elements.
"""
-from __future__ import absolute_import
-
from qtpy.QtCore import Qt, QObject
from .application import get_application
diff --git a/qt/python/mantidqt/utils/qt/testing/application.py b/qt/python/mantidqt/utils/qt/testing/application.py
index 4efe6d044af339198632eccd96b34ca662bd0bac..434de477aa12ccd33acfdc4194ca6feca445a0fb 100644
--- a/qt/python/mantidqt/utils/qt/testing/application.py
+++ b/qt/python/mantidqt/utils/qt/testing/application.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import atexit
import sys
import traceback
diff --git a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
index c6cf9329528a29a530605d9232f79a18fd2ea3b1..eda1f09f20aaf92d94857cae508413324e714aab 100644
--- a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
+++ b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
@@ -7,10 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
import inspect
-import six
import traceback
from qtpy.QtCore import QTimer, QMetaObject, Qt
@@ -100,7 +97,7 @@ class ScriptRunner(object):
if inspect.isgenerator(ret):
self.script_iter.append(ret)
ret = None
- elif isinstance(ret, six.integer_types) or isinstance(ret, float):
+ elif isinstance(ret, int) or isinstance(ret, float):
# Start non-blocking pause in seconds
self.pause_timer.start(int(ret * 1000))
ret = None
@@ -162,7 +159,7 @@ def open_in_window(widget_or_name, script, attach_debugger=True, pause=0,
app = get_application()
if widget_or_name is not None:
widget_name = 'Widget to test'
- if isinstance(widget_or_name, six.string_types):
+ if isinstance(widget_or_name, str):
widget = create_widget(widget_or_name)
widget_name = widget_or_name
elif isinstance(widget_or_name, QWidget):
@@ -201,7 +198,7 @@ def run_script(script_or_name, widget):
:param widget: A widget to interact with.
:return: Output of the script or an Exception object.
"""
- if isinstance(script_or_name, six.string_types):
+ if isinstance(script_or_name, str):
module_name, fun_name = split_qualified_name(script_or_name)
m = __import__(module_name, fromlist=[fun_name])
fun = getattr(m, fun_name)
diff --git a/qt/python/mantidqt/utils/qt/testing/gui_window_test.py b/qt/python/mantidqt/utils/qt/testing/gui_window_test.py
index c8afa8a21be31d4b5ee1e70d137b5d80aab8923a..f48e763f6d02a1bec5c9c6641491347697bf6778 100644
--- a/qt/python/mantidqt/utils/qt/testing/gui_window_test.py
+++ b/qt/python/mantidqt/utils/qt/testing/gui_window_test.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import print_function
import inspect
import platform
import sys
diff --git a/qt/python/mantidqt/utils/qt/testing/modal_tester.py b/qt/python/mantidqt/utils/qt/testing/modal_tester.py
index 95e92319daac3b7756fb6de6bc9ec6d597bd1ebf..5567957383ad552b190c8b310e58770f91c1b567 100644
--- a/qt/python/mantidqt/utils/qt/testing/modal_tester.py
+++ b/qt/python/mantidqt/utils/qt/testing/modal_tester.py
@@ -25,8 +25,6 @@ class TestModalDialog(unittest.TestCase):
tester.start()
self.assertTrue(tester.passed)
"""
-from __future__ import absolute_import
-
import traceback
from qtpy.QtCore import QTimer
diff --git a/qt/python/mantidqt/utils/qt/testing/qt_assertions_helper.py b/qt/python/mantidqt/utils/qt/testing/qt_assertions_helper.py
index bc5a648f3c2883ff7f75285b743a9f6b4e309920..058f60d503c673a2ce229e8183560787fff3a655 100644
--- a/qt/python/mantidqt/utils/qt/testing/qt_assertions_helper.py
+++ b/qt/python/mantidqt/utils/qt/testing/qt_assertions_helper.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
from qtpy.QtWidgets import QPushButton
diff --git a/qt/python/mantidqt/utils/show_in_explorer.py b/qt/python/mantidqt/utils/show_in_explorer.py
index 0892016c1f9eaf2ad305658de15f6fad521dd0c8..b5b72af9e4c673405eff2ab03caca79cd761833b 100644
--- a/qt/python/mantidqt/utils/show_in_explorer.py
+++ b/qt/python/mantidqt/utils/show_in_explorer.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import os
import subprocess
import sys
diff --git a/qt/python/mantidqt/utils/test/test_async.py b/qt/python/mantidqt/utils/test/test_async.py
index 4bfdc7eeefbd768b7d136241270cca837fbc98b7..6d69ad2508f6b0f2b871b03785999982b65b5f42 100644
--- a/qt/python/mantidqt/utils/test/test_async.py
+++ b/qt/python/mantidqt/utils/test/test_async.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# system imports
import traceback
import unittest
@@ -108,9 +106,9 @@ class AsyncTaskTest(unittest.TestCase):
self.assertEqual(2, len(recv.task_exc_stack))
# line number of self.target in asynchronous.py
- self.assertEqual(67, recv.task_exc_stack[0][1])
+ self.assertEqual(65, recv.task_exc_stack[0][1])
# line number of raise statement above
- self.assertEqual(95, recv.task_exc_stack[1][1])
+ self.assertEqual(93, recv.task_exc_stack[1][1])
def test_unsuccessful_args_and_kwargs_operation_calls_error_and_finished_callback(self):
def foo(scale, shift):
@@ -143,8 +141,8 @@ class AsyncTaskTest(unittest.TestCase):
self.assertTrue(recv.error_cb_called)
self.assertTrue(isinstance(recv.task_exc, RuntimeError))
self.assertEqual(3, len(recv.task_exc_stack))
- self.assertEqual(135, recv.task_exc_stack[1][1])
- self.assertEqual(134, recv.task_exc_stack[2][1])
+ self.assertEqual(133, recv.task_exc_stack[1][1])
+ self.assertEqual(132, recv.task_exc_stack[2][1])
# ---------------------------------------------------------------
# Failure cases
diff --git a/qt/python/mantidqt/utils/test/test_modal_tester.py b/qt/python/mantidqt/utils/test/test_modal_tester.py
index 254ad2149ba4f3acf67caa869d1d26e77a0b255f..18981949c94c37c6dfd92ac7b266cedc4e3e1040 100644
--- a/qt/python/mantidqt/utils/test/test_modal_tester.py
+++ b/qt/python/mantidqt/utils/test/test_modal_tester.py
@@ -7,13 +7,12 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
from qtpy.QtWidgets import QInputDialog
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.qt.testing import start_qapplication, ModalTester
diff --git a/qt/python/mantidqt/utils/test/test_qt_utils.py b/qt/python/mantidqt/utils/test/test_qt_utils.py
index 298acefbcd982991fe67aff8f449539e47dc158b..bf9ee1d865d6172fa4fdf696a4adf356b6acae77 100644
--- a/qt/python/mantidqt/utils/test/test_qt_utils.py
+++ b/qt/python/mantidqt/utils/test/test_qt_utils.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/python/mantidqt/utils/test/test_writetosignal.py b/qt/python/mantidqt/utils/test/test_writetosignal.py
index 5dc8c4c5e45fd208a59c2e878dd350bef03e78c7..051aedf89d84f60c6bf8333eab3e41c90225921c 100644
--- a/qt/python/mantidqt/utils/test/test_writetosignal.py
+++ b/qt/python/mantidqt/utils/test/test_writetosignal.py
@@ -7,12 +7,10 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
from qtpy.QtCore import QCoreApplication, QObject
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.writetosignal import WriteToSignal
diff --git a/qt/python/mantidqt/utils/testing/__init__.py b/qt/python/mantidqt/utils/testing/__init__.py
index 0fb72b0143feabc37340826351939db3450f273e..5d9ba75dbc79786691ecb615c855a0483050425b 100644
--- a/qt/python/mantidqt/utils/testing/__init__.py
+++ b/qt/python/mantidqt/utils/testing/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_codeeditor.py b/qt/python/mantidqt/utils/testing/mocks/mock_codeeditor.py
index a41c9ea53b9db4caa344fa3b78c60bd085a1e6c5..f7f950ea365fa58a0b509079188664097e7175d3 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_codeeditor.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_codeeditor.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
from mantidqt.utils.testing.strict_mock import StrictMock
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py b/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py
index 82ee2727536d34e1b24a121c1fda975d6fd3173c..9a37f8549b0660702bb6ba5e3e9324cbc2df49ff 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py
@@ -5,9 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.utils.testing.strict_mock import StrictMock
AXIS_INDEX_FOR_HORIZONTAL = 0
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py b/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py
index 4e3d4cbf9099b43e7c8026a07e33966884de487e..35e53f3282a8f11f1a095a70a964e45bc0e05f43 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py
@@ -5,9 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.utils.testing.mocks.mock_qt import MockQTab, MockQTableView
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_observing.py b/qt/python/mantidqt/utils/testing/mocks/mock_observing.py
index a13b81f74e0b39e1a9b3f6b4804bc71874337522..3fb6ca81a86c9a3b478f8258b2a516025e7f1d41 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_observing.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_observing.py
@@ -5,9 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.observers.observing_presenter import ObservingPresenter
from mantidqt.widgets.observers.observing_view import ObservingView
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py b/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py
index e690d97a03f9f25529bff250e606a5674d8a2896..0025d34f9de72aeae271bdeea7b96345fb098c49 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py
@@ -23,10 +23,7 @@ only the ones that have been necessary so far. If another function
needs to be mocked it can be freely added in the relevant class below
and it should not break any existing tests.
"""
-from __future__ import (absolute_import, division, print_function)
-
-
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
class MockAx:
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_qt.py b/qt/python/mantidqt/utils/testing/mocks/mock_qt.py
index c6bb3b7192b5026994a5e75e8be09083595d57d8..6de077c164725331d477c3ca572073c7f9bd2c07 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_qt.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_qt.py
@@ -5,9 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.utils.testing.strict_mock import StrictMock
try:
diff --git a/qt/python/mantidqt/utils/testing/strict_mock.py b/qt/python/mantidqt/utils/testing/strict_mock.py
index bcedfc3f1a5fee38297041947823285459a0f3b4..d6f6a9ee6b89a933027658e5a404c3dd8836cf01 100644
--- a/qt/python/mantidqt/utils/testing/strict_mock.py
+++ b/qt/python/mantidqt/utils/testing/strict_mock.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import unittest
-from mantid.py3compat.mock import Mock, PropertyMock
+from unittest.mock import Mock, PropertyMock
class StrictMock(Mock):
diff --git a/qt/python/mantidqt/utils/writetosignal.py b/qt/python/mantidqt/utils/writetosignal.py
index 0e20fd6204583c51d35f35d4f3a4931e48ba4172..cf42760cc187b027940a119cc5cf6911f037ac7d 100644
--- a/qt/python/mantidqt/utils/writetosignal.py
+++ b/qt/python/mantidqt/utils/writetosignal.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
from qtpy.QtCore import QObject, Signal
diff --git a/qt/python/mantidqt/widgets/algorithmselector/algorithm_factory_observer.py b/qt/python/mantidqt/widgets/algorithmselector/algorithm_factory_observer.py
index 53dc193903da353c6f4fef36b3120c3ab86d77cd..dc602bd8551881f7d94732606ec6acf39dc6f245 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/algorithm_factory_observer.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/algorithm_factory_observer.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
-
from mantid.api import AlgorithmFactoryObserver
diff --git a/qt/python/mantidqt/widgets/algorithmselector/model.py b/qt/python/mantidqt/widgets/algorithmselector/model.py
index d1c1b61ed30484b0869fc778556d42ee4c2cad81..f842c62f01fd6346b557794e5d4e072405b06f19 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/model.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from mantid.api import AlgorithmFactory, AlgorithmManager, IWorkspaceProperty
from mantid.kernel import Direction
diff --git a/qt/python/mantidqt/widgets/algorithmselector/presenter.py b/qt/python/mantidqt/widgets/algorithmselector/presenter.py
index a7625aea0781f2d2c2db75538a0a53d8558af21f..a7ded888d264a668bae794de90093dcca238324c 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/presenter.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from collections import namedtuple
from .model import AlgorithmSelectorModel
diff --git a/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py b/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py
index 20d7ed548cd10d394a05ccb7fb9decb519ad757e..b65be5c43701c2e94128da71b08fb8a46a36b15d 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py
@@ -7,12 +7,10 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
import unittest
from mantid.api import AlgorithmFactory, PythonAlgorithm
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.algorithmselector.widget import AlgorithmSelectorWidget
from mantidqt.widgets.algorithmselector.algorithm_factory_observer import AlgorithmSelectorFactoryObserver
diff --git a/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py b/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
index a9f0d1dca63769c9470c0b557f5074ae8a61d752..a0be969cd8ccde3407c8392cb4bd0af718acece2 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
from collections import Counter, namedtuple
import unittest
@@ -17,7 +15,7 @@ from qtpy.QtCore import Qt
from qtpy.QtTest import QTest
from mantid.api import AlgorithmFactoryImpl
-from mantid.py3compat.mock import Mock, patch, call
+from unittest.mock import Mock, patch, call
from mantidqt.utils.qt.testing import (select_item_in_combo_box,
select_item_in_tree, start_qapplication)
from mantidqt.widgets.algorithmselector.model import AlgorithmSelectorModel
diff --git a/qt/python/mantidqt/widgets/algorithmselector/widget.py b/qt/python/mantidqt/widgets/algorithmselector/widget.py
index f09a4be91d438d71d60d50756ba79b46b9e1d293..04efba951631baaab6a0f58c8f031b4e12a5231e 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/widget.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
import re
import qtpy
diff --git a/qt/python/mantidqt/widgets/codeeditor/completion.py b/qt/python/mantidqt/widgets/codeeditor/completion.py
index 5635af79038604bb99d4af10b25b48d3fd579c20..d91b96ceb57dfaf4e391ac3e6da33d33b3f06e50 100644
--- a/qt/python/mantidqt/widgets/codeeditor/completion.py
+++ b/qt/python/mantidqt/widgets/codeeditor/completion.py
@@ -25,8 +25,6 @@ For these reasons it was agreed jedi would be dropped, possibly
revisiting when we move to Python 3.
"""
-from __future__ import (absolute_import, unicode_literals)
-
import ast
from collections import namedtuple
import contextlib
@@ -38,12 +36,8 @@ import warnings
from lib2to3.pgen2.tokenize import detect_encoding
from io import BytesIO
-from six import PY2, string_types
-if PY2: # noqa
- from inspect import getargspec as getfullargspec
-else: # noqa
- from inspect import getfullargspec
+from inspect import getfullargspec
from mantidqt.widgets.codeeditor.editor import CodeEditor
@@ -181,7 +175,7 @@ def generate_call_tips(definitions, prepend_module_name=None):
else:
module_name = prepend_module_name
if inspect.isfunction(py_object) or inspect.isbuiltin(py_object):
- if isinstance(module_name, string_types):
+ if isinstance(module_name, str):
call_tips.append(module_name + '.' + name + get_function_spec(py_object))
else:
call_tips.append(name + get_function_spec(py_object))
@@ -199,7 +193,7 @@ def generate_call_tips(definitions, prepend_module_name=None):
call_tip = name + '.' + attr + get_function_spec(f_attr)
else:
call_tip = name + '.' + attr
- if isinstance(module_name, string_types):
+ if isinstance(module_name, str):
call_tips.append(module_name + '.' + call_tip)
except Exception:
continue
diff --git a/qt/python/mantidqt/widgets/codeeditor/editor.py b/qt/python/mantidqt/widgets/codeeditor/editor.py
index 24e8139123b5ba5a14ecc291e80deedf0b15e3de..04c71cebc17bb0f83980be7f83ab4dec7bad9572 100644
--- a/qt/python/mantidqt/widgets/codeeditor/editor.py
+++ b/qt/python/mantidqt/widgets/codeeditor/editor.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# 3rd party imports
# local imports
diff --git a/qt/python/mantidqt/widgets/codeeditor/errorformatter.py b/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
index 41e0dcf9a694679204272fabe57a7cdfc263fd5b..4096c9ed4dbf2e93faa5f92c336bc305d633121c 100644
--- a/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
@@ -7,13 +7,10 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import traceback
# third-party imports
-import six
class ErrorFormatter(object):
@@ -34,9 +31,4 @@ class ErrorFormatter(object):
if stack is not None:
lines.extend(traceback.format_list(stack))
- if six.PY2:
- # traceback always returns a list of ascii string objects
- # encoded as utf-8 we want unicode to be consistent
- # with using unicode_literals across the codebase
- lines = map(lambda x: x.decode('utf-8') , lines)
return ''.join(lines)
diff --git a/qt/python/mantidqt/widgets/codeeditor/execution.py b/qt/python/mantidqt/widgets/codeeditor/execution.py
index c78a7ce1fed8e53e85cd00da675be969544fda84..d5457fc4896617a68c48736ed585a2be54df29b2 100644
--- a/qt/python/mantidqt/widgets/codeeditor/execution.py
+++ b/qt/python/mantidqt/widgets/codeeditor/execution.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import absolute_import, unicode_literals
-
import __future__
import ast
diff --git a/qt/python/mantidqt/widgets/codeeditor/interpreter.py b/qt/python/mantidqt/widgets/codeeditor/interpreter.py
index 862db7ebf7ecfe30f27596948ab520252873a2f1..937dd2c80b72e7e9ef9394d7091d0fccd7c087c9 100644
--- a/qt/python/mantidqt/widgets/codeeditor/interpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/interpreter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import (absolute_import, unicode_literals)
-
import io
import os.path
import sys
diff --git a/qt/python/mantidqt/widgets/codeeditor/multifileinterpreter.py b/qt/python/mantidqt/widgets/codeeditor/multifileinterpreter.py
index 3def7f5f9db1b9594cad38d07b5942a111b6530e..88eac6cec6e5d8afc97d06233eb6aecd1be70ab4 100644
--- a/qt/python/mantidqt/widgets/codeeditor/multifileinterpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/multifileinterpreter.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import os.path as osp
@@ -69,7 +67,7 @@ class MultiPythonFileInterpreter(QWidget):
if filename is None:
title = NEW_TAB_TITLE
i = 1
- while title in self.tab_titles:
+ while title in self.stripped_tab_titles:
title = "{} ({})".format(NEW_TAB_TITLE, i)
i += 1
return title, title
@@ -77,8 +75,13 @@ class MultiPythonFileInterpreter(QWidget):
return osp.basename(filename), filename
@property
- def tab_titles(self):
- return [self._tabs.tabText(i).rstrip('*') for i in range(self.editor_count)]
+ def stripped_tab_titles(self):
+ tab_text = [self._tabs.tabText(i) for i in range(self.editor_count)]
+ tab_text = [txt.rstrip('*') for txt in tab_text]
+ # Some DEs (such as KDE) will automatically assign keyboard shortcuts using the Qt & annotation
+ # see Qt Docs - qtabwidget#addTab
+ tab_text = [txt.replace('&', '') for txt in tab_text]
+ return tab_text
def closeEvent(self, event):
self.deleteLater()
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/__init__.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/__init__.py
index 0fb72b0143feabc37340826351939db3450f273e..5d9ba75dbc79786691ecb615c855a0483050425b 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/__init__.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_presenter.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_presenter.py
index 1fe3d36987c3e0276570af1cbc2b46706a914b4a..2d2c99b0c602770059d966570b2966b66d60faa7 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_presenter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import os
from mantid.kernel import logger
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_view.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_view.py
index d8fdca3e96a187e93554f299a9cea582a09df3fe..4981f50c8f5230dd7de0686d08d8380df11866fa 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_view.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QColor
from qtpy.QtWidgets import QAction, QHBoxLayout, QMenu, QPushButton, QSizePolicy, QTabWidget, QWidget
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/__init__.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/__init__.py
index 0fb72b0143feabc37340826351939db3450f273e..5d9ba75dbc79786691ecb615c855a0483050425b 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
index 58c499172691776038f305b9410de1a09b1e609c..b4ec7fbe3f34c762cb8df9702f89f5a77a6d002c 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
@@ -5,12 +5,10 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import os
from unittest import TestCase
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.testing.mocks.mock_qt import MockQWidget
from mantidqt.utils.testing.strict_mock import StrictPropertyMock
from mantidqt.widgets.codeeditor.tab_widget.codeeditor_tab_presenter import CodeEditorTabPresenter
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_view.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_view.py
index 09a382cd30deac37d6d437b1fb13b94876fb7d0b..f9df768897c8486f06b6c52d2de45d8cdda45af1 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_view.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import unittest
from qtpy.QtWidgets import QAction, QApplication, QWidget
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_codeeditor.py b/qt/python/mantidqt/widgets/codeeditor/test/test_codeeditor.py
index d0a78c40f4ac9149487afbe6f6b643d794bb7946..a5a11e35bd53e8e8af5e5a4777514f6ecd45cc18 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_codeeditor.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_codeeditor.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
import unittest
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py b/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py
index ef1effd4bc699d6b7bc0eb330c1e19a48514323f..edc7fc1a7d7094c3db75b82dc42b7b66e64fe034 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import re
import unittest
@@ -14,7 +12,7 @@ import matplotlib.pyplot as plt # noqa
import numpy as np # noqa
from mantid.simpleapi import Rebin # noqa # needed so sys.modules can pick up Rebin
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.codeeditor.completion import (CodeCompleter, generate_call_tips, get_function_spec,
get_builtin_argspec, get_module_import_alias)
from testhelpers import assertRaisesNothing
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
index b4a5b3198b4970440f8428ed66667ea74c94cedd..886056a2f279bcfdfdd7d8c324328adb81c05f8f 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
@@ -7,15 +7,12 @@
#
# This file is part of the mantidqt package
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import sys
import traceback
import unittest
# third-party imports
-import six
# local imports
from mantidqt.widgets.codeeditor.errorformatter import ErrorFormatter
@@ -71,24 +68,6 @@ foo()
for produced, expected in zip(error_lines, expected_lines):
self.assertRegexpMatches(produced, expected)
- def test_errors_containing_unicode_produce_expected_value_in_python2(self):
- if not six.PY2:
- # everything is already unicode in python > 2
- return
- try:
- exec("é =")
- except SyntaxError:
- exc_type, exc_value = sys.exc_info()[:2]
- formatter = ErrorFormatter()
- error = formatter.format(exc_type, exc_value, None)
-
- expected = """ File "<string>", line 1
- é =
- ^
-SyntaxError: invalid syntax
-"""
- self.assertEqual(expected, error)
-
if __name__ == "__main__":
unittest.main()
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
index ac36b915c7368553af72efba26a90393113c1d22..660417454da0c46d361e794c273ebc6a0c03a807 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
@@ -8,8 +8,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import sys
import traceback
@@ -19,8 +17,8 @@ import unittest
from qtpy.QtCore import QCoreApplication, QObject
# local imports
-from mantid.py3compat import StringIO
-from mantid.py3compat.mock import patch, Mock
+from io import StringIO
+from unittest.mock import patch, Mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.widgets.codeeditor.execution import PythonCodeExecution, _get_imported_from_future
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py
index 4596e2cf32352a350824c3b2074eff689c51d147..35b83d55ebed39c8699690c376c6834a0098476e 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py
@@ -7,11 +7,9 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.widgets.codeeditor.interpreter import PythonFileInterpreter
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter_view.py b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter_view.py
index b4583e98c190933b4e3fbbae96033416eafb0de8..022563dbf3ce6d43d03653689c2ff5dd42da30f0 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter_view.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter_view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
index 0df872acaf64b3f0afe092d6a45e0f3d9a37d732..e449aab996cb1da794689228a6400d62227be526 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
@@ -7,11 +7,9 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.qt.testing.qt_widget_finder import QtWidgetFinder
from mantidqt.widgets.codeeditor.multifileinterpreter import MultiPythonFileInterpreter
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter_view.py b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter_view.py
index 4d33075dffb508e06d3f99ca88efcd27037c37a3..adc3ba40d8b2ce2a0cd2df2932a9f4285c99d759 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter_view.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter_view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from qtpy.QtWidgets import QApplication
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_scriptcompatibility.py b/qt/python/mantidqt/widgets/codeeditor/test/test_scriptcompatibility.py
index 3fa0ce52b3e741aeb4f0ab052e7b1a4b528032e1..2c9321e49acef62aecd7868c3a9ee208084bb813 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_scriptcompatibility.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_scriptcompatibility.py
@@ -10,7 +10,7 @@
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.codeeditor.scriptcompatibility import (mantid_api_import_needed,
mantid_algorithm_used_without_import)
diff --git a/qt/python/mantidqt/widgets/colorbar/colorbar.py b/qt/python/mantidqt/widgets/colorbar/colorbar.py
index 6c0e0c106116c623d955f0d34ce4f91b0371fb41..069b34c7268354dcb3c97bab1e26c0a1707af91f 100644
--- a/qt/python/mantidqt/widgets/colorbar/colorbar.py
+++ b/qt/python/mantidqt/widgets/colorbar/colorbar.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from mantid.plots.utility import mpl_version_info, get_current_cmap
from mantidqt.MPLwidgets import FigureCanvas
from matplotlib.colorbar import Colorbar
diff --git a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py
index eafb8e8d28e51ba79000e101bd1f947776bdaf27..d8326202508ee15c32042cfa1dda054b01c3a5c6 100644
--- a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py
+++ b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import (absolute_import, division, print_function)
-
from enum import Enum
from mantidqt.widgets.embedded_find_replace_dialog.view import EmbeddedFindReplaceDialogView
diff --git a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py
index 68cba2835421ea6962625495081787f4a0782a33..206a263abe1d40426ad67cf9a43bdadbc3b9a00c 100644
--- a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py
+++ b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import (absolute_import, division, print_function)
-
from unittest import TestCase
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.widgets.embedded_find_replace_dialog.presenter import EmbeddedFindReplaceDialog, SearchDirection
from mantidqt.utils.testing.mocks.mock_codeeditor import MockCodeEditor
diff --git a/qt/python/mantidqt/widgets/filefinder/__init__.py b/qt/python/mantidqt/widgets/filefinder/__init__.py
index 7384daca550ed27125b15d156c381e3903386c24..0d7a0619616547f14aedd82ada99966d113d1ae8 100644
--- a/qt/python/mantidqt/widgets/filefinder/__init__.py
+++ b/qt/python/mantidqt/widgets/filefinder/__init__.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
FileFinder = import_qt('..._common', 'mantidqt.widgets.filefinder', 'MWRunFiles')
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/presenter.py b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/presenter.py
index 6c47b0a931e42fef994cf20099bcd86945e69670..510fd8d59e73013c95619a97125f999a7b5a6648 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/presenter.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from .view import AddFunctionDialogView
from mantidqt.interfacemanager import InterfaceManager
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/test/test_addfunctiondialogpresenter.py b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/test/test_addfunctiondialogpresenter.py
index 7d85ad05b81a1f42dd2f2987673c2f9728f2941e..3a4d7099c37f679ca90ebca3397871d122394b31 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/test/test_addfunctiondialogpresenter.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/test/test_addfunctiondialogpresenter.py
@@ -8,7 +8,7 @@
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.widgets.fitpropertybrowser.addfunctiondialog.presenter import AddFunctionDialog
from testhelpers import assertRaisesNothing
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/view.py b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/view.py
index b8d172d448fe27e019f1dca9aaa4335ae87bffbe..987b87e04f597d0a6d26f23a231df43c35e67f58 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/view.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt, Signal
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QCompleter, QDialog
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/fitpropertybrowser.py b/qt/python/mantidqt/widgets/fitpropertybrowser/fitpropertybrowser.py
index 2d9c6a67f1346cf7a3e2325c94ebd9bc180685c4..5910630694e6f1ec8a860a35d5d703d718adbf87 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/fitpropertybrowser.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/fitpropertybrowser.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (print_function, absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt, Signal, Slot
import matplotlib.pyplot
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/interactive_tool.py b/qt/python/mantidqt/widgets/fitpropertybrowser/interactive_tool.py
index 9133e99474b47d2be2355dff25bda0ca881047c2..e692ceaa94ae93fdbb90cb02b35fe737e88d2460 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/interactive_tool.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/interactive_tool.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import QObject, Signal, Slot
from mantidqt.plotting.markers import PeakMarker, RangeMarker
diff --git a/qt/python/mantidqt/widgets/instrumentview/__init__.py b/qt/python/mantidqt/widgets/instrumentview/__init__.py
index fea27059e188b62cc03c2664754f8b417ebdcc37..3a8621ded61f42c6b600860ae377e76bf582e438 100644
--- a/qt/python/mantidqt/widgets/instrumentview/__init__.py
+++ b/qt/python/mantidqt/widgets/instrumentview/__init__.py
@@ -20,8 +20,6 @@ You can run this widget independently by for example:
window = InstrumentView(ws)
app.exec_()
"""
-from __future__ import (absolute_import, unicode_literals)
-
# 3rdparty imports
from qtpy import PYQT4
diff --git a/qt/python/mantidqt/widgets/instrumentview/io.py b/qt/python/mantidqt/widgets/instrumentview/io.py
index 880fc2e465a8e4a2376ddb639b85504cb3b9b51e..088ccbb759a9d6ff11d5cce519f97bc367ec08fc 100644
--- a/qt/python/mantidqt/widgets/instrumentview/io.py
+++ b/qt/python/mantidqt/widgets/instrumentview/io.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
-
from mantid.api import AnalysisDataService as ADS
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/widgets/instrumentview/presenter.py b/qt/python/mantidqt/widgets/instrumentview/presenter.py
index 0f0a2fa6e5bbc4c80de9123531423bd1987984b5..e4629aee494d263977602d78249fb51abfbe6f3b 100644
--- a/qt/python/mantidqt/widgets/instrumentview/presenter.py
+++ b/qt/python/mantidqt/widgets/instrumentview/presenter.py
@@ -10,8 +10,6 @@
"""
Contains the presenter for displaying the InstrumentWidget
"""
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.widgets.observers.ads_observer import WorkspaceDisplayADSObserver
from mantidqt.widgets.observers.observing_presenter import ObservingPresenter
from .view import InstrumentView
diff --git a/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_io.py b/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_io.py
index c59d7b2fb25214c3102a6c83a24f08378df82140..3e34fe62d2e42b864537b85c50102bd5ee90f802 100644
--- a/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_io.py
+++ b/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_io.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantidqt.project.encoderfactory import EncoderFactory
diff --git a/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_view.py b/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_view.py
index 74bb51eab5d09daba98cb4e67aa929f343acf207..8e5e88fe1b723631124b868ef17dff8bce80048d 100644
--- a/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_view.py
+++ b/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import, unicode_literals
-
import unittest
from qtpy.QtWidgets import QApplication
diff --git a/qt/python/mantidqt/widgets/instrumentview/view.py b/qt/python/mantidqt/widgets/instrumentview/view.py
index 36ca948edd99e30d66be9291471d0bf0ed464746..252f6792f40eaf4bfd4d599483d5dd4b3c96d851 100644
--- a/qt/python/mantidqt/widgets/instrumentview/view.py
+++ b/qt/python/mantidqt/widgets/instrumentview/view.py
@@ -10,8 +10,6 @@
"""
Contains the Python wrapper class for the C++ instrument widget
"""
-from __future__ import (absolute_import, unicode_literals)
-
# 3rdparty imports
from qtpy.QtCore import Qt, Signal, Slot
from qtpy.QtWidgets import QVBoxLayout, QWidget
diff --git a/qt/python/mantidqt/widgets/jobtreeview/__init__.py b/qt/python/mantidqt/widgets/jobtreeview/__init__.py
index 52124cdf06bfd82a39c052057380e47ccbf14a2f..ac5f84908ad26870e191ef0937aac57d68ba4050 100644
--- a/qt/python/mantidqt/widgets/jobtreeview/__init__.py
+++ b/qt/python/mantidqt/widgets/jobtreeview/__init__.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
Cell = import_qt('..._common', 'mantidqt.widgets.jobtreeview', 'Cell')
diff --git a/qt/python/mantidqt/widgets/jupyterconsole.py b/qt/python/mantidqt/widgets/jupyterconsole.py
index c5aa0d961c943e8ee454b05b778919ba2c7581b6..8b2c65657320c3906144c7a804f36ba2aac5612a 100644
--- a/qt/python/mantidqt/widgets/jupyterconsole.py
+++ b/qt/python/mantidqt/widgets/jupyterconsole.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import absolute_import
-
# system imports
import types
@@ -26,7 +24,7 @@ except ImportError:
from IPython.qt.inprocess import QtInProcessKernelManager
# local imports
-from mantid.py3compat import getfullargspec
+from inspect import getfullargspec
from mantidqt.utils.asynchronous import BlockingAsyncTaskWithCallback
diff --git a/qt/python/mantidqt/widgets/manageuserdirectories.py b/qt/python/mantidqt/widgets/manageuserdirectories.py
index 449e0d5cc269f8baf1012fa10e522c0f32eca6a8..79c3a3aff27a5cbd8600ffd49a3121155f2a1b1d 100644
--- a/qt/python/mantidqt/widgets/manageuserdirectories.py
+++ b/qt/python/mantidqt/widgets/manageuserdirectories.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
ManageUserDirectories = import_qt('.._common', 'mantidqt.widgets', 'ManageUserDirectories')
diff --git a/qt/python/mantidqt/widgets/messagedisplay.py b/qt/python/mantidqt/widgets/messagedisplay.py
index 7c413883acfcd6faf714ba5a76dc4fe917174891..843c3985339f7224ada9429cad337496710e1baa 100644
--- a/qt/python/mantidqt/widgets/messagedisplay.py
+++ b/qt/python/mantidqt/widgets/messagedisplay.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtWidgets import QAction, QActionGroup
from qtpy.QtGui import QFont
diff --git a/qt/python/mantidqt/widgets/observers/ads_observer.py b/qt/python/mantidqt/widgets/observers/ads_observer.py
index a1e3372b99fa7cd2c2907adcd58875b9e6b42eba..90e2a2f288d1fb838be04496a57cc58394f0ecb1 100644
--- a/qt/python/mantidqt/widgets/observers/ads_observer.py
+++ b/qt/python/mantidqt/widgets/observers/ads_observer.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
import sys
from functools import wraps
diff --git a/qt/python/mantidqt/widgets/observers/observing_presenter.py b/qt/python/mantidqt/widgets/observers/observing_presenter.py
index 37f1dd12913484712cacade1101abad8e4ab3d89..de6929d82806c5128a79586dc1ef368dfbaf607a 100644
--- a/qt/python/mantidqt/widgets/observers/observing_presenter.py
+++ b/qt/python/mantidqt/widgets/observers/observing_presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
class ObservingPresenter(object):
"""
diff --git a/qt/python/mantidqt/widgets/observers/observing_view.py b/qt/python/mantidqt/widgets/observers/observing_view.py
index ed507045d371a63c94f3c4a4f438f35bbb6caced..52b52d6bbf7396940cddce26fd87648d0cb4be1e 100644
--- a/qt/python/mantidqt/widgets/observers/observing_view.py
+++ b/qt/python/mantidqt/widgets/observers/observing_view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
class ObservingView(object):
"""
diff --git a/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py b/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py
index 6c3bf71b62883ad427581270f23680f749836235..923c6edb690b5b209e7b6bf7d7baa9223b1a45f2 100644
--- a/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py
+++ b/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.observers.ads_observer import WorkspaceDisplayADSObserver
diff --git a/qt/python/mantidqt/widgets/observers/test/test_observing_presenter.py b/qt/python/mantidqt/widgets/observers/test/test_observing_presenter.py
index 1fb7db9de19f7dc7761a0cdcd41a1bb561abe545..3dbf84c398d7768d94a4a3890a47d21ada728696 100644
--- a/qt/python/mantidqt/widgets/observers/test/test_observing_presenter.py
+++ b/qt/python/mantidqt/widgets/observers/test/test_observing_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantidqt.utils.testing.mocks.mock_observing import MockObservingPresenter
diff --git a/qt/python/mantidqt/widgets/observers/test/test_observing_view.py b/qt/python/mantidqt/widgets/observers/test/test_observing_view.py
index aba39e6fdec8274f2ff4a57928cb42fddf1da591..c83cd90e45f54dca43daa2df4b7d52077f540bfc 100644
--- a/qt/python/mantidqt/widgets/observers/test/test_observing_view.py
+++ b/qt/python/mantidqt/widgets/observers/test/test_observing_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantidqt.utils.testing.mocks.mock_observing import MockObservingView
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/__init__.py
index 87763f237517340b803315a527b1b1467882c731..58ef4a89010ebc610f86986c7e546f9a17549d5e 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/__init__.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib.axes import ErrorbarContainer
from matplotlib.collections import QuadMesh
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py
index 40d396400dae13c796656567142050a462867304..96bd7a51cb88ea107b07c806f0b42dc9860e7b4d 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
class AxProperties(dict):
"""
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/presenter.py
index 343ea46b10956118aefe0bd30290e556a989640a..982a686cd6f4e91b40ace8b63e6ef3cf1cf28809 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.widgets.plotconfigdialog import generate_ax_name, get_axes_names_dict
from mantidqt.widgets.plotconfigdialog.axestabwidget import AxProperties
from mantidqt.widgets.plotconfigdialog.axestabwidget.view import AxesTabWidgetView
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py
index 9f4698acb99d3e2ac3d2b6bc7e9971e06a66b7e4..ed9b8188047bc5b46b862c405347e0f03dee18fa 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py
@@ -6,15 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib import use as mpl_use
mpl_use('Agg') # noqa
from matplotlib.pyplot import figure
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.plotconfigdialog import generate_ax_name, get_axes_names_dict
from mantidqt.widgets.plotconfigdialog.axestabwidget import AxProperties
from mantidqt.widgets.plotconfigdialog.axestabwidget.presenter import AxesTabWidgetPresenter as Presenter
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/view.py
index 7e923bcbee7d42f0a58199a51f5cd674134b7db2..c8924fb4bb1cbc769be71eb4a586ffe8a301e041 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QDoubleValidator
from qtpy.QtWidgets import QWidget, QMessageBox
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/colorselector.py b/qt/python/mantidqt/widgets/plotconfigdialog/colorselector.py
index dc7db8c600dfa748b3ffb3c7a630940ed2acfb77..20916eb4366fd304e19e4d575a2748969a4e3859 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/colorselector.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/colorselector.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantid.plots.legend import convert_color_to_hex
from matplotlib import rcParams
from qtpy.QtCore import QRegExp
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/__init__.py
index 343a8a03bd77e0de0a0cbd834d15dc3fc8996730..1acaabb712c48710fe93aa1c3ee22390781d234f 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/__init__.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib import rcParams
from matplotlib.axes import ErrorbarContainer
from matplotlib.lines import Line2D
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/view.py
index b63e862e61e24c79f91883373d36597862d9d85c..c9ac5f9f38458da02398597348fa7951fa816a1d 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/view.py
index 8e0e7362e71e19ab11e23aafc9398c8ceb00cd0a..a762c27b899d1ff4c8c1762eacc214619a384e56 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/view.py
index 20351fcff3e87aba79c4e2f1549df7f7cfbf8678..b8a39c9bce8951c93afabf69f3db08511c28ce38 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/presenter.py
index 98b15e08b255e2954ad962ae3cd36b56f139ee35..56724d8c1f2662c7f904cdf4b48d3fec2e564e35 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib.collections import PolyCollection
from matplotlib.lines import Line2D
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curveproperties.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curveproperties.py
index 757762013dcb650491a45f0d7fecfa0bddab0655..da4b0243a00a5bac590eaa2716955ccdd3a287ab 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curveproperties.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curveproperties.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib import use as mpl_use
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py
index d06247161250e557fcac4b443fb1075cd3458dd4..eedcd97191f7dd3fe85f23d7c1b3b6dde550b424 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib import use as mpl_use
@@ -19,7 +17,7 @@ from numpy import array_equal
from mantid.simpleapi import CreateWorkspace
from mantid.plots import datafunctions
from mantid.plots.utility import MantidAxType
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.widgets.plotconfigdialog.colorselector import convert_color_to_hex
from mantidqt.widgets.plotconfigdialog.curvestabwidget import CurveProperties
from mantidqt.widgets.plotconfigdialog.curvestabwidget.presenter import (
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/view.py
index 6b40e0d88cea00a04c2ee99e0c1e7d8b61b1b4fc..25ad138fa858f9daa29f4aae9ac1f0f61b04c06b 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/__init__.py
index 7b7731026419baaaed080f80b4e0b7b89b9f5043..40c77756bab3b595649bce4498ea5ed60cff94a0 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/__init__.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib.collections import QuadMesh
from matplotlib.colors import LogNorm
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/presenter.py
index 0ccbe31e90d0b258eb06938c419f1f63e174c185..a635b873fc9a103cb27531a7d7c761d8fb05bbda 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantid.plots.datafunctions import update_colorbar_scale
from mantidqt.utils.qt import block_signals
from mantidqt.widgets.plotconfigdialog import generate_ax_name, get_images_from_fig
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/test_imagestabwidgetpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/test_imagestabwidgetpresenter.py
index 4190ff43b052c015e0f0859d8717ac8675fa3101..2134a1acd5fc218a422a413d3332e98475597139 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/test_imagestabwidgetpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/test_imagestabwidgetpresenter.py
@@ -15,7 +15,7 @@ from matplotlib.pyplot import figure
from numpy import linspace, random
from mantid.plots import MantidAxes # register mantid projection # noqa
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantid.simpleapi import CreateWorkspace
from mantidqt.widgets.plotconfigdialog.imagestabwidget import ImageProperties
from mantidqt.widgets.plotconfigdialog.imagestabwidget.presenter import ImagesTabWidgetPresenter
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/view.py
index 8dfa5554b0ba3d9234bee14b29cec6fc54ff4ac1..07fafd71878929ae16a694cb44d7d8ca0196a714 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import numpy as np
from matplotlib.colors import LogNorm, Normalize
from matplotlib import cm
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/view.py
index 3daba515629ce8c4da9a80632f565f0a4e613bca..e4ea50b4889f99128aa463208fceeeb92decd7ba 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt, QSize
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialog
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
index 62717edb75196f8bdd5480af446574f26988605a..a6ebb26d6957ec820032f464f4715580f65067bb 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantid.plots.legend import LegendProperties
from mantidqt.widgets.plotconfigdialog.legendtabwidget.view import LegendTabWidgetView
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
index 320506a1cedd5196ae9e665819d8ffa32e5c6c3e..f414d3cd65368421c86aada8dc123ae88bc56dec 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/presenter.py
index 547f4ef1ed51f59d74ab33a0bfcd72af491f2d24..89455efc511e9a7990db58ab5901330c7a79121d 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.widgets.plotconfigdialog import curve_in_figure, image_in_figure, legend_in_figure
from mantidqt.widgets.plotconfigdialog.view import PlotConfigDialogView
from mantidqt.widgets.plotconfigdialog.axestabwidget.presenter import AxesTabWidgetPresenter
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_apply_all_properties.py b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_apply_all_properties.py
index 84eac3ac2e35bf48a42059fbd389b31779639b9e..755f292774e0dbda1fce817efc66cf335e3f7b47 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_apply_all_properties.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_apply_all_properties.py
@@ -16,7 +16,7 @@ from matplotlib.patches import BoxStyle
from matplotlib.pyplot import figure
from mantid.plots.legend import LegendProperties
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.widgets.plotconfigdialog.colorselector import convert_color_to_hex
from mantidqt.widgets.plotconfigdialog.axestabwidget import AxProperties
from mantidqt.widgets.plotconfigdialog.imagestabwidget import ImageProperties
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py
index 3e003acfd5857ddf37eabacd53b43a243bcc1c4c..648a178c1c73c85a70cd054c073957a0d5ebfdee 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py
@@ -6,15 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib import use as mpl_use
mpl_use('Agg') # noqa
from matplotlib.pyplot import figure
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.widgets.plotconfigdialog.presenter import PlotConfigDialogPresenter
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/view.py
index c15bb639b02b74bec643d838cd11e0d46b19e5d3..6e71d2df0f65f9e273682cb992a0cd9423f27c88 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialog
diff --git a/qt/python/mantidqt/widgets/samplelogs/model.py b/qt/python/mantidqt/widgets/samplelogs/model.py
index 8b20520ada90b03c3fb165c1b2310e5f496136d9..a98feafc801aeea21b5359cc82d4e1072de16a9e 100644
--- a/qt/python/mantidqt/widgets/samplelogs/model.py
+++ b/qt/python/mantidqt/widgets/samplelogs/model.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import (BoolTimeSeriesProperty,
FloatTimeSeriesProperty, Int32TimeSeriesProperty,
Int64TimeSeriesProperty, StringTimeSeriesProperty, logger)
diff --git a/qt/python/mantidqt/widgets/samplelogs/presenter.py b/qt/python/mantidqt/widgets/samplelogs/presenter.py
index 5498c3fc910ab96acfabd4c5efa5f04a24fa6937..bab138a7088af8f28ea8e353ac31333655bfd904 100644
--- a/qt/python/mantidqt/widgets/samplelogs/presenter.py
+++ b/qt/python/mantidqt/widgets/samplelogs/presenter.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from .model import SampleLogsModel
from .view import SampleLogsView
diff --git a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_model.py b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_model.py
index 19e6c582a4b0c3ee975c48f9a1a6522e0216fe81..022452e71b781a9e7740144bb2816bbc766a33dd 100644
--- a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_model.py
+++ b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import LoadEventNexus, CreateMDWorkspace
from mantidqt.widgets.samplelogs.model import SampleLogsModel
diff --git a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py
index e373f06c99ecae1a57a38b794f2a0eaf49e407ea..570d8ae0bfe53a513fbd7939648fc7bfcaf74ff1 100644
--- a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py
+++ b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py
@@ -7,13 +7,11 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import matplotlib
matplotlib.use('Agg') # noqa: E402
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.samplelogs.model import SampleLogsModel
from mantidqt.widgets.samplelogs.presenter import SampleLogs
from mantidqt.widgets.samplelogs.view import SampleLogsView
diff --git a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_view.py b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_view.py
index 72b439918dceadfe4e1214aaf98ec9500ba0dd34..b71e9ce83136bd31044daa16824849fc17b2059b 100644
--- a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_view.py
+++ b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import unittest
import matplotlib as mpl
diff --git a/qt/python/mantidqt/widgets/samplelogs/view.py b/qt/python/mantidqt/widgets/samplelogs/view.py
index 7c6299a265f280901c4c34ea4d6e1b220703f84f..6bad261fc1f6aa263e5769c393d2688640c63557 100644
--- a/qt/python/mantidqt/widgets/samplelogs/view.py
+++ b/qt/python/mantidqt/widgets/samplelogs/view.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QTableView, QHBoxLayout, QVBoxLayout,
QAbstractItemView, QFormLayout, QLineEdit,
QHeaderView, QLabel, QCheckBox, QMenu,
diff --git a/qt/python/mantidqt/widgets/scriptrepository.py b/qt/python/mantidqt/widgets/scriptrepository.py
index b4b1182608ba9a769a4538237b675e979c14b542..9a9883e6bb6d1fa794622cb0cbf582015eaf8e7c 100644
--- a/qt/python/mantidqt/widgets/scriptrepository.py
+++ b/qt/python/mantidqt/widgets/scriptrepository.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py b/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py
index 9afa7bd0523d1aa4ad684f46e741cd9919213d63..d0fa58871a048fedcc2eafbd4381f31251e3a243 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py
@@ -7,10 +7,9 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QLabel, QPushButton, QSlider, QDoubleSpinBox, QSpinBox
from qtpy.QtCore import Qt, Signal
-from mantid.py3compat.enum import Enum
+from enum import Enum
class State(Enum):
diff --git a/qt/python/mantidqt/widgets/sliceviewer/model.py b/qt/python/mantidqt/widgets/sliceviewer/model.py
index 43b76f1a092787f932e2b1d724ea8136c8277bf7..cb94985dcc2a15ce92c8078665f6ca9345c4c102 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/model.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/model.py
@@ -7,11 +7,10 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from mantid.plots.datafunctions import get_indices
from mantid.api import MatrixWorkspace, MultipleExperimentInfos
from mantid.simpleapi import BinMD
-from mantid.py3compat.enum import Enum
+from enum import Enum
import numpy as np
diff --git a/qt/python/mantidqt/widgets/sliceviewer/presenter.py b/qt/python/mantidqt/widgets/sliceviewer/presenter.py
index c82acf7910bb4988e0b8b61422ab60a9999de3d1..45f2716e43392fad249bc4e29e0b2be98ccfc762 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/presenter.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/presenter.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from .model import SliceViewerModel, WS_TYPE
from .view import SliceViewerView
import mantid.api
diff --git a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py
index 4c0916b97e885c1fa9b0ac12e8b42678500335e6..b1302a3a58cc2683434a498dc4bb45a06ee5a50c 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateMDHistoWorkspace, CreateWorkspace, CreateMDWorkspace, FakeMDEventData
from mantidqt.widgets.sliceviewer.model import SliceViewerModel, WS_TYPE
from numpy.testing import assert_equal, assert_allclose
diff --git a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
index 1b807d4d453899cc4ad39ac7b2afdfef258b96a5..6398948e75727cc36727b07ed5de865b762191a2 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
@@ -7,14 +7,12 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import matplotlib
matplotlib.use('Agg') # noqa: E402
import unittest
import mantid.api
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.sliceviewer.model import SliceViewerModel, WS_TYPE
from mantidqt.widgets.sliceviewer.presenter import SliceViewer
from mantidqt.widgets.sliceviewer.view import SliceViewerView
diff --git a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_view.py b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_view.py
index 0bf01b069e8a0421af1e98984128749c72d323ce..f30b8811cbd8b8cc584dd575cad6c90679a25da6 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_view.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import unittest
import matplotlib as mpl
diff --git a/qt/python/mantidqt/widgets/sliceviewer/toolbar.py b/qt/python/mantidqt/widgets/sliceviewer/toolbar.py
index c3e1191cb170bd4d69708115e39b038a3c96e782..0de17f733dc82e1772aa808d4e1f8b5e16f85fcc 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/toolbar.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/toolbar.py
@@ -8,8 +8,7 @@
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
from mantidqt.MPLwidgets import NavigationToolbar2QT
from mantidqt.icons import get_icon
from qtpy.QtCore import Signal, Qt, QSize
diff --git a/qt/python/mantidqt/widgets/sliceviewer/view.py b/qt/python/mantidqt/widgets/sliceviewer/view.py
index 50d6307d4dcbf96ba282de444a2f4b2ef4150413..67e27a477c0315ac8c26b79888e16029bde94281 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/view.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from matplotlib import gridspec
from matplotlib.figure import Figure
from matplotlib.transforms import Bbox, BboxTransform
diff --git a/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py b/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py
index a0cd07b36a6e1d789dfbc55d10cf2d04b0ce2c49..99c611413fbd7954e8461784d84c6d31717db2d1 100644
--- a/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py
+++ b/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py
@@ -13,7 +13,7 @@ matplotlib.use('AGG') # noqa
from numpy import zeros
from mantid.api import AnalysisDataService, WorkspaceFactory
-from mantid.py3compat.mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, Mock, patch
from mantid.simpleapi import CreateSampleWorkspace, CreateWorkspace
from mantidqt.plotting.functions import plot
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/widgets/test/test_fitpropertybrowserbase.py b/qt/python/mantidqt/widgets/test/test_fitpropertybrowserbase.py
index 0bbb1e0b91eba735da62c74c713a08110079fe51..c679e41b748d90cf15bcdd32640c27483dfe2112 100644
--- a/qt/python/mantidqt/widgets/test/test_fitpropertybrowserbase.py
+++ b/qt/python/mantidqt/widgets/test/test_fitpropertybrowserbase.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import platform
import sys
import unittest
diff --git a/qt/python/mantidqt/widgets/test/test_functionbrowser.py b/qt/python/mantidqt/widgets/test/test_functionbrowser.py
index 5cf6660a9f7a687280d80cc8dd7f685bdb3bfa7f..7335afe66e00fbc415694ddfa868a056e368aecd 100644
--- a/qt/python/mantidqt/widgets/test/test_functionbrowser.py
+++ b/qt/python/mantidqt/widgets/test/test_functionbrowser.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from qtpy.QtWidgets import QApplication
@@ -13,7 +12,7 @@ from qtpy.QtTest import QTest
from mantid import FrameworkManager, FunctionFactory
from mantid.fitfunctions import FunctionWrapper
-from mantid.py3compat.mock import MagicMock, call
+from unittest.mock import MagicMock, call
from mantidqt.utils.qt.testing.gui_window_test import (GuiWindowTest, not_on_windows, get_child, click_on)
from mantidqt.widgets.functionbrowser import FunctionBrowser
diff --git a/qt/python/mantidqt/widgets/test/test_jupyterconsole.py b/qt/python/mantidqt/widgets/test/test_jupyterconsole.py
index 588df0fd83de3d23c608276aa47de4eba741df39..a1b84668154ea983b88bf2faedb03b3e9d6694f8 100644
--- a/qt/python/mantidqt/widgets/test/test_jupyterconsole.py
+++ b/qt/python/mantidqt/widgets/test/test_jupyterconsole.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
# system imports
# import readline (if available) before QApplication starts to avoid segfault with IPython 5 and Python 3
try:
diff --git a/qt/python/mantidqt/widgets/test/test_messagedisplay.py b/qt/python/mantidqt/widgets/test/test_messagedisplay.py
index 7ea86346dccb980a9b017b3524ea70fbcb1bf8d1..ab28aed6d53422b2c9e7254dd880820326890d71 100644
--- a/qt/python/mantidqt/widgets/test/test_messagedisplay.py
+++ b/qt/python/mantidqt/widgets/test/test_messagedisplay.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/python/mantidqt/widgets/test/test_scriptrepository.py b/qt/python/mantidqt/widgets/test/test_scriptrepository.py
index 4cc0bb8e86d8a07594399250e4a13c4e7397edc9..3be7488862cc8db7ec743ee9496597ca4ee24cf5 100644
--- a/qt/python/mantidqt/widgets/test/test_scriptrepository.py
+++ b/qt/python/mantidqt/widgets/test/test_scriptrepository.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/presenter.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/presenter.py
index 14c9052fb712f1760ed06c81e7340ab62e360737..e51c888c9ac9ef3babdda06c3b48752442544c0a 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/presenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib.collections import PolyCollection
from mantid.plots import datafunctions
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py
index b105f6a10f2dd8d2e7665b7edabde3a24caa287b..4370b7d972d02421b34adb29127a111a345e8a8b 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
index 3d1b5c554cc1b679ac8f5d07023a6e06e72d4dcd..586214700bc495129e2d5bbfd6d480ce733f198e 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
@@ -6,15 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib.collections import PolyCollection
from matplotlib.pyplot import figure
from mantid.plots import datafunctions
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.waterfallplotfillareadialog.presenter import WaterfallPlotFillAreaDialogPresenter
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/view.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/view.py
index 84a54916f0b5a2b0725460fb91a56a537a099bac..3108abf11e281faaf1d5262a1fbc41f50fc5d477 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/view.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialog
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py
index d4649f5e6d8bb07eea47f10137cb8dbc8c8b3cb0..b4bf0064ff36baea47116c7d1090b9da96e3ebdd 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/presenter.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/presenter.py
index 10401c4e3e3c5438524408cababa6e7f8def6f7c..8a22ab17dd602af0443ff2d36c7e59a3ab8933c0 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/presenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.widgets.waterfallplotoffsetdialog.view import WaterfallPlotOffsetDialogView
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py
index b105f6a10f2dd8d2e7665b7edabde3a24caa287b..4370b7d972d02421b34adb29127a111a345e8a8b 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py
@@ -5,5 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
index f2c2e1de134f1259d8872fe95095dba80c47fd80..a197b4cb9eba49f10ab3ee18552cab10d0ef5f29 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
@@ -6,14 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib.pyplot import figure
from mantid.plots import MantidAxes # noqa
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.waterfallplotoffsetdialog.presenter import WaterfallPlotOffsetDialogPresenter
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/view.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/view.py
index 5f10de04bc9580e61f026fde3133ffa4fb4b98ee..b4441f6558f75a960fdc5087a81e2e799e4260d6 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/view.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialog
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/__init__.py b/qt/python/mantidqt/widgets/workspacedisplay/__init__.py
index 2a0da4d3236beba7b1c2c7db9aaacf47084f4252..896aed8278b6ac9ec3d58b34e7343ae4d0def834 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/__init__.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/__init__.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
# 3rdparty imports
from qtpy import PYQT4
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/data_copier.py b/qt/python/mantidqt/widgets/workspacedisplay/data_copier.py
index a8e51b624028283099fc17f7cb2566f72b85ef78..a1d50522cdb74416d8f4f1c6aada3600647b06d9 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/data_copier.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/data_copier.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtGui
from qtpy.QtWidgets import QMessageBox
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/model.py
index 159247f38d5b378ca794682dce3682d6408519f5..9aaa549df62b4a7d32b9354d6d20aa2f2de2836e 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/model.py
@@ -8,8 +8,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import MatrixWorkspace
from mantid.dataobjects import EventWorkspace, Workspace2D
from mantidqt.widgets.workspacedisplay.matrix.table_view_model import MatrixWorkspaceTableViewModel, \
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/presenter.py
index b31e8ab22087ee4d989d2b999f2e993a81003359..bca546995f302d83aca83d1f7a917453a6db6f28 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, division, print_function
-
from mantid.plots.utility import MantidAxType
from mantidqt.widgets.observers.ads_observer import WorkspaceDisplayADSObserver
from mantidqt.widgets.workspacedisplay.data_copier import DataCopier
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py
index acdc39da8466a9328a0f60d6b31382d20ffcf0a4..fe8403749c8e5169f7c91e68b6dee1eca284598e 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py
@@ -8,8 +8,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtGui
from qtpy.QtCore import QVariant, Qt, QAbstractTableModel
from enum import Enum
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_io.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_io.py
index 3260175104876fe9ac61263302258006da032421..66e59e648b6a5bf0800fad065881499a27bb035e 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_io.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_io.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import absolute_import
-
import unittest
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py
index db27c672e9941fe2787fe49d0c88d0f4f78dffb5..3fcd61060034291e1dc4242bf0711668e45659a5 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py
@@ -7,11 +7,9 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantid.simpleapi import CreateSampleWorkspace
from mantidqt.utils.testing.mocks.mock_mantid import MockWorkspace
from mantidqt.widgets.workspacedisplay.matrix.model import MatrixWorkspaceDisplayModel
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py
index a77180a93d094ebc055d2f4fb8034a37d0093ad5..7d17e1f2a7b6aa1feb5c8242ff5f02588cd8cd41 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py
@@ -7,13 +7,11 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from qtpy.QtWidgets import QStatusBar
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.utils.testing.mocks.mock_mantid import MockWorkspace
from mantidqt.utils.testing.mocks.mock_matrixworkspacedisplay import MockMatrixWorkspaceDisplayView
from mantidqt.utils.testing.mocks.mock_qt import MockQModelIndex, MockQTableView
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py
index 735478410934f3c71ec27fba3f700fedd218afd6..ffd71c7b7b0f3c401e2ebc7cf22406173ca0c639 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py
@@ -7,15 +7,13 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, absolute_import, division, division, print_function, print_function
-
import unittest
import qtpy
from qtpy import QtCore
from qtpy.QtCore import Qt
-from mantid.py3compat.mock import MagicMock, Mock, call
+from unittest.mock import MagicMock, Mock, call
from mantidqt.utils.testing.mocks.mock_mantid import AXIS_INDEX_FOR_HORIZONTAL, AXIS_INDEX_FOR_VERTICAL, MockMantidAxis, \
MockMantidSymbol, MockMantidUnit, MockSpectrum, MockWorkspace
from mantidqt.utils.testing.mocks.mock_qt import MockQModelIndex
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_view.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_view.py
index 3e6e906b83da15fe3377856e2cf250438f8f1b65..7800c021a016ab229baded1b99dc5d57bb500895 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_view.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/view.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/view.py
index ddca1f42eb15301b57066abc8a26993ed0d59c35..fad62358e4e27b3491ba7fc2bbe6fe2691ac8668 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/view.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from functools import partial
from qtpy import QtGui
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py b/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py
index 410006c5cb5fd0d2927a5d8882317fb5bbe7cad6..a06426ed88f0daa870732e4a6600f68fd8c24ccd 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package.
-from __future__ import absolute_import
class ErrorColumn:
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py b/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py
index 3cdd9b938c1a1865fb495b7b6633a00650ca521f..0d3447ebb8d28c9fdebdc7525a85c7ada3528666 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package.
-from __future__ import absolute_import
class MarkedColumns:
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/model.py b/qt/python/mantidqt/widgets/workspacedisplay/table/model.py
index 99738ce70c2f3954e29dedcaa1a1a4cf299bb215..8d1d5e3f4e3c6b9b3857e9522cb2abc22f82b64d 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/model.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# coding=utf-8
# This file is part of the mantidqt package.
-from __future__ import (absolute_import, division, print_function)
-
from mantid.dataobjects import PeaksWorkspace, TableWorkspace
from mantid.kernel import V3D
from mantid.simpleapi import DeleteTableRows, SortPeaksWorkspace, SortTableWorkspace, StatisticsOfTableWorkspace
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/table/presenter.py
index ebf0f80798eccadd22ab986c91e28b7ea76d2ce4..99326805af8421a213b69489bf67c80881aeb391 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of mantidqt package.
-from __future__ import absolute_import, division, print_function
-
from functools import partial
from qtpy.QtCore import Qt
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_io.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_io.py
index 3f27e21eca97bc43ab3c46b803d89bf6fa947dbd..c84680bf59db79c3436925a60f607a4a42c3a75e 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_io.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_io.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, print_function)
-
import unittest
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_marked_columns.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_marked_columns.py
index 324f2c0ff30a472ff0474a5299803ca784de23b8..6d29940a419b9fecd9c15e03afa291691aba2773 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_marked_columns.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_marked_columns.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from itertools import permutations
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
index fcd8ad23220319424c63246f32038eeb883826ae..a856738438be04e18788a1bd1ad5eadba48bd104 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
@@ -7,13 +7,11 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import functools
import unittest
from mantid.kernel import V3D
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.utils.testing.mocks.mock_mantid import MockWorkspace
from mantidqt.utils.testing.strict_mock import StrictMock
from mantidqt.widgets.workspacedisplay.table.model import TableWorkspaceColumnTypeMapping, TableWorkspaceDisplayModel
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
index 682f09c1820a8a6f0251f6888b28463ac9b635b3..9e80be240af4503143229abbabc4c83aa5a28507 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
@@ -7,13 +7,11 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from qtpy.QtWidgets import QStatusBar
-from mantid.py3compat.mock import Mock, call, patch
+from unittest.mock import Mock, call, patch
from mantidqt.utils.testing.mocks.mock_mantid import MockWorkspace
from mantidqt.utils.testing.mocks.mock_plotlib import MockAx, MockPlotLib
from mantidqt.utils.testing.mocks.mock_qt import MockQModelIndex, MockQSelectionModel
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_view.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_view.py
index c2744fbc89393f7cb701ef2105a401aa1fc7c95a..e51fa582887960dadb686d232630042263e7db4e 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_view.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, print_function)
-
import unittest
from qtpy.QtWidgets import QApplication
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_workbench_table_widget_item.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_workbench_table_widget_item.py
index b21691ebf17459cd03d95c2f8f0c0c65d64ea590..2a9c7ae5cd7e8ab1d7bddab0415dcbc219928e04 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_workbench_table_widget_item.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_workbench_table_widget_item.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from qtpy.QtCore import Qt
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/view.py b/qt/python/mantidqt/widgets/workspacedisplay/table/view.py
index dc7d2874e9a0cc643f3892ab8e5c916dd9cf9a30..971f0b66ccf37a9c7c2971c69eb19a2355ff7113 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/view.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package.
-from __future__ import (absolute_import, division, print_function)
-
import sys
from functools import partial
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/test/test_data_copier.py b/qt/python/mantidqt/widgets/workspacedisplay/test/test_data_copier.py
index b95ab45e14f6f8ad5ff5b99238f9eb0daf8c0211..70b5d28264b1b5bec85b5455e5ff66334a61f172 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/test/test_data_copier.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/test/test_data_copier.py
@@ -7,7 +7,7 @@
# This file is part of the mantid workbench.
from unittest import TestCase
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from qtpy.QtWidgets import QMessageBox
from mantidqt.widgets.workspacedisplay.data_copier import DataCopier
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/test/test_user_notifier.py b/qt/python/mantidqt/widgets/workspacedisplay/test/test_user_notifier.py
index 4a2a244d43df151d98c177de11b6c05d13ec81db..fc903200df9ebec1e4a09707e8c620317d60539d 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/test/test_user_notifier.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/test/test_user_notifier.py
@@ -8,7 +8,7 @@
import sys
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.testing.mocks.mock_qt import MockQStatusBar
from mantidqt.widgets.workspacedisplay.user_notifier import UserNotifier
diff --git a/qt/python/mantidqt/widgets/workspacewidget/algorithmhistorywindow.py b/qt/python/mantidqt/widgets/workspacewidget/algorithmhistorywindow.py
index e811f53c2ffb73ced762f5b015f5ab1e45e6b8ce..1a4366a64ace66490220aedaf00b121578057f8a 100644
--- a/qt/python/mantidqt/widgets/workspacewidget/algorithmhistorywindow.py
+++ b/qt/python/mantidqt/widgets/workspacewidget/algorithmhistorywindow.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/widgets/workspacewidget/mantidtreemodel.py b/qt/python/mantidqt/widgets/workspacewidget/mantidtreemodel.py
index 6dc646142c82dfcf0d8ce20eb03f030d279b5a15..1f8498b6bde987fbdbc9e7ca881540304510a631 100644
--- a/qt/python/mantidqt/widgets/workspacewidget/mantidtreemodel.py
+++ b/qt/python/mantidqt/widgets/workspacewidget/mantidtreemodel.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/widgets/workspacewidget/test/test_workspacetreewidget.py b/qt/python/mantidqt/widgets/workspacewidget/test/test_workspacetreewidget.py
index 18c0a2ad53a1a2a084c1ce409760208a3618a709..9b1187b72fc6b1e484cb0ac6c9437b129355bf0f 100644
--- a/qt/python/mantidqt/widgets/workspacewidget/test/test_workspacetreewidget.py
+++ b/qt/python/mantidqt/widgets/workspacewidget/test/test_workspacetreewidget.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
import unittest
from mantidqt.widgets.workspacewidget.workspacetreewidget import WorkspaceTreeWidget
diff --git a/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py b/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py
index d099ad33ed47a547a15dad98afae709dbaa7835f..2810a33ba806297db3cdb782c59292af052cc022 100644
--- a/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py
+++ b/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
WorkspaceTreeWidget = import_qt('..._common', 'mantidqt.widgets.workspacewidget', 'WorkspaceTreeWidgetSimple')
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentWidget.ui b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentWidget.ui
index 87ce5f4fc24be8be5c7d8acd1319b56240a3c498..4c6d279f7fb766beae8662ffdee86be63185d6da 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentWidget.ui
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentWidget.ui
@@ -75,7 +75,7 @@
</size>
</property>
<property name="text">
- <string>Output Stitch Params</string>
+ <string>Output Stitch Properties</string>
</property>
</widget>
</item>
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp
index bf8ae9f8a0122ace44b4458c1609b75ca2942588..60a9a6fb9c2ae1a31eb2901bd323880d0660b228 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp
@@ -269,7 +269,6 @@ void QtExperimentView::registerExperimentSettingsWidgets(
registerSettingWidget(*m_ui.transStitchParamsEdit, "Params", alg);
registerSettingWidget(*m_ui.transScaleRHSCheckBox, "ScaleRHSWorkspace", alg);
registerSettingWidget(*m_ui.polCorrCheckBox, "PolarizationAnalysis", alg);
- registerSettingWidget(stitchOptionsLineEdit(), "Params", alg);
registerSettingWidget(*m_ui.reductionTypeComboBox, "ReductionType", alg);
registerSettingWidget(*m_ui.summationTypeComboBox, "SummationType", alg);
registerSettingWidget(*m_ui.includePartialBinsCheckBox, "IncludePartialBins",
@@ -277,6 +276,12 @@ void QtExperimentView::registerExperimentSettingsWidgets(
registerSettingWidget(*m_ui.floodCorComboBox, "FloodCorrection", alg);
registerSettingWidget(*m_ui.floodWorkspaceWsSelector, "FloodWorkspace", alg);
registerSettingWidget(*m_ui.debugCheckBox, "Debug", alg);
+
+ registerSettingWidget(stitchOptionsLineEdit(),
+ "Properties to use for stitching the output workspaces "
+ "in Q. Only required for groups containing multiple "
+ "rows. Start typing to see property hints or see "
+ "Stitch1DMany for details.");
}
void QtExperimentView::connectExperimentSettingsWidgets() {
@@ -349,6 +354,12 @@ void QtExperimentView::registerSettingWidget(
setToolTipAsPropertyDocumentation(widget, propertyName, alg);
}
+template <typename Widget>
+void QtExperimentView::registerSettingWidget(Widget &widget,
+ std::string const &tooltip) {
+ widget.setToolTip(QString::fromStdString(tooltip));
+}
+
void QtExperimentView::setToolTipAsPropertyDocumentation(
QWidget &widget, std::string const &propertyName,
const Mantid::API::IAlgorithm_sptr &alg) {
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h
index 285ffe9cf06bc850caee82b2225658e193954a85..2efaf48f3fd0fc80195586c95ac6403f40075e9d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h
@@ -141,6 +141,8 @@ private:
template <typename Widget>
void registerSettingWidget(Widget &widget, std::string const &propertyName,
const Mantid::API::IAlgorithm_sptr &alg);
+ template <typename Widget>
+ void registerSettingWidget(Widget &widget, std::string const &tooltip);
void connectSettingsChange(QLineEdit &edit);
void connectSettingsChange(QComboBox &edit);
void connectSettingsChange(QCheckBox &edit);
diff --git a/qt/widgets/common/test/MWRunFilesTest.py b/qt/widgets/common/test/MWRunFilesTest.py
index f01d47e254d37de0235e48670650efd87b2f12d9..ee9e01e74998b59288e08a8e527c31261a1a056b 100644
--- a/qt/widgets/common/test/MWRunFilesTest.py
+++ b/qt/widgets/common/test/MWRunFilesTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import sys
import unittest
from PyQt4 import QtCore, QtGui
diff --git a/qt/widgets/sliceviewer/test/SliceViewerPythonInterfaceTest.py b/qt/widgets/sliceviewer/test/SliceViewerPythonInterfaceTest.py
index 683242097f5494185352fa9a14ddc25a9811c173..26c70a5f0bc8eb872cd9d961343f5ac25ec6eca9 100644
--- a/qt/widgets/sliceviewer/test/SliceViewerPythonInterfaceTest.py
+++ b/qt/widgets/sliceviewer/test/SliceViewerPythonInterfaceTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import sys
import sys
import os
diff --git a/scripts/AbinsModules/AbinsConstants.py b/scripts/AbinsModules/AbinsConstants.py
index ef9c931b2cd410abf2167171daf1b5b4bbf91303..cecccd7235ac6da8eafc5037e1602eff888e1cb2 100644
--- a/scripts/AbinsModules/AbinsConstants.py
+++ b/scripts/AbinsModules/AbinsConstants.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from scipy import constants
diff --git a/scripts/AbinsModules/AbinsData.py b/scripts/AbinsModules/AbinsData.py
index 9f2136dbe1256059aa804185e7028ec1b6e2953d..a4b57b0fae7e806a9a5f969dd2eae95654ec5547 100644
--- a/scripts/AbinsModules/AbinsData.py
+++ b/scripts/AbinsModules/AbinsData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
diff --git a/scripts/AbinsModules/AbinsTestHelpers.py b/scripts/AbinsModules/AbinsTestHelpers.py
index a1a052e7e9acad531cf8ca4521d9d0cd9f6af9be..f6fc2a952c9d193ae5ab654e978afee50a92e648 100644
--- a/scripts/AbinsModules/AbinsTestHelpers.py
+++ b/scripts/AbinsModules/AbinsTestHelpers.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
diff --git a/scripts/AbinsModules/AtomsData.py b/scripts/AbinsModules/AtomsData.py
index 74b5a0d3e68e934df8ebc966b86a11b7bf417ce3..1b987dd369d67fd1e4ac4ceac4c07618cba03b8d 100644
--- a/scripts/AbinsModules/AtomsData.py
+++ b/scripts/AbinsModules/AtomsData.py
@@ -4,9 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
-import six
import AbinsModules
@@ -52,7 +50,7 @@ class AtomsData(AbinsModules.GeneralData):
# "sort"
sort = item["sort"]
- if not (isinstance(sort, six.integer_types) or np.issubdtype(sort.dtype, np.integer)):
+ if not (isinstance(sort, int) or np.issubdtype(sort.dtype, np.integer)):
raise ValueError("Parameter sort should be integer.")
if sort < 0:
raise ValueError("Parameter sort cannot be negative.")
diff --git a/scripts/AbinsModules/CalculateDWSingleCrystal.py b/scripts/AbinsModules/CalculateDWSingleCrystal.py
index 01d15b67d0989e3f3578d5f9bdae3a042a91c08e..8299c92fd46d7743ba98b812391bbc7f64f5a590 100644
--- a/scripts/AbinsModules/CalculateDWSingleCrystal.py
+++ b/scripts/AbinsModules/CalculateDWSingleCrystal.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
# Abins modules
diff --git a/scripts/AbinsModules/CalculatePowder.py b/scripts/AbinsModules/CalculatePowder.py
index 9448b023d0c2988486593e4bd4761c22c68bb77b..291fe748b16fc3205f0e77e5517b487a9762279f 100644
--- a/scripts/AbinsModules/CalculatePowder.py
+++ b/scripts/AbinsModules/CalculatePowder.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import AbinsModules
from AbinsModules import AbinsParameters
diff --git a/scripts/AbinsModules/CalculateS.py b/scripts/AbinsModules/CalculateS.py
index 9a6bb5eed0452657954e339729b6b04110d3bcca..5b7e3a19422622ee1460747a92359592f60de33c 100644
--- a/scripts/AbinsModules/CalculateS.py
+++ b/scripts/AbinsModules/CalculateS.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import AbinsModules
diff --git a/scripts/AbinsModules/CalculateSingleCrystal.py b/scripts/AbinsModules/CalculateSingleCrystal.py
index 86ed8f595eb41bbcc8a50e2f3c0e44ef03e7b012..6ef6bcb6a83f506bfda4a02a2aab7120c805542d 100644
--- a/scripts/AbinsModules/CalculateSingleCrystal.py
+++ b/scripts/AbinsModules/CalculateSingleCrystal.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
diff --git a/scripts/AbinsModules/DWSingleCrystalData.py b/scripts/AbinsModules/DWSingleCrystalData.py
index 0efbf26b03408fb8555da7c065167f659275889f..cd342fb1f57713478a4c99d7c832079d967878ab 100644
--- a/scripts/AbinsModules/DWSingleCrystalData.py
+++ b/scripts/AbinsModules/DWSingleCrystalData.py
@@ -4,10 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
-import six
-
# Abins modules
import AbinsModules
@@ -28,7 +25,7 @@ class DWSingleCrystalData(AbinsModules.GeneralData):
else:
raise ValueError("Improper value of temperature.")
- if isinstance(num_atoms, six.integer_types) and num_atoms > 0:
+ if isinstance(num_atoms, int) and num_atoms > 0:
self._num_atoms = num_atoms
else:
raise ValueError("Improper number of atoms.")
@@ -71,7 +68,7 @@ class DWSingleCrystalData(AbinsModules.GeneralData):
:param data: Debye-Waller factor to check
:param atom: number of atom
"""
- if not isinstance(atom, six.integer_types):
+ if not isinstance(atom, int):
raise ValueError("Number of atom should be an integer.")
if atom < 0 or atom > self._num_atoms: # here we count from zero
raise ValueError("Invalid number of atom.")
diff --git a/scripts/AbinsModules/FrequencyPowderGenerator.py b/scripts/AbinsModules/FrequencyPowderGenerator.py
index 3620b00934860ba56ee7ae628ce635b55d6f9b1e..cf8c4a0f727f729fb51a0bb473da95767b5e0aaa 100644
--- a/scripts/AbinsModules/FrequencyPowderGenerator.py
+++ b/scripts/AbinsModules/FrequencyPowderGenerator.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import AbinsModules
diff --git a/scripts/AbinsModules/GeneralAbInitioParser.py b/scripts/AbinsModules/GeneralAbInitioParser.py
index 8556d246b6dcb4c12d58bd73b676ca9a1ff60e09..b31d3738cea909b7bb121ff2d78322f30d062fc5 100644
--- a/scripts/AbinsModules/GeneralAbInitioParser.py
+++ b/scripts/AbinsModules/GeneralAbInitioParser.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-import six
import re
import AbinsModules
@@ -29,11 +26,10 @@ class GeneralAbInitioParser(object):
This string will be compiled to a Python re.Pattern .
:type regex: str
"""
- if not six.PY2:
- if msg is not None:
- msg = bytes(msg, "utf8")
- if regex is not None:
- regex = bytes(regex, "utf8")
+ if msg is not None:
+ msg = bytes(msg, "utf8")
+ if regex is not None:
+ regex = bytes(regex, "utf8")
if msg and regex:
raise ValueError("msg or regex should be provided, not both")
@@ -59,8 +55,7 @@ class GeneralAbInitioParser(object):
:param file_obj: file object from which we read
:param msg: keyword to find
"""
- if not six.PY2:
- msg = bytes(msg, "utf8")
+ msg = bytes(msg, "utf8")
found = False
last_entry = None
@@ -103,8 +98,7 @@ class GeneralAbInitioParser(object):
pos = file_obj.tell()
line = file_obj.readline()
file_obj.seek(pos)
- if not six.PY2:
- item = bytes(item, "utf8")
+ item = bytes(item, "utf8")
if item in line:
return True
return False
@@ -115,8 +109,7 @@ class GeneralAbInitioParser(object):
:param file_obj: file object from which we read
:param msg: keyword to find
"""
- if not six.PY2:
- msg = bytes(msg, "utf8")
+ msg = bytes(msg, "utf8")
while not self.file_end(file_obj=file_obj):
pos = file_obj.tell()
line = file_obj.readline()
diff --git a/scripts/AbinsModules/GeneralAbInitioProgram.py b/scripts/AbinsModules/GeneralAbInitioProgram.py
index b44d55dcac0024541f60925d985da1719f44b5a6..022e149ae17e68f3b699df4772cbcdcee3f0b73a 100644
--- a/scripts/AbinsModules/GeneralAbInitioProgram.py
+++ b/scripts/AbinsModules/GeneralAbInitioProgram.py
@@ -4,10 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import logger
import AbinsModules
-import six
from mantid.kernel import Atom
@@ -17,8 +15,7 @@ class GeneralAbInitioProgramName(type):
# noinspection PyMethodMayBeStatic
-@six.add_metaclass(GeneralAbInitioProgramName)
-class GeneralAbInitioProgram(object):
+class GeneralAbInitioProgram(object, metaclass=GeneralAbInitioProgramName):
"""
A general class which groups all methods which should be inherited or implemented by an ab initio program used
in INS analysis.
diff --git a/scripts/AbinsModules/GeneralData.py b/scripts/AbinsModules/GeneralData.py
index f5e0deccecdee187c802625910b7b8720dcba8f9..2c2c56d97e480eb36cf09ceecc55662ed722db1c 100644
--- a/scripts/AbinsModules/GeneralData.py
+++ b/scripts/AbinsModules/GeneralData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class GeneralData(object):
diff --git a/scripts/AbinsModules/GeneralLoadAbInitioTester.py b/scripts/AbinsModules/GeneralLoadAbInitioTester.py
index a1775656b91177b213f0929ce02b08e92a8dfe44..a27fe6d8f92db3cd228b583450add3f337b64d9f 100644
--- a/scripts/AbinsModules/GeneralLoadAbInitioTester.py
+++ b/scripts/AbinsModules/GeneralLoadAbInitioTester.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
import json
import numpy as np
diff --git a/scripts/AbinsModules/IOmodule.py b/scripts/AbinsModules/IOmodule.py
index 008843815b4fbf043e62eea4e2b728604fc2d1db..14bc7e64e5fce1775bc16bdfd890c29bcf8c77eb 100644
--- a/scripts/AbinsModules/IOmodule.py
+++ b/scripts/AbinsModules/IOmodule.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import hashlib
import io
import json
import os
-import six
import subprocess
import shutil
import h5py
@@ -301,28 +299,6 @@ class IOmodule(object):
end = reversed_path.find("/")
return reversed_path[:end]
- @classmethod
- def _convert_unicode_to_str(cls, object_to_check):
- """
- Converts unicode to Python str, works for nested dicts and lists (recursive algorithm). Only required
- for Python 2 where a mismatch with unicode/str objects is a problem for dictionary lookup
-
- :param object_to_check: dictionary, or list with names which should be converted from unicode to string.
- """
- if six.PY2:
- if isinstance(object_to_check, list):
- object_to_check = list(map(cls._convert_unicode_to_str, object_to_check))
-
- elif isinstance(object_to_check, dict):
- return {cls._encode_utf8_if_text(key): cls._convert_unicode_to_str(value)
- for key, value in object_to_check.items()}
-
- # unicode element
- elif isinstance(object_to_check, six.text_type):
- object_to_check = cls._encode_utf8_if_text(object_to_check)
-
- return object_to_check
-
@staticmethod
def _encode_utf8_if_text(item):
"""
@@ -332,7 +308,7 @@ class IOmodule(object):
:param item: item to convert to unicode str if Python 2 str
:returns: laundered item
"""
- if isinstance(item, six.text_type):
+ if isinstance(item, str):
return item.encode('utf-8')
else:
return item
@@ -364,11 +340,9 @@ class IOmodule(object):
structured_dataset_list.append(
self._recursively_load_dict_contents_from_group(hdf_file=hdf_file,
path=hdf_group.name + "/%s" % item))
- return self._convert_unicode_to_str(structured_dataset_list)
+ return structured_dataset_list
else:
- return self._convert_unicode_to_str(
- self._recursively_load_dict_contents_from_group(hdf_file=hdf_file,
- path=hdf_group.name + "/"))
+ return self._recursively_load_dict_contents_from_group(hdf_file=hdf_file, path=hdf_group.name + "/")
@classmethod
def _recursively_load_dict_contents_from_group(cls, hdf_file=None, path=None):
diff --git a/scripts/AbinsModules/InstrumentProducer.py b/scripts/AbinsModules/InstrumentProducer.py
index 551c71e97164a9b3a4a0b13c381e59258d80eedd..01e5ea544562cc3a9d5628699c2cf1c87be34c86 100644
--- a/scripts/AbinsModules/InstrumentProducer.py
+++ b/scripts/AbinsModules/InstrumentProducer.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from AbinsModules.Instruments import ToscaInstrument
from AbinsModules import AbinsConstants
diff --git a/scripts/AbinsModules/Instruments/Broadening.py b/scripts/AbinsModules/Instruments/Broadening.py
index 843e55ab28a29a13196933cf425f1a1c8dd5096c..4ea2d6b151cef52c5e22354d338340fe4c594391 100644
--- a/scripts/AbinsModules/Instruments/Broadening.py
+++ b/scripts/AbinsModules/Instruments/Broadening.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from scipy.special import erf
from scipy.signal import convolve
diff --git a/scripts/AbinsModules/Instruments/Instrument.py b/scripts/AbinsModules/Instruments/Instrument.py
index 02c7887a6c99895a94502ec8b96ec18cc8942d27..1bfdb5d19e3d9237fb8d7fff7aadd295fcf47c4c 100644
--- a/scripts/AbinsModules/Instruments/Instrument.py
+++ b/scripts/AbinsModules/Instruments/Instrument.py
@@ -4,10 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
+# noinspection PyPep8Naming
-# noinspection PyPep8Naming
class Instrument(object):
_name = None
diff --git a/scripts/AbinsModules/Instruments/ToscaInstrument.py b/scripts/AbinsModules/Instruments/ToscaInstrument.py
index 7b5c83a3f3f0fde99438f4bc31fb8e41c9fe4161..668b6115d3bda160ebd0ec8b2c10fde0f3400da8 100644
--- a/scripts/AbinsModules/Instruments/ToscaInstrument.py
+++ b/scripts/AbinsModules/Instruments/ToscaInstrument.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from .Instrument import Instrument
from .Broadening import broaden_spectrum, prebin_required_schemes
diff --git a/scripts/AbinsModules/Instruments/__init__.py b/scripts/AbinsModules/Instruments/__init__.py
index cb3c293c5c58386e5545255f1717bd192371cb0f..87179b99f85685b06f059e266a7c0a5674b7d2be 100644
--- a/scripts/AbinsModules/Instruments/__init__.py
+++ b/scripts/AbinsModules/Instruments/__init__.py
@@ -5,7 +5,5 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# flake8: noqa
-from __future__ import (absolute_import, division, print_function)
-
from .ToscaInstrument import ToscaInstrument
from .Instrument import Instrument
diff --git a/scripts/AbinsModules/KpointsData.py b/scripts/AbinsModules/KpointsData.py
index 010f6853596d55e3723df8e3f3bd92e51c399956..c94f643b90adbb4863adda882d2674be9990f6df 100644
--- a/scripts/AbinsModules/KpointsData.py
+++ b/scripts/AbinsModules/KpointsData.py
@@ -4,9 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
-import six
import AbinsModules
@@ -43,12 +41,12 @@ class KpointsData(AbinsModules.GeneralData):
"""
super(KpointsData, self).__init__()
- if isinstance(num_k, six.integer_types) and num_k > 0:
+ if isinstance(num_k, int) and num_k > 0:
self._num_k = num_k
else:
raise ValueError("Invalid number of k-points.")
- if isinstance(num_atoms, six.integer_types) and num_atoms > 0:
+ if isinstance(num_atoms, int) and num_atoms > 0:
self._num_atoms = num_atoms # number of displacements for one k-point
else:
raise ValueError("Invalid number of atoms.")
diff --git a/scripts/AbinsModules/LoadCASTEP.py b/scripts/AbinsModules/LoadCASTEP.py
index 37bbcf346c8a81d9dd3e259783402240759ab786..0a031da8dbadf5e67082f7e9015b6ca8c4e7dece 100644
--- a/scripts/AbinsModules/LoadCASTEP.py
+++ b/scripts/AbinsModules/LoadCASTEP.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import re
import AbinsModules
diff --git a/scripts/AbinsModules/LoadCRYSTAL.py b/scripts/AbinsModules/LoadCRYSTAL.py
index b90545a6d29a3dd6c34062efd5011857f4dc2eae..02486eccf446f93f69ba23989c1e3fd782907c8e 100644
--- a/scripts/AbinsModules/LoadCRYSTAL.py
+++ b/scripts/AbinsModules/LoadCRYSTAL.py
@@ -4,9 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import io
-import six
import numpy as np
import AbinsModules
from mantid.kernel import Atom, logger
@@ -538,9 +536,8 @@ class LoadCRYSTAL(AbinsModules.GeneralAbInitioProgram):
end_message = ["INFORMATION", "*******************************************************************************",
"GAMMA"]
- if not six.PY2:
- for i, item in enumerate(end_message):
- end_message[i] = bytes(item, "utf8")
+ for i, item in enumerate(end_message):
+ end_message[i] = bytes(item, "utf8")
while not self._parser.file_end(file_obj=file_obj):
diff --git a/scripts/AbinsModules/LoadDMOL3.py b/scripts/AbinsModules/LoadDMOL3.py
index 0f028fb9a76fded1c502ad9e619c6e25292bc5b9..2fe2e5f3f5b8079eef54b977e6dfb02a6d371e1e 100644
--- a/scripts/AbinsModules/LoadDMOL3.py
+++ b/scripts/AbinsModules/LoadDMOL3.py
@@ -4,10 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
import io
-import six
import numpy as np
from math import sqrt
from mantid.kernel import Atom
@@ -255,9 +253,8 @@ class LoadDMOL3(AbinsModules.GeneralAbInitioProgram):
end_msg = "Molecular Mass:"
key = "Atom"
- if not six.PY2:
- end_msg = bytes(end_msg, "utf8")
- key = bytes(key, "utf8")
+ end_msg = bytes(end_msg, "utf8")
+ key = bytes(key, "utf8")
while not self._parser.file_end(file_obj=obj_file):
line = obj_file.readline()
diff --git a/scripts/AbinsModules/LoadGAUSSIAN.py b/scripts/AbinsModules/LoadGAUSSIAN.py
index 62e61cea629d7d3291911240b39c9a641823237b..1ef9e949e3cd9a91465515e8f1091a8934455360 100644
--- a/scripts/AbinsModules/LoadGAUSSIAN.py
+++ b/scripts/AbinsModules/LoadGAUSSIAN.py
@@ -4,10 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
import io
-import six
import numpy as np
from mantid.kernel import Atom
@@ -197,9 +195,8 @@ class LoadGAUSSIAN(AbinsModules.GeneralAbInitioProgram):
end_msg = "Molecular mass:"
key = "Atom"
- if not six.PY2:
- end_msg = bytes(end_msg, "utf8")
- key = bytes(key, "utf8")
+ end_msg = bytes(end_msg, "utf8")
+ key = bytes(key, "utf8")
while not self._parser.file_end(file_obj=file_obj):
diff --git a/scripts/AbinsModules/PowderData.py b/scripts/AbinsModules/PowderData.py
index 8ec142a081e77128f6cf31d3d08fb1da2a24e142..9aa69421a4f12d4a64faa79d2a4137712e31a7d0 100644
--- a/scripts/AbinsModules/PowderData.py
+++ b/scripts/AbinsModules/PowderData.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-import six
import AbinsModules
@@ -16,7 +14,7 @@ class PowderData(AbinsModules.GeneralData):
def __init__(self, num_atoms=None):
super(PowderData, self).__init__()
- if isinstance(num_atoms, six.integer_types) and num_atoms > 0:
+ if isinstance(num_atoms, int) and num_atoms > 0:
self._num_atoms = num_atoms
else:
raise ValueError("Invalid value of atoms.")
diff --git a/scripts/AbinsModules/SData.py b/scripts/AbinsModules/SData.py
index 04d410f17aca034c610283db6fee96e9d54a56b1..5c45012a8a38fb1f3a933201c1a345822f4beda2 100644
--- a/scripts/AbinsModules/SData.py
+++ b/scripts/AbinsModules/SData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.kernel import logger as mantid_logger
import AbinsModules
diff --git a/scripts/AbinsModules/SPowderSemiEmpiricalCalculator.py b/scripts/AbinsModules/SPowderSemiEmpiricalCalculator.py
index fb9e69332f95f081c6cf0d7a252d972c2d459af4..84e097f0300bd59900e89123c4dd907c59e2ab9b 100644
--- a/scripts/AbinsModules/SPowderSemiEmpiricalCalculator.py
+++ b/scripts/AbinsModules/SPowderSemiEmpiricalCalculator.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
from AbinsModules import AbinsParameters, AbinsConstants
import gc
diff --git a/scripts/AbinsModules/SingleCrystalData.py b/scripts/AbinsModules/SingleCrystalData.py
index 39e0e81dcc1dc08910ba1c9b835327661746aec6..b18b9dd5caaea5bf3747c0ef00374c63b7c18148 100644
--- a/scripts/AbinsModules/SingleCrystalData.py
+++ b/scripts/AbinsModules/SingleCrystalData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
diff --git a/scripts/AbinsModules/__init__.py b/scripts/AbinsModules/__init__.py
index f7f017454ea09d283afcb81aa694b41459534119..ba8624e18bc9ec95858907601d034a6e4bb09dbe 100644
--- a/scripts/AbinsModules/__init__.py
+++ b/scripts/AbinsModules/__init__.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# flake8: noqa
-from __future__ import (absolute_import, division, print_function)
-
-
from .IOmodule import IOmodule
# Frequency generator
diff --git a/scripts/BilbyCustomFunctions_Reduction.py b/scripts/BilbyCustomFunctions_Reduction.py
index 29d574d9f6b4277e7f6e207479e25d3ac94b4041..a9ed4c2c3ade1272d2c387f9cc276cc5e5abb985 100644
--- a/scripts/BilbyCustomFunctions_Reduction.py
+++ b/scripts/BilbyCustomFunctions_Reduction.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
import csv
import math
from itertools import product
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_All.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_All.py
index 9798d847093cf2efa60d92fd85f610b73379d9f7..d4f296050865b91ac2dbc2e522e7600ec2729570 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_All.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_All.py
@@ -58,8 +58,6 @@ Calibration technique: Finding tubes not well calibrated
"""
-from __future__ import absolute_import, division, print_function
-
import mantid.simpleapi as mantid
import tube
import numpy
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py
index b9c62e695f45d7d88483b7467210c5017b9545b4..2d1ea2e243ee5d0fa9b5c40f17ac8d061091147d 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py
@@ -10,8 +10,6 @@
#
# Here we run the calibration of a selected part of MAPS
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_calib_fit_params import TubeCalibFitParams
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3.py
index d63b0541c99d7a134ae6e8c3e87ffd17cf0a9428..ba188c23b0e0c33712d542e68b11c7dc4f82cdbd 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3.py
@@ -11,8 +11,6 @@
# Here we run the calibration of a selected part of MAPS consisting of several components
# by running setTubeSpecByString several times.
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_spec import TubeSpec
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3C2.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3C2.py
index 7db8de221f4988c0476b4f75540de213983e48c0..fef52b033983c192767cac3534b25ed5fb9e0faf 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3C2.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3C2.py
@@ -11,8 +11,6 @@
# Here we run the calibration of a selected part of MAPS consisting of several components
# specifying them in an array of strings.
-from __future__ import absolute_import, division, print_function
-
import tube
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_D2.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_D2.py
index 11912b5b888305cf0858b7a33f8e9c87f650ce3f..11e23633a420d9901d5f1218fc628f2eb9ea137f 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_D2.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_D2.py
@@ -10,8 +10,6 @@
#
# Here we run the calibration of a selected part of MAPS
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_calib_fit_params import TubeCalibFitParams
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_D2_WideMargins.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_D2_WideMargins.py
index 196030a2e59c3c6ec31efb90ea375ed9f57c50cc..dcfa9ed3df94e937e72c65ae21bdb3bf5d472166 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_D2_WideMargins.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_D2_WideMargins.py
@@ -10,8 +10,6 @@
#
# Here we run the calibration of a selected part of MAPS
-from __future__ import absolute_import, division, print_function
-
import tube
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_D4.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_D4.py
index f313d1fe1826eee01ae2373af8717da2bd15088b..4f3201c99a25f1f007dc2b8288d7032fe3e09a25 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_D4.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_D4.py
@@ -10,8 +10,6 @@
#
# Here we run the calibration of a selected part of MAPS
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_calib_fit_params import TubeCalibFitParams
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMerlin.py b/scripts/Calibration/Examples/TubeCalibDemoMerlin.py
index 40d3abde9b5481759852c3a29068455d6f1990bb..98bff03d25ab370c739041da27847650c7c94295 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMerlin.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMerlin.py
@@ -49,8 +49,6 @@ The previous calibrated instrument view:
.. sectionauthor:: Gesner Passos - ISIS
"""
-from __future__ import absolute_import, division, print_function
-
import numpy
import mantid.simpleapi as mantid
import tube
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMerlin_Simple.py b/scripts/Calibration/Examples/TubeCalibDemoMerlin_Simple.py
index 53b4fc586a91806ccf9b1f5e1ef99be009e7b42b..c5b141cafab0f5693bcf00b2fbb4e6a46481d796 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMerlin_Simple.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMerlin_Simple.py
@@ -18,8 +18,6 @@
# The workspace with calibrated instrument is saved to a Nexus file
#
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_calib_fit_params import TubeCalibFitParams
import numpy
diff --git a/scripts/Calibration/Examples/TubeCalibDemoWish0.py b/scripts/Calibration/Examples/TubeCalibDemoWish0.py
index 31e780d7939c8960b7001d58243ea8750d3e3e3b..685414c46424e050e6158d3f5d1f0dfc97d6ccee 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoWish0.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoWish0.py
@@ -15,8 +15,6 @@
# because we do not consider the upper and lower position of the tubes around the
# WISH instrument.
#
-from __future__ import absolute_import, division, print_function
-
import tube
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoWish1.py b/scripts/Calibration/Examples/TubeCalibDemoWish1.py
index 89204997b83287208548e7375a29b72a67d40ebb..9837db0168f1aa3e2732d7790c17588ca5bd5011 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoWish1.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoWish1.py
@@ -12,8 +12,6 @@
# We base the ideal tube on one tube of this door.
#
-from __future__ import absolute_import, division, print_function
-
import tube
reload(tube) # noqa
from tube_spec import TubeSpec
diff --git a/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py b/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py
index ba7205080bacac4d49a37a09a6146e055f470c4b..354f32c0ca354ab5d4f850bd67df70b95cbe19e2 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py
@@ -18,8 +18,6 @@ to calibrate the whole instrument.
"""
-from __future__ import absolute_import, division, print_function
-
import numpy
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoWish_Simple.py b/scripts/Calibration/Examples/TubeCalibDemoWish_Simple.py
index a3aca6bee7e805a4cfd8bcbf00af3b9d527926f4..d604c5bf71ab262821586740cd1e562fb17e4576 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoWish_Simple.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoWish_Simple.py
@@ -11,8 +11,6 @@
# Here we run the calibration of WISH panel03 using a simple CalibrateWish function.
#
-from __future__ import absolute_import, division, print_function
-
import numpy
import tube
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/tube.py b/scripts/Calibration/tube.py
index ef121149f2b00ce367acab189f301b10e43d790f..781408f6e86746be030089c3f78b02003c23b64a 100644
--- a/scripts/Calibration/tube.py
+++ b/scripts/Calibration/tube.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import absolute_import, division, print_function
-
import numpy
import os
import re
diff --git a/scripts/Calibration/tube_calib.py b/scripts/Calibration/tube_calib.py
index bc5c1b88ad246c66c7db0416867432b001ca319c..a529c1c5e92f427c5383c306452fe1686c4bee47 100644
--- a/scripts/Calibration/tube_calib.py
+++ b/scripts/Calibration/tube_calib.py
@@ -16,8 +16,6 @@ Users should not need to directly call any other function other than :func:`getC
"""
## Author: Karl palmen ISIS and for readPeakFile Gesner Passos ISIS
-from __future__ import absolute_import, division, print_function
-
import numpy
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/scripts/Calibration/tube_calib_fit_params.py b/scripts/Calibration/tube_calib_fit_params.py
index 7d4192983827a507fe7717e6b53bbb2c7b7edeec..76ae22eec9db0a721f22a0a9ff77494fd1a25869 100644
--- a/scripts/Calibration/tube_calib_fit_params.py
+++ b/scripts/Calibration/tube_calib_fit_params.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
class TubeCalibFitParams(object):
diff --git a/scripts/Calibration/tube_spec.py b/scripts/Calibration/tube_spec.py
index f86b60538a23154b947540f787d812c6af53a5ca..a7df4ebd859de9bac4306b385435f3d8300c0cc0 100644
--- a/scripts/Calibration/tube_spec.py
+++ b/scripts/Calibration/tube_spec.py
@@ -12,8 +12,6 @@
# Author: Karl Palmen ISIS
-from __future__ import absolute_import, division, print_function
-
class TubeSpec:
"""
diff --git a/scripts/CrystalTools/PeakReport.py b/scripts/CrystalTools/PeakReport.py
index d9ddd21262c010424f25ea2e80e8a98bafebc185..8afcda27fe78e2d2293c683bbf277ee286a19a0e 100644
--- a/scripts/CrystalTools/PeakReport.py
+++ b/scripts/CrystalTools/PeakReport.py
@@ -8,7 +8,6 @@
"""
This is a module for creating peak integration reports.
"""
-from __future__ import (absolute_import, division, print_function)
import os
import mantid.api
from mantidplot import plotSlice
diff --git a/scripts/DGSPlanner.py b/scripts/DGSPlanner.py
index d1a5cb0b49aa77019eaacf0bc833e6eaf57839a8..2151e9e2ede349da28b03ca69d182d73792e7bfc 100644
--- a/scripts/DGSPlanner.py
+++ b/scripts/DGSPlanner.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,unused-import
-from __future__ import (absolute_import, division, print_function)
import sys
from DGSPlanner import DGSPlannerGUI
from mantidqt.gui_helper import get_qapplication
diff --git a/scripts/DGSPlanner/ClassicUBInputWidget.py b/scripts/DGSPlanner/ClassicUBInputWidget.py
index 1dcbe720806cbc457358afa6fc40b03598e743bb..e1bd1493b904082a2721227f0999b517b1ae1f3d 100644
--- a/scripts/DGSPlanner/ClassicUBInputWidget.py
+++ b/scripts/DGSPlanner/ClassicUBInputWidget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtGui, QtCore
import sys
import mantid
diff --git a/scripts/DGSPlanner/DGSPlannerGUI.py b/scripts/DGSPlanner/DGSPlannerGUI.py
index af6e49f7a9cb847c677bfad6947daa59c3b8f26f..ad54f83348a402ebf38ecac27c473fcbc2916e52 100644
--- a/scripts/DGSPlanner/DGSPlannerGUI.py
+++ b/scripts/DGSPlanner/DGSPlannerGUI.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,relative-import
-from __future__ import (absolute_import, division, print_function)
from . import InstrumentSetupWidget
from . import ClassicUBInputWidget
from . import MatrixUBInputWidget
diff --git a/scripts/DGSPlanner/DimensionSelectorWidget.py b/scripts/DGSPlanner/DimensionSelectorWidget.py
index f3137f95033b3f2b04f17499c62461f114b5b3bf..32e19314b672f10c2489f86da27f3fd70276c356 100644
--- a/scripts/DGSPlanner/DimensionSelectorWidget.py
+++ b/scripts/DGSPlanner/DimensionSelectorWidget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-instance-attributes,super-on-old-class,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtGui, QtCore, QtWidgets
import sys
import numpy
diff --git a/scripts/DGSPlanner/InstrumentSetupWidget.py b/scripts/DGSPlanner/InstrumentSetupWidget.py
index e663c0dd9d25682244004e89e94d4a8c311ee355..4257fa03535d127cce9a3242f3160d704f8631df 100644
--- a/scripts/DGSPlanner/InstrumentSetupWidget.py
+++ b/scripts/DGSPlanner/InstrumentSetupWidget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-instance-attributes,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtGui, QtCore, QtWidgets
import sys
import mantid
diff --git a/scripts/DGSPlanner/LoadNexusUB.py b/scripts/DGSPlanner/LoadNexusUB.py
index 54cc854ab6724371fbea7e8365c58f19a4df816c..047286e380391e9727dd2bf1ec59d829ff96fd56 100644
--- a/scripts/DGSPlanner/LoadNexusUB.py
+++ b/scripts/DGSPlanner/LoadNexusUB.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.simpleapi import *
diff --git a/scripts/DGSPlanner/MatrixUBInputWidget.py b/scripts/DGSPlanner/MatrixUBInputWidget.py
index 47b8f200d690b0ec77bb6e3da8873b0908f51b3f..c57ef80386c864d8a0b558b5a6dffd2e1adbc5fe 100644
--- a/scripts/DGSPlanner/MatrixUBInputWidget.py
+++ b/scripts/DGSPlanner/MatrixUBInputWidget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtCore, QtGui, QtWidgets
import sys
import mantid
diff --git a/scripts/DGSPlanner/ValidateOL.py b/scripts/DGSPlanner/ValidateOL.py
index daff258ef6287f6708428c3fd1ec42877e8b6726..c438f8a08688e4b067435b144b7a511b6aa431fe 100644
--- a/scripts/DGSPlanner/ValidateOL.py
+++ b/scripts/DGSPlanner/ValidateOL.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
import mantid
import numpy
diff --git a/scripts/DGS_Reduction.py b/scripts/DGS_Reduction.py
index 99e0878803cf3a684000047f6250a054d750ea47..2557ac17852d91fc1b24663f3304a7d85e8f863a 100644
--- a/scripts/DGS_Reduction.py
+++ b/scripts/DGS_Reduction.py
@@ -8,7 +8,6 @@
"""
Script used to start the DGS reduction GUI from MantidPlot
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_application import ReductionGUI
reducer = ReductionGUI(instrument_list=["ARCS", "CNCS", "HYSPEC", "MAPS",
diff --git a/scripts/DiamondAttenuationCorrection/FitTrans.py b/scripts/DiamondAttenuationCorrection/FitTrans.py
index bba1a3bd336de8b2aa12c5a54f7ac8b496c4cdd7..1289e12b55492fb5136d40603576944de253d6d8 100644
--- a/scripts/DiamondAttenuationCorrection/FitTrans.py
+++ b/scripts/DiamondAttenuationCorrection/FitTrans.py
@@ -19,7 +19,6 @@ Data types:
***
'''
# Import all needed libraries
-from __future__ import (absolute_import, division, print_function)
from matplotlib import pyplot as plt
import numpy as np
import itertools as itt
diff --git a/scripts/DiamondAttenuationCorrection/FitTransReadUB.py b/scripts/DiamondAttenuationCorrection/FitTransReadUB.py
index 30e27f3c00b1d2db1b73e5d5638fcd675ce3771d..a30965f27da7f4c38d3e15161df39245ce0bae15 100644
--- a/scripts/DiamondAttenuationCorrection/FitTransReadUB.py
+++ b/scripts/DiamondAttenuationCorrection/FitTransReadUB.py
@@ -19,7 +19,6 @@ Data types:
***
'''
# Import all needed libraries
-from __future__ import (absolute_import, division, print_function)
from matplotlib import pyplot as plt
import numpy as np
import itertools as itt
diff --git a/scripts/DiamondAttenuationCorrection/UBMatrixGenerator.py b/scripts/DiamondAttenuationCorrection/UBMatrixGenerator.py
index 3f16202fb08b7e4714f6f2aa7ce0e06ccd606a4d..4ab94557fe95e396b7bc32a03b18f4afa3027b6c 100644
--- a/scripts/DiamondAttenuationCorrection/UBMatrixGenerator.py
+++ b/scripts/DiamondAttenuationCorrection/UBMatrixGenerator.py
@@ -10,7 +10,6 @@ Identifies upstream and downstream diamonds and assigns matrices to them
'''
# Import all needed libraries
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import itertools as itt
diff --git a/scripts/Diffraction/isis_powder/__init__.py b/scripts/Diffraction/isis_powder/__init__.py
index b4fa960144b1174999f9cfc047684807c5afcdd4..108af00a69a84fcb4b3eb8982915d3bf064e9b02 100644
--- a/scripts/Diffraction/isis_powder/__init__.py
+++ b/scripts/Diffraction/isis_powder/__init__.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Disable unused import warnings. The import is for user convenience
# Bring instruments into package namespace
from .gem import Gem # noqa: F401
diff --git a/scripts/Diffraction/isis_powder/abstract_inst.py b/scripts/Diffraction/isis_powder/abstract_inst.py
index 5d0527b98fea1bd4ab7026f9dd60d69ea1f50e61..62b5a8c40ab1a194af43bce235a5bccadc2471e0 100644
--- a/scripts/Diffraction/isis_powder/abstract_inst.py
+++ b/scripts/Diffraction/isis_powder/abstract_inst.py
@@ -4,13 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from isis_powder.routines import calibrate, focus, common, common_enums, common_output
from mantid.kernel import config, logger
-from six import iteritems
-
# This class provides common hooks for instruments to override
# if they want to define the behaviour of the hook. Otherwise it
# returns the object passed in without manipulating it as a default
@@ -322,7 +318,7 @@ class AbstractInst(object):
"tof_xye_filename": dat_files_directory,
"dspacing_xye_filename": dat_files_directory
}
- for key, output_dir in iteritems(output_formats):
+ for key, output_dir in output_formats.items():
filepath = os.path.join(output_dir,
getattr(self._inst_settings, key).format(**format_options))
out_file_names[key] = filepath
diff --git a/scripts/Diffraction/isis_powder/gem.py b/scripts/Diffraction/isis_powder/gem.py
index 3ad4b27b8950b99a6691280418b0cfabdab58f3d..74b5e36671e3fe6714f1927321e812a06eaaa7b3 100644
--- a/scripts/Diffraction/isis_powder/gem.py
+++ b/scripts/Diffraction/isis_powder/gem.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from isis_powder.abstract_inst import AbstractInst
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py b/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py
index 069ef627f5708cac805c8833a8c0e8f3a3a891d5..9d29951c8ded2bb27bd6e79768ddf7cbabe25a03 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import copy
from isis_powder.routines.common import ADVANCED_CONFIG as COMMON_ADVANCED_CONFIG
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py b/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py
index b9a9a87b1227a6ea18cf4e163587bcf3ab436e53..6170315b2a8783ec1b02fcec9ceba0ef8ea0a298 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from isis_powder.routines import absorb_corrections, common
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_calibration_algs.py b/scripts/Diffraction/isis_powder/gem_routines/gem_calibration_algs.py
index 44eef7e076eb825daeecbdb05ee7e28959c3fd18..f91a8d5fc2f1b115a6ddf977f5d32f358d8d1d9c 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_calibration_algs.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_calibration_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import mantid.simpleapi as mantid
import isis_powder.routines.common as common
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py b/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py
index 2d50a547488f5d1d039ed30e1b68b2f1ccd1a9b9..c5f1bcae8e4c369a15a04778fa4265fe795ef77f 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class GEM_CHOPPER_MODES(object):
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_output.py b/scripts/Diffraction/isis_powder/gem_routines/gem_output.py
index 7c6603e8e9d45d9217f69b53ae957695958b248f..de8fd4c5fa933b73d007ccc89efceed386148dd1 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_output.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_output.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py b/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py
index cfcd44e6e0450340790defcc5a853443f2829546..e7ae385b573b8d55fac08b28b6e7df36115e7c79 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.routines.param_map_entry import ParamMapEntry
from isis_powder.gem_routines.gem_enums import GEM_CHOPPER_MODES
from isis_powder.routines.common import PARAM_MAPPING as COMMON_PARAM_MAPPING
diff --git a/scripts/Diffraction/isis_powder/hrpd.py b/scripts/Diffraction/isis_powder/hrpd.py
index a55065ee1501814febe560436d8c1a1ffb483a7d..9055f8c684dd25a63b7d4bdb4fee0f351e78208a 100644
--- a/scripts/Diffraction/isis_powder/hrpd.py
+++ b/scripts/Diffraction/isis_powder/hrpd.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from isis_powder.abstract_inst import AbstractInst
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py
index 0f1113854e7089eb831316e3be352d5abd26dbff..93eaa0f1e9c50faaae430475a5c12e89ee7a2ae2 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.hrpd_routines.hrpd_enums import HRPD_TOF_WINDOWS
absorption_correction_params = {
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_algs.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_algs.py
index 906b90866b6549b5aea4bbcf852f9fe1e63609bb..2dde439e9090c63445d56a87ec6aab63bdd6fb63 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_algs.py
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from isis_powder.hrpd_routines import hrpd_advanced_config
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py
index b54c973da7e403f7d7d12b209aea6290b9401dcc..d785d775e6a2a92819071eb5b169d51f077cea94 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class HRPD_TOF_WINDOWS(object):
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_param_mapping.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_param_mapping.py
index 443848545a6d757e69d080224863560d68f02672..5131937d160f2759ae64d678a3dcf736ef2fb725 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_param_mapping.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.hrpd_routines.hrpd_enums import HRPD_MODES, HRPD_TOF_WINDOWS
from isis_powder.routines.common import PARAM_MAPPING as COMMON_PARAM_MAPPING
from isis_powder.routines.param_map_entry import ParamMapEntry
diff --git a/scripts/Diffraction/isis_powder/pearl.py b/scripts/Diffraction/isis_powder/pearl.py
index 7b391a35eb86607ef813f2964f1c8aba8f4baffe..ac106f99bb244e63dd1a96ffad0fddb72aff930c 100644
--- a/scripts/Diffraction/isis_powder/pearl.py
+++ b/scripts/Diffraction/isis_powder/pearl.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from contextlib import contextmanager
import mantid.simpleapi as mantid
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_advanced_config.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_advanced_config.py
index 978a24d0d66c99d1fbab5a5063f74756e84d336a..22302dbb14baac3eeb9b193b26a782f64a08f8fd 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_advanced_config.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from numpy import array
general_params = {
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py
index e697118c202b2b972baadfa54d3cd0b227e6c7e7..f94c254e3962041d109a06aeba30d9aa090fca07 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
import isis_powder.routines.common as common
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_calibration_algs.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_calibration_algs.py
index 03bf602e55bdb0799ac6eccb8b096edfbbdb94b6..180830647ef608bddb29023451092949d04d5831 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_calibration_algs.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_calibration_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import mantid.simpleapi as mantid
import isis_powder.routines.common as common
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py
index b12801d05520878837f8010de30f9ffd14a4fc58..3649c244f468893b2b6a7f06fa0577453c2e3a8e 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class PEARL_FOCUS_MODES(object):
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_output.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_output.py
index 4a6a9fa2a46bbdb72befa96f9c2850f1499e5dda..605c7997f642603c5245f47ac94002b45ae5bbc2 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_output.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_output.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from isis_powder.routines.common_enums import WORKSPACE_UNITS
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_param_mapping.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_param_mapping.py
index e0508d6ae66cdb480dc8b64e6d76bb746fd5c05f..2514081153dff9b440df31058e154fe3121cbf45 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_param_mapping.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.routines.common import PARAM_MAPPING
from isis_powder.routines.param_map_entry import ParamMapEntry
from isis_powder.pearl_routines.pearl_enums import PEARL_FOCUS_MODES, PEARL_TT_MODES
diff --git a/scripts/Diffraction/isis_powder/polaris.py b/scripts/Diffraction/isis_powder/polaris.py
index 0dfd83cb460e32aed14e7d11b39d829c154e9662..0c80b633fdeba1dad103dc0710fdf22a758f09a2 100644
--- a/scripts/Diffraction/isis_powder/polaris.py
+++ b/scripts/Diffraction/isis_powder/polaris.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from isis_powder.routines import absorb_corrections, common, instrument_settings
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py
index 8cd626c228d5511f5992b2d1d91708b3b2ded854..21d9f4893b0331f4cf8710db993613924b7f2938 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py
@@ -7,8 +7,6 @@
# Note all changes in this file require a restart of Mantid
# additionally any long term changes should be sent back to the development team so any changes can be merged
# into future versions of Mantid.
-from __future__ import (absolute_import, unicode_literals)
-
import copy
from isis_powder.routines.common import ADVANCED_CONFIG as COMMON_ADVANCED_CONFIG
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
index f8c015e93bde19eac665389bf7457391b6a15954..cd94d7cd1422f455689511e50c5652bdd0b1aee2 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
@@ -4,14 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import math
import mantid.simpleapi as mantid
from mantid.api import WorkspaceGroup
-from six import string_types
-
from isis_powder.routines import absorb_corrections, common
from isis_powder.routines.common_enums import WORKSPACE_UNITS
from isis_powder.routines.run_details import create_run_details_object, get_cal_mapping_dict
@@ -167,7 +164,7 @@ def _obtain_focused_run(run_number, focus_file_path):
def _load_qlims(q_lims):
- if isinstance(q_lims, string_types):
+ if isinstance(q_lims, str):
q_min = []
q_max = []
try:
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py
index 3147259db17c7b658fd7c018d8ccd7d7a4e34d78..ae042fb669efe1a252d34992d81183120ce8bde6 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class POLARIS_CHOPPER_MODES(object):
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
index cb2e721b2ec2bdcf8efbe1080759e62afe45e7ca..3b26bb1f2cdc6a46855b50b9d8a2cb2fe2112e16 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.routines.param_map_entry import ParamMapEntry
from isis_powder.routines.common import PARAM_MAPPING as COMMON_PARAM_MAPPING
from isis_powder.routines.common_enums import INPUT_BATCHING
diff --git a/scripts/Diffraction/isis_powder/routines/__init__.py b/scripts/Diffraction/isis_powder/routines/__init__.py
index 700e4f0d1ad22c4e0df0bd9f764f0053f54247ca..9fcc06f4b0b39877ddc8a8450fcd2dd205c40328 100644
--- a/scripts/Diffraction/isis_powder/routines/__init__.py
+++ b/scripts/Diffraction/isis_powder/routines/__init__.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Disable unused import warnings. The import is for user convenience
# Currently these are the things from routines we want to expose to a public API
diff --git a/scripts/Diffraction/isis_powder/routines/absorb_corrections.py b/scripts/Diffraction/isis_powder/routines/absorb_corrections.py
index 2bb2b5e86f4ff97c623f5c20c08ff1ba503a30b0..eb8614f157ce0d2e2d172714540cba77fe151d9c 100644
--- a/scripts/Diffraction/isis_powder/routines/absorb_corrections.py
+++ b/scripts/Diffraction/isis_powder/routines/absorb_corrections.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from isis_powder.routines import common, common_enums, sample_details
diff --git a/scripts/Diffraction/isis_powder/routines/calibrate.py b/scripts/Diffraction/isis_powder/routines/calibrate.py
index f2008529dc24d979125f038ff20de6c766f3a274..5bf66e1f5561e3b03d30148f166359f0dbf344cb 100644
--- a/scripts/Diffraction/isis_powder/routines/calibrate.py
+++ b/scripts/Diffraction/isis_powder/routines/calibrate.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
import isis_powder.routines.common as common
diff --git a/scripts/Diffraction/isis_powder/routines/common.py b/scripts/Diffraction/isis_powder/routines/common.py
index b8956e879e564ea854f46e67e9978c443fdac031..4024a1ac123131f7cffe5aae6058daaec844ebe7 100644
--- a/scripts/Diffraction/isis_powder/routines/common.py
+++ b/scripts/Diffraction/isis_powder/routines/common.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-from six import PY2, iterkeys
import collections
import warnings
@@ -146,7 +144,7 @@ def dictionary_key_helper(dictionary, key, throws=True, case_insensitive=False,
if case_insensitive:
# Convert key to str
lower_key = str(key).lower()
- for dict_key in iterkeys(dictionary):
+ for dict_key in dictionary.keys():
if str(dict_key).lower() == lower_key:
# Found it
return dictionary[dict_key]
@@ -522,14 +520,7 @@ def read_masking_file(masking_file_path):
all_banks_masking_list = []
bank_masking_list = []
- # Python > 3 requires the encoding to be included so an Angstrom
- # symbol can be read, I'm assuming all file read here are
- # `latin-1` which may not be true in the future. Python 2 `open`
- # doesn't have an encoding option
- if PY2:
- encoding = {}
- else:
- encoding = {"encoding": "latin-1"}
+ encoding = {"encoding": "latin-1"}
with open(masking_file_path, **encoding) as mask_file:
for line in mask_file:
if 'bank' in line:
diff --git a/scripts/Diffraction/isis_powder/routines/common_enums.py b/scripts/Diffraction/isis_powder/routines/common_enums.py
index cd55f4f46d38b6ac7b6277aa2b75bf1f357153e3..59d657444be3bc6b8f0c9a02384d4fd382c24ead 100644
--- a/scripts/Diffraction/isis_powder/routines/common_enums.py
+++ b/scripts/Diffraction/isis_powder/routines/common_enums.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Holds enumeration classes for common values
diff --git a/scripts/Diffraction/isis_powder/routines/common_output.py b/scripts/Diffraction/isis_powder/routines/common_output.py
index 9d67c20958105f65288afed3c3758ea58f8586ad..b2425442790f9c19e7488285845696418b034767 100644
--- a/scripts/Diffraction/isis_powder/routines/common_output.py
+++ b/scripts/Diffraction/isis_powder/routines/common_output.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
import os
diff --git a/scripts/Diffraction/isis_powder/routines/focus.py b/scripts/Diffraction/isis_powder/routines/focus.py
index ff2e7d48ecb87c3d43bf3d9553a0eec2575c5ab6..8880bc998e5954954acbf8a9309d5f7b8412a5e6 100644
--- a/scripts/Diffraction/isis_powder/routines/focus.py
+++ b/scripts/Diffraction/isis_powder/routines/focus.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import WorkspaceGroup
import mantid.simpleapi as mantid
diff --git a/scripts/Diffraction/isis_powder/routines/instrument_settings.py b/scripts/Diffraction/isis_powder/routines/instrument_settings.py
index 9e60fd3da8c2223f0def67009dfcca437e86b0e1..75d6ca6d1f793015f57de16f679de83d5d46ed38 100644
--- a/scripts/Diffraction/isis_powder/routines/instrument_settings.py
+++ b/scripts/Diffraction/isis_powder/routines/instrument_settings.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-from six import iteritems
from isis_powder.routines import yaml_parser
import warnings
@@ -190,7 +187,7 @@ def _get_enum_values(enum_cls):
"""
enum_known_vals = []
- for k, enum_val in iteritems(enum_cls.__dict__):
+ for k, enum_val in enum_cls.__dict__.items():
# Get all class attribute and value pairs except enum_friendly_name
if k.startswith("__") or k.lower() == "enum_friendly_name":
continue
diff --git a/scripts/Diffraction/isis_powder/routines/param_map_entry.py b/scripts/Diffraction/isis_powder/routines/param_map_entry.py
index e260b0dd8da2f28e10f2d1e8778d55cd63f58f08..4da9de368b1e812bcd14e57086d175c856b3b652 100644
--- a/scripts/Diffraction/isis_powder/routines/param_map_entry.py
+++ b/scripts/Diffraction/isis_powder/routines/param_map_entry.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Holds an entry for a parameter map which will be later parsed by InstrumentSettings
diff --git a/scripts/Diffraction/isis_powder/routines/run_details.py b/scripts/Diffraction/isis_powder/routines/run_details.py
index 14aa89cb90627201d77358e3b4a2bd8c9c7b7a38..bbc45fa162d527396be48f17e8edaa848cb17c64 100644
--- a/scripts/Diffraction/isis_powder/routines/run_details.py
+++ b/scripts/Diffraction/isis_powder/routines/run_details.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.routines import common, yaml_parser
import os
diff --git a/scripts/Diffraction/isis_powder/routines/sample_details.py b/scripts/Diffraction/isis_powder/routines/sample_details.py
index 0354c99d2482a01fb7f3570313de7da9ba1aee67..addcffe6b0a3fe7bb9888e9b3c631f46750d3a5c 100644
--- a/scripts/Diffraction/isis_powder/routines/sample_details.py
+++ b/scripts/Diffraction/isis_powder/routines/sample_details.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-from six import iteritems
from isis_powder.routines import common
import math
from mantid import logger
@@ -95,7 +92,7 @@ class SampleDetails(object):
# Attempt to convert them all to floating point relying on the fact on
# the way Python has aliases to an object
- for key, value in iteritems(values_to_check):
+ for key, value in values_to_check.items():
_check_value_is_physical(property_name=key, value=value)
_check_can_convert_to_float(property_name=key, value=value)
@@ -226,7 +223,7 @@ class _Cylinder(object):
# Attempt to convert them all to floating point relying on the fact on
# the way Python has aliases to an object
- for key, value in iteritems(values_to_check):
+ for key, value in values_to_check.items():
_check_value_is_physical(property_name=key, value=value)
_check_can_convert_to_float(property_name=key, value=value)
diff --git a/scripts/Diffraction/isis_powder/routines/yaml_parser.py b/scripts/Diffraction/isis_powder/routines/yaml_parser.py
index 0b5489e04180020bc44b651ad67b77ebb4e46146..e97886594b074fd92fe95446b11cee091a69faa3 100644
--- a/scripts/Diffraction/isis_powder/routines/yaml_parser.py
+++ b/scripts/Diffraction/isis_powder/routines/yaml_parser.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import yaml
from isis_powder.routines import common as common
diff --git a/scripts/Diffraction/isis_powder/routines/yaml_sanity.py b/scripts/Diffraction/isis_powder/routines/yaml_sanity.py
index 039e7e1a61ade636ef23a4a5e2cc974c3663da6c..0f083d17fc021e30c18fb944c27030066c7c622a 100644
--- a/scripts/Diffraction/isis_powder/routines/yaml_sanity.py
+++ b/scripts/Diffraction/isis_powder/routines/yaml_sanity.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
def calibration_file_sanity_check(yaml_dict, file_path):
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
index 06d8a50a6903d7fedfe69dc960fac78ee8782274..801887642f4b583af0a8aa361e1079e2e57e5965 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
@@ -4,13 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
import unittest
-from six import iterkeys, assertRaisesRegex
-
from isis_powder.routines import absorb_corrections, SampleDetails
@@ -37,17 +33,17 @@ class ISISPowderAbsorptionTest(unittest.TestCase):
}
# Test each key one at a time
- for blacklisted_key in iterkeys(sample_properties):
+ for blacklisted_key in sample_properties.keys():
# Force python to make a shallow copy
modified_dict = sample_properties.copy()
modified_dict.pop(blacklisted_key)
# Check that is raises an error
- with assertRaisesRegex(self, KeyError, "The following key was not found in the advanced configuration"):
+ with self.assertRaisesRegex(KeyError, "The following key was not found in the advanced configuration"):
absorb_corrections.create_vanadium_sample_details_obj(config_dict=modified_dict)
# Then check the error actually has the key name in it
- with assertRaisesRegex(self, KeyError, blacklisted_key):
+ with self.assertRaisesRegex(KeyError, blacklisted_key):
absorb_corrections.create_vanadium_sample_details_obj(config_dict=modified_dict)
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
index 711d3f2e3d791750b49f1a0ee575bc57efd10d0d..cc8509c4b56e51e97420b0c11034cb49cdd2dfd5 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid
from isis_powder.abstract_inst import AbstractInst
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
index 5021089160d6dc2f06980c08366c5a0b07adf79b..21284c0a3e5dd28138a776f4d49dd630f2f3926b 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
@@ -4,13 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid # Have to import Mantid to setup paths
import unittest
-from six import assertRaisesRegex
-
from isis_powder.routines import common, common_enums, SampleDetails
@@ -23,12 +19,12 @@ class ISISPowderCommonTest(unittest.TestCase):
dict_with_key = {correct_key_name: expected_val}
# Check it correctly raises
- with assertRaisesRegex(self, KeyError, "The field '" + missing_key_name + "' is required"):
+ with self.assertRaisesRegex(KeyError, "The field '" + missing_key_name + "' is required"):
common.cal_map_dictionary_key_helper(dictionary=dict_with_key, key=missing_key_name)
# Check it correctly appends the passed error message when raising
appended_e_msg = "test append message"
- with assertRaisesRegex(self, KeyError, appended_e_msg):
+ with self.assertRaisesRegex(KeyError, appended_e_msg):
common.cal_map_dictionary_key_helper(dictionary=dict_with_key, key=missing_key_name,
append_to_error_message=appended_e_msg)
@@ -60,15 +56,15 @@ class ISISPowderCommonTest(unittest.TestCase):
bank_list.append(mantid.CreateSampleWorkspace(OutputWorkspace=out_name, XMin=0, XMax=1100, BinWidth=1))
# Check a list of WS and single cropping value is detected
- with assertRaisesRegex(self, ValueError, "The cropping values were not in a list or tuple type"):
+ with self.assertRaisesRegex(ValueError, "The cropping values were not in a list or tuple type"):
common.crop_banks_using_crop_list(bank_list=bank_list, crop_values_list=1000)
# Check a list of cropping values and a single workspace is detected
- with assertRaisesRegex(self, RuntimeError, "Attempting to use list based cropping"):
+ with self.assertRaisesRegex(RuntimeError, "Attempting to use list based cropping"):
common.crop_banks_using_crop_list(bank_list=bank_list[0], crop_values_list=cropping_value_list)
# What about a mismatch between the number of cropping values and workspaces
- with assertRaisesRegex(self, RuntimeError, "The number of TOF cropping values does not match"):
+ with self.assertRaisesRegex(RuntimeError, "The number of TOF cropping values does not match"):
common.crop_banks_using_crop_list(bank_list=bank_list[1:], crop_values_list=cropping_value_list)
# Check we can crop a single workspace from the list
@@ -97,11 +93,11 @@ class ISISPowderCommonTest(unittest.TestCase):
bank_list.append(mantid.CreateSampleWorkspace(OutputWorkspace=out_name, XMin=x_min, XMax=x_max, BinWidth=1))
# Check a list of WS and non list or tuple
- with assertRaisesRegex(self, ValueError, "The cropping values were not in a list or tuple type"):
+ with self.assertRaisesRegex(ValueError, "The cropping values were not in a list or tuple type"):
common.crop_banks_using_crop_list(bank_list=bank_list, crop_values_list=1000)
# Check a cropping value and a single workspace is detected
- with assertRaisesRegex(self, RuntimeError, "Attempting to use list based cropping"):
+ with self.assertRaisesRegex(RuntimeError, "Attempting to use list based cropping"):
common.crop_banks_using_crop_list(bank_list=bank_list[0], crop_values_list=cropping_value)
# Check we can crop a single workspace from the list
@@ -208,7 +204,7 @@ class ISISPowderCommonTest(unittest.TestCase):
with self.assertRaises(KeyError):
common.dictionary_key_helper(dictionary=test_dictionary, key=bad_key_name)
- with assertRaisesRegex(self, KeyError, e_msg):
+ with self.assertRaisesRegex(KeyError, e_msg):
common.dictionary_key_helper(dictionary=test_dictionary, key=bad_key_name, exception_msg=e_msg)
self.assertEqual(common.dictionary_key_helper(dictionary=test_dictionary, key=good_key_name), 123)
@@ -312,11 +308,11 @@ class ISISPowderCommonTest(unittest.TestCase):
def test_generate_run_numbers_fails(self):
run_input_sting = "text-string"
- with assertRaisesRegex(self, ValueError, "Could not generate run numbers from this input"):
+ with self.assertRaisesRegex(ValueError, "Could not generate run numbers from this input"):
common.generate_run_numbers(run_number_string=run_input_sting)
# Check it says what the actual string was
- with assertRaisesRegex(self, ValueError, run_input_sting):
+ with self.assertRaisesRegex(ValueError, run_input_sting):
common.generate_run_numbers(run_number_string=run_input_sting)
def test_load_current_normalised_workspace(self):
@@ -446,14 +442,14 @@ class ISISPowderCommonTest(unittest.TestCase):
NumBanks=1, BankPixelWidth=1, XMax=10, BinWidth=1))
# What if the item passed in is not a list
err_msg_not_list = "was not a list"
- with assertRaisesRegex(self, RuntimeError, err_msg_not_list):
+ with self.assertRaisesRegex(RuntimeError, err_msg_not_list):
common.rebin_workspace_list(workspace_list=ws_list, bin_width_list=None)
- with assertRaisesRegex(self, RuntimeError, err_msg_not_list):
+ with self.assertRaisesRegex(RuntimeError, err_msg_not_list):
common.rebin_workspace_list(workspace_list=None, bin_width_list=[])
# What about if the lists aren't the same length
- with assertRaisesRegex(self, ValueError, "does not match the number of banks"):
+ with self.assertRaisesRegex(ValueError, "does not match the number of banks"):
incorrect_number_bin_widths = [1] * (number_of_ws - 1)
common.rebin_workspace_list(workspace_list=ws_list, bin_width_list=incorrect_number_bin_widths)
@@ -482,10 +478,10 @@ class ISISPowderCommonTest(unittest.TestCase):
# Are the lengths checked
incorrect_length = [1] * (number_of_ws - 1)
- with assertRaisesRegex(self, ValueError, "The number of starting bin values"):
+ with self.assertRaisesRegex(ValueError, "The number of starting bin values"):
common.rebin_workspace_list(workspace_list=ws_list, bin_width_list=ws_bin_widths,
start_x_list=incorrect_length, end_x_list=end_x_list)
- with assertRaisesRegex(self, ValueError, "The number of ending bin values"):
+ with self.assertRaisesRegex(ValueError, "The number of ending bin values"):
common.rebin_workspace_list(workspace_list=ws_list, bin_width_list=ws_bin_widths,
start_x_list=start_x_list, end_x_list=incorrect_length)
@@ -590,7 +586,7 @@ class ISISPowderCommonTest(unittest.TestCase):
ws_file_name = "100" # Load POL100
# This should throw as the TOF ranges do not match
- with assertRaisesRegex(self, ValueError, "specified for this file do not have matching binning. Do the "):
+ with self.assertRaisesRegex(ValueError, "specified for this file do not have matching binning. Do the "):
common.subtract_summed_runs(ws_to_correct=sample_ws, instrument=ISISPowderMockInst(),
empty_sample_ws_string=ws_file_name)
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
index c0f7e8baa93fa7c49000b326214deb24b8cdb625..a6036aec7030b10363bc0aa57cad35a7db39d166 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as mantid
from isis_powder.routines import focus
import unittest
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
index 52a8dc9198f4c527a93078f2e2c198065759b723..95a7dd7a3ae89051440d479cbab148a8f4b23bd6 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import FileFinder
import mantid.simpleapi as mantid # Have to import Mantid to setup paths
import unittest
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
index 8040524d061f5165ad0262920875355182f48d07..1c6966ae8e6f3de0cd5c7aa126d6ccc1d11b489b 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
@@ -4,13 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import warnings
-from six import assertRaisesRegex, assertRegex
-
from isis_powder.routines import instrument_settings, param_map_entry
@@ -20,7 +16,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
inst_settings_obj = instrument_settings.InstrumentSettings(param_map=[param_entry])
- with assertRaisesRegex(self, AttributeError, "is required but was not set or passed"):
+ with self.assertRaisesRegex(AttributeError, "is required but was not set or passed"):
foo = inst_settings_obj.script_facing_name
del foo
@@ -30,7 +26,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
inst_settings_obj = instrument_settings.InstrumentSettings(param_map=[param_entry])
# Check it still prints the acceptable values when it fails
- with assertRaisesRegex(self, AttributeError, "A BAR"):
+ with self.assertRaisesRegex(AttributeError, "A BAR"):
foo = inst_settings_obj.script_facing_name
del foo
@@ -39,7 +35,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
inst_settings_obj = instrument_settings.InstrumentSettings(param_map=[param_entry])
- with assertRaisesRegex(self, AttributeError, "Please contact the development team"):
+ with self.assertRaisesRegex(AttributeError, "Please contact the development team"):
foo = inst_settings_obj.not_known
del foo
@@ -65,9 +61,9 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
inst_settings_obj = instrument_settings.InstrumentSettings(param_map=[param_entry], kwargs=keyword_args,
adv_conf_dict=adv_config)
- assertRegex(self, str(warning_capture[-1].message), "which was previously set to")
- assertRegex(self, str(warning_capture[-1].message), str(original_value))
- assertRegex(self, str(warning_capture[-1].message), str(new_value))
+ self.assertRegex(str(warning_capture[-1].message), "which was previously set to")
+ self.assertRegex(str(warning_capture[-1].message), str(original_value))
+ self.assertRegex(str(warning_capture[-1].message), str(new_value))
self.assertEqual(inst_settings_obj.script_facing_name, new_value)
@@ -92,9 +88,9 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
warnings.simplefilter("always")
inst_settings_obj.update_attributes(basic_config=config_dict)
- assertRegex(self, str(warning_capture[-1].message), "which was previously set to")
- assertRegex(self, str(warning_capture[-1].message), str(original_value))
- assertRegex(self, str(warning_capture[-1].message), str(new_value))
+ self.assertRegex(str(warning_capture[-1].message), "which was previously set to")
+ self.assertRegex(str(warning_capture[-1].message), str(original_value))
+ self.assertRegex(str(warning_capture[-1].message), str(new_value))
warnings_current_length = len(warning_capture)
# Then check that we only get one additional warning when replacing values again not two
@@ -143,7 +139,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
# First test we cannot set it to a different value
incorrect_value_dict = {"user_facing_name": "wrong"}
- with assertRaisesRegex(self, ValueError, "The user specified value: 'wrong' is unknown"):
+ with self.assertRaisesRegex(ValueError, "The user specified value: 'wrong' is unknown"):
instrument_settings.InstrumentSettings(param_map=[param_entry],
adv_conf_dict=incorrect_value_dict)
@@ -159,8 +155,8 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
def test_param_map_rejects_enum_missing_friendly_name(self):
# Check that is the friendly name is not set it is correctly detected
- with assertRaisesRegex(self, RuntimeError,
- "'enum_friendly_name' was not set. Please contact development team."):
+ with self.assertRaisesRegex(RuntimeError,
+ "'enum_friendly_name' was not set. Please contact development team."):
param_map_entry.ParamMapEntry(ext_name="user_facing_name", int_name="script_facing_name",
enum_class=BadSampleEnum)
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
index 67f1d5797057d72f9798e8870683a38c09192ff2..917785670ccdd7fb451d3abe0ea1d53c31703d32 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.api
import os
import random
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
index b04f02ed6ed0382e60d7a99dfae457b830d8a02a..d9bd971cdccdab86a231bb20709c12f3cff8fa57 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
@@ -4,17 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import io
-import six
import sys
import unittest
from isis_powder.routines import sample_details
-from six import assertRaisesRegex, assertRegex
-
class ISISPowderSampleDetailsTest(unittest.TestCase):
def test_constructor(self):
@@ -61,34 +56,34 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
char_input_value = 'a'
# Check it handles empty input
- with assertRaisesRegex(self, ValueError, "Could not convert the height to a number"):
+ with self.assertRaisesRegex(ValueError, "Could not convert the height to a number"):
sample_details.SampleDetails(height=empty_input_value, radius=good_input,
center=good_center_input, shape="cylinder")
# Does it handle bad input and tell us what we put in
- with assertRaisesRegex(self, ValueError, ".*to a number. The input was: '" + char_input_value + "'"):
+ with self.assertRaisesRegex(ValueError, ".*to a number. The input was: '" + char_input_value + "'"):
sample_details.SampleDetails(height=char_input_value, radius=good_input,
center=good_center_input, shape="cylinder")
# Does it indicate which field was incorrect
- with assertRaisesRegex(self, ValueError, "radius"):
+ with self.assertRaisesRegex(ValueError, "radius"):
sample_details.SampleDetails(height=good_input, radius=char_input_value,
center=good_center_input, shape="cylinder")
# Can it handle bad center values
- with assertRaisesRegex(self, ValueError, "center"):
+ with self.assertRaisesRegex(ValueError, "center"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=["", 2, 3], shape="cylinder")
# Does it throw if were not using a list for the input
- with assertRaisesRegex(self, ValueError, "must be specified as a list of X, Y, Z"):
+ with self.assertRaisesRegex(ValueError, "must be specified as a list of X, Y, Z"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=1, shape="cylinder")
# Does it throw if we are using a list of incorrect length (e.g. not 3D)
- with assertRaisesRegex(self, ValueError, "must have three values corresponding to"):
+ with self.assertRaisesRegex(ValueError, "must have three values corresponding to"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=[], shape="cylinder")
- with assertRaisesRegex(self, ValueError, "must have three values corresponding to"):
+ with self.assertRaisesRegex(ValueError, "must have three values corresponding to"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=[1, 2], shape="cylinder")
- with assertRaisesRegex(self, ValueError, "must have three values corresponding to"):
+ with self.assertRaisesRegex(ValueError, "must have three values corresponding to"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=[1, 2, 3, 4], shape="cylinder")
def test_constructor_with_impossible_val(self):
@@ -100,22 +95,22 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
negative_string = "-1"
# Check it handles zero
- with assertRaisesRegex(self, ValueError, "The value set for height was: 0"):
+ with self.assertRaisesRegex(ValueError, "The value set for height was: 0"):
sample_details.SampleDetails(height=zero_value, radius=good_input,
center=good_center_input, shape="cylinder")
# Very small negative
- with assertRaisesRegex(self, ValueError, "which is impossible for a physical object"):
+ with self.assertRaisesRegex(ValueError, "which is impossible for a physical object"):
sample_details.SampleDetails(height=good_input, radius=negative_value,
center=good_center_input, shape="cylinder")
# Integer negative
- with assertRaisesRegex(self, ValueError, "The value set for height was: -1"):
+ with self.assertRaisesRegex(ValueError, "The value set for height was: -1"):
sample_details.SampleDetails(height=negative_int, radius=good_input,
center=good_center_input, shape="cylinder")
# String negative
- with assertRaisesRegex(self, ValueError, "The value set for radius was: -1"):
+ with self.assertRaisesRegex(ValueError, "The value set for radius was: -1"):
sample_details.SampleDetails(height=good_input, radius=negative_string,
center=good_center_input, shape="cylinder")
@@ -127,7 +122,7 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
self.assertIsNotNone(sample_details_obj.material_object)
# Check that the material is now immutable
- with assertRaisesRegex(self, RuntimeError, "The material has already been set to the above details"):
+ with self.assertRaisesRegex(RuntimeError, "The material has already been set to the above details"):
sample_details_obj.set_material(chemical_formula='V')
# Check resetting it works
@@ -144,7 +139,7 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
self.assertIsNone(sample_details_obj.material_object)
# Check we cannot set a material property without setting the underlying material
- with assertRaisesRegex(self, RuntimeError, "The material has not been set"):
+ with self.assertRaisesRegex(RuntimeError, "The material has not been set"):
sample_details_obj.set_material_properties(absorption_cross_section=1.0, scattering_cross_section=2.0)
# Check that with a material object we are allowed to set material properties
@@ -180,7 +175,7 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
self.assertEqual(material_obj_number_density.number_density, number_density_sample)
# Check that it raises an error if we have a non-elemental formula without number density
- with assertRaisesRegex(self, ValueError, "A number density formula must be set on a chemical formula"):
+ with self.assertRaisesRegex(ValueError, "A number density formula must be set on a chemical formula"):
sample_details._Material(chemical_formula=chemical_formula_complex)
# Check it constructs if it is given the number density too
@@ -197,14 +192,14 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
good_scattering = 2.0
material_obj = sample_details._Material(chemical_formula='V')
- with assertRaisesRegex(self, ValueError, "absorption_cross_section was: -1 which is impossible for a physical "
- "object"):
+ with self.assertRaisesRegex(ValueError, "absorption_cross_section was: -1 which is impossible for a physical "
+ "object"):
material_obj.set_material_properties(abs_cross_sect=bad_absorb, scattering_cross_sect=good_scattering)
# Check the immutability flag has not been set on a failure
self.assertFalse(material_obj._is_material_props_set)
- with assertRaisesRegex(self, ValueError, "scattering_cross_section was: 0"):
+ with self.assertRaisesRegex(ValueError, "scattering_cross_section was: 0"):
material_obj.set_material_properties(abs_cross_sect=good_absorb, scattering_cross_sect=bad_scattering)
# Check nothing has been set yet
@@ -218,7 +213,7 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
self.assertEqual(material_obj.scattering_cross_section, float(good_scattering))
# Check we cannot set it twice and fields do not change
- with assertRaisesRegex(self, RuntimeError, "The material properties have already been set"):
+ with self.assertRaisesRegex(RuntimeError, "The material properties have already been set"):
material_obj.set_material_properties(abs_cross_sect=999, scattering_cross_sect=999)
self.assertEqual(material_obj.absorption_cross_section, float(good_absorb))
self.assertEqual(material_obj.scattering_cross_section, float(good_scattering))
@@ -244,19 +239,19 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
# Test with most defaults set
sample_details_obj.print_sample_details()
captured_std_out_default = std_out_buffer.getvalue()
- assertRegex(self, captured_std_out_default, "Height: " + str(float(expected_height)))
- assertRegex(self, captured_std_out_default, "Radius: " + str(float(expected_radius)))
- assertRegex(self, captured_std_out_default, "Center X:" + str(float(expected_center[0])))
- assertRegex(self, captured_std_out_default, "Material has not been set")
+ self.assertRegex(captured_std_out_default, "Height: " + str(float(expected_height)))
+ self.assertRegex(captured_std_out_default, "Radius: " + str(float(expected_radius)))
+ self.assertRegex(captured_std_out_default, "Center X:" + str(float(expected_center[0])))
+ self.assertRegex(captured_std_out_default, "Material has not been set")
# Test with material set but not number density
sys.stdout = std_out_buffer = get_std_out_buffer_obj()
sample_details_obj.set_material(chemical_formula=chemical_formula)
sample_details_obj.print_sample_details()
captured_std_out_material_default = std_out_buffer.getvalue()
- assertRegex(self, captured_std_out_material_default, "Material properties:")
- assertRegex(self, captured_std_out_material_default, "Chemical formula: " + chemical_formula)
- assertRegex(self, captured_std_out_material_default, "Number Density: Set from elemental properties")
+ self.assertRegex(captured_std_out_material_default, "Material properties:")
+ self.assertRegex(captured_std_out_material_default, "Chemical formula: " + chemical_formula)
+ self.assertRegex(captured_std_out_material_default, "Number Density: Set from elemental properties")
# Test with material and number density
sys.stdout = std_out_buffer = get_std_out_buffer_obj()
@@ -265,13 +260,13 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
number_density=expected_number_density)
sample_details_obj.print_sample_details()
captured_std_out_material_set = std_out_buffer.getvalue()
- assertRegex(self, captured_std_out_material_set, "Chemical formula: " + chemical_formula_two)
- assertRegex(self, captured_std_out_material_set, "Number Density: " + str(expected_number_density))
+ self.assertRegex(captured_std_out_material_set, "Chemical formula: " + chemical_formula_two)
+ self.assertRegex(captured_std_out_material_set, "Number Density: " + str(expected_number_density))
# Test with no material properties set - we can reuse buffer from previous test
- assertRegex(self, captured_std_out_material_default, "Absorption cross section: Calculated by Mantid")
- assertRegex(self, captured_std_out_material_default, "Scattering cross section: Calculated by Mantid")
- assertRegex(self, captured_std_out_material_default, "Note to manually override these call")
+ self.assertRegex(captured_std_out_material_default, "Absorption cross section: Calculated by Mantid")
+ self.assertRegex(captured_std_out_material_default, "Scattering cross section: Calculated by Mantid")
+ self.assertRegex(captured_std_out_material_default, "Note to manually override these call")
expected_abs_x_section = 2.13
expected_scattering_x_section = 5.32
@@ -282,10 +277,10 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
scattering_cross_section=expected_scattering_x_section)
sample_details_obj.print_sample_details()
captured_std_out_material_props = std_out_buffer.getvalue()
- assertRegex(self, captured_std_out_material_props, "Absorption cross section: "
- + str(expected_abs_x_section))
- assertRegex(self, captured_std_out_material_props, "Scattering cross section: "
- + str(expected_scattering_x_section))
+ self.assertRegex(captured_std_out_material_props, "Absorption cross section: "
+ + str(expected_abs_x_section))
+ self.assertRegex(captured_std_out_material_props, "Scattering cross section: "
+ + str(expected_scattering_x_section))
finally:
# Ensure std IO is restored. Do NOT remove this line as all std out will pipe into our buffer otherwise
sys.stdout = old_std_out
@@ -354,10 +349,7 @@ def get_std_out_buffer_obj():
# Because of the way that strings and bytes
# have changed between Python 2/3 we need to
# return a buffer which is appropriate to the current version
- if six.PY2:
- return io.BytesIO()
- elif six.PY3:
- return io.StringIO()
+ return io.StringIO()
if __name__ == "__main__":
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
index f9a3019d73446efed8b63ba884ef1392f42d51c2..7efd940a530f59f8b5be013013b87d75713e592d 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
@@ -4,14 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import tempfile
import os
import unittest
import warnings
-from six import assertRaisesRegex
-
from isis_powder.routines import yaml_parser
@@ -79,7 +75,7 @@ class ISISPowderYamlParserTest(unittest.TestCase):
self.fail("File exists after deleting cannot continue this test")
# Check the error message is there
- with assertRaisesRegex(self, ValueError, "Config file not found at path"):
+ with self.assertRaisesRegex(ValueError, "Config file not found at path"):
yaml_parser.get_run_dictionary(run_number_string="1", file_path=file_path)
def test_is_run_range_unbounded(self):
@@ -105,7 +101,7 @@ class ISISPowderYamlParserTest(unittest.TestCase):
file_path = file_handle.name
file_handle.close()
- with assertRaisesRegex(self, ValueError, "YAML files appears to be empty at"):
+ with self.assertRaisesRegex(ValueError, "YAML files appears to be empty at"):
yaml_parser.get_run_dictionary(run_number_string=1, file_path=file_path)
def test_run_number_not_found_gives_sane_err(self):
@@ -120,15 +116,15 @@ class ISISPowderYamlParserTest(unittest.TestCase):
file_handle.close()
# Test a value in the middle of 1-10
- with assertRaisesRegex(self, ValueError, "Run number 5 not recognised in cycle mapping file"):
+ with self.assertRaisesRegex(ValueError, "Run number 5 not recognised in cycle mapping file"):
yaml_parser.get_run_dictionary(run_number_string="5", file_path=file_path)
# Check on edge of invalid numbers
- with assertRaisesRegex(self, ValueError, "Run number 9 not recognised in cycle mapping file"):
+ with self.assertRaisesRegex(ValueError, "Run number 9 not recognised in cycle mapping file"):
yaml_parser.get_run_dictionary(run_number_string=9, file_path=file_path)
# What about a range of numbers
- with assertRaisesRegex(self, ValueError, "Run number 2 not recognised in cycle mapping file"):
+ with self.assertRaisesRegex(ValueError, "Run number 2 not recognised in cycle mapping file"):
yaml_parser.get_run_dictionary(run_number_string="2-8", file_path=file_path)
# Check valid number still works
@@ -143,7 +139,7 @@ class ISISPowderYamlParserTest(unittest.TestCase):
file_path = file_handle.name
file_handle.close()
- with assertRaisesRegex(self, ValueError, "Seen multiple unbounded keys in mapping file"):
+ with self.assertRaisesRegex(ValueError, "Seen multiple unbounded keys in mapping file"):
yaml_parser.get_run_dictionary(run_number_string="11", file_path=file_path)
def test_yaml_sanity_detects_val_larger_than_unbound(self):
@@ -154,8 +150,8 @@ class ISISPowderYamlParserTest(unittest.TestCase):
file_path = file_handle.name
file_handle.close()
- with assertRaisesRegex(self, ValueError, "Found a run range in calibration mapping overlaps an unbounded run "
- "range"):
+ with self.assertRaisesRegex(ValueError, "Found a run range in calibration mapping overlaps an unbounded run "
+ "range"):
yaml_parser.get_run_dictionary(run_number_string="32", file_path=file_path)
diff --git a/scripts/Diffraction/wish/reduce.py b/scripts/Diffraction/wish/reduce.py
index d0b58a042bb3d1d8a72e642a54cf018aeed3379c..fe898d4fe7887d25441d0596bb592b9389329b1d 100644
--- a/scripts/Diffraction/wish/reduce.py
+++ b/scripts/Diffraction/wish/reduce.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid import logger
import mantid.simpleapi as simple
import os
diff --git a/scripts/Elemental_Analysis.py b/scripts/Elemental_Analysis.py
index ef3ed66f8282e6f04e8e3d63cf337acd53481701..51c824c0f67d9894b22e67995355350a50d32fd4 100644
--- a/scripts/Elemental_Analysis.py
+++ b/scripts/Elemental_Analysis.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from qtpy import QtCore
from Muon.GUI.ElementalAnalysis.elemental_analysis import ElementalAnalysisGui
from Muon.GUI.Common.usage_report import report_interface_startup
diff --git a/scripts/Engineering/EnggUtils.py b/scripts/Engineering/EnggUtils.py
index 6d5b752f7733b4322d26f8ff06e0f2395a9a9085..370527dbb59ba0efc5e4778e8ec6f2e8a1a504f3 100644
--- a/scripts/Engineering/EnggUtils.py
+++ b/scripts/Engineering/EnggUtils.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
import mantid.simpleapi as mantid
diff --git a/scripts/Engineering/EnginX.py b/scripts/Engineering/EnginX.py
index 933b4956628700caac68d5d96f0c6ff9630d25de..6bb5c4449757e389f2de2d6b5d74654a96ee20c5 100644
--- a/scripts/Engineering/EnginX.py
+++ b/scripts/Engineering/EnginX.py
@@ -4,16 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import csv
import matplotlib.pyplot as plt
import numpy as np
import os
from platform import system
from shutil import copy2
-import six
-
import mantid.plots # noqa
import Engineering.EnggUtils as Utils
import mantid.simpleapi as simple
@@ -576,18 +572,11 @@ def focus_texture_mode(run_number, van_curves, van_int, focus_directory, focus_g
banks = {}
# read the csv file to work out the banks
# ensure csv reading works on python 2 or 3
- if not six.PY2:
- with open(dg_file, 'r', newline='', encoding='utf-8') as grouping_file:
- group_reader = csv.reader(_decomment_csv(grouping_file), delimiter=',')
-
- for row in group_reader:
- banks.update({row[0]: ','.join(row[1:])})
- else:
- with open(dg_file, 'r') as grouping_file:
- group_reader = csv.reader(_decomment_csv(grouping_file), delimiter=',')
+ with open(dg_file, 'r', newline='', encoding='utf-8') as grouping_file:
+ group_reader = csv.reader(_decomment_csv(grouping_file), delimiter=',')
- for row in group_reader:
- banks.update({row[0]: ','.join(row[1:])})
+ for row in group_reader:
+ banks.update({row[0]: ','.join(row[1:])})
# loop through the banks described in the csv, focusing and saing them out
for bank in banks:
@@ -635,7 +624,7 @@ def _save_out(run_number, focus_directory, focus_general, output, enginx_file_na
dat_name, genie_filename, gss_name, hdf5_name, nxs_name = _find_focus_file_location(bank_id, focus_directory,
enginx_file_name_format,
run_number)
- if not six.u(bank_id).isnumeric():
+ if not str(bank_id).isnumeric():
bank_id = 0
# save the files out to the user directory
simple.SaveFocusedXYE(InputWorkspace=output, Filename=dat_name, SplitFiles=False,
diff --git a/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py b/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
index 97157eaa5f9a1614077f4e20869276de0cca4d71..6c71e427b75654f2d919591e6d3d16503778cc9e 100644
--- a/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
+++ b/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtCore, QtWidgets
from .tabs.calibration.model import CalibrationModel
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/settings_helper.py b/scripts/Engineering/gui/engineering_diffraction/settings/settings_helper.py
index ecfa06083aba7e992736efe4cfffad4ac006882a..b9e2df13e27b01de37fdca2553d5d22ce747ec8d 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/settings_helper.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/settings_helper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy.QtCore import QSettings
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/settings_model.py b/scripts/Engineering/gui/engineering_diffraction/settings/settings_model.py
index 24a641c2458ca2cb77c94872f40d21ad13868375..fb003562f72a5b19641a4a6847a96d602c4ab446 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/settings_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/settings_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Engineering.gui.engineering_diffraction.settings.settings_helper import get_setting, set_setting
from Engineering.gui.engineering_diffraction.tabs.common import path_handling
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/settings_presenter.py b/scripts/Engineering/gui/engineering_diffraction/settings/settings_presenter.py
index ef44ae60a5cf9e6c220f72f347741912aa45bfc7..1a3f20754452424727a579d2b9bc64d1575dbe4c 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/settings_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/settings_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from os import path
SETTINGS_DICT = {"save_location": str, "full_calibration": str, "recalc_vanadium": bool}
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/settings_view.py b/scripts/Engineering/gui/engineering_diffraction/settings/settings_view.py
index 59b9bfa8dddafa6793671672ece5003c282216a4..d5c9b4e215dbadb6731717a5d6c89de8ad45fc49 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/settings_view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/settings_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtCore
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_helper.py b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_helper.py
index f9d646c9d4ecc703a522ca79f89470cb5724f38e..0b162adde95d586d35f070e49744a811f18eec95 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_helper.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_helper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Engineering.gui.engineering_diffraction.settings.settings_helper import set_setting, get_setting
from qtpy.QtCore import QSettings, QCoreApplication
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py
index e7efc5d99e75f3852374fc03ecba7dd6eab6bced..17f7b77831d8415d9f8e6d5958965a947cd53bf1 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from Engineering.gui.engineering_diffraction.settings.settings_model import SettingsModel
dir_path = "Engineering.gui.engineering_diffraction.settings."
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py
index b60834f9309d9ac85de2fc51f44237efdb3cb5f6..03b3e977b07490b719457bd799701ece3ffe3377 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py
@@ -5,11 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Engineering.gui.engineering_diffraction.settings import settings_model, settings_view, settings_presenter
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
index 7226bcbeecc9017b4effab53ad35edbf44dbe74a..99fdd6912832c521daa58d347d06fc606290b74a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from os import path, makedirs
from matplotlib import gridspec
import matplotlib.pyplot as plt
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
index c2f544610995594f506a924291cc4f5dff3d452b..581c8ae078abc8f854a497c111897657eb64b2b2 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from copy import deepcopy
from Engineering.gui.engineering_diffraction.tabs.common import INSTRUMENT_DICT, create_error_message
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
index c0be1f4250ed25d0890f87c2cfc1c9836fea0ee6..1b15fdbc71939a0035633cd1bc474fab2221c5e0 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat.mock import patch
-from mantid.py3compat.mock import MagicMock
+from unittest.mock import patch
+from unittest.mock import MagicMock
from Engineering.gui.engineering_diffraction.tabs.calibration.model import CalibrationModel
VANADIUM_NUMBER = "307521"
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
index 909b6ba0f3718105e958992c4ec05b11d9f76c0f..8719144e3d943140aa6680824d7a68d99ee1071a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat.mock import patch, MagicMock
-from mantid.py3compat import mock
+from unittest.mock import patch, MagicMock
+from unittest import mock
from Engineering.gui.engineering_diffraction.tabs.calibration import model, view, presenter
from Engineering.gui.engineering_diffraction.tabs.common.calibration_info import CalibrationInfo
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py
index 09d685f039f50c9782972cf189ab6503a1de3a85..c9d71b8f34ab2b5089e7b4994df88f14af52deda 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtCore
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py
index 4e2d57432e9b48db6113ee6ede6f7d3fe3e3222d..d0902aa517bc043b00ca7d8faf1b7421ca68baf5 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class CalibrationInfo(object):
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_model.py
index 0f610f4e01a06574371a31534a04f08f5d26d312..2ad947119a48384dadeaeaef9b6310941a0a5e2b 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import re
ENGINX_MAX_SPECTRA = 2400 # 2512 spectra appear in the ws. But from testing, anything > 2400 doesn't work.
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
index 478e9a69474191374319e4107ced77713f3ed26c..ba44698dd08f8a192650d23bf0a7fb93e6c5bb46 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class CroppingPresenter(object):
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_view.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_view.py
index 9879c0e339135d4cfb6319b7b05e69064640b91f..adda044e6518d6d56b7e357b0b57cd1b559e4154 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_widget.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_widget.py
index 5312ad202a556b94851d332ddbef3c66c48bcce0..21c9c35549aa94971b40189d5fca3bee9786eac4 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_widget.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Engineering.gui.engineering_diffraction.tabs.common.cropping.cropping_model import CroppingModel
from Engineering.gui.engineering_diffraction.tabs.common.cropping.cropping_view import CroppingView
from Engineering.gui.engineering_diffraction.tabs.common.cropping.cropping_presenter import CroppingPresenter
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py
index e7c4a0a730c593bfb4fbdd8af69a141ec837b4f1..75da21c3f4749b8f94d99668b75ad8588effea5f 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from Engineering.gui.engineering_diffraction.tabs.common.cropping.cropping_model import CroppingModel
@@ -47,9 +45,9 @@ class CroppingModelTest(unittest.TestCase):
self.assertEqual(self.model._clean_spectrum_numbers("2-1, 76-5, 3"), "1-2,5-76,3")
def test_clean_spectrum_numbers_equal_range(self):
- self.assertRaisesRegexp(ValueError,
- "Ranges cannot contain the same value twice. Invalid Range:*",
- self.model._clean_spectrum_numbers, "1-1, 76-76, 3")
+ self.assertRaisesRegex(ValueError,
+ "Ranges cannot contain the same value twice. Invalid Range:*",
+ self.model._clean_spectrum_numbers, "1-1, 76-76, 3")
def test_validate_and_clean_with_valid_input(self):
self.assertEqual(self.model.validate_and_clean_spectrum_numbers("1-6, 7-23, 46, 1"),
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
index 11cd00f1531d1e9797de20655d611fd39643f879..dc49c3c48ce7597630ec48b9715b5a721b2bf97a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Engineering.gui.engineering_diffraction.tabs.common.cropping import cropping_model, cropping_view, cropping_presenter
dir_path = "Engineering.gui.engineering_diffraction.tabs.common.cropping"
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/path_handling.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/path_handling.py
index 07df2ef7e1a5dc1f9267afe331b55d1e055d3852..97fdbd900fbe7b9df5dd824b322506113838bd3f 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/path_handling.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/path_handling.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from os import path
from mantid.kernel import logger
from mantid.simpleapi import Load
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py
index 7feb1cca23b64b3807065a4476e18bc5d7851948..b27db29fcf9493139830389ecc1389446b1ee86f 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py
@@ -4,15 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import tempfile
from shutil import rmtree
from os import path
from Engineering.gui.engineering_diffraction.tabs.common import vanadium_corrections
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
dir_path = "Engineering.gui.engineering_diffraction.tabs.common"
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/vanadium_corrections.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/vanadium_corrections.py
index 9526b520710b9cf1b800eeb99a47249f55c3c0b1..710bcb9dbea07b53b4cdf436c6d18800bd0d676b 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/vanadium_corrections.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/vanadium_corrections.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from os import path
from os import makedirs
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_model.py
index 1c42efc282f570e4f4cf68146439d2e2524f02a9..3d177b0ac34e09e4ac14c7d4153c575288b69ec1 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_model.py
@@ -6,8 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch
+from unittest import mock
+from unittest.mock import patch
from Engineering.gui.engineering_diffraction.tabs.fitting.data_handling.data_model import FittingDataModel
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py
index 4d0301cb2de3eab2d4d446a96bdb015216f3832f..fe3e6af22a9945fb34795a5674e440322c554f5d 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py
@@ -6,8 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch
+from unittest import mock
+from unittest.mock import patch
from Engineering.gui.engineering_diffraction.tabs.fitting.data_handling import data_model, data_presenter, data_view
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_model.py
index 812fcfa65e95979244ff1c8ab6895625efae38fd..d05061a7b48ac18f010979bd452125b4ef5dab3d 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_model.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Engineering.gui.engineering_diffraction.tabs.fitting.plotting import plot_model
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_presenter.py
index 293ae3859c8dd97c7584b95301297172c753eccf..3595a2bb52cd390db0e200585c4c1327ae740697 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_presenter.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Engineering.gui.engineering_diffraction.tabs.fitting.plotting import plot_model, plot_view, plot_presenter
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
index a744c6995cc5cd64365faa0d8388afde7cc35219..7018f1bf99c6d4a0e07821537979dbaff2ef833a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import csv
from os import path, makedirs
from matplotlib import gridspec
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
index 037145720d5fbf806d72cb30ff2eb19129e8fa06..b4d8a8c8290eb2f67b998a85963e7eb054583807 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from Engineering.gui.engineering_diffraction.tabs.common import INSTRUMENT_DICT, create_error_message
from Engineering.gui.engineering_diffraction.tabs.common.calibration_info import CalibrationInfo
from Engineering.gui.engineering_diffraction.tabs.common.vanadium_corrections import check_workspaces_exist
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py
index d117784272767ff41946ec001cff9adf9a8efce7..413857d2987df6136af7bb9ad57de27045821a63 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py
@@ -4,14 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import tempfile
import shutil
from os import path
-from mantid.py3compat.mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
from mantid.simpleapi import CreateSampleWorkspace
from Engineering.gui.engineering_diffraction.tabs.focus import model
from Engineering.gui.engineering_diffraction.tabs.common import path_handling
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
index e87f279d1b1e58289a0b57b03b430ec89c34d6a0..6d74fefe505990d9a20d74166b3388c7c14b90b2 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch, MagicMock
+from unittest import mock
+from unittest.mock import patch, MagicMock
from Engineering.gui.engineering_diffraction.tabs.focus import model, view, presenter
from Engineering.gui.engineering_diffraction.tabs.common.calibration_info import CalibrationInfo
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py
index b9c89f23ca7fb117d545a64bea8641ac453f9cd6..288d38fbfaee1f5f0d87c2a35ae2e41564786987 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtCore
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Engineering_Diffraction.py b/scripts/Engineering_Diffraction.py
index a3b4396c63356532ab1be14c715ea7fd1f38767b..a23e7d83dc14a5407dd7053b592b54037c11da7e 100644
--- a/scripts/Engineering_Diffraction.py
+++ b/scripts/Engineering_Diffraction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from Engineering.gui.engineering_diffraction.engineering_diffraction import EngineeringDiffractionGui
from qtpy import QtCore
diff --git a/scripts/ErrorReporter/error_dialog_app.py b/scripts/ErrorReporter/error_dialog_app.py
index 97a136caff84905f27fb24a69d1613cdda7b9f6f..eac92f7ab60a420c20c9b8f70159877e18be9610 100644
--- a/scripts/ErrorReporter/error_dialog_app.py
+++ b/scripts/ErrorReporter/error_dialog_app.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import argparse
import sys
diff --git a/scripts/ErrorReporter/error_report_presenter.py b/scripts/ErrorReporter/error_report_presenter.py
index 4033d6800705ea5652314613f8a635eecaaa95dd..ad6630c4355ef2335da10a3e82faaeb1cb2471e9 100644
--- a/scripts/ErrorReporter/error_report_presenter.py
+++ b/scripts/ErrorReporter/error_report_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import os
from mantid.kernel import ConfigService, ErrorReporter, Logger, UsageService
diff --git a/scripts/ErrorReporter/errorreport.py b/scripts/ErrorReporter/errorreport.py
index 4f588692b503004359e0c089ec0f5b0ac70f576f..93d179e8335025442591385854960ce39a688735 100644
--- a/scripts/ErrorReporter/errorreport.py
+++ b/scripts/ErrorReporter/errorreport.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import qtpy
if qtpy.PYQT5: # noqa
diff --git a/scripts/FilterEvents.py b/scripts/FilterEvents.py
index 0df797189a229f4b8c4691c78d2e6e0f3dfcdedd..51421f005ce2c2793f4b41f2444e6da35ceb355b 100644
--- a/scripts/FilterEvents.py
+++ b/scripts/FilterEvents.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import sys
from mantidqt.gui_helper import set_matplotlib_backend, get_qapplication
set_matplotlib_backend() # must be called before anything tries to use matplotlib
diff --git a/scripts/FilterEvents/eventFilterGUI.py b/scripts/FilterEvents/eventFilterGUI.py
index 604453b9e0ae8cd7562b4fe36f1ff710c1405647..29651b3425864533f98713b814880f6542ef70f6 100644
--- a/scripts/FilterEvents/eventFilterGUI.py
+++ b/scripts/FilterEvents/eventFilterGUI.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, too-many-lines, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import numpy
from qtpy.QtWidgets import (QFileDialog, QMainWindow, QMessageBox, QSlider, QVBoxLayout, QWidget) # noqa
diff --git a/scripts/Frequency_Domain_Analysis.py b/scripts/Frequency_Domain_Analysis.py
index 245dc491f0f788a130786b101db2c445d281e954..53228c87841c8a8457896bfbdce19814ef122d42 100644
--- a/scripts/Frequency_Domain_Analysis.py
+++ b/scripts/Frequency_Domain_Analysis.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from Muon.GUI.FrequencyDomainAnalysis.frequency_domain_analysis_2 import FrequencyAnalysisGui
from qtpy import QtCore
from Muon.GUI.Common.usage_report import report_interface_startup
diff --git a/scripts/Frequency_Domain_Analysis_Old.py b/scripts/Frequency_Domain_Analysis_Old.py
index 2452d83cd7f932072c936242542fdd445e8594e6..2bc1e89136c370075c95c151b977c30872d74953 100644
--- a/scripts/Frequency_Domain_Analysis_Old.py
+++ b/scripts/Frequency_Domain_Analysis_Old.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import sys
import PyQt4.QtGui as QtGui
diff --git a/scripts/HFIR_4Circle_Reduction.py b/scripts/HFIR_4Circle_Reduction.py
index 54da4b755effe09bc04aa91040ad0187f9057ca4..a026c1364078d9912c3cb693b770b1eaacdf83b8 100644
--- a/scripts/HFIR_4Circle_Reduction.py
+++ b/scripts/HFIR_4Circle_Reduction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import sys
from mantidqt.gui_helper import set_matplotlib_backend, get_qapplication
set_matplotlib_backend() # must be called before anything tries to use matplotlib
diff --git a/scripts/HFIR_4Circle_Reduction/FindUBUtility.py b/scripts/HFIR_4Circle_Reduction/FindUBUtility.py
index 9591efb30b63f0596ee6f8a9f92a90845af77871..a9f995b25dd0fc1796cd3637b257731cb3867c66 100644
--- a/scripts/HFIR_4Circle_Reduction/FindUBUtility.py
+++ b/scripts/HFIR_4Circle_Reduction/FindUBUtility.py
@@ -7,7 +7,6 @@
"""
Containing a set of classes used for finding (calculating and refining) UB matrix
"""
-from __future__ import (absolute_import, division, print_function)
import os
from . import guiutility
from qtpy.QtWidgets import (QDialog, QFileDialog) # noqa
diff --git a/scripts/HFIR_4Circle_Reduction/IntegrateSingePtSubWindow.py b/scripts/HFIR_4Circle_Reduction/IntegrateSingePtSubWindow.py
index 298b8e9ceb6e5ef5a39c93bbcf6ca49aa86aa696..bd4e7a65360505cde4ace443591bfe5b4adefc31 100644
--- a/scripts/HFIR_4Circle_Reduction/IntegrateSingePtSubWindow.py
+++ b/scripts/HFIR_4Circle_Reduction/IntegrateSingePtSubWindow.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103
-from __future__ import (absolute_import, division, print_function)
from HFIR_4Circle_Reduction.hfctables import SinglePtIntegrationTable
from HFIR_4Circle_Reduction.integratedpeakview import SinglePtIntegrationView
import HFIR_4Circle_Reduction.guiutility as guiutility
diff --git a/scripts/HFIR_4Circle_Reduction/NTableWidget.py b/scripts/HFIR_4Circle_Reduction/NTableWidget.py
index b595cadfa9beccadf625a8017e29e053137b692b..74598a992dacf20cc48b0e02a686c9296dc8533d 100644
--- a/scripts/HFIR_4Circle_Reduction/NTableWidget.py
+++ b/scripts/HFIR_4Circle_Reduction/NTableWidget.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103,R0904
# N(DAV)TableWidget
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import csv
from qtpy.QtWidgets import (QCheckBox, QTableWidget, QTableWidgetItem) # noqa
from qtpy import QtCore # noqa
diff --git a/scripts/HFIR_4Circle_Reduction/PeaksIntegrationReport.py b/scripts/HFIR_4Circle_Reduction/PeaksIntegrationReport.py
index fb81758227559a3a8aca9e522fe60b56c05ae3db..ab129168f40c5beab0771459f0743290f155ca93 100644
--- a/scripts/HFIR_4Circle_Reduction/PeaksIntegrationReport.py
+++ b/scripts/HFIR_4Circle_Reduction/PeaksIntegrationReport.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from qtpy.QtWidgets import (QDialog, QFileDialog) # noqa
diff --git a/scripts/HFIR_4Circle_Reduction/absorption.py b/scripts/HFIR_4Circle_Reduction/absorption.py
index e7c5dc13c0369872aae8e9c65bd44cc65138320d..255b850ab1bce9eaf76673dd782c131fa7e82d84 100644
--- a/scripts/HFIR_4Circle_Reduction/absorption.py
+++ b/scripts/HFIR_4Circle_Reduction/absorption.py
@@ -5,14 +5,11 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=R0913,W0403,R0903,C0103
-from __future__ import (absolute_import, division, print_function)
import HFIR_4Circle_Reduction.fourcircle_utility as util4
import math
from mantid.api import AnalysisDataService
import numpy
import numpy.linalg
-from six.moves import range
-
# This module does absorption correction
diff --git a/scripts/HFIR_4Circle_Reduction/detector2dview.py b/scripts/HFIR_4Circle_Reduction/detector2dview.py
index 37baa6b3f90346a2ccce6d79d3e353cdf7e2b9be..6de56654864d20c65e0d590ec3f238afd4b759b0 100644
--- a/scripts/HFIR_4Circle_Reduction/detector2dview.py
+++ b/scripts/HFIR_4Circle_Reduction/detector2dview.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,R0902,R0903,R0904,W0212
-from __future__ import (absolute_import, division, print_function)
from HFIR_4Circle_Reduction import mpl2dgraphicsview
import numpy as np
import os
diff --git a/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py b/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py
index 8ea88badebac3a35ac5ee4c6677e32029a55b7c4..5678816a1f21aa9135527768cbeb24580cf83ac0 100644
--- a/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py
+++ b/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0633,R0913,too-many-branches
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import csv
import os
try:
diff --git a/scripts/HFIR_4Circle_Reduction/fputility.py b/scripts/HFIR_4Circle_Reduction/fputility.py
index 37ad2c9a9805077ce79d1c3d989e35b10f34dc17..a57d8906fbb4d9fddcd7c5abb3563b848af88695 100644
--- a/scripts/HFIR_4Circle_Reduction/fputility.py
+++ b/scripts/HFIR_4Circle_Reduction/fputility.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=R0914,R0912,R0913
# Utility methods for Fullprof
-from __future__ import (absolute_import, division, print_function)
import os
import math
diff --git a/scripts/HFIR_4Circle_Reduction/guiutility.py b/scripts/HFIR_4Circle_Reduction/guiutility.py
index 6e78c1c31c4422af3ef46e44a69c5951aa2faab1..33686806dc607a6a37796a55e05b9d98573ba0b8 100644
--- a/scripts/HFIR_4Circle_Reduction/guiutility.py
+++ b/scripts/HFIR_4Circle_Reduction/guiutility.py
@@ -7,8 +7,6 @@
#
# GUI Utility Methods
#
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import math
import numpy
import os
diff --git a/scripts/HFIR_4Circle_Reduction/hfctables.py b/scripts/HFIR_4Circle_Reduction/hfctables.py
index 2903c2cc580064b4641981955c7e3be37cab5ddd..1c9a4e3c7b1c177033bbd14729ba33848c160bf5 100644
--- a/scripts/HFIR_4Circle_Reduction/hfctables.py
+++ b/scripts/HFIR_4Circle_Reduction/hfctables.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,C0103,R0901,R0904,R0913,C0302
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import numpy
import sys
from HFIR_4Circle_Reduction import fourcircle_utility
diff --git a/scripts/HFIR_4Circle_Reduction/integratedpeakview.py b/scripts/HFIR_4Circle_Reduction/integratedpeakview.py
index 88d4db885bb7d6b0059a8b09dbab47915fa14000..a30b982585be6687a25138e9e9a35dbbad70c32b 100644
--- a/scripts/HFIR_4Circle_Reduction/integratedpeakview.py
+++ b/scripts/HFIR_4Circle_Reduction/integratedpeakview.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,R0904,R0903
-from __future__ import (absolute_import, division, print_function)
import numpy
from HFIR_4Circle_Reduction import mplgraphicsview
diff --git a/scripts/HFIR_4Circle_Reduction/message_dialog.py b/scripts/HFIR_4Circle_Reduction/message_dialog.py
index 5bd120966b0323502222bfdc2ded22f3d3bee309..dc3cee74144e6e94e1f5285c1e2586c0cb2d3282 100644
--- a/scripts/HFIR_4Circle_Reduction/message_dialog.py
+++ b/scripts/HFIR_4Circle_Reduction/message_dialog.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# Dialog for message
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
from qtpy.QtWidgets import (QDialog) # noqa
from mantid.kernel import Logger
try:
diff --git a/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py b/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py
index 35999dd59c1b92d09928b04ff6734fe3fe6dee85..9b94c4d6cb6e927d51a157ae5ef180cc906ba13c 100644
--- a/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py
+++ b/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments,non-parent-init-called,R0901,R0902,too-many-branches,C0302
-from __future__ import (absolute_import, division, print_function)
import os
import numpy as np
from qtpy.QtWidgets import (QWidget, QVBoxLayout, QSizePolicy)
diff --git a/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py b/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
index 07ad0787b8e19641bc1dab9bdf3f435044fd2325..3492b1335edb83b333cb669d7ad7ebd648590a39 100644
--- a/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
+++ b/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments,non-parent-init-called,R0902,too-many-branches,C0302
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import os
import numpy as np
from mantidqt.MPLwidgets import FigureCanvasQTAgg as FigureCanvas
diff --git a/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py b/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
index 90633c55ae21c660eb5e038b50b516ce4d49546a..b4fd4e22a0ec3adc421b9cb72c45cd8359771680 100644
--- a/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
+++ b/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=R0901,R0902,R0904
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import numpy as np
import os
diff --git a/scripts/HFIR_4Circle_Reduction/multi_threads_helpers.py b/scripts/HFIR_4Circle_Reduction/multi_threads_helpers.py
index 9ef97de5f18bfe9cddaf8498bf9c0d616f621605..c96ecef7c1e8582c9ac1fd910721a9f2769bebda 100644
--- a/scripts/HFIR_4Circle_Reduction/multi_threads_helpers.py
+++ b/scripts/HFIR_4Circle_Reduction/multi_threads_helpers.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,R0913,R0902
-from __future__ import (absolute_import, division, print_function)
import os
from qtpy.QtCore import Signal as pyqtSignal
from qtpy.QtCore import QThread # noqa
diff --git a/scripts/HFIR_4Circle_Reduction/optimizelatticewindow.py b/scripts/HFIR_4Circle_Reduction/optimizelatticewindow.py
index 358c8e91ef32c0f44477f475a7831ed2905270fd..4823c7cd5199edac87f0d46215ee9be017b80cbf 100644
--- a/scripts/HFIR_4Circle_Reduction/optimizelatticewindow.py
+++ b/scripts/HFIR_4Circle_Reduction/optimizelatticewindow.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QMainWindow)
from qtpy.QtCore import Signal as pyqtSignal
from mantid.kernel import Logger
diff --git a/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py b/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py
index b9d13c6802e8bda26e7a14ef8997a916929428c0..c5011c6af8f2e28f7b65aca931e6ccdf683ebc42 100644
--- a/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py
+++ b/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# Utility methods to do peak integration
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import numpy
import math
import os
diff --git a/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py b/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py
index ae0e5bbeb5a1a434a70eecd9e6db0320fc4f286c..dc6ad63d5fd3195becb98f6e250c7b50c60dda54 100644
--- a/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py
+++ b/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,R0902
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import numpy
import time
import random
diff --git a/scripts/HFIR_4Circle_Reduction/plot3dwindow.py b/scripts/HFIR_4Circle_Reduction/plot3dwindow.py
index a88c9bd0a1881a61dc55869e03b8198738326ada..8de6d26cb817bb0b9d06c9f94be9e789ed2218e2 100644
--- a/scripts/HFIR_4Circle_Reduction/plot3dwindow.py
+++ b/scripts/HFIR_4Circle_Reduction/plot3dwindow.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103,W0403
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import sys
import numpy as np
from qtpy.QtWidgets import (QMainWindow)
diff --git a/scripts/HFIR_4Circle_Reduction/process_mask.py b/scripts/HFIR_4Circle_Reduction/process_mask.py
index d22307f943794b7620fd4b3c88054658430f4c36..bd240492ab0b6ebeee5b66b58b6531645742834c 100644
--- a/scripts/HFIR_4Circle_Reduction/process_mask.py
+++ b/scripts/HFIR_4Circle_Reduction/process_mask.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
import math
import numpy
import re
diff --git a/scripts/HFIR_4Circle_Reduction/project_manager.py b/scripts/HFIR_4Circle_Reduction/project_manager.py
index 6c0f9f5425de96bedc4bead39c7dce61667390ab..50a3bc6c916da3787803c06a6b6ecccf3fb1e398 100644
--- a/scripts/HFIR_4Circle_Reduction/project_manager.py
+++ b/scripts/HFIR_4Circle_Reduction/project_manager.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import mantid.simpleapi as mantidsimple
diff --git a/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py b/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py
index 054bd6c2cf37ad3a9211edec95feee9dcbbfc870..556fa85b0222b44adf0189bfe0fa2623ced0f6ad 100644
--- a/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py
+++ b/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py
@@ -14,7 +14,6 @@
# - Download from internet to cache (download-mode)
#
################################################################################
-from __future__ import (absolute_import, division, print_function)
import bisect
try:
# python3
@@ -25,7 +24,6 @@ except ImportError:
from urllib2 import urlopen
from urllib2 import HTTPError
from urllib2 import URLError
-from six.moves import range
import math
import csv
import random
diff --git a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
index 5eadb8771e6c400c5b0358d6c0962bcb6319b1ea..b1917bfd8e5b1ac51f456a00fae96df802878be5 100644
--- a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
+++ b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
@@ -10,9 +10,6 @@
# MainWindow application for reducing HFIR 4-circle
#
################################################################################
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
-import six
import os
import sys
import csv
@@ -63,8 +60,7 @@ if PYQT4:
SCROLL_AVAILABLE = True
except ImportError:
SCROLL_AVAILABLE = False
-if six.PY3:
- unicode = str
+unicode = str
# define constants
IndexFromSpice = 'From Spice (pre-defined)'
diff --git a/scripts/HFIR_4Circle_Reduction/refineubfftsetup.py b/scripts/HFIR_4Circle_Reduction/refineubfftsetup.py
index 43ce8a562647a617ec2fe31fb4d21a54e95c2c60..adc0f3c9e3b05e174ca800612b07ce36c25b48e4 100644
--- a/scripts/HFIR_4Circle_Reduction/refineubfftsetup.py
+++ b/scripts/HFIR_4Circle_Reduction/refineubfftsetup.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy.QtWidgets import (QDialog) # noqa
from mantid.kernel import Logger
try:
diff --git a/scripts/HFIR_4Circle_Reduction/viewspicedialog.py b/scripts/HFIR_4Circle_Reduction/viewspicedialog.py
index d169d0b65019e40b278b670c98aae95cab349e3e..e7f47610f6e68c0495f13c4f5f88fa2664fb30b4 100644
--- a/scripts/HFIR_4Circle_Reduction/viewspicedialog.py
+++ b/scripts/HFIR_4Circle_Reduction/viewspicedialog.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QDialog) # noqa
from mantid.kernel import Logger
try:
diff --git a/scripts/Inelastic/CrystalField/__init__.py b/scripts/Inelastic/CrystalField/__init__.py
index d057ea945087019be119cea700a7e848d95afdef..a8ed4a5891083a2a5aa7b3675737ce616a075082 100644
--- a/scripts/Inelastic/CrystalField/__init__.py
+++ b/scripts/Inelastic/CrystalField/__init__.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from .fitting import CrystalField, CrystalFieldFit
from .function import PeaksFunction, Background, Function, ResolutionModel, PhysicalProperties
from .pointcharge import PointCharge
diff --git a/scripts/Inelastic/CrystalField/energies.py b/scripts/Inelastic/CrystalField/energies.py
index 9cc270c3b8cd88ca37f78eebf863e2606b1b9951..ac979e1ac198b87bb596327958ef2b5396eba81b 100644
--- a/scripts/Inelastic/CrystalField/energies.py
+++ b/scripts/Inelastic/CrystalField/energies.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-name-in-module
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import CrystalFieldEnergies
import numpy as np
import warnings
diff --git a/scripts/Inelastic/CrystalField/fitting.py b/scripts/Inelastic/CrystalField/fitting.py
index 586e7189746d39fcbe79fc0f10231f8330d33696..88380bc986ac3aed7f68d0d0c8bd330f2880ace6 100644
--- a/scripts/Inelastic/CrystalField/fitting.py
+++ b/scripts/Inelastic/CrystalField/fitting.py
@@ -4,13 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import re
import warnings
-from six import string_types, iteritems
-
-
# RegEx pattern matching a composite function parameter name, eg f2.Sigma.
FN_PATTERN = re.compile('f(\\d+)\\.(.+)')
@@ -903,7 +899,7 @@ class CrystalField(object):
ws_index = args.pop(0)
pptype = 'M(T)' if (typeid == 4) else 'M(H)'
- self._typeid = self._str2id(typeid) if isinstance(typeid, string_types) else int(typeid)
+ self._typeid = self._str2id(typeid) if isinstance(typeid, str) else int(typeid)
return self._getPhysProp(PhysicalProperties(pptype, *args, **kwargs), workspace, ws_index)
@@ -1004,7 +1000,7 @@ class CrystalField(object):
params['ion1.' + bparam] = other[bparam]
ties = {}
fixes = []
- for prefix, obj in iteritems({'ion0.':self, 'ion1.':other}):
+ for prefix, obj in {'ion0.':self, 'ion1.':other}.items():
tiestr = obj.function.getTies()
if tiestr:
for tiepair in [tie.split('=') for tie in tiestr.split(',')]:
@@ -1159,7 +1155,7 @@ class CrystalField(object):
alg = AlgorithmManager.createUnmanaged('EvaluateFunction')
alg.initialize()
alg.setChild(True)
- alg.setProperty('Function', i if isinstance(i, string_types) else self.makeSpectrumFunction(i))
+ alg.setProperty('Function', i if isinstance(i, str) else self.makeSpectrumFunction(i))
alg.setProperty("InputWorkspace", workspace)
alg.setProperty('WorkspaceIndex', ws_index)
alg.setProperty('OutputWorkspace', 'dummy')
diff --git a/scripts/Inelastic/CrystalField/function.py b/scripts/Inelastic/CrystalField/function.py
index 9a9b0dfd410c192409b291fba971f50c7eec3126..89ee2dd6aa520be6c9316d50e1d3b73c9ff6fb61 100644
--- a/scripts/Inelastic/CrystalField/function.py
+++ b/scripts/Inelastic/CrystalField/function.py
@@ -4,10 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import re
-from six import string_types
-
parNamePattern = re.compile(r'([a-zA-Z][\w.]+)')
@@ -507,7 +504,7 @@ class PhysicalProperties(object):
self._physpropTemperature = 1.
self._lambda = 0. # Exchange parameter (for susceptibility only)
self._chi0 = 0. # Residual/background susceptibility (for susceptibility only)
- self._typeid = self._str2id(typeid) if isinstance(typeid, string_types) else int(typeid)
+ self._typeid = self._str2id(typeid) if isinstance(typeid, str) else int(typeid)
try:
initialiser = getattr(self, 'init' + str(self._typeid))
except AttributeError:
@@ -530,7 +527,7 @@ class PhysicalProperties(object):
def _checkhdir(self, hdir):
import numpy as np
try:
- if isinstance(hdir, string_types):
+ if isinstance(hdir, str):
if 'powder' in hdir.lower():
return 'powder'
else:
@@ -563,7 +560,7 @@ class PhysicalProperties(object):
@Inverse.setter
def Inverse(self, value):
if (self._typeid == self.SUSCEPTIBILITY or self._typeid == self.MAGNETICMOMENT):
- if isinstance(value, string_types):
+ if isinstance(value, str):
self._suscInverseFlag = value.lower() in ['true', 't', '1', 'yes', 'y']
else:
self._suscInverseFlag = bool(value) # In some cases will always be true...
diff --git a/scripts/Inelastic/CrystalField/normalisation.py b/scripts/Inelastic/CrystalField/normalisation.py
index b1e8842b3579f9b15fcd9b0f382277f6f43838bd..bde70d5bb95af9004f5cec28704c3cf79b81c8ee 100644
--- a/scripts/Inelastic/CrystalField/normalisation.py
+++ b/scripts/Inelastic/CrystalField/normalisation.py
@@ -4,12 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from CrystalField.energies import energies as CFEnergy
from CrystalField.fitting import ionname2Nre
-from six import iteritems
-from six import string_types
def _get_normalisation(nre, bnames):
@@ -177,10 +174,10 @@ def split2range(*args, **kwargs):
argin[argnames[ia]] = args[ia]
# Further arguments beyond the first 3 are treated as crystal field parameter names
for ia in range(3, len(args)):
- if isinstance(args[ia], string_types) and args[ia].startswith('B'):
+ if isinstance(args[ia], str) and args[ia].startswith('B'):
argin['Parameters'].append(args[ia])
# Parses the keyword arguments
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
for ia in range(len(argnames)):
if key == argnames[ia]:
argin[key] = value
diff --git a/scripts/Inelastic/CrystalField/pointcharge.py b/scripts/Inelastic/CrystalField/pointcharge.py
index 4ad0b5fc4e6a34fcb74280b7b8d2a4a82f84a44e..b4c71474abb573d65cab6b7c2e7620eeba31fdd6 100644
--- a/scripts/Inelastic/CrystalField/pointcharge.py
+++ b/scripts/Inelastic/CrystalField/pointcharge.py
@@ -4,9 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
-from six import string_types
from scipy import constants
import warnings
@@ -133,7 +131,7 @@ class PointCharge(object):
from mantid.simpleapi import mtd, LoadCIF, CreateWorkspace, DeleteWorkspace
import uuid
self._fromCIF = False
- if isinstance(structure, string_types):
+ if isinstance(structure, str):
if mtd.doesExist(structure):
try:
self._cryst = self._copyCrystalStructure(mtd[structure].sample().getCrystalStructure())
diff --git a/scripts/Inelastic/Direct/AbsorptionShapes.py b/scripts/Inelastic/Direct/AbsorptionShapes.py
index 37dbcc12910524f80b64eecffb9e9162f244585f..bcba21b4b558309d86fe2094812ba8695344b89e 100644
--- a/scripts/Inelastic/Direct/AbsorptionShapes.py
+++ b/scripts/Inelastic/Direct/AbsorptionShapes.py
@@ -4,8 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-from six import string_types
+
from mantid.kernel import funcinspect
from mantid.simpleapi import *
@@ -107,7 +106,7 @@ class anAbsorptionShape(object):
if value is None:
self._Material = {}
return
- if isinstance(value, string_types):
+ if isinstance(value, str):
value = [value]
if isinstance(value,(list,tuple)):
if len(value) == 2:
@@ -130,7 +129,7 @@ class anAbsorptionShape(object):
#
Mater_properties = self._Material
if 'ChemicalFormula' in Mater_properties:
- if not isinstance(Mater_properties['ChemicalFormula'], string_types):
+ if not isinstance(Mater_properties['ChemicalFormula'], str):
raise TypeError('*** The chemical formula for the material must be described by a string')
# Test if the material property are recognized by SetSampleMaterial
# algorithm.
@@ -247,7 +246,7 @@ class anAbsorptionShape(object):
{'Cylinder': Cylinder(), 'FlatPlate':FlatPlate(),
'HollowCylinder':HollowCylinder(),'Sphere': Sphere()} # noqa: E127
- if not isinstance(str_val, string_types):
+ if not isinstance(str_val, str):
raise ValueError(
'The input of the "from_str" function should be a string representing a diary.'
' Actually it is: {0}'.format(type(str_val)))
diff --git a/scripts/Inelastic/Direct/CommonFunctions.py b/scripts/Inelastic/Direct/CommonFunctions.py
index a4c5afb4be0f4e7358ed25cc3256c8e98e60861d..c60338a495b035de4451e1986a330afdc18d6fb3 100644
--- a/scripts/Inelastic/Direct/CommonFunctions.py
+++ b/scripts/Inelastic/Direct/CommonFunctions.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import sys
# See https://www.python.org/dev/peps/pep-0479/#abstract and
diff --git a/scripts/Inelastic/Direct/DirectEnergyConversion.py b/scripts/Inelastic/Direct/DirectEnergyConversion.py
index c92e4a9f14da204da4189915060c162cae9c1277..56abf1de7b1d756ea1e349dde6acc6528358e87b 100644
--- a/scripts/Inelastic/Direct/DirectEnergyConversion.py
+++ b/scripts/Inelastic/Direct/DirectEnergyConversion.py
@@ -7,7 +7,6 @@
#pylint: disable=too-many-lines
#pylint: disable=invalid-name
#pylind: disable=attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from mantid.simpleapi import *
from mantid.kernel import funcinspect
from mantid import geometry,api
@@ -18,9 +17,6 @@ import math
import time
import numpy as np
import collections
-from six import iteritems, string_types
-from six.moves import range
-
import Direct.CommonFunctions as common
import Direct.diagnostics as diagnostics
from Direct.PropertyManager import PropertyManager
@@ -1344,7 +1340,7 @@ class DirectEnergyConversion(object):
self._spectra_masks=None
elif isinstance(value,api.Workspace):
self._spectra_masks = value.name()
- elif isinstance(value, string_types):
+ elif isinstance(value, str):
if value in mtd:
self._spectra_masks = value
else:
@@ -1519,7 +1515,7 @@ class DirectEnergyConversion(object):
scale_factor = van_multiplier * sample_multiplier / xsection
- for norm_type,val in iteritems(norm_factor):
+ for norm_type,val in norm_factor.items():
norm_factor[norm_type] = val * scale_factor
# check for NaN
diff --git a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
index 2c42ca646a184564dd840778954a0726f84e7369..55c02cf2e7b1199b035927a84872503876f89e8d 100644
--- a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
+++ b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import sys
import platform
@@ -15,8 +14,6 @@ import copy
from datetime import date
import time
from xml.dom import minidom
-from six import iteritems, string_types
-
# the list of instruments this configuration is applicable to
INELASTIC_INSTRUMENTS = ['MAPS', 'LET', 'MERLIN', 'MARI', 'HET']
# the list of the parameters, which can be replaced if found in user files
@@ -94,7 +91,7 @@ class UserProperties(object):
self._rb_dirs[recent_date_id] = rb_folder_or_id
if self._recent_dateID:
max_date = self._start_dates[self._recent_dateID]
- for date_key, a_date in iteritems(self._start_dates):
+ for date_key, a_date in self._start_dates.items():
if a_date > max_date:
self._recent_dateID = date_key
max_date = a_date
@@ -265,7 +262,7 @@ class UserProperties(object):
if isinstance(cycle, int):
cycle = convert_cycle_int(cycle)
- if isinstance(cycle, string_types):
+ if isinstance(cycle, str):
if len(cycle) == 11:
last_letter = cycle[-1]
if not last_letter.upper() in {'A','B','C','D','E'}:
@@ -289,7 +286,7 @@ class UserProperties(object):
"but it is {0}".format(cycle))
if isinstance(rb_folder_or_id, int):
rb_folder_or_id = "RB{0:07}".format(rb_folder_or_id)
- if not isinstance(rb_folder_or_id, string_types):
+ if not isinstance(rb_folder_or_id, str):
raise RuntimeError("RB Folder {0} should be a string".format(rb_folder_or_id))
else:
f_path, rbf = os.path.split(rb_folder_or_id)
@@ -317,7 +314,7 @@ class UserProperties(object):
"ISIS inelastic instruments".format(instrument))
def validate_date(self, start_date):
- if isinstance(start_date, string_types):
+ if isinstance(start_date, str):
# the date of express -- let's make it long in the past
if start_date.lower() == 'none':
start_date = '19800101'
diff --git a/scripts/Inelastic/Direct/NonIDF_Properties.py b/scripts/Inelastic/Direct/NonIDF_Properties.py
index 95410d6d1e6db3b17fb66ac61a8253e689f9865a..967916b032ddc63fd395eabd9aabb611584f1498 100644
--- a/scripts/Inelastic/Direct/NonIDF_Properties.py
+++ b/scripts/Inelastic/Direct/NonIDF_Properties.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-from six import string_types
from Direct.PropertiesDescriptors import *
from Direct.RunDescriptor import RunDescriptor,RunDescriptorDependent
from mantid.simpleapi import *
@@ -203,7 +201,7 @@ class NonIDF_Properties(object):
facility_ = config.getFacility('TEST_LIVE')
#end
- elif isinstance(Instrument, string_types): # instrument name defined
+ elif isinstance(Instrument, str): # instrument name defined
new_name,full_name,facility_ = prop_helpers.check_instrument_name(None,Instrument)
#idf_dir = config.getString('instrumentDefinitgeton.directory')
idf_file = api.ExperimentInfo.getInstrumentFilename(full_name)
diff --git a/scripts/Inelastic/Direct/PropertiesDescriptors.py b/scripts/Inelastic/Direct/PropertiesDescriptors.py
index 4babec380fed7a5eff845f51f84c02279e90b583..b676d400ae7d2623555ff7756e76a9932c74acc3 100644
--- a/scripts/Inelastic/Direct/PropertiesDescriptors.py
+++ b/scripts/Inelastic/Direct/PropertiesDescriptors.py
@@ -9,14 +9,11 @@
""" File contains collection of Descriptors used to define complex
properties in NonIDF_Properties and PropertyManager classes
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import numpy as np
import math
import re
from collections import Iterable
-from six import string_types
-
import mantid.simpleapi as mantid
from mantid import api
@@ -190,7 +187,7 @@ class IncidentEnergy(PropDescriptor):
""" Set up incident energy or range of energies in various formats
or define autoEi"""
if value is not None:
- if isinstance(value, string_types):
+ if isinstance(value, str):
# Check autoEi
if value.lower() == 'auto':
self._use_autoEi = True
@@ -405,7 +402,7 @@ class EnergyBins(PropDescriptor):
def __set__(self, instance, values):
if values is not None:
- if isinstance(values, string_types):
+ if isinstance(values, str):
values = values.replace('[', '').replace(']', '').strip()
lst = values.split(',')
self.__set__(instance, lst)
@@ -622,7 +619,7 @@ class mon2NormalizationEnergyRange(PropDescriptor):
""" set detector calibration file using various formats """
if isinstance(val, list):
self._relative_range = self._check_range(val, instance)
- elif isinstance(val, string_types):
+ elif isinstance(val, str):
val = self._parce_string2list(val)
self.__set__(instance, val)
else:
@@ -744,7 +741,7 @@ class DetCalFile(PropDescriptor):
self._det_cal_file = val
self._calibrated_by_run = False
return
- if isinstance(val, string_types):
+ if isinstance(val, str):
if val in mantid.mtd:
val = mantid.mtd[val]
self._det_cal_file = val
@@ -798,7 +795,7 @@ class DetCalFile(PropDescriptor):
return (True, 'Workspace {0} used for detectors calibration'.format(self._det_cal_file.name()))
dcf_val = self._det_cal_file
- if isinstance(dcf_val, string_types): # it may be string representation of runN
+ if isinstance(dcf_val, str): # it may be string representation of runN
try:
dcf_val = int(dcf_val)
except ValueError:
@@ -939,7 +936,7 @@ class HardMaskOnly(prop_helpers.ComplexProperty):
if isinstance(value, bool) or isinstance(value, int):
use_hard_mask_only = bool(value)
hard_mask_file = instance.hard_mask_file
- elif isinstance(value, string_types):
+ elif isinstance(value, str):
if value.lower() in ['true', 'yes']:
use_hard_mask_only = True
elif value.lower() in ['false', 'no']:
@@ -1036,7 +1033,7 @@ class MonovanIntegrationRange(prop_helpers.ComplexProperty):
self._rel_range = False
self._other_prop = ['monovan_lo_value', 'monovan_hi_value']
- if isinstance(value, string_types):
+ if isinstance(value, str):
values = value.split(',')
result = []
for val in values:
@@ -1104,7 +1101,7 @@ class EiMonSpectra(prop_helpers.ComplexProperty):
else:
tDict = instance.__dict__
- if isinstance(value, string_types):
+ if isinstance(value, str):
val = value.replace('[', '').replace(']', '').strip()
if val.find(':') > -1:
val = val.split(':')
@@ -1150,7 +1147,7 @@ class EiMonSpectra(prop_helpers.ComplexProperty):
properties and these properties are currently standard properties
"""
- if isinstance(mon_range, string_types):
+ if isinstance(mon_range, str):
mon_val = mon_range.split(',')
else:
mon_val = mon_range
@@ -1200,7 +1197,7 @@ class SpectraToMonitorsList(PropDescriptor):
if spectra_list is None:
return None
- if isinstance(spectra_list, string_types):
+ if isinstance(spectra_list, str):
if spectra_list.lower() == 'none':
result = None
else:
@@ -1255,7 +1252,7 @@ class SaveFormat(PropDescriptor):
return
# check string
- if isinstance(value, string_types):
+ if isinstance(value, str):
value = value.strip('[]().')
subformats = value.split(',')
if len(subformats) > 1:
@@ -1319,7 +1316,7 @@ class DiagSpectra(PropDescriptor):
""" process IDF description of the spectra string """
if specta_sring is None:
return None
- if isinstance(specta_sring, string_types):
+ if isinstance(specta_sring, str):
if specta_sring.lower() in ['none', 'no']:
return None
else:
@@ -1364,7 +1361,7 @@ class BackbgroundTestRange(PropDescriptor):
if value is None:
self._background_test_range = None
return
- if isinstance(value, string_types):
+ if isinstance(value, str):
value = value.split(',')
if len(value) != 2:
raise ValueError("background test range can be only a 2 element list of floats")
@@ -1409,7 +1406,7 @@ class MultirepTOFSpectraList(PropDescriptor):
if value is None:
self._spectra_list = None
return
- if isinstance(value, string_types):
+ if isinstance(value, str):
value = value.split(',')
self.__set__(instance, value)
return
@@ -1522,7 +1519,7 @@ class MotorLogName(PropDescriptor):
return self._log_names
def __set__(self, instance, value):
- if isinstance(value, string_types):
+ if isinstance(value, str):
val_list = value.split(';')
elif isinstance(value, list):
val_list = []
@@ -1590,7 +1587,7 @@ class RotationAngle(PropDescriptor):
return self.read_psi_from_workspace(self._log_ws_name)
def __set__(self, instance, value):
- if isinstance(value, string_types):
+ if isinstance(value, str):
if value in mantid.mtd: ## its workspace
self._log_ws_name = value
self._own_psi_value = None
@@ -1615,7 +1612,7 @@ class RotationAngle(PropDescriptor):
if working_ws is None:
raise RuntimeError("No workspace provided. Can not read logs to identify psi")
else:
- if isinstance(external_ws, string_types):
+ if isinstance(external_ws, str):
working_ws = mantid.mtd[external_ws]
value = None
@@ -1707,7 +1704,7 @@ class AbsCorrInfo(PropDescriptor):
self._is_fast = False
return
val_dict = {}
- if isinstance(value, string_types):
+ if isinstance(value, str):
val = re.sub(' u ', ' ', re.sub(r'[{}\[\]"=:;,\']', ' ', value))
val_list = re.split(r'\s+',val)
ik = 0
@@ -1788,7 +1785,7 @@ class AbsorptionShapesContainer(PropDescriptor):
if value is None:
self._theShapeHolder = None
return
- if isinstance(value, string_types):
+ if isinstance(value, str):
self._theShapeHolder = anAbsorptionShape.from_str(value)
elif isinstance(value,anAbsorptionShape):
self._theShapeHolder = value
diff --git a/scripts/Inelastic/Direct/PropertyManager.py b/scripts/Inelastic/Direct/PropertyManager.py
index 415525d66d3711894a7bad324746900e7ca8593c..7a34d05abc597468bde3b43225da7b61768c95f4 100644
--- a/scripts/Inelastic/Direct/PropertyManager.py
+++ b/scripts/Inelastic/Direct/PropertyManager.py
@@ -8,11 +8,9 @@
# Mantid Repository : https://github.com/mantidproject/mantid
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from Direct.NonIDF_Properties import *
from collections import OrderedDict, Iterable
-from six import iteritems, string_types
from mantid.kernel import funcinspect
@@ -104,7 +102,7 @@ class PropertyManager(NonIDF_Properties):
self.__dict__.update(param_dict)
# use existing descriptors setter to define IDF-defined descriptor's state
- for key,val in iteritems(descr_dict):
+ for key,val in descr_dict.items():
object.__setattr__(self,key,val)
# file properties -- the properties described files which should exist for reduction to work.
@@ -141,7 +139,7 @@ class PropertyManager(NonIDF_Properties):
class_decor = '_'+type(self).__name__+'__'
- for key,val in iteritems(prop_dict):
+ for key,val in prop_dict.items():
new_key = class_decor+key
object.__setattr__(self,new_key,val)
@@ -165,7 +163,7 @@ class PropertyManager(NonIDF_Properties):
#end
# replace common substitutions for string value
- if isinstance(val, string_types):
+ if isinstance(val, str):
val1 = val.lower()
if val1 == 'none' or len(val1) == 0:
val = None
@@ -352,7 +350,7 @@ class PropertyManager(NonIDF_Properties):
'instr_name':'','print_diag_results':True,'mapmask_ref_ws':None}
result = {}
- for key,val in iteritems(diag_param_list):
+ for key,val in diag_param_list.items():
try:
result[key] = getattr(self,key)
except KeyError:
@@ -400,7 +398,7 @@ class PropertyManager(NonIDF_Properties):
# Walk through descriptors list and set their values
# Assignment to descriptors should accept the form, descriptor is written in IDF
changed_descriptors = set()
- for key,val in iteritems(descr_dict):
+ for key,val in descr_dict.items():
if key not in old_changes_list:
try: # this is reliability check, and except ideally should never be hit. May occur if old IDF contains
# properties, not present in recent IDF.
@@ -444,7 +442,7 @@ class PropertyManager(NonIDF_Properties):
self.setChangedProperties(changed_descriptors)
# Walk through the complex properties first and then through simple properties
- for key,val in iteritems(sorted_param.copy()):
+ for key,val in sorted_param.copy().items():
# complex properties may change through their dependencies so we are setting them first
public_name = self.is_complex_property(key, val)
@@ -552,7 +550,7 @@ class PropertyManager(NonIDF_Properties):
self.setChangedProperties(set())
# set back all changes stored earlier and may be overwritten by new IDF
# (this is just to be sure -- should not change anything as we do not set properties changed)
- for key,val in iteritems(old_changes):
+ for key,val in old_changes.items():
setattr(self,key,val)
# Clear changed properties list (is this wise?, may be we want to know that some defaults changed?)
diff --git a/scripts/Inelastic/Direct/ReductionHelpers.py b/scripts/Inelastic/Direct/ReductionHelpers.py
index d6a7ffb5098c2d0eec53a10acb6857e4c7516f7a..ce40e02416aef42e58b2ed8ed077e4f9bf99405c 100644
--- a/scripts/Inelastic/Direct/ReductionHelpers.py
+++ b/scripts/Inelastic/Direct/ReductionHelpers.py
@@ -5,13 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-from six import string_types
from mantid import config
import os
import re
-from six.moves import range
-
"""
Set of functions to assist with processing instrument parameters relevant to reduction.
"""
@@ -167,7 +163,7 @@ def build_properties_dict(param_map,synonims,descr_list=[]) :
if final_name in descr_list:
is_descriptor = True
- if isinstance(val, string_types):
+ if isinstance(val, str):
val = val.strip()
keys_candidates = val.split(":")
n_keys = len(keys_candidates)
@@ -227,7 +223,7 @@ def build_subst_dictionary(synonims_list=None) :
return dict()
if isinstance(synonims_list, dict) : # all done
return synonims_list
- if not isinstance(synonims_list, string_types):
+ if not isinstance(synonims_list, str):
raise AttributeError("The synonyms field of Reducer object has to be special format string or the dictionary")
# we are in the right place and going to transform string into
# dictionary
@@ -378,7 +374,7 @@ def parse_single_name(filename):
def parse_run_file_name(run_string):
""" Parses run file name to obtain run number, path if possible, and file extension if any present in the string"""
- if not isinstance(run_string, string_types):
+ if not isinstance(run_string, str):
raise ValueError("REDUCTION_HELPER:parse_run_file_name -- input has to be a string")
runs = run_string.split(',')
diff --git a/scripts/Inelastic/Direct/ReductionWrapper.py b/scripts/Inelastic/Direct/ReductionWrapper.py
index 6963c797ba23d78a141391a220d39ed8eb7aeb04..9bd1a70fe2569c0703ac14e366e7779bdeb9c449 100644
--- a/scripts/Inelastic/Direct/ReductionWrapper.py
+++ b/scripts/Inelastic/Direct/ReductionWrapper.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from mantid.simpleapi import *
from mantid import config, api
from mantid.kernel import funcinspect
@@ -17,8 +16,6 @@ from types import MethodType # noqa
import os
import re
import time
-from six import iteritems, string_types
-
try:
import h5py
@@ -134,9 +131,9 @@ class ReductionWrapper(object):
f = open(FileName, 'w')
f.write("standard_vars = {\n")
str_wrapper = ' '
- for key, val in iteritems(self._wvs.standard_vars):
- if isinstance(val, string_types):
- row = "{0}\'{1}\':\'{2}\'".format(str_wrapper, key, val)
+ for key, val in self._wvs.standard_vars.items():
+ if isinstance(val, str):
+ row = "{0}\'{1}\':\'{2}\'".format(str_wrapper,key,val)
else:
row = "{0}\'{1}\':{2}".format(str_wrapper, key, val)
f.write(row)
@@ -144,9 +141,9 @@ class ReductionWrapper(object):
f.write("\n}\nadvanced_vars={\n")
# print advances variables
str_wrapper = ' '
- for key, val in iteritems(self._wvs.advanced_vars):
- if isinstance(val, string_types):
- row = "{0}\'{1}\':\'{2}\'".format(str_wrapper, key, val)
+ for key, val in self._wvs.advanced_vars.items():
+ if isinstance(val, str):
+ row = "{0}\'{1}\':\'{2}\'".format(str_wrapper,key,val)
else:
row = "{0}\'{1}\':{2}".format(str_wrapper, key, val)
f.write(row)
@@ -321,7 +318,7 @@ class ReductionWrapper(object):
# this row defines location of the validation file
validation_file = self.validation_file_name()
sample_run = self.validate_run_number
- if isinstance(validation_file, string_types):
+ if isinstance(validation_file, str):
path, name = os.path.split(validation_file)
if name in mtd:
reference_ws = mtd[name]
@@ -759,7 +756,7 @@ def iliad(reduce):
input_file = None
output_directory = None
# add input file folder to data search directory if file has it
- if input_file and isinstance(input_file, string_types):
+ if input_file and isinstance(input_file, str):
data_path = os.path.dirname(input_file)
if len(data_path) > 0:
try:
@@ -787,7 +784,7 @@ def iliad(reduce):
# prohibit returning workspace to web services.
# pylint: disable=protected-access
- if host._run_from_web and not isinstance(rez, string_types):
+ if host._run_from_web and not isinstance(rez, str):
rez = ""
else:
if isinstance(rez, list):
diff --git a/scripts/Inelastic/Direct/RunDescriptor.py b/scripts/Inelastic/Direct/RunDescriptor.py
index c9451c23e6621d828005236035643ea26f4847ce..7fbd7339ac69e1c0fed22579943281e005a3d770 100644
--- a/scripts/Inelastic/Direct/RunDescriptor.py
+++ b/scripts/Inelastic/Direct/RunDescriptor.py
@@ -9,8 +9,6 @@
#pylint: disable=attribute-defined-outside-init
""" File contains Descriptors used describe run for direct inelastic reduction """
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-from six import string_types
from mantid.simpleapi import *
from mantid.kernel import funcinspect
from Direct.PropertiesDescriptors import *
@@ -54,7 +52,7 @@ class RunList(object):
local_fext=[]
for item in runs_to_add:
- if isinstance(item, string_types):
+ if isinstance(item, str):
file_path,run_num,fext = prop_helpers.parse_run_file_name(item)
runs.append(run_num)
if not fnames_given:
@@ -452,7 +450,7 @@ class RunDescriptor(PropDescriptor):
self._set_ws_as_source(value)
return
- if isinstance(value, string_types): # it may be run number as string or it may be a workspace name
+ if isinstance(value, str): # it may be run number as string or it may be a workspace name
if value in mtd: # workspace name
ws = mtd[value]
self.__set__(instance,ws)
@@ -993,7 +991,7 @@ class RunDescriptor(PropDescriptor):
def set_file_ext(self,val):
"""Set non-default file extension """
- if isinstance(val, string_types):
+ if isinstance(val, str):
if val[0] != '.':
value = '.' + val
else:
@@ -1152,7 +1150,7 @@ class RunDescriptor(PropDescriptor):
ws_calibration = prop_helpers.get_default_parameter(loaded_ws.getInstrument(),'det_cal_file')
if ws_calibration is None:
ws_calibration = calibration
- if isinstance(ws_calibration, string_types) and ws_calibration.lower() == 'none':
+ if isinstance(ws_calibration, str) and ws_calibration.lower() == 'none':
ws_calibration = calibration
if ws_calibration :
test_name = ws_calibration
@@ -1168,7 +1166,7 @@ class RunDescriptor(PropDescriptor):
else:
return
- if isinstance(ws_calibration, string_types) : # It can be only a file (got it from calibration property)
+ if isinstance(ws_calibration, str) : # It can be only a file (got it from calibration property)
RunDescriptor._logger('load_data: Moving detectors to positions specified in cal file {0}'.format(ws_calibration),'debug')
# Pull in pressures, thicknesses & update from cal file
LoadDetectorInfo(Workspace=loaded_ws, DataFilename=ws_calibration, RelocateDets=True)
@@ -1670,7 +1668,7 @@ def build_run_file_name(run_num,inst,file_path='',fext=''):
"""Build the full name of a runfile from all possible components"""
if fext is None:
fext = ''
- if isinstance(run_num, string_types):
+ if isinstance(run_num, str):
run_num_str = run_num
else:
#pylint: disable=protected-access
diff --git a/scripts/Inelastic/Direct/dgreduce.py b/scripts/Inelastic/Direct/dgreduce.py
index 52911c53a3ba6f2694cd71517246254d7f2535bc..95c32d070c3958377c883375dfec300a361e76e3 100644
--- a/scripts/Inelastic/Direct/dgreduce.py
+++ b/scripts/Inelastic/Direct/dgreduce.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
""" Empty class temporary left for compatibility with previous interfaces """
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import Direct.DirectEnergyConversion as DRC
from mantid.simpleapi import *
from mantid.kernel import funcinspect
diff --git a/scripts/Inelastic/Direct/diagnostics.py b/scripts/Inelastic/Direct/diagnostics.py
index 0c0cb79d94bccb530f606b6ff90cf07292045f9a..82eb87987d1a350002869b48950aa548d95fa042 100644
--- a/scripts/Inelastic/Direct/diagnostics.py
+++ b/scripts/Inelastic/Direct/diagnostics.py
@@ -17,14 +17,11 @@ The output of each function is a workspace containing a single bin where:
This workspace can be summed with other masked workspaces to accumulate
masking and also passed to MaskDetectors to match masking there.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-from six import string_types
from mantid.simpleapi import *
from mantid.kernel.funcinspect import lhs_info
import os
import Direct.RunDescriptor as RunDescriptor
from Direct.PropertyManager import PropertyManager
-from six import iteritems
# Reference to reducer used if necessary for working with run descriptors (in diagnostics)
__Reducer__ = None
@@ -457,7 +454,7 @@ def get_failed_spectra_list(diag_workspace):
diag_workspace - A workspace containing masking
"""
- if isinstance(diag_workspace, string_types):
+ if isinstance(diag_workspace, str):
diag_workspace = mtd[diag_workspace]
failed_spectra = []
@@ -477,5 +474,5 @@ class ArgumentParser(object):
def __init__(self, keywords):
self.start_index = None # Make this more general for anything that is missing!
self.end_index = None
- for key, value in iteritems(keywords):
+ for key, value in keywords.items():
setattr(self, key, value)
diff --git a/scripts/Inelastic/IndirectBayes.py b/scripts/Inelastic/IndirectBayes.py
index 1525e9b13fba7039515fa11291957f8caa8f5579..0936593c1e22b9b7354a0ea8a51c7f82907b9c45 100644
--- a/scripts/Inelastic/IndirectBayes.py
+++ b/scripts/Inelastic/IndirectBayes.py
@@ -13,7 +13,6 @@ Input : the Python list is padded to Fortrans length using procedure PadArray
Output : the Fortran numpy array is sliced to Python length using dataY = yout[:ny]
"""
-from __future__ import (absolute_import, division, print_function)
from IndirectImport import *
if is_supported_f2py_platform(): # noqa
QLr = import_f2py("QLres")
diff --git a/scripts/Inelastic/IndirectCommon.py b/scripts/Inelastic/IndirectCommon.py
index ac2384eabab6fdd28d060beef64da73b5b4d92ed..5e3a53baee2b0a15ed9ce9453d7cefd0f2b04fe7 100644
--- a/scripts/Inelastic/IndirectCommon.py
+++ b/scripts/Inelastic/IndirectCommon.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
-
import mantid.simpleapi as s_api
from mantid import config, logger
diff --git a/scripts/Inelastic/IndirectImport.py b/scripts/Inelastic/IndirectImport.py
index a1570644015d39244fd6af043fe5a6a15a69d4ed..c50699be1f78181e567bf9b466b645faff73f22f 100644
--- a/scripts/Inelastic/IndirectImport.py
+++ b/scripts/Inelastic/IndirectImport.py
@@ -10,8 +10,6 @@ the Indirect scripts depending on platform and numpy package version.
We also deal with importing the mantidplot module outside of MantidPlot here.
"""
-from __future__ import (absolute_import, division, print_function)
-
from contextlib import contextmanager
import numpy.core.setup_common as numpy_cfg
import os
diff --git a/scripts/Inelastic/IndirectMuscat.py b/scripts/Inelastic/IndirectMuscat.py
index 88dff9a707715cad16657ed58ed1fb32ef357c04..9b74728daabff684d1c0156fd2da4cc4d0c6e2d6 100644
--- a/scripts/Inelastic/IndirectMuscat.py
+++ b/scripts/Inelastic/IndirectMuscat.py
@@ -10,7 +10,6 @@
MUSIC : Version of Minus for MIDAS
"""
-from __future__ import (absolute_import, division, print_function)
from IndirectImport import *
if is_supported_f2py_platform(): # noqa
muscat = import_f2py("muscat")
diff --git a/scripts/Inelastic/IndirectNeutron.py b/scripts/Inelastic/IndirectNeutron.py
index 0cd0a744b1720dce948da960d7e68ff89ac1bd67..754cb8600f6510963d3285f5b5dbfa82ab6d80a3 100644
--- a/scripts/Inelastic/IndirectNeutron.py
+++ b/scripts/Inelastic/IndirectNeutron.py
@@ -10,7 +10,6 @@
Force for ILL backscattering raw
"""
-from __future__ import (absolute_import, division, print_function)
from IndirectImport import *
from mantid.simpleapi import *
from mantid import config, logger, mtd, FileFinder
diff --git a/scripts/Inelastic/IndirectReductionCommon.py b/scripts/Inelastic/IndirectReductionCommon.py
index b8fbc3e61241bd4c7c121872e4241aec38bccd54..228c84f8674db91e8de74279fcbdaa0db12ca4e8 100644
--- a/scripts/Inelastic/IndirectReductionCommon.py
+++ b/scripts/Inelastic/IndirectReductionCommon.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import DeleteWorkspace, Load
from mantid.api import AnalysisDataService, WorkspaceGroup, AlgorithmManager
from mantid import mtd, logger, config
diff --git a/scripts/Inelastic/dos/__init__.py b/scripts/Inelastic/dos/__init__.py
index c292a33b86ab4c8db3c944693a352eadcede926e..479ea6a6fd575a2fbbedf37e0e666c9a6281ee82 100644
--- a/scripts/Inelastic/dos/__init__.py
+++ b/scripts/Inelastic/dos/__init__.py
@@ -10,6 +10,4 @@ load_castep -- Parses a castep file into a file data object
load_phonon -- Parses a phonon file into a file data object
"""
-from __future__ import absolute_import
-
__all__=['load_castep','load_phonon', 'load_helper']
diff --git a/scripts/Inelastic/dos/load_castep.py b/scripts/Inelastic/dos/load_castep.py
index 4ad003730ec09aaf47643e3f7f322b75c74e1bf3..415dce5595c7d987a7c185eeb5cf769333038009 100644
--- a/scripts/Inelastic/dos/load_castep.py
+++ b/scripts/Inelastic/dos/load_castep.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
-
import re
import numpy as np
diff --git a/scripts/Inelastic/dos/load_phonon.py b/scripts/Inelastic/dos/load_phonon.py
index a3893aec2254a37e1eee352727a518d7a0f4f742..f9b61a961e5bcb63939beb91cc8095d097894c7d 100644
--- a/scripts/Inelastic/dos/load_phonon.py
+++ b/scripts/Inelastic/dos/load_phonon.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
-
import re
import numpy as np
diff --git a/scripts/Inelastic/vesuvio/__init__.py b/scripts/Inelastic/vesuvio/__init__.py
index ae05f8178944d7ede5f96158e96793d08304d3fa..777ef7a03edde3af2e786ec436b3e9c91eed0591 100644
--- a/scripts/Inelastic/vesuvio/__init__.py
+++ b/scripts/Inelastic/vesuvio/__init__.py
@@ -15,6 +15,4 @@ profiles -- Defines mass profiles
testing -- Simulates Vesuvio data for use in tests
"""
-from __future__ import absolute_import
-
__all__=['backgrounds','base','commands','fitting','instrument','profiles', 'testing']
diff --git a/scripts/Inelastic/vesuvio/backgrounds.py b/scripts/Inelastic/vesuvio/backgrounds.py
index d612de57e1b523861e4b32e3c6429b51ec818083..873431c605fd073a8415c6a7b52645e741fb8b3f 100644
--- a/scripts/Inelastic/vesuvio/backgrounds.py
+++ b/scripts/Inelastic/vesuvio/backgrounds.py
@@ -7,9 +7,6 @@
# pylint: disable=too-few-public-methods,redefined-builtin
"""Holds classes that define the backgrounds for fitting
"""
-from __future__ import (absolute_import, division, print_function)
-from six import iteritems
-
import ast
# --------------------------------------------------------------------------------
@@ -90,5 +87,5 @@ def create_from_str(func_str):
errors[str(cls)] = str(exc)
# if we get here we were unable to parse anything acceptable
- msgs = ["{0}: {1}".format(name, error) for name, error in iteritems(errors)]
+ msgs = ["{0}: {1}".format(name, error) for name, error in errors.items()]
raise ValueError("\n".join(msgs))
diff --git a/scripts/Inelastic/vesuvio/base.py b/scripts/Inelastic/vesuvio/base.py
index 07673ece9ce1ff46dc335687ec4df7d36f423585..b68f071f127457ba4d28954686a4ca8de64ec55d 100644
--- a/scripts/Inelastic/vesuvio/base.py
+++ b/scripts/Inelastic/vesuvio/base.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-few-public-methods,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-from six import iteritems
-
from mantid.api import Algorithm
@@ -37,7 +34,7 @@ class VesuvioBase(Algorithm):
ret_props = [ret_props]
del kwargs['return_values']
- for name, value in iteritems(kwargs):
+ for name, value in kwargs.items():
alg.setProperty(name, value)
alg.execute()
diff --git a/scripts/Inelastic/vesuvio/commands.py b/scripts/Inelastic/vesuvio/commands.py
index 9c80a35556b6918f8834f31529c4d9a3dde94751..4061eb2ab489d82dfd88a9d42ee0b9cf0fc2cee9 100644
--- a/scripts/Inelastic/vesuvio/commands.py
+++ b/scripts/Inelastic/vesuvio/commands.py
@@ -9,8 +9,6 @@
Defines functions and classes to start the processing of Vesuvio data.
The main entry point that most users should care about is fit_tof().
"""
-from __future__ import (absolute_import, division, print_function)
-
import re
import numpy as np
from functools import reduce
@@ -198,10 +196,8 @@ class VesuvioTOFFitRoutineIteration(object):
# Calculate corrections
corrections_result = self._corrections(vesuvio_input.sample_data, vesuvio_input.container_data, index,
all_mass_values, all_profiles, prefit_result[1], verbose_output)
-
# Calculate final fit
fit_result = self._final_fit(corrections_result[-1], fit_mass_values, fit_profiles)
-
# Update output with results from fit
_update_output(vesuvio_output, prefit_result, corrections_result, fit_result)
@@ -210,7 +206,6 @@ class VesuvioTOFFitRoutineIteration(object):
UnGroupWorkspace(corrections_result[0])
UnGroupWorkspace(corrections_result[1])
mtd.remove(prefit_result[1].name())
- mtd.remove(corrections_result[-1].name())
mtd.remove(fit_result[1].name())
return vesuvio_output
diff --git a/scripts/Inelastic/vesuvio/profiles.py b/scripts/Inelastic/vesuvio/profiles.py
index 056b12d0cbdc7f828430357394e662a1583ecc96..daf0f00d08e2dfdce77552e5b8c569f4a4298780 100644
--- a/scripts/Inelastic/vesuvio/profiles.py
+++ b/scripts/Inelastic/vesuvio/profiles.py
@@ -9,9 +9,6 @@
This is all essentially about parsing the user input and putting it into a form
the Mantid fitting algorithm will understand
"""
-from __future__ import (absolute_import, division, print_function)
-from six import iteritems
-
import ast
import collections
import re
@@ -430,5 +427,5 @@ def create_from_str(func_str, mass):
errors[str(cls)] = str(exc)
# if we get here we were unable to parse anything acceptable
- msgs = ["{0}: {1}".format(name, error) for name, error in iteritems(errors)]
+ msgs = ["{0}: {1}".format(name, error) for name, error in errors.items()]
raise ValueError("\n".join(msgs))
diff --git a/scripts/Interface/compile_pd_ui.py b/scripts/Interface/compile_pd_ui.py
index b66c2859ea5fb3bdb7d17cd0ac62a33cb0d2b077..66348f5983bd97e3c3b701a1db576ac14cb04162 100755
--- a/scripts/Interface/compile_pd_ui.py
+++ b/scripts/Interface/compile_pd_ui.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from compile_util import compile_ui
# Compile resource files for Diffraction instruments
diff --git a/scripts/Interface/compile_util_ui.py b/scripts/Interface/compile_util_ui.py
index 5080f47ed469d04aab11aeba3b22cfa4d482369d..5bbdaca58b5e3486959779f9723f2076f0d801a7 100644
--- a/scripts/Interface/compile_util_ui.py
+++ b/scripts/Interface/compile_util_ui.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
diff --git a/scripts/Interface/reduction_application.py b/scripts/Interface/reduction_application.py
index e78c9e15d9c4c1bb8dd722d6aae40810428d5387..f8643250e5e3d055ffc4337030f6f796a0d29f77 100644
--- a/scripts/Interface/reduction_application.py
+++ b/scripts/Interface/reduction_application.py
@@ -8,8 +8,6 @@
"""
Main window for reduction UIs
"""
-from __future__ import (absolute_import, division, print_function)
-import six
import sys
import os
import traceback
@@ -31,8 +29,7 @@ except ImportError:
Logger("ReductionGUI").information('Using legacy ui importer')
from mantidplot import load_ui # noqa
-if six.PY3:
- unicode = str
+unicode = str
STARTUP_WARNING = ""
diff --git a/scripts/Interface/reduction_gui/instruments/dgs_interface_dev.py b/scripts/Interface/reduction_gui/instruments/dgs_interface_dev.py
index 2358a567156f003c2d7da6053e011855a2768545..ee73393ce050baaca6302f5dd15b1cbe843e2295 100644
--- a/scripts/Interface/reduction_gui/instruments/dgs_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/dgs_interface_dev.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.interface import InstrumentInterface
from reduction_gui.widgets.inelastic.dgs_sample_setup import SampleSetupWidget
from reduction_gui.widgets.inelastic.dgs_data_corrections import DataCorrectionsWidget
diff --git a/scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py b/scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py
index 525913ceab6e4ba5fe7c53315942f7a9656fa83f..6d7f267de446cd2c05d3cc2baa568c0308d9fcf3 100644
--- a/scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.interface import InstrumentInterface
from reduction_gui.widgets.diffraction.diffraction_run_setup import RunSetupWidget
from reduction_gui.widgets.diffraction.diffraction_adv_setup import AdvancedSetupWidget
diff --git a/scripts/Interface/reduction_gui/instruments/eqsans_interface_dev.py b/scripts/Interface/reduction_gui/instruments/eqsans_interface_dev.py
index fd52fe62f9aa98ffb305986a73fb625a881e4006..0246724cbfda0c446bdff01206876dcab3ef060f 100644
--- a/scripts/Interface/reduction_gui/instruments/eqsans_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/eqsans_interface_dev.py
@@ -10,7 +10,6 @@
The actual view/layout is define in .ui files. The state of the reduction
process is kept elsewhere (SNSReduction object)
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.interface import InstrumentInterface
from reduction_gui.widgets.sans.hfir_detector import DetectorWidget
from reduction_gui.widgets.sans.eqsans_instrument import SANSInstrumentWidget
diff --git a/scripts/Interface/reduction_gui/instruments/hfir_interface_dev.py b/scripts/Interface/reduction_gui/instruments/hfir_interface_dev.py
index 32a101d23a4874043bc7ea28bff5403a35592da6..ba61da55496c50f3376383b580dd17e296fed4f2 100644
--- a/scripts/Interface/reduction_gui/instruments/hfir_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/hfir_interface_dev.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""
This module defines the interface control for HFIR SANS.
Each reduction method tab that needs to be presented is defined here.
diff --git a/scripts/Interface/reduction_gui/instruments/instrument_factory.py b/scripts/Interface/reduction_gui/instruments/instrument_factory.py
index fb2eb86cb0af2c586c10f35b4e96698158844721..4f0f722c24e89de0cba88c146f564eb768339888 100644
--- a/scripts/Interface/reduction_gui/instruments/instrument_factory.py
+++ b/scripts/Interface/reduction_gui/instruments/instrument_factory.py
@@ -9,7 +9,6 @@
This module is responsible for the association between an instrument name
and its corresponding interface class.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.hfir_interface_dev import HFIRInterface
from reduction_gui.instruments.eqsans_interface_dev import EQSANSInterface
from reduction_gui.instruments.dgs_interface_dev import DgsInterface
diff --git a/scripts/Interface/reduction_gui/instruments/interface.py b/scripts/Interface/reduction_gui/instruments/interface.py
index e994d52cd3c3b5ce484b18e4d135cc54cec0f6d8..e36c0d5335f935d15d99a7fbb01ad7915304e9d7 100644
--- a/scripts/Interface/reduction_gui/instruments/interface.py
+++ b/scripts/Interface/reduction_gui/instruments/interface.py
@@ -8,16 +8,13 @@
"""
Base class for instrument-specific user interface
"""
-from __future__ import (absolute_import, division, print_function)
-import six
from qtpy.QtWidgets import (QMessageBox) # noqa
import sys
import os
import traceback
from reduction_gui.reduction.scripter import BaseReductionScripter
-if six.PY3:
- unicode = str
+unicode = str
class InstrumentInterface(object):
diff --git a/scripts/Interface/reduction_gui/instruments/toftof_interface_dev.py b/scripts/Interface/reduction_gui/instruments/toftof_interface_dev.py
index 23670d06739b15bba5538f4af4857055f83d5c0d..4ac651b6b77632ed1a794cced856ecee6f7680ad 100644
--- a/scripts/Interface/reduction_gui/instruments/toftof_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/toftof_interface_dev.py
@@ -8,7 +8,6 @@
"""
TOFTOF reduction workflow gui.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.interface import InstrumentInterface
from reduction_gui.reduction.toftof.toftof_reduction import TOFTOFReductionScripter
diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py
index a5964d1f0b2d8b8d56d30663deb10f14fd7ecbb5..ec9c64d1ac660b3fee187553f2aa22e82faf463e 100644
--- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py
+++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py
@@ -10,7 +10,6 @@
from the the interface class so that the DgsReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_filter_setup_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_filter_setup_script.py
index f1df36ce97ca6457f79c38f997cc5277a49c0e54..701325672c44258c076dd195edea656229be7f03 100644
--- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_filter_setup_script.py
+++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_filter_setup_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Classes for each reduction step. Those are kept separately
diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
index a9b80cbb5ba32b4c1817ebd14bd475ecfe715ab9..9050f4e42bf0c77d74320d2b019f5c2ad48f1080 100644
--- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
+++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name,R0912
"""
Classes for each reduction step. Those are kept separately
@@ -304,7 +303,7 @@ class DiffractionReductionScripter(BaseReductionScripter):
runsetupdict.pop('ExpIniFile', None)
# c) all properties
- for propname, propvalue in runsetupdict.iteritems():
+ for propname, propvalue in runsetupdict.items():
# skip these pseudo-properties
if propname in ['DisableBackgroundCorrection', 'DisableVanadiumCorrection',
'DisableVanadiumBackgroundCorrection', 'DoReSampleX']:
@@ -329,7 +328,7 @@ class DiffractionReductionScripter(BaseReductionScripter):
# ENDFOR
# 2. Advanced setup
- for propname, propvalue in advsetupdict.iteritems():
+ for propname, propvalue in advsetupdict.items():
if propvalue == '' or propvalue is None:
# Skip not-defined value
continue
diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py
index df7ed4ee6eb0a0607aad2b8a3b8efcdc6547000f..f097e71022225693689ea674e048500710cb5dc4 100644
--- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py
+++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""
Classes for each reduction step. Those are kept separately
from the the interface class so that the DgsReduction class could
diff --git a/scripts/Interface/reduction_gui/reduction/eqsans_reduction.py b/scripts/Interface/reduction_gui/reduction/eqsans_reduction.py
index 97dbf3c7a34fc2d7380f4e6ede273a3dec4c9966..b87e9877b72a667f24e4b441719cf9a1d28603a8 100644
--- a/scripts/Interface/reduction_gui/reduction/eqsans_reduction.py
+++ b/scripts/Interface/reduction_gui/reduction/eqsans_reduction.py
@@ -9,7 +9,6 @@
This class holds all the necessary information to create a reduction script.
This is a fake version of the Reducer for testing purposes.
"""
-from __future__ import (absolute_import, division, print_function)
import time
import os
from reduction_gui.reduction.scripter import BaseReductionScripter
diff --git a/scripts/Interface/reduction_gui/reduction/hfir_reduction.py b/scripts/Interface/reduction_gui/reduction/hfir_reduction.py
index d723c3ff33ef86a5e8156eb5d33c94f72a92d96e..1e80d8c5d3a8ff44ca259cc32ef75e395f9864c6 100644
--- a/scripts/Interface/reduction_gui/reduction/hfir_reduction.py
+++ b/scripts/Interface/reduction_gui/reduction/hfir_reduction.py
@@ -9,7 +9,6 @@
This class holds all the necessary information to create a reduction script.
This is a fake version of the Reducer for testing purposes.
"""
-from __future__ import (absolute_import, division, print_function)
import time
import os
from reduction_gui.reduction.scripter import BaseReductionScripter
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py
index edd03ec03d35cfdec539ef67fc406db7853512e3..3630595d28069eebf92618d364d788afab7b36f6 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Classes for each reduction step. Those are kept separately
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_data_corrections_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_data_corrections_script.py
index 4050a932815723fd1ab032e765d6523fd9416a5b..ad623d18cb7e986546f49ea14aff0efa44d21042 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_data_corrections_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_data_corrections_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Classes for each reduction step. Those are kept separately
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_diagnose_detectors_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_diagnose_detectors_script.py
index 428114e49b8dbfb584a78f22530fe82cd7b9c42b..078bf1bc0436ba87c57eb0253cadc8a8e3cc830b 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_diagnose_detectors_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_diagnose_detectors_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Classes for each reduction step. Those are kept separately
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_pd_sc_conversion_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_pd_sc_conversion_script.py
index 8cd8bc48d9c4ebaf5c0eb94b269f07439cdbf3df..62e23c861bc91110398d8ee5803a33e0a9ca8d03 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_pd_sc_conversion_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_pd_sc_conversion_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""
Classes for each reduction step. Those are kept separately
from the the interface class so that the DgsReduction class could
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_reduction_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_reduction_script.py
index 977b2432a6c297daed0543831314a88343443498..7072cfcc3f9113c22412131ca421cbaab65be7e8 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_reduction_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_reduction_script.py
@@ -10,7 +10,6 @@
from the the interface class so that the DgsReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import time
import mantid
from reduction_gui.reduction.scripter import BaseReductionScripter
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py
index a7ab34d275a105f58d02772025c6adaf84d16929..6937d7a1d8058117d8bc55f4c2403825b59c915c 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py
@@ -10,7 +10,6 @@
from the the interface class so that the DgsReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import os
import xml.dom.minidom
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
index 261bdb8adb8854472862d7b5dcc28e4c0ce70a11..b04dfa37469c83e22dd9eba61b5bf384ae672fce 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
IS_IN_MANTIDPLOT = False
diff --git a/scripts/Interface/reduction_gui/reduction/output_script.py b/scripts/Interface/reduction_gui/reduction/output_script.py
index 79a2acd8147fa47198aed0757d89099b2aa3ad03..83be0261dd19156e12e41ea24de993161ac70df3 100644
--- a/scripts/Interface/reduction_gui/reduction/output_script.py
+++ b/scripts/Interface/reduction_gui/reduction/output_script.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import sys
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py b/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py
index d516fb9052bc8c1995ac6c062af88c043dca9663..831dc0f60293f70ab7298fc63ee5dcc2e82128fd 100644
--- a/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py
+++ b/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py
@@ -8,7 +8,6 @@
Legacy class that old LR reduction options.
This is still in use for backward compatibility.
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_series.py b/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_series.py
index 4a30c132c16dcf89e60bfb51d7b0c6101f4d1459..8b6a91007533f7b3afa12b832499a8978c382b91 100644
--- a/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_series.py
+++ b/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_series.py
@@ -9,7 +9,6 @@
from the the interface class so that the HFIRReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.reflectometer.refl_data_script import DataSets as REFLDataSets
diff --git a/scripts/Interface/reduction_gui/reduction/sans/data_cat.py b/scripts/Interface/reduction_gui/reduction/sans/data_cat.py
index c263d134344c703d26ee3ea543d925f4b21f2569..145e587d9f2c76dc62f67d4b4ff0027d83de43a2 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/data_cat.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/data_cat.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Simple local data catalog for Mantid
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_background_script.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_background_script.py
index f35f4108f43bd52f5e797b7b3e1077f4381b4bcd..47ec6bfafabf5311acbb8e49fa479612a6927ad5 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_background_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_background_script.py
@@ -7,7 +7,6 @@
"""
Sample data options for EQSANS reduction
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.sans.hfir_background_script import Background as BaseBackground
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py
index c317d3d13e270d29e8a8976a63e1a95d84877dd2..8d1507a6022d1eb2f8b72e546ab218cac42279ec 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py
@@ -8,7 +8,6 @@
"""
Data catalog for EQSANS
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.reduction.sans.data_cat import DataCatalog as BaseCatalog
from reduction_gui.reduction.sans.data_cat import DataSet, DataType
from reduction_gui.reduction.scripter import execute_script
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_proxy.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_proxy.py
index 9610941352d2414f857a15ae7f290ee059c48067..649cfe2aab6a46cf78d033af12803159fa69df46 100755
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_proxy.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_proxy.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import sys
# Check whether Mantid is available
try:
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_script.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_script.py
index e7ff9ded46a7e24482a60440a5814e0e3c62f8be..511f860ff1e608b5f2fd6208a251f2ea87006c78 100755
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_script.py
@@ -7,7 +7,6 @@
"""
Data set options for EQSANS reduction
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.reduction.sans.eqsans_sample_script import SampleData as BaseSampleData
from reduction_gui.reduction.sans.eqsans_background_script import Background
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_options_script.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_options_script.py
index e1f39bcd0be96c4dec74e623f219e3d3515cf45e..da2b489341ef7d8d7ae8caeff661c938878f55ac 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_options_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_options_script.py
@@ -7,7 +7,6 @@
"""
General options for EQSANS reduction
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.sans.hfir_options_script import ReductionOptions as BaseOptions
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_sample_script.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_sample_script.py
index 5d96f9287c01b767b36d1a86f871f2d804d91f2e..6d4f2aa65e9843c2dcd720ecf36cc8dd38b611fc 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_sample_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_sample_script.py
@@ -7,7 +7,6 @@
"""
Sample data options for EQSANS reduction
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.sans.hfir_sample_script import SampleData as BaseSampleData
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_background_script.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_background_script.py
index 1737a1279376306a2d51dc3d32e2dcab7fac9266..672f1d55d1e46a8e14d69b67054fce2b67205e1e 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_background_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_background_script.py
@@ -9,7 +9,6 @@
from the the interface class so that the HFIRReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.sans.hfir_sample_script import SampleData
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py
index a85ee36d6e566fa97e6a723fe1afaef607fc6b92..063f90503b276677b3db760f0ed2707209983d43 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py
@@ -8,7 +8,6 @@
"""
Data catalog for HFIR SANS
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.reduction.sans.data_cat import DataCatalog as BaseCatalog
from reduction_gui.reduction.sans.data_cat import DataSet, DataType
from reduction_gui.reduction.scripter import execute_script
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_data_proxy.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_data_proxy.py
index 5ad9d011421058b33113103fa1694f27bde49c0e..1f43b16baed1a71be1daffef6c7efa96d3745e2a 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_data_proxy.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_data_proxy.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=bare-except,invalid-name
-from __future__ import (absolute_import, division, print_function)
import sys
# Check whether Mantid is available
try:
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_detector_script.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_detector_script.py
index 67faea2a708f565463a675198aec55935c8e94e7..2e7690f15b04dd487fe231b774641c2d5eb10066 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_detector_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_detector_script.py
@@ -8,7 +8,6 @@
"""
Detector options for reduction
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_options_script.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_options_script.py
index 00518a887423cb828b86fac1a28d5495c3eddcff..b43e39348bf79ea2d4ef62bccf05c3175539baa4 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_options_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_options_script.py
@@ -9,7 +9,6 @@
from the the interface class so that the HFIRReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import inspect
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_sample_script.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_sample_script.py
index 4f88ddba09230013dbd3f241320eb36a07b958b1..bb779bb939d23b80651a209f8b1c7c329120ad29 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_sample_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_sample_script.py
@@ -10,7 +10,6 @@
from the the interface class so that the HFIRReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
import os
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/scripter.py b/scripts/Interface/reduction_gui/reduction/scripter.py
index 6039660efa7fee129e3780e4c08eb7843bf5e814..a3fadcd4ab09b9bb9ab8a3188bc2a4ccfc9bd14c 100644
--- a/scripts/Interface/reduction_gui/reduction/scripter.py
+++ b/scripts/Interface/reduction_gui/reduction/scripter.py
@@ -9,7 +9,6 @@
Reduction scripter used to take reduction parameters
end produce a Mantid reduction script
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
import sys
import time
diff --git a/scripts/Interface/reduction_gui/reduction/toftof/toftof_reduction.py b/scripts/Interface/reduction_gui/reduction/toftof/toftof_reduction.py
index a2074aad79cc78c5584a88fc11f08e096a461997..cb9677c1ace82c97cd070a1381d5e51189249a5e 100644
--- a/scripts/Interface/reduction_gui/reduction/toftof/toftof_reduction.py
+++ b/scripts/Interface/reduction_gui/reduction/toftof/toftof_reduction.py
@@ -11,8 +11,6 @@
"""
TOFTOF reduction workflow gui.
"""
-from __future__ import (absolute_import, division, print_function)
-
from itertools import repeat, compress
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement, BaseReductionScripter
diff --git a/scripts/Interface/reduction_gui/settings/application_settings.py b/scripts/Interface/reduction_gui/settings/application_settings.py
index 132776196d81966f6640a62719c22b058088f766..ee880e42955aee355e9dc58a6cef1dfd6375a749 100644
--- a/scripts/Interface/reduction_gui/settings/application_settings.py
+++ b/scripts/Interface/reduction_gui/settings/application_settings.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-import six
'''
Notes:
@@ -20,8 +18,7 @@ From mantidplot:
from qtpy.QtCore import (QObject, QSettings, Signal) # noqa
-if six.PY3:
- unicode = str
+unicode = str
class GeneralSettings(QObject):
diff --git a/scripts/Interface/reduction_gui/widgets/base_widget.py b/scripts/Interface/reduction_gui/widgets/base_widget.py
index b2fbdc514001f56f8e1d8d3b5120f8003af1d65f..90ef8ffe12816a03234728b5004a0d54bee92142 100644
--- a/scripts/Interface/reduction_gui/widgets/base_widget.py
+++ b/scripts/Interface/reduction_gui/widgets/base_widget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtCore import (QFileInfo) # noqa
from qtpy.QtWidgets import (QFileDialog, QHBoxLayout, QMessageBox, QWidget) # noqa
import os
diff --git a/scripts/Interface/reduction_gui/widgets/data_table_view.py b/scripts/Interface/reduction_gui/widgets/data_table_view.py
index 210324521ddc46e487191fde99420dafc0de59aa..8576f20a3624048a34d63619c675eacf235fc97e 100644
--- a/scripts/Interface/reduction_gui/widgets/data_table_view.py
+++ b/scripts/Interface/reduction_gui/widgets/data_table_view.py
@@ -7,7 +7,6 @@
"""
DataTable Widget for data runs.
"""
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtCore, QtWidgets
from qtpy.QtCore import Qt
diff --git a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py
index cb265ea77ac258c8d0a004f9c66e81a291ee0453..975db7e3435eaad42e7e285c689defd78bdd2afd 100644
--- a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py
@@ -8,7 +8,6 @@
################################################################################
# Advanced Setup Widget
################################################################################
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QDialog, QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_filter_setup.py b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_filter_setup.py
index 477bd26d3fffcf2872431d1d610cf3dceb9cb66f..87eb676284a3715a48ad457a80b402d76fb8ae80 100644
--- a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_filter_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_filter_setup.py
@@ -8,7 +8,6 @@
################################################################################
# Event Filtering (and advanced) Setup Widget
################################################################################
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Logger
from mantid.simpleapi import ExportTimeSeriesLog, Load
import matplotlib.pyplot as plt
diff --git a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_run_setup.py b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_run_setup.py
index 041831c9ea86c51d8a26384d286d4c5dc0385544..dc1d5bd544166ef3e0000183507fb95b46f1b880 100644
--- a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_run_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_run_setup.py
@@ -8,7 +8,6 @@
################################################################################
# This is my first attempt to make a tab from quasi-scratch
################################################################################
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QDialog, QFrame) # noqa
from qtpy.QtCore import (QRegExp) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator, QRegExpValidator) # noqa
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py
index a074a5447a437d9e6fcc4d7a5de9388ffe86d032..4f541d027a6f4ef3a249c664450298dd7fdd3f0b 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_data_corrections.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_data_corrections.py
index 8bea8f914e64e26390d47a48072fdb7941f37201..b5611a8368563c5422751b7098dc422d3f240287 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_data_corrections.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_data_corrections.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QButtonGroup, QFrame) # noqa
from qtpy.QtGui import (QIntValidator) # noqa
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_diagnose_detectors.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_diagnose_detectors.py
index c9eece0d22952ad0416fb11aee561338a960090a..6cd25d23dba50cbfe72ab6902a33e646ac0b6af4 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_diagnose_detectors.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_diagnose_detectors.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_pd_sc_conversion.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_pd_sc_conversion.py
index fbf4c78685bd09ad53e06106dfb1f05ce2f6ccc9..ef3839c70003694f9f29009e1a7a8934e1706b06 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_pd_sc_conversion.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_pd_sc_conversion.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtGui, QtCore
from functools import partial
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py
index 36960a056c67f31694abb8a91cfbde3d451e3f16..fa0a0f63f9ca6c071df5b275fedfbed2d42a12bd 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFileDialog, QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
from functools import partial
diff --git a/scripts/Interface/reduction_gui/widgets/output.py b/scripts/Interface/reduction_gui/widgets/output.py
index 66c8047e38e6da2ecaba770cf8801b094002bc6c..41d3336438508758b247ab67677718a48d0fc696 100644
--- a/scripts/Interface/reduction_gui/widgets/output.py
+++ b/scripts/Interface/reduction_gui/widgets/output.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFrame) # noqa
from reduction_gui.reduction.output_script import Output
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py b/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
index 1b55535ade5a1118c1e92601a3bcd28f9e99cb4c..b82fc2bd458d96f956b0186509a285dd62b05aca 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-import six
from qtpy.QtWidgets import (QButtonGroup, QFrame, QMessageBox) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
import os
@@ -21,8 +19,7 @@ except ImportError:
Logger("DataSetsWidget").information('Using legacy ui importer')
from mantidplot import load_ui
-if six.PY3:
- unicode = str
+unicode = str
class DataSetsWidget(BaseWidget):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py b/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
index 3442e3e408eaf52db7f2ea71661f3dca10001b60..aa21774f2b0d783658c13e052799f5c287a46f7c 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-import six
from qtpy.QtWidgets import (QButtonGroup, QDialog, QFileDialog, QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
import reduction_gui.widgets.util as util
@@ -22,8 +20,7 @@ except ImportError:
from mantidplot import load_ui
from mantid.api import AnalysisDataService
from mantid.simpleapi import ExtractMask
-if six.PY3:
- unicode = str
+unicode = str
class SANSInstrumentWidget(BaseWidget):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_background.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_background.py
index 17d7b84bbc4b978e6e3d9fff18366fabc69e8bc4..0fddcdd9bf62aeeb019468113b4d54306780e0d5 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_background.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_background.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
import reduction_gui.widgets.util as util
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
index 1e830ca44e270abb0719f100a4e7235da8a996a5..c9ee1e24ac0eb76dc195def2f1a71d76433f0a3e 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-import six
from qtpy.QtWidgets import (QFrame, QMessageBox) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
import reduction_gui.widgets.util as util
@@ -22,8 +20,7 @@ except ImportError:
from mantid.api import AnalysisDataService
from reduction_gui.reduction.scripter import execute_script
-if six.PY3:
- unicode = str
+unicode = str
class DetectorWidget(BaseWidget):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
index a67123b12b5f5d8d5912eebd11aad0a37247b4cd..c61a5eee42d2d37abc26abc5f4296c852b63d8bd 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,protected-access
-from __future__ import (absolute_import, division, print_function)
-import six
from qtpy.QtWidgets import (QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
import reduction_gui.widgets.util as util
@@ -22,8 +20,7 @@ except ImportError:
from mantidplot import load_ui
from mantid.api import AnalysisDataService
from mantid.simpleapi import ExtractMask
-if six.PY3:
- unicode = str
+unicode = str
class SANSInstrumentWidget(BaseWidget):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
index 5451b7465b43d2de6792de815c86a321213fbfab..0896eb240cd2f97e078aa1b1c5c4089e98785abc 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,protected-access
-from __future__ import (absolute_import, division, print_function)
-import six
import os
from qtpy.QtWidgets import (QFrame, QGroupBox, QMessageBox) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
@@ -20,8 +18,7 @@ except ImportError:
Logger("DirectBeam").information('Using legacy ui importer')
from mantidplot import load_ui
-if six.PY3:
- unicode = str
+unicode = str
class DirectBeam(BaseWidget):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/sans_catalog.py b/scripts/Interface/reduction_gui/widgets/sans/sans_catalog.py
index 29eedfc74d4d14a70362a339f4282d16121f2f2f..a8aaa60f576b587000bb1c40f8a53d00250b7ee8 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/sans_catalog.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/sans_catalog.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtCore import (Qt) # noqa
from qtpy.QtWidgets import (QAction, QApplication, QFileDialog, QFrame, QMenu, QTableWidgetItem) # noqa
from reduction_gui.settings.application_settings import GeneralSettings
diff --git a/scripts/Interface/reduction_gui/widgets/sans/stitcher.py b/scripts/Interface/reduction_gui/widgets/sans/stitcher.py
index 08cd4e7d0dc4a45d606971df46636e9519431850..6976a3484f090a5a775a6199a60bca25b6e57aed 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/stitcher.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/stitcher.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, protected-access, super-on-old-class
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtGui, QtCore
import os
from reduction_gui.settings.application_settings import GeneralSettings
diff --git a/scripts/Interface/reduction_gui/widgets/toftof/toftof_setup.py b/scripts/Interface/reduction_gui/widgets/toftof/toftof_setup.py
index 19c2d3789d7c6cf65d1301be4f7e74fc88f475cc..a55ae810d250b4740c8f64d6827703fb1e828008 100644
--- a/scripts/Interface/reduction_gui/widgets/toftof/toftof_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/toftof/toftof_setup.py
@@ -10,7 +10,6 @@
"""
TOFTOF reduction workflow gui.
"""
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtCore import (Qt) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
from qtpy.QtWidgets import (QButtonGroup, QCheckBox, QDoubleSpinBox, QFileDialog, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QLayout, QLineEdit, QPushButton, QRadioButton, QSizePolicy, QSpacerItem, QWidget, QVBoxLayout) # noqa
diff --git a/scripts/Interface/reduction_gui/widgets/util.py b/scripts/Interface/reduction_gui/widgets/util.py
index 87ee5981faac25754c008ab59ca3bd2c9b3f0f37..3d75d27f6ec7eee63646a0a772a0663e76d0c166 100644
--- a/scripts/Interface/reduction_gui/widgets/util.py
+++ b/scripts/Interface/reduction_gui/widgets/util.py
@@ -7,7 +7,6 @@
"""
Utility functions used be the widgets
"""
-from __future__ import (absolute_import, division, print_function)
CSS_VALID = """QLineEdit {
background-color: white;
}"""
diff --git a/scripts/Interface/ui/batchwidget/batch_widget_gui.py b/scripts/Interface/ui/batchwidget/batch_widget_gui.py
index fd45f28e0c3f8fc8224eb1d35d24a680931006a1..54a9c9692e087bd0eb7475a71ff9ae1c4591a796 100644
--- a/scripts/Interface/ui/batchwidget/batch_widget_gui.py
+++ b/scripts/Interface/ui/batchwidget/batch_widget_gui.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtGui
from mantidqtpython import MantidQt
from ui.batchwidget.ui_batch_widget_window import Ui_BatchWidgetWindow
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index 540f318b59b8ee436d1be38d236fd6c3bbe7a072..f85e59ea1fe16d4b54bfcb703cc2adcd3c5430ff 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtGui
from mantidqtpython import MantidQt
from ui.dataprocessorinterface.ui_data_processor_window import Ui_DataProcessorWindow
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 6ad2af48f06b5f94c4466c78dcd47487b5135ec9..02bc95db6f11b5c48dafdf6273bd1e4d6573d0f4 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
try:
from mantidplot import *
except ImportError:
diff --git a/scripts/Interface/ui/sans_isis/add_runs_page.py b/scripts/Interface/ui/sans_isis/add_runs_page.py
index 1ba692ab01e4a0e6b1459db268cc947228760251..9461c580054ca68bbe63cd99fa571646bf2b022e 100644
--- a/scripts/Interface/ui/sans_isis/add_runs_page.py
+++ b/scripts/Interface/ui/sans_isis/add_runs_page.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from qtpy import QtWidgets
from qtpy.QtCore import Signal
diff --git a/scripts/Interface/ui/sans_isis/beam_centre.py b/scripts/Interface/ui/sans_isis/beam_centre.py
index f3d257b2dc503a6c2f0b45c05cd5629f75832963..531693b47c6cc705ed7b2d359c78725da2ee11ce 100644
--- a/scripts/Interface/ui/sans_isis/beam_centre.py
+++ b/scripts/Interface/ui/sans_isis/beam_centre.py
@@ -4,12 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from qtpy import QtGui, QtCore, QtWidgets
-from six import with_metaclass
-
from mantidqt.utils.qt import load_ui
from mantidqt.widgets import messagedisplay
@@ -28,7 +24,7 @@ Ui_BeamCentre, _ = load_ui(__file__, "beam_centre.ui")
class BeamCentre(QtWidgets.QWidget, Ui_BeamCentre):
- class BeamCentreListener(with_metaclass(ABCMeta, object)):
+ class BeamCentreListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to for the beam centre finder
"""
diff --git a/scripts/Interface/ui/sans_isis/diagnostics_page.py b/scripts/Interface/ui/sans_isis/diagnostics_page.py
index 57a463bf875f092084fecc3fed4395f3bfc1867c..e32925663e92e36f2f01a380f3dfea689c2d6d98 100644
--- a/scripts/Interface/ui/sans_isis/diagnostics_page.py
+++ b/scripts/Interface/ui/sans_isis/diagnostics_page.py
@@ -4,14 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from qtpy import QtCore, QtWidgets
from mantidqt.utils.qt import load_ui
-from six import with_metaclass
-
from sans.gui_logic.gui_common import (load_file, GENERIC_SETTINGS)
try:
@@ -24,7 +20,7 @@ Ui_DiagnosticsPage, _ = load_ui(__file__, "diagnostics_page.ui")
class DiagnosticsPage(QtWidgets.QWidget, Ui_DiagnosticsPage):
- class DiagnosticsPageListener(with_metaclass(ABCMeta, object)):
+ class DiagnosticsPageListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to for the beam centre finder
"""
diff --git a/scripts/Interface/ui/sans_isis/masking_table.py b/scripts/Interface/ui/sans_isis/masking_table.py
index 893c357c37cb508af7c9e2ed92f17f3055d87d02..df07e525946097e1e4b0682e6c6c6e781b06a0db 100644
--- a/scripts/Interface/ui/sans_isis/masking_table.py
+++ b/scripts/Interface/ui/sans_isis/masking_table.py
@@ -10,19 +10,15 @@ The view for the masking table displays all available masks for a SANS reduction
and masked SANS workspace.
"""
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from qtpy import QtWidgets
-from six import with_metaclass
-
from mantidqt.utils.qt import load_ui
Ui_MaskingTable, _ = load_ui(__file__, "masking_table.ui")
class MaskingTable(QtWidgets.QWidget, Ui_MaskingTable):
- class MaskingTableListener(with_metaclass(ABCMeta, object)):
+ class MaskingTableListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to for the masking table
"""
diff --git a/scripts/Interface/ui/sans_isis/run_selector_widget.py b/scripts/Interface/ui/sans_isis/run_selector_widget.py
index daf7f0dbfe1acede20bb1a79e11e45fd641e8b14..c532514a720f995dfd8722fce3f503a85d04a3ff 100644
--- a/scripts/Interface/ui/sans_isis/run_selector_widget.py
+++ b/scripts/Interface/ui/sans_isis/run_selector_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtGui, QtWidgets
from qtpy.QtCore import Signal, QSettings, QFileInfo
diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
index 19d1d483fbf2a20c80a29635083cbbeeb0b3df3b..cc002a04f163a85bbfb7987c4fcd316da8040170 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -8,17 +8,13 @@
""" Main view for the ISIS SANS reduction interface.
"""
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from qtpy.QtCore import QRegExp
from qtpy.QtGui import (QDoubleValidator, QIntValidator, QRegExpValidator)
from qtpy.QtWidgets import (QListWidgetItem, QMessageBox, QFileDialog, QMainWindow)
-from six import with_metaclass
-
from mantid.kernel import (Logger, UsageService, FeatureType)
-from mantid.py3compat import Enum
+from enum import Enum
from mantidqt import icons
from mantidqt.interfacemanager import InterfaceManager
from mantidqt.utils.qt import load_ui
@@ -57,7 +53,7 @@ class SANSDataProcessorGui(QMainWindow,
MULTI_PERIOD_COLUMNS = ["SSP", "STP", "SDP", "CSP", "CTP", "CDP"]
- class RunTabListener(with_metaclass(ABCMeta, object)):
+ class RunTabListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to in this View
"""
diff --git a/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py b/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
index f04d99dbc8d790b5c295b7b51baa4fcf2183dae7..21ad68551084814a2cd7cc601d9bfb79522a53ac 100644
--- a/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
+++ b/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
@@ -11,11 +11,9 @@ from the individual rows in the data table. This view is useful for checking the
and helps the developer to identify issues.
"""
-from __future__ import (absolute_import, division, print_function)
from abc import ABCMeta, abstractmethod
import os
from qtpy import QtWidgets
-from six import with_metaclass, PY3
from mantidqt.utils.qt import load_ui
@@ -23,14 +21,13 @@ from mantid import UsageService
from mantid.kernel import FeatureType
from sans.gui_logic.gui_common import (GENERIC_SETTINGS, JSON_SUFFIX, load_file)
-if PY3:
- unicode = str
+unicode = str
Ui_SettingsDiagnosticTab, _ = load_ui(__file__, "settings_diagnostic_tab.ui")
class SettingsDiagnosticTab(QtWidgets.QWidget, Ui_SettingsDiagnosticTab):
- class SettingsDiagnosticTabListener(with_metaclass(ABCMeta, object)):
+ class SettingsDiagnosticTabListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to for the diagnostic tab
"""
diff --git a/scripts/Interface/ui/sans_isis/summation_settings_widget.py b/scripts/Interface/ui/sans_isis/summation_settings_widget.py
index b80a591bf85abed597cd1cf2865cc3b6e5dadfcf..cb1d2f857bd0756863a234aaad3a9ab92a520537 100644
--- a/scripts/Interface/ui/sans_isis/summation_settings_widget.py
+++ b/scripts/Interface/ui/sans_isis/summation_settings_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
from qtpy.QtCore import Signal
diff --git a/scripts/Interface/ui/sans_isis/work_handler.py b/scripts/Interface/ui/sans_isis/work_handler.py
index 19b6b0532732a9e2a6829da3b88f06b371a6e62f..6945ad09ff3929d42c8a2c7c7e1179309e4a41b8 100644
--- a/scripts/Interface/ui/sans_isis/work_handler.py
+++ b/scripts/Interface/ui/sans_isis/work_handler.py
@@ -14,11 +14,8 @@ The "worker" handles running the function via a unique process ID; "listeners" m
each process which are then notified upon certain actions (such as an error being thrown by the
worker, or the worker finishing its task) using the nested class WorkListener.
"""
-from __future__ import absolute_import
-
from qtpy.QtCore import Slot, QThreadPool
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
import functools
import uuid
@@ -34,7 +31,7 @@ class WorkHandler(object):
an ID which is then used to identify the Worker through the API.
"""
- class WorkListener(with_metaclass(ABCMeta, object)):
+ class WorkListener(metaclass=ABCMeta):
"""
This abstract base class defines methods which must be overriden and which
handle responses to certain worker actions such as raised errors, or completion.
diff --git a/scripts/LargeScaleStructures/EQSANS_geometry.py b/scripts/LargeScaleStructures/EQSANS_geometry.py
index b8cd5667b6d4887a8c21b22279a388c5246186f3..303b277ff0f2d4c5ffbfdef8436f396f621cc087 100644
--- a/scripts/LargeScaleStructures/EQSANS_geometry.py
+++ b/scripts/LargeScaleStructures/EQSANS_geometry.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from .geometry_writer import MantidGeom
import math
diff --git a/scripts/LargeScaleStructures/PolrefTest.py b/scripts/LargeScaleStructures/PolrefTest.py
index be34f82161f55b74a9f7e59c6b628aa23bf4a485..6cef5ddaa58da0cfaf70cbf172bee2331366728e 100644
--- a/scripts/LargeScaleStructures/PolrefTest.py
+++ b/scripts/LargeScaleStructures/PolrefTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from .ReflectometerCors import *
diff --git a/scripts/LargeScaleStructures/REF_L_geometry.py b/scripts/LargeScaleStructures/REF_L_geometry.py
index db7ee1159ce62dab5b0621de8a92145cc6147896..895bef04c3d698b3a277e707e188b957985d4727 100644
--- a/scripts/LargeScaleStructures/REF_L_geometry.py
+++ b/scripts/LargeScaleStructures/REF_L_geometry.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from .geometry_writer import MantidGeom
import mantid.simpleapi as mantid
diff --git a/scripts/LargeScaleStructures/ReflectometerCors.py b/scripts/LargeScaleStructures/ReflectometerCors.py
index 14d8411622facd5bbe63b044cf5351fca9d33c55..b07d5ad10a750b4fb9c7f15d631e00bd0bbf69fd 100644
--- a/scripts/LargeScaleStructures/ReflectometerCors.py
+++ b/scripts/LargeScaleStructures/ReflectometerCors.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
diff --git a/scripts/LargeScaleStructures/data_stitching.py b/scripts/LargeScaleStructures/data_stitching.py
index 684926166532849201f80dd47063eee73592e7ff..7af99d7a7a428f8db9cbf898aa92111311ef5301 100644
--- a/scripts/LargeScaleStructures/data_stitching.py
+++ b/scripts/LargeScaleStructures/data_stitching.py
@@ -8,7 +8,6 @@
"""
Data stitching for SANS and reflectometry
"""
-from __future__ import (absolute_import, division, print_function)
import os
from mantid.simpleapi import *
from mantid.kernel import Logger
diff --git a/scripts/LargeScaleStructures/geometry_writer.py b/scripts/LargeScaleStructures/geometry_writer.py
index 1b5a0a8c5aff7b6cba75bf7d4d165a51028b1e4d..b63ea581a670dbb85324c558e52ea83b518bd455 100644
--- a/scripts/LargeScaleStructures/geometry_writer.py
+++ b/scripts/LargeScaleStructures/geometry_writer.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from xml.dom.minidom import getDOMImplementation
from datetime import datetime
import re
diff --git a/scripts/MSlice.py b/scripts/MSlice.py
index 89c3f329789b37611de4b793fcb22b2b0e95d2f8..fd666becbc7e22c62d086df31ec2a597463f4c42 100755
--- a/scripts/MSlice.py
+++ b/scripts/MSlice.py
@@ -5,7 +5,5 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from mslice.app import show_gui
show_gui()
diff --git a/scripts/MantidIPython/__init__.py b/scripts/MantidIPython/__init__.py
index a8c8b49962078356826a6e1bf737b80d6b5c9ca0..3b0a8c2dac161fe2ed8bb04a4a39758e92abaf00 100644
--- a/scripts/MantidIPython/__init__.py
+++ b/scripts/MantidIPython/__init__.py
@@ -11,7 +11,6 @@ Some tools for use in ipython notebooks generated by Mantid.
# Suppress warnings about unused import as these
# imports are important for iPython
-from __future__ import (absolute_import, division, print_function)
from MantidIPython.plot_functions import * # noqa: F401
import warnings # noqa: F401
import mantid.kernel # noqa: F401
diff --git a/scripts/MantidIPython/plot_functions.py b/scripts/MantidIPython/plot_functions.py
index a06b74ad0caa0251c8b12b5abd99f3e083a0dffb..31dec186e10c5fe3a72cc5ada62b6189e2a4af35 100644
--- a/scripts/MantidIPython/plot_functions.py
+++ b/scripts/MantidIPython/plot_functions.py
@@ -8,7 +8,6 @@
Plotting functions for use in IPython notebooks that are generated by MantidPlot
"""
-from __future__ import (absolute_import, division, print_function)
import matplotlib.pyplot as plt
# Import Mantid
diff --git a/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py b/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py
index 772e1c579cc3471dd5336f33f6f6af871b3eafe3..e7cffe80a92dd4114f989e9a92d696e80563cca0 100644
--- a/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py
+++ b/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
class QuickEditPresenter(object):
diff --git a/scripts/MultiPlotting/QuickEdit/quickEdit_view.py b/scripts/MultiPlotting/QuickEdit/quickEdit_view.py
index d03db00ff0d71d2d31cfefc3875993b10ea15fb7..af2c38de5705f5f54a9164746a6c5d5a3bc3e63e 100644
--- a/scripts/MultiPlotting/QuickEdit/quickEdit_view.py
+++ b/scripts/MultiPlotting/QuickEdit/quickEdit_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
from qtpy import QtWidgets, QtCore
import qtpy
from MultiPlotting.AxisChanger.axis_changer_presenter import AxisChangerPresenter
diff --git a/scripts/MultiPlotting/QuickEdit/quickEdit_widget.py b/scripts/MultiPlotting/QuickEdit/quickEdit_widget.py
index f6a0eeb23aa60f735bbcf0dfd4814c47ca9365fa..f20c3c74555dcb8bb0cfce42b71901eb9998e7f7 100644
--- a/scripts/MultiPlotting/QuickEdit/quickEdit_widget.py
+++ b/scripts/MultiPlotting/QuickEdit/quickEdit_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from MultiPlotting.QuickEdit.quickEdit_view import QuickEditView
from MultiPlotting.QuickEdit.quickEdit_presenter import QuickEditPresenter
diff --git a/scripts/MultiPlotting/edit_windows/remove_plot_window.py b/scripts/MultiPlotting/edit_windows/remove_plot_window.py
index 6eec769417d50740c85c55fbeddb2f0159daa9f3..58f32431a73b03aea71aa1927fbc06df50c2b2a9 100644
--- a/scripts/MultiPlotting/edit_windows/remove_plot_window.py
+++ b/scripts/MultiPlotting/edit_windows/remove_plot_window.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtCore, QtWidgets
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/MultiPlotting/edit_windows/select_subplot.py b/scripts/MultiPlotting/edit_windows/select_subplot.py
index 92fdb26781374ef63dd5dec249ced7e2b8541626..30469feaed1e4b8f25f356b94d747c98965fb5eb 100644
--- a/scripts/MultiPlotting/edit_windows/select_subplot.py
+++ b/scripts/MultiPlotting/edit_windows/select_subplot.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtCore, QtWidgets
diff --git a/scripts/MultiPlotting/gridspec_engine.py b/scripts/MultiPlotting/gridspec_engine.py
index 272b20744246fa5b4b49fb215faae9c3f9e9481c..2cc581762e182b18176ffe2485f10bce65dcf346 100644
--- a/scripts/MultiPlotting/gridspec_engine.py
+++ b/scripts/MultiPlotting/gridspec_engine.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from matplotlib.gridspec import GridSpec
import math
diff --git a/scripts/MultiPlotting/label.py b/scripts/MultiPlotting/label.py
index aeb8572e3a5a72a07fc5255f134d526c394613f7..ffa28338455eec7d9ae8534443b88caab8e89149 100644
--- a/scripts/MultiPlotting/label.py
+++ b/scripts/MultiPlotting/label.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
class Label(object):
diff --git a/scripts/MultiPlotting/multi_plotting_context.py b/scripts/MultiPlotting/multi_plotting_context.py
index e1ef31e584e3c6af39eaade6bd8be014ac918f03..f784a705178776070163eb3c7a5ae0cb79fcf4bc 100644
--- a/scripts/MultiPlotting/multi_plotting_context.py
+++ b/scripts/MultiPlotting/multi_plotting_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from MultiPlotting.gridspec_engine import gridspecEngine
from MultiPlotting.subplot.subplot_context import subplotContext
diff --git a/scripts/MultiPlotting/multi_plotting_widget.py b/scripts/MultiPlotting/multi_plotting_widget.py
index de2329899f1cec9254ddc15d8c5e85f4bfa85174..5627114b5dd3c460ededdeef564ddc3dce4479d4 100644
--- a/scripts/MultiPlotting/multi_plotting_widget.py
+++ b/scripts/MultiPlotting/multi_plotting_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from copy import deepcopy
from MultiPlotting.subplot.subplot import subplot
diff --git a/scripts/MultiPlotting/navigation_toolbar.py b/scripts/MultiPlotting/navigation_toolbar.py
index c9566b5d3cf9d8689ce5bc9dffa7cc34f0fdfd27..3780b57ae786415e2e9d1fc1f0f3846c40866fdb 100644
--- a/scripts/MultiPlotting/navigation_toolbar.py
+++ b/scripts/MultiPlotting/navigation_toolbar.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtGui
from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar
diff --git a/scripts/MultiPlotting/subplot/subplot.py b/scripts/MultiPlotting/subplot/subplot.py
index a0c72b0972badbbf734826cc07154a56dc6e4c69..7c599db34c095d9ee5462bf96de8b74e438fee74 100644
--- a/scripts/MultiPlotting/subplot/subplot.py
+++ b/scripts/MultiPlotting/subplot/subplot.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from copy import deepcopy
diff --git a/scripts/MultiPlotting/subplot/subplot_ADS_observer.py b/scripts/MultiPlotting/subplot/subplot_ADS_observer.py
index 4556adf12291303621e63fdc2a2bfe2d468a222a..c94c85cebcd566b347251fec997b81caadfed963 100644
--- a/scripts/MultiPlotting/subplot/subplot_ADS_observer.py
+++ b/scripts/MultiPlotting/subplot/subplot_ADS_observer.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AnalysisDataServiceObserver
diff --git a/scripts/MultiPlotting/subplot/subplot_context.py b/scripts/MultiPlotting/subplot/subplot_context.py
index 6bc18e7315c46b3b37f9bdd127b3f3bdb99f5b95..264db242b05275cecb285e646384e0fa688b5a80 100644
--- a/scripts/MultiPlotting/subplot/subplot_context.py
+++ b/scripts/MultiPlotting/subplot/subplot_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-from six import iteritems
from mantid import plots
from copy import copy
@@ -193,7 +191,7 @@ class subplotContext(object):
del self._specNum[name]
# remove line for ws
to_delete = []
- for key, list in iteritems(self._ws):
+ for key, list in self._ws.items():
if name in list:
list.remove(name)
if len(list) == 0:
diff --git a/scripts/Muon/GUI/Common/ADSHandler/muon_workspace_wrapper.py b/scripts/Muon/GUI/Common/ADSHandler/muon_workspace_wrapper.py
index 3255bc3efd7b089cb5abe9e340ef429480069c76..54dba9366aa38d36fa3c1bf18a19eaf1d450bdc2 100644
--- a/scripts/Muon/GUI/Common/ADSHandler/muon_workspace_wrapper.py
+++ b/scripts/Muon/GUI/Common/ADSHandler/muon_workspace_wrapper.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=F0401
-from __future__ import (absolute_import, division, print_function)
from mantid.api import Workspace, AnalysisDataService
from mantid.simpleapi import RenameWorkspace, GroupWorkspaces
diff --git a/scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py b/scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py
index 97aab03dc77c0d8862dd50c4b9fd53028ef344d9..c5306e13bbae6bd4a3e1e5baed5b0f76cb73e4a2 100644
--- a/scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py
+++ b/scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import re
group_str = "; Group; "
diff --git a/scripts/Muon/GUI/Common/calculate_pair_and_group.py b/scripts/Muon/GUI/Common/calculate_pair_and_group.py
index 06bba6dae21a753a95e38dd7e80f258a74152f67..68947d3e0690a4202feeab102bb05754544dcefb 100644
--- a/scripts/Muon/GUI/Common/calculate_pair_and_group.py
+++ b/scripts/Muon/GUI/Common/calculate_pair_and_group.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import Muon.GUI.Common.utilities.algorithm_utils as algorithm_utils
diff --git a/scripts/Muon/GUI/Common/checkbox.py b/scripts/Muon/GUI/Common/checkbox.py
index 4d925e5863e439e850f0af49dd9cef7a1403e363..7fe7b683443442067aab03528352d97ce7fb9068 100644
--- a/scripts/Muon/GUI/Common/checkbox.py
+++ b/scripts/Muon/GUI/Common/checkbox.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtCore, QtWidgets
diff --git a/scripts/Muon/GUI/Common/context_example/context_example_model.py b/scripts/Muon/GUI/Common/context_example/context_example_model.py
index 6673b273eae76f7e9b5454500202863487964888..de5821377d759c5ec4f546b017c17a733c86ee42 100644
--- a/scripts/Muon/GUI/Common/context_example/context_example_model.py
+++ b/scripts/Muon/GUI/Common/context_example/context_example_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common import group_object
from Muon.GUI.Common import pair_object
diff --git a/scripts/Muon/GUI/Common/context_example/context_example_presenter.py b/scripts/Muon/GUI/Common/context_example/context_example_presenter.py
index c46d45a9036e85b845a911e11d9d0d3a9beec53f..40e3d95f504e08b1d14601b01cd87a7fc6ba9ab9 100644
--- a/scripts/Muon/GUI/Common/context_example/context_example_presenter.py
+++ b/scripts/Muon/GUI/Common/context_example/context_example_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class ContextExamplePresenter(object):
diff --git a/scripts/Muon/GUI/Common/context_example/context_example_view.py b/scripts/Muon/GUI/Common/context_example/context_example_view.py
index dfa139579fdcbf9353e9fea5230eb3080b0a852d..eb8420521173a34acaf7aedc3cdb667fc2051bec 100644
--- a/scripts/Muon/GUI/Common/context_example/context_example_view.py
+++ b/scripts/Muon/GUI/Common/context_example/context_example_view.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from qtpy import QtCore, QtWidgets
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/Muon/GUI/Common/context_example/context_example_widget.py b/scripts/Muon/GUI/Common/context_example/context_example_widget.py
index f9aca966a31f3be682372057dfa0cdd1a6e906b4..cbe2317c8b1d5170cf60c2c502cc07345e08af97 100644
--- a/scripts/Muon/GUI/Common/context_example/context_example_widget.py
+++ b/scripts/Muon/GUI/Common/context_example/context_example_widget.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from Muon.GUI.Common.context_example.context_example_view import ContextExampleView
from Muon.GUI.Common.context_example.context_example_presenter import ContextExamplePresenter
from Muon.GUI.Common.context_example.context_example_model import ContextExampleModel
diff --git a/scripts/Muon/GUI/Common/contexts/fitting_context.py b/scripts/Muon/GUI/Common/contexts/fitting_context.py
index adf6d1398d7ab78106a9fc06486693515ca8276f..d04bab1587913786ca3ee12d973c75d0a7fa1a7b 100644
--- a/scripts/Muon/GUI/Common/contexts/fitting_context.py
+++ b/scripts/Muon/GUI/Common/contexts/fitting_context.py
@@ -4,13 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division)
-
from collections import OrderedDict
import re
from mantid.api import AnalysisDataService
-from mantid.py3compat import iteritems, iterkeys, string_types
import numpy as np
from mantidqt.utils.observer_pattern import Observable
@@ -60,7 +57,7 @@ def _create_unique_param_lookup(parameter_workspace, global_parameters):
return False, False
# Do we have this parameter already?
- for unique_name in iterkeys(unique_params):
+ for unique_name in unique_params.keys():
if is_same_parameter(unique_name, global_name):
return True, True
@@ -86,7 +83,7 @@ def _move_globals_to_front(unique_params):
:return: The updated parameters list reordered
"""
return OrderedDict(
- sorted(iteritems(unique_params), key=lambda x: not x[1].is_global))
+ sorted(unique_params.items(), key=lambda x: not x[1].is_global))
class Parameter(object):
@@ -200,9 +197,9 @@ class FitInformation(object):
global_parameters)
self.fit_function_name = fit_function_name
self.input_workspaces = [input_workspace] if isinstance(
- input_workspace, string_types) else input_workspace
+ input_workspace, str) else input_workspace
self.output_workspace_names = [output_workspace_names] if isinstance(
- output_workspace_names, string_types) else output_workspace_names
+ output_workspace_names, str) else output_workspace_names
def __eq__(self, other):
"""Objects are equal if each member is equal to the other"""
diff --git a/scripts/Muon/GUI/Common/contexts/muon_context.py b/scripts/Muon/GUI/Common/contexts/muon_context.py
index 25bb0fe44ff918a609ffac7b7b6ed757fb680f55..0f98ba53fe4893aae4d4cbcc1d748dcf100b8176 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_context.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.ADSHandler.workspace_naming import (get_raw_data_workspace_name, get_group_data_workspace_name,
get_pair_data_workspace_name, get_base_data_directory,
get_group_asymmetry_name,
diff --git a/scripts/Muon/GUI/Common/contexts/muon_context_ADS_observer.py b/scripts/Muon/GUI/Common/contexts/muon_context_ADS_observer.py
index a00871a5ce1943a36fef933964767f25d54221d9..3a4e3fc6008de3d4d6903b7b3ce1d2613aa98c7a 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_context_ADS_observer.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_context_ADS_observer.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
from mantid.api import AnalysisDataServiceObserver, WorkspaceGroup
from functools import wraps
import sys
diff --git a/scripts/Muon/GUI/Common/contexts/muon_data_context.py b/scripts/Muon/GUI/Common/contexts/muon_data_context.py
index 17fdc8f7b194102fb81275b36b8526ac11fecabd..fe808fe9917b1afbf5175bec85e63fcee4af4237 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_data_context.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_data_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import Muon.GUI.Common.utilities.load_utils as load_utils
from Muon.GUI.Common.muon_group import MuonGroup
from Muon.GUI.Common.muon_pair import MuonPair
diff --git a/scripts/Muon/GUI/Common/contexts/muon_group_pair_context.py b/scripts/Muon/GUI/Common/contexts/muon_group_pair_context.py
index b348039d81c3528edf42f14a430629bf5c7b1d09..94b9e597810a91221085287b895921c0b6dbb0a9 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_group_pair_context.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_group_pair_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import Muon.GUI.Common.utilities.xml_utils as xml_utils
diff --git a/scripts/Muon/GUI/Common/contexts/muon_gui_context.py b/scripts/Muon/GUI/Common/contexts/muon_gui_context.py
index c0e929eb5e8ff1ce78c3a8088ea22dbc18e8c5a8..60647c6edbb049122f52d9b5e5d85588ccc77f23 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_gui_context.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_gui_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantidqt.utils.observer_pattern import Observable
diff --git a/scripts/Muon/GUI/Common/contexts/phase_table_context.py b/scripts/Muon/GUI/Common/contexts/phase_table_context.py
index c04dd95cece88dd820d5c5c23b19c3a62d8ecbce..421f9e0adfee560cd7dd09e7578fc5266a3dd19c 100644
--- a/scripts/Muon/GUI/Common/contexts/phase_table_context.py
+++ b/scripts/Muon/GUI/Common/contexts/phase_table_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
default_dict = {'first_good_time': 0.1, 'last_good_time': 15, 'forward_group': 'fwd', 'backward_group': 'bwd', 'input_workspace': '',
'phase_quad_input_workspace': '', 'phase_table_for_phase_quad': ''}
diff --git a/scripts/Muon/GUI/Common/dock/dock_view.py b/scripts/Muon/GUI/Common/dock/dock_view.py
index 215fe68c9b74534ef5246f3855292fc02a0a4626..56b97d3b6e841d684b0519f6424f6265c9af5f15 100644
--- a/scripts/Muon/GUI/Common/dock/dock_view.py
+++ b/scripts/Muon/GUI/Common/dock/dock_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
diff --git a/scripts/Muon/GUI/Common/dock/dockable_tabs.py b/scripts/Muon/GUI/Common/dock/dockable_tabs.py
index e47ea72320ab7a4a89dce9fc9d3a2b82795d1c49..a562f95223421e31bca80ecbe8f9feb3f59084f3 100644
--- a/scripts/Muon/GUI/Common/dock/dockable_tabs.py
+++ b/scripts/Muon/GUI/Common/dock/dockable_tabs.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
from qtpy import QtWidgets, QtCore, QtGui, PYQT4
from qtpy.QtCore import Slot
diff --git a/scripts/Muon/GUI/Common/dummy/dummy_presenter.py b/scripts/Muon/GUI/Common/dummy/dummy_presenter.py
index 9929b766792d40bc854e7b62fa0076d61885d98a..c3b8ee64d475257d02e85db194bbb7d1c30ca96c 100644
--- a/scripts/Muon/GUI/Common/dummy/dummy_presenter.py
+++ b/scripts/Muon/GUI/Common/dummy/dummy_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class DummyPresenter(object):
diff --git a/scripts/Muon/GUI/Common/dummy/dummy_view.py b/scripts/Muon/GUI/Common/dummy/dummy_view.py
index 4caceb9d613ae037a7ba83a3c941be20e76f0e05..2d98d6bddeee0580b9ae8c3dc2392d48d60d3678 100644
--- a/scripts/Muon/GUI/Common/dummy/dummy_view.py
+++ b/scripts/Muon/GUI/Common/dummy/dummy_view.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from qtpy import QtCore, QtWidgets
diff --git a/scripts/Muon/GUI/Common/dummy/dummy_widget.py b/scripts/Muon/GUI/Common/dummy/dummy_widget.py
index 6747bbea2e4ff42c7d488ca50ebada6c66a36768..4edad0589dfa7752770dba4f29e18fc94ecfeffa 100644
--- a/scripts/Muon/GUI/Common/dummy/dummy_widget.py
+++ b/scripts/Muon/GUI/Common/dummy/dummy_widget.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from Muon.GUI.Common.dummy.dummy_view import DummyView
from Muon.GUI.Common.dummy.dummy_presenter import DummyPresenter
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py
index 7be742bef59e746f3459d611166ed106f38fd388..9d178203f5d0f80637b722dea7e198f14c7abaef 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class DummyLabelModel(object):
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py
index 2d69d0ab8496acc48ded06779881626b860af768..dd753d9e2539b16214206cb40c3e39892e7ede45 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class DummyLabelPresenter(object):
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_view.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_view.py
index 786f900a342f669d3862a2349cb039f58a87e25f..bd82af777a6cc1cfa3e66ff625eeea5eda40850f 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_view.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_view.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_widget.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_widget.py
index d42c2a24373e391b5f05f9d6a36157906fbb9745..49a24d0b8427b371003f98f4e651487036005f30 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_widget.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.dummy_label.dummy_label_view import DummyLabelView
from Muon.GUI.Common.dummy_label.dummy_label_presenter import DummyLabelPresenter
from Muon.GUI.Common.dummy_label.dummy_label_model import DummyLabelModel
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_model.py b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_model.py
index 3444f771e36606dd58669d7908f4f698d69a803d..faa6f83df02550aeb0ffe5e37caafe91bad474ce 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_model.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.utilities.algorithm_utils import run_Fit, run_simultaneous_Fit, run_CalculateMuonAsymmetry
from Muon.GUI.Common.ADSHandler.workspace_naming import *
from Muon.GUI.Common.ADSHandler.muon_workspace_wrapper import MuonWorkspaceWrapper
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_presenter.py b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_presenter.py
index 375bad229bc331ca8797b585053fc3dabe79243b..86f0a81b8a4001723e7c1ff860af5c83d84578f6 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_presenter.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.fitting_tab_widget.workspace_selector_view import WorkspaceSelectorView
from mantidqt.utils.observer_pattern import GenericObserver, GenericObserverWithArgPassing, GenericObservable
from Muon.GUI.Common.thread_model_wrapper import ThreadModelWrapperWithOutput
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_view.py b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_view.py
index 64f70f916fb31c06c2a65c165d81a0ec3d01ebd1..d791afb418dc8886e080a8a056c33489fe08ebc5 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_view.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
from Muon.GUI.Common.message_box import warning
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_widget.py b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_widget.py
index d6fc5812d925ccbbc64d2d6778b10eafda5e57b6..698f0b95b6f75a7545894f74d31df9ec6a3a4c92 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_widget.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.fitting_tab_widget.fitting_tab_view import FittingTabView
from Muon.GUI.Common.fitting_tab_widget.fitting_tab_presenter import FittingTabPresenter
from Muon.GUI.Common.fitting_tab_widget.fitting_tab_model import FittingTabModel
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector_view.py b/scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector_view.py
index 7e5080196601f9de338d16a2e8684ed2638b982b..5a19df66aefcd55f657655587c610d9669e38aea 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector_view.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Muon/GUI/Common/group_object.py b/scripts/Muon/GUI/Common/group_object.py
index 167a0b4d53691f3d6f21d6cce3ead9dea58238a5..fd01718f705c5334702739d78088646121ad01a5 100644
--- a/scripts/Muon/GUI/Common/group_object.py
+++ b/scripts/Muon/GUI/Common/group_object.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import pythonTSV as TSVHelper
diff --git a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget.py b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget.py
index 719c2daf2c021e7c06d464f693b329a62d7c56fb..14a092685d8557da15f783d64239ef414a01047b 100644
--- a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget.py
+++ b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.grouping_table_widget.grouping_table_widget_view import GroupingTableView
from Muon.GUI.Common.grouping_table_widget.grouping_table_widget_presenter import GroupingTablePresenter
diff --git a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_model.py b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_model.py
index 661affe491a621903345a1fd94ea00466b892c1c..c51b396c5e3ade32a01366cc20362bb9acccbb09 100644
--- a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_model.py
+++ b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.contexts.muon_data_context import construct_empty_group, construct_empty_pair
from Muon.GUI.Common.muon_group import MuonGroup
from Muon.GUI.Common.muon_pair import MuonPair
diff --git a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_presenter.py b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_presenter.py
index 38b599d1be0e77e8a250ebc6aa4107cc3dc79e55..0543ddff8e0cf36dbbb85e5574e307baa6e6bf00 100644
--- a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantidqt.utils.observer_pattern import Observer, Observable, GenericObservable, GenericObserver
import Muon.GUI.Common.utilities.muon_file_utils as file_utils
import Muon.GUI.Common.utilities.xml_utils as xml_utils
diff --git a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_view.py b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_view.py
index e2bdf558ff7508b4a1c7658e6a92bb9907167d42..b657173dec8c4b20319905a055df571bfeefa1fc 100644
--- a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_view.py
+++ b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, PYQT4, QtCore, QtGui
from Muon.GUI.Common.utilities.run_string_utils import run_string_regex
from Muon.GUI.Common.message_box import warning, question
diff --git a/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_presenter.py b/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_presenter.py
index 646dba409d377a370a65729e22f6174897a28526..b616bb1e0331055e5f642b5061d0d20a282ac7c7 100644
--- a/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import re
from Muon.GUI.Common.utilities import run_string_utils as run_utils
diff --git a/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_view.py b/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_view.py
index 1cd4fecb95c41a16a72bef076f61e3a423ce4d1d..13cf8df0a3b83d04fbf0de946ce93e37d349f76b 100644
--- a/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_view.py
+++ b/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtGui, QtCore
from qtpy.QtCore import Signal
import sys
diff --git a/scripts/Muon/GUI/Common/help_widget/help_widget_presenter.py b/scripts/Muon/GUI/Common/help_widget/help_widget_presenter.py
index 73851a53325ef98af3acf55d7a1787039758b6f4..ecc2fe1ea6d5763b09d6a56f34ada2c934af70db 100644
--- a/scripts/Muon/GUI/Common/help_widget/help_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/help_widget/help_widget_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from Muon.GUI.Common.help_widget.help_widget_view import HelpWidgetView
diff --git a/scripts/Muon/GUI/Common/help_widget/help_widget_view.py b/scripts/Muon/GUI/Common/help_widget/help_widget_view.py
index 8ddae50bcea3d6ad54e4c65ffd4f42adb1e08d29..da1db7b2a6accfb58622fad5f3ef078fa0a4241e 100644
--- a/scripts/Muon/GUI/Common/help_widget/help_widget_view.py
+++ b/scripts/Muon/GUI/Common/help_widget/help_widget_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
import Muon.GUI.Common.message_box as message_box
diff --git a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_model.py b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_model.py
index 2982446416e7bbe5cf7ea735e6f3eef872981559..37c95c8fd06247cbd1bbe2cb36499b0b8ffaf3e5 100644
--- a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_model.py
+++ b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from decimal import Decimal, InvalidOperation
from mantid import api
from mantid.api import ITableWorkspace
diff --git a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_presenter.py b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_presenter.py
index 400c74ddd971735f43bc6efc4e73e284062f8aaf..13648fddb71282f68f439d8ed13dcf690a7b4ba1 100644
--- a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.home_tab.home_tab_presenter import HomeTabSubWidget
import Muon.GUI.Common.utilities.load_utils as load_utils
from Muon.GUI.Common.utilities.muon_file_utils import filter_for_extensions
diff --git a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py
index b7b615a36e1fe6860e087769b7f3f79aab64ee01..5b74561c51f3d48de382523459fa972a461910dd 100644
--- a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py
+++ b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QtGui
from qtpy.QtCore import Signal
from Muon.GUI.Common.utilities.muon_file_utils import allowed_instruments, show_file_browser_and_return_selection
diff --git a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py
index 0dd50b86715accd57bd4400f19ca145fc4aa2423..afc1abb0dc20da449374579e1112bdf08330bca2 100644
--- a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py
+++ b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
millions_counts_conversion = 1. / 1e6
diff --git a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py
index 4451aa7eaccc0976b8ef41dcfb0fdbe429dcc25a..7d0ecd97e8083c14dc6b006fd24ce44338b7e1a3 100644
--- a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.home_tab.home_tab_presenter import HomeTabSubWidget
diff --git a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_view.py b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_view.py
index 43f8c489532b0b2f6485e5133d51caaa470a8fad..ff4ab6176efda74e85d66107ec05a0b86c27f0f3 100644
--- a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_view.py
+++ b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtGui
diff --git a/scripts/Muon/GUI/Common/home_tab/home_tab_model.py b/scripts/Muon/GUI/Common/home_tab/home_tab_model.py
index dee45d9a45f439bf970414c13ecbead98ec9a556..8a0077f9b9842aa0ccb7187735d091f5108621e1 100644
--- a/scripts/Muon/GUI/Common/home_tab/home_tab_model.py
+++ b/scripts/Muon/GUI/Common/home_tab/home_tab_model.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class HomeTabModel(object):
diff --git a/scripts/Muon/GUI/Common/home_tab/home_tab_presenter.py b/scripts/Muon/GUI/Common/home_tab/home_tab_presenter.py
index d308f9b881aef55ab97017a79f7af5fd72bc4843..a2dfb07bc58809570848efb28b433de7446297d6 100644
--- a/scripts/Muon/GUI/Common/home_tab/home_tab_presenter.py
+++ b/scripts/Muon/GUI/Common/home_tab/home_tab_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from mantidqt.utils.observer_pattern import Observer, GenericObserver
diff --git a/scripts/Muon/GUI/Common/home_tab/home_tab_view.py b/scripts/Muon/GUI/Common/home_tab/home_tab_view.py
index ad7ac86e9240544ed869121360fad2a12b537032..6655e9d978d5fb01bbd50c32b24bbfdd36d20a49 100644
--- a/scripts/Muon/GUI/Common/home_tab/home_tab_view.py
+++ b/scripts/Muon/GUI/Common/home_tab/home_tab_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/Common/home_tab/home_tab_widget.py b/scripts/Muon/GUI/Common/home_tab/home_tab_widget.py
index 07611a002fe884060c1568f23fa8012359d83f95..232eefdadce7129628ff610a44b8778edac1ba33 100644
--- a/scripts/Muon/GUI/Common/home_tab/home_tab_widget.py
+++ b/scripts/Muon/GUI/Common/home_tab/home_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.home_instrument_widget.home_instrument_widget_model import InstrumentWidgetModel
from Muon.GUI.Common.home_instrument_widget.home_instrument_widget_view import InstrumentWidgetView
from Muon.GUI.Common.home_instrument_widget.home_instrument_widget_presenter import InstrumentWidgetPresenter
diff --git a/scripts/Muon/GUI/Common/list_selector/TableWidgetDragRows.py b/scripts/Muon/GUI/Common/list_selector/TableWidgetDragRows.py
index 3a89007294a3733f90c812ec13fb61429c5c0fcf..986903ad15188c4bc0557d222f7929e2ce2b079f 100644
--- a/scripts/Muon/GUI/Common/list_selector/TableWidgetDragRows.py
+++ b/scripts/Muon/GUI/Common/list_selector/TableWidgetDragRows.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
# Original from https://stackoverflow.com/questions/26227885/drag-and-drop-rows-within-qtablewidget
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QTableWidget, QAbstractItemView, QTableWidgetItem
diff --git a/scripts/Muon/GUI/Common/list_selector/list_selector_presenter.py b/scripts/Muon/GUI/Common/list_selector/list_selector_presenter.py
index be787b66978669851a853f8e0b2b701f10d70a78..eccb51613880708dfd9fb8d942765b9d4419e60b 100644
--- a/scripts/Muon/GUI/Common/list_selector/list_selector_presenter.py
+++ b/scripts/Muon/GUI/Common/list_selector/list_selector_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
model_position = 0
model_selected = 1
model_enabled = 2
diff --git a/scripts/Muon/GUI/Common/list_selector/list_selector_view.py b/scripts/Muon/GUI/Common/list_selector/list_selector_view.py
index f2aedd1f77e91fe9e84ef5e1f282f9311bfb85cc..8d22598f9ebb375b543558757ffe3ab2d68df3ae 100644
--- a/scripts/Muon/GUI/Common/list_selector/list_selector_view.py
+++ b/scripts/Muon/GUI/Common/list_selector/list_selector_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
import functools
from qtpy.QtCore import Qt
diff --git a/scripts/Muon/GUI/Common/load_file_widget/model.py b/scripts/Muon/GUI/Common/load_file_widget/model.py
index cebf07735737d5cf2e758a0ec95fb432737dcebd..d051f1964c663473fe82c0faa8163480182adf70 100644
--- a/scripts/Muon/GUI/Common/load_file_widget/model.py
+++ b/scripts/Muon/GUI/Common/load_file_widget/model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.kernel import ConfigService
from Muon.GUI.Common.muon_load_data import MuonLoadData
diff --git a/scripts/Muon/GUI/Common/load_file_widget/presenter.py b/scripts/Muon/GUI/Common/load_file_widget/presenter.py
index f6a9a90e139436f91dafd799bfe9bde51de5fddb..66ced7869836a5db76958530d65ad44589378b96 100644
--- a/scripts/Muon/GUI/Common/load_file_widget/presenter.py
+++ b/scripts/Muon/GUI/Common/load_file_widget/presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import copy
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/Common/load_file_widget/view.py b/scripts/Muon/GUI/Common/load_file_widget/view.py
index 4f293d104b0d4d73af300650230e06c82006da47..7f077851276a893ef69da51bcaa977a2e7e69532 100644
--- a/scripts/Muon/GUI/Common/load_file_widget/view.py
+++ b/scripts/Muon/GUI/Common/load_file_widget/view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
from qtpy.QtCore import Signal
import Muon.GUI.Common.message_box as message_box
diff --git a/scripts/Muon/GUI/Common/load_run_widget/load_run_model.py b/scripts/Muon/GUI/Common/load_run_widget/load_run_model.py
index 9b81bbdcd3905b2a6f4d543a12a6434937fd97f9..05d3d2d0ab632dc5b53d2b673a5e56e61730763d 100644
--- a/scripts/Muon/GUI/Common/load_run_widget/load_run_model.py
+++ b/scripts/Muon/GUI/Common/load_run_widget/load_run_model.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from Muon.GUI.Common.muon_load_data import MuonLoadData
import Muon.GUI.Common.utilities.load_utils as load_utils
diff --git a/scripts/Muon/GUI/Common/load_run_widget/load_run_presenter.py b/scripts/Muon/GUI/Common/load_run_widget/load_run_presenter.py
index 566afd7a2bd4dd1f6617ba8f0fd5e0e1e566a530..c58a2a4c51a84d6f18e48420ca18feac654b1e8e 100644
--- a/scripts/Muon/GUI/Common/load_run_widget/load_run_presenter.py
+++ b/scripts/Muon/GUI/Common/load_run_widget/load_run_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import copy
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/Common/load_run_widget/load_run_view.py b/scripts/Muon/GUI/Common/load_run_widget/load_run_view.py
index cf44de59d1b0be7c8d85e4445b0e459a6c3eff0c..9941407038af4e36c2f8786545da095acbe1e42a 100644
--- a/scripts/Muon/GUI/Common/load_run_widget/load_run_view.py
+++ b/scripts/Muon/GUI/Common/load_run_widget/load_run_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QtGui
from qtpy.QtCore import Signal
diff --git a/scripts/Muon/GUI/Common/load_widget/load_presenter.py b/scripts/Muon/GUI/Common/load_widget/load_presenter.py
index 5751995d4e24ba6c4982586b7acfdd77912d544a..1ddd040989e6283d18d9a24a566a472e2b4a8b53 100644
--- a/scripts/Muon/GUI/Common/load_widget/load_presenter.py
+++ b/scripts/Muon/GUI/Common/load_widget/load_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from Muon.GUI.Common import thread_model
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/GUI/Common/load_widget/load_view.py b/scripts/Muon/GUI/Common/load_widget/load_view.py
index 282eb57c96c9a17b225bd60932508cb0b696d430..ff2720d2ba5fa1cfb4da5ffe95e94d33f5bdf5c3 100644
--- a/scripts/Muon/GUI/Common/load_widget/load_view.py
+++ b/scripts/Muon/GUI/Common/load_widget/load_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from qtpy import QtWidgets, QtCore
from mantidqt.widgets import manageuserdirectories
diff --git a/scripts/Muon/GUI/Common/message_box.py b/scripts/Muon/GUI/Common/message_box.py
index b01fb7cf781d093a1c8e592e447b5c120dd34587..90fa457229aaf07565302d7c4ec140b0a0f3c4a5 100644
--- a/scripts/Muon/GUI/Common/message_box.py
+++ b/scripts/Muon/GUI/Common/message_box.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/Common/muon_context/muon_context.py b/scripts/Muon/GUI/Common/muon_context/muon_context.py
index c566385c9674786375d0f7cb530a9badfd417d20..2ef3066e20138ae10d083d7fac00014b3612d6a1 100644
--- a/scripts/Muon/GUI/Common/muon_context/muon_context.py
+++ b/scripts/Muon/GUI/Common/muon_context/muon_context.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# Muon context - contains all of the values from the GUI
-from __future__ import (absolute_import, division, print_function)
from collections import OrderedDict
import copy
diff --git a/scripts/Muon/GUI/Common/muon_group.py b/scripts/Muon/GUI/Common/muon_group.py
index 24b1420ba3eef396a60b171505a9738223bf797e..16e9550f58a4c8bcaf511d17503e0341306c580e 100644
--- a/scripts/Muon/GUI/Common/muon_group.py
+++ b/scripts/Muon/GUI/Common/muon_group.py
@@ -5,10 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=C0111
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.ADSHandler.muon_workspace_wrapper import MuonWorkspaceWrapper
-import six
class MuonGroup(object):
@@ -65,7 +62,7 @@ class MuonGroup(object):
@detectors.setter
def detectors(self, detector_ids):
- if isinstance(detector_ids, six.string_types):
+ if isinstance(detector_ids, str):
raise AttributeError("MuonGroup : detectors must be a list of ints.")
elif isinstance(detector_ids, list):
if sum([not isinstance(item, int) for item in detector_ids]) == 0:
diff --git a/scripts/Muon/GUI/Common/muon_load_data.py b/scripts/Muon/GUI/Common/muon_load_data.py
index aac1de09232316f127e030cbaa511a02b3f66a36..e8827e54ae07dd68fbe8cf4dd371c835287c5eef 100644
--- a/scripts/Muon/GUI/Common/muon_load_data.py
+++ b/scripts/Muon/GUI/Common/muon_load_data.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import Muon.GUI.Common.utilities.load_utils as load_utils
diff --git a/scripts/Muon/GUI/Common/muon_pair.py b/scripts/Muon/GUI/Common/muon_pair.py
index 71515fb83503067d7a6f1410eb0330e236ffdf94..105d3fee4e6c5b65dfdef92ed37176c5aae9f7b2 100644
--- a/scripts/Muon/GUI/Common/muon_pair.py
+++ b/scripts/Muon/GUI/Common/muon_pair.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=C0111
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.ADSHandler.muon_workspace_wrapper import MuonWorkspaceWrapper
diff --git a/scripts/Muon/GUI/Common/pair_object.py b/scripts/Muon/GUI/Common/pair_object.py
index 11323244d35b50a09d8fd4e0c739d515cea5ac0c..650520e62779d1a249e583cc2c9c2c5504a7c990 100644
--- a/scripts/Muon/GUI/Common/pair_object.py
+++ b/scripts/Muon/GUI/Common/pair_object.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
import pythonTSV as TSVHelper
diff --git a/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_presenter.py b/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_presenter.py
index 006f65bfc21640a9e8bed9635c89c745c3c75aee..de27f300b4095d2fe548b4e498c3822050b410d1 100644
--- a/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import re
from Muon.GUI.Common.muon_pair import MuonPair
diff --git a/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_view.py b/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_view.py
index 62e61abe31065d73ae1df29b3147040e1ebae6a1..b1c17e31f63ced5045067d91fd6596d1f82a2f23 100644
--- a/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_view.py
+++ b/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QtGui
from qtpy.QtCore import Signal
diff --git a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_presenter.py b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_presenter.py
index 00ee926d0f70ecc8d8acf092ae0d0d4584cea64f..9c3d550364b77366f6ee13c51871c670358e295b 100644
--- a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_presenter.py
+++ b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.thread_model_wrapper import ThreadModelWrapper
from Muon.GUI.Common import thread_model
from Muon.GUI.Common.utilities.algorithm_utils import run_CalMuonDetectorPhases, run_PhaseQuad
diff --git a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_view.py b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_view.py
index 05ea07c4c5b7436564b5a4181e06668ceb0a4c6e..b6f9dc8b2211f3f753bf4d671d0ef854641c4540 100644
--- a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_view.py
+++ b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
from Muon.GUI.Common.message_box import warning
diff --git a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_widget.py b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_widget.py
index 10978081fd49078d090c1a94c4173602f6c2f580..16088612277c2902647ddd60e8de5953b74bc92f 100644
--- a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_widget.py
+++ b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.phase_table_widget.phase_table_view import PhaseTableView
from Muon.GUI.Common.phase_table_widget.phase_table_presenter import PhaseTablePresenter
diff --git a/scripts/Muon/GUI/Common/plotting_widget/dockable_plot_toolbar.py b/scripts/Muon/GUI/Common/plotting_widget/dockable_plot_toolbar.py
index 2aeea10c3f9f42569940395f5c96bde1b5ace74a..02c47ed8e07c56381202e3b5406ec2fb155effeb 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/dockable_plot_toolbar.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/dockable_plot_toolbar.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from matplotlib.backends.qt_compat import is_pyqt5
if is_pyqt5():
diff --git a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget.py b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget.py
index 073ac51c26f4ce1825a4cb32c04db21d21d1bc64..9e9094e07b69906f65066539f065ec7ce2370950 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.plotting_widget.plotting_widget_view import PlotWidgetView
from Muon.GUI.Common.plotting_widget.plotting_widget_presenter import PlotWidgetPresenter
from Muon.GUI.Common.plotting_widget.plotting_widget_model import PlotWidgetModel
diff --git a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_model.py b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_model.py
index 770884a83e8b8db74946f477ad93e723c0397d61..1b4dde5dce7b260721d4fb229ab7e9325eba57d8 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_model.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_model.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import AnalysisDataService
diff --git a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_presenter.py b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_presenter.py
index 65031995bf71a2da6081f9d720b9453b07ca461c..aa663d1ee88d4e5dcfaf157071d6bf8ae41f026e 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import re
from Muon.GUI.Common.home_tab.home_tab_presenter import HomeTabSubWidget
from mantidqt.utils.observer_pattern import GenericObservable, GenericObserver, GenericObserverWithArgPassing
diff --git a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_view.py b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_view.py
index 03fa2ad3815140207923108c9cb240201e9d227b..410309654b9d9d43bd26b44f3d89eaba9ae451b3 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_view.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
import Muon.GUI.Common.message_box as message_box
from Muon.GUI.Common.plotting_widget.dockable_plot_toolbar import DockablePlotToolbar
diff --git a/scripts/Muon/GUI/Common/plotting_widget/workspace_finder.py b/scripts/Muon/GUI/Common/plotting_widget/workspace_finder.py
index 485a53bde8b38b28068e25fae28cf0291397ea7f..33c3473309be168617d23848bfed66e4aab2be5e 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/workspace_finder.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/workspace_finder.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
COUNTS_PLOT_TYPE = 'Counts'
ASYMMETRY_PLOT_TYPE = 'Asymmetry'
FREQ_PLOT_TYPE = "Frequency "
diff --git a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py
index 7e6fc7f1197316e819300d4c7e80481661ad872e..22072ddb64381f1c291f13fe61e37f46281e2892 100644
--- a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py
+++ b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantid.api import AnalysisDataService as ads, WorkspaceFactory
from mantid.kernel import FloatTimeSeriesProperty
from enum import Enum
diff --git a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_presenter.py b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_presenter.py
index dd7ae93f21a852e31b3c634b11cde1adc1d323d3..26c88062aac4848603074fe44567a69466a704e8 100644
--- a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_presenter.py
+++ b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division)
-
from qtpy.QtCore import QMetaObject, QObject, Slot
from mantidqt.utils.observer_pattern import GenericObserver
diff --git a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_view.py b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_view.py
index 608fb37c9fc65126d8f4aa68a14bc599c30e6768..8695fc9084c4e37ff97592c194e7511ecd77d387 100644
--- a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_view.py
+++ b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantidqt.utils.qt import load_ui
from qtpy import PYQT4, QtCore, QtWidgets
diff --git a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_widget.py b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_widget.py
index 903b3c245af9697af253db260d0fa5882ecadc39..145b60d1aa18a292eb5cb81a4f41a1ecf31bf58e 100644
--- a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_widget.py
+++ b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division)
-
from Muon.GUI.Common.results_tab_widget.results_tab_presenter import ResultsTabPresenter
from Muon.GUI.Common.results_tab_widget.results_tab_view import ResultsTabView
from Muon.GUI.Common.results_tab_widget.results_tab_model import ResultsTabModel
diff --git a/scripts/Muon/GUI/Common/run_selection_dialog.py b/scripts/Muon/GUI/Common/run_selection_dialog.py
index 14b692e88c0b1fc37277aa1952b9d18563a77f2b..b8b8499e42d798e8905fd1240a72c571d86d66e2 100644
--- a/scripts/Muon/GUI/Common/run_selection_dialog.py
+++ b/scripts/Muon/GUI/Common/run_selection_dialog.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
from qtpy import QtWidgets, QtCore
diff --git a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_presenter.py b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_presenter.py
index 851aa58f3aab516aef191999198e19c3f8033c70..3b7280618a24c53d8811dcde286db3b0c802919f 100644
--- a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_presenter.py
+++ b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
from mantidqt.utils.observer_pattern import GenericObserver, GenericObserverWithArgPassing
from Muon.GUI.Common.thread_model_wrapper import ThreadModelWrapperWithOutput
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_view.py b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_view.py
index f7f3849ec43463ae0f55b37d3af04b6007f83309..12a19c08967b4b98813c5207739c9d4040616c79 100644
--- a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_view.py
+++ b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QtGui
from mantidqt.utils.qt import load_ui
from Muon.GUI.Common.message_box import warning
diff --git a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_widget.py b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_widget.py
index 92609bd2b2c68946b0b214c8cbf7325fdc2dba4e..089b6a73c7689b00bfec1a8738404fba9854f31c 100644
--- a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_widget.py
+++ b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.seq_fitting_tab_widget.seq_fitting_tab_view import SeqFittingTabView
from Muon.GUI.Common.seq_fitting_tab_widget.seq_fitting_tab_presenter import SeqFittingTabPresenter
diff --git a/scripts/Muon/GUI/Common/test_helpers/context_setup.py b/scripts/Muon/GUI/Common/test_helpers/context_setup.py
index a5c19ce2864e77e79b80639b715c3795d5a968d0..97b19930917180442b2c528aedfd8d66c227f2e4 100644
--- a/scripts/Muon/GUI/Common/test_helpers/context_setup.py
+++ b/scripts/Muon/GUI/Common/test_helpers/context_setup.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.contexts.muon_context import MuonContext
from Muon.GUI.Common.contexts.muon_data_context import MuonDataContext
from Muon.GUI.Common.contexts.muon_group_pair_context import MuonGroupPairContext
@@ -14,7 +12,7 @@ from Muon.GUI.Common.muon_load_data import MuonLoadData
from Muon.GUI.Common.contexts.phase_table_context import PhaseTableContext
from Muon.GUI.Common.contexts.fitting_context import FittingContext
from Muon.GUI.FrequencyDomainAnalysis.frequency_context import FrequencyContext
-from mantid.py3compat import mock
+from unittest import mock
def setup_context_for_tests(parent_object):
diff --git a/scripts/Muon/GUI/Common/test_helpers/general_test_helpers.py b/scripts/Muon/GUI/Common/test_helpers/general_test_helpers.py
index 683a9fe972db491936c77b51083af8a4fb62a746..31bc8b873a1c4bd8b7c6ad71aa10e8efca17d89a 100644
--- a/scripts/Muon/GUI/Common/test_helpers/general_test_helpers.py
+++ b/scripts/Muon/GUI/Common/test_helpers/general_test_helpers.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantid.simpleapi import CreateWorkspace
from Muon.GUI.Common.ADSHandler.muon_workspace_wrapper import MuonWorkspaceWrapper
from Muon.GUI.Common.muon_group import MuonGroup
diff --git a/scripts/Muon/GUI/Common/thread_model.py b/scripts/Muon/GUI/Common/thread_model.py
index 15d18ca62c4d8a4ffe12142c922676a5de321fa8..8d40dfcc3ee910193005c227ad36e295ab35730c 100644
--- a/scripts/Muon/GUI/Common/thread_model.py
+++ b/scripts/Muon/GUI/Common/thread_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from qtpy.QtCore import Signal
from qtpy.QtCore import Slot
diff --git a/scripts/Muon/GUI/Common/thread_model_wrapper.py b/scripts/Muon/GUI/Common/thread_model_wrapper.py
index f8380287286fd8e479877e3b04bdf920d43ead07..32f05968945ed1c4b24879f9dc705ab6fac89f01 100644
--- a/scripts/Muon/GUI/Common/thread_model_wrapper.py
+++ b/scripts/Muon/GUI/Common/thread_model_wrapper.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
class ThreadModelWrapper(object):
diff --git a/scripts/Muon/GUI/Common/usage_report.py b/scripts/Muon/GUI/Common/usage_report.py
index a509ccf717550f3bdd7d2c5886e6b3bdd284df12..a360df9f665cfbbb605519da3dec0480b9567090 100644
--- a/scripts/Muon/GUI/Common/usage_report.py
+++ b/scripts/Muon/GUI/Common/usage_report.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantid.kernel import (UsageService, FeatureType)
diff --git a/scripts/Muon/GUI/Common/utilities/algorithm_utils.py b/scripts/Muon/GUI/Common/utilities/algorithm_utils.py
index cdfb512fe4e2dc531e4a4a9424067775d114e85b..652b39f6173529e93b6852e105e7bd9702ea29d2 100644
--- a/scripts/Muon/GUI/Common/utilities/algorithm_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/algorithm_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from mantid.kernel import Logger
diff --git a/scripts/Muon/GUI/Common/utilities/load_utils.py b/scripts/Muon/GUI/Common/utilities/load_utils.py
index 59280fef37ad0669a27c6196be856c4156183a8e..9d8216d2598b52935ff4335ee6ddcbde261b2d34 100644
--- a/scripts/Muon/GUI/Common/utilities/load_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/load_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import mantid.simpleapi as mantid
from mantid.api import WorkspaceGroup, AnalysisDataService
diff --git a/scripts/Muon/GUI/Common/utilities/muon_file_utils.py b/scripts/Muon/GUI/Common/utilities/muon_file_utils.py
index e10ba9f33cd925985acf8b4f4741d8ac378d4f73..44885d274558fb6757d36484f06642fa3875d03c 100644
--- a/scripts/Muon/GUI/Common/utilities/muon_file_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/muon_file_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.api import FileFinder
from Muon.GUI.Common.message_box import warning
diff --git a/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py b/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py
index 8590b67fb65aa4113d14bb418e917c99766a3593..20eaf29fd7a628b9322dd4cc926b094cd5c289eb 100644
--- a/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py
+++ b/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
class IteratorWithException:
diff --git a/scripts/Muon/GUI/Common/utilities/run_string_utils.py b/scripts/Muon/GUI/Common/utilities/run_string_utils.py
index 1c57e9189205570ac62c1676437ad9ce6204130f..b4fb1810acf7868e4343d6e14b988b122258e99b 100644
--- a/scripts/Muon/GUI/Common/utilities/run_string_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/run_string_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from itertools import groupby
from operator import itemgetter
import functools
diff --git a/scripts/Muon/GUI/Common/utilities/table_utils.py b/scripts/Muon/GUI/Common/utilities/table_utils.py
index 78a342160f41bd14a9b4e10ee7eb3ef176bc8cc7..8204cd5899fdc7c210280301302b36fc06fc9046 100644
--- a/scripts/Muon/GUI/Common/utilities/table_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/table_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from functools import wraps
import sys
diff --git a/scripts/Muon/GUI/Common/utilities/xml_utils.py b/scripts/Muon/GUI/Common/utilities/xml_utils.py
index 42eebfec8a6d9433a3acefe9841f3f92c7cc30f4..bf45aa46fdf0c21be1b9f2b680dba7d2d5dd1975 100644
--- a/scripts/Muon/GUI/Common/utilities/xml_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/xml_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import xml.etree.ElementTree as ET
import Muon.GUI.Common.utilities.run_string_utils as run_string_utils
diff --git a/scripts/Muon/GUI/Common/validate_errors.py b/scripts/Muon/GUI/Common/validate_errors.py
index f68fd4695c206bbb903fa7d2626806e19ebc4124..5a00b93fdbc6b32ea1f86c5e79ae83583600b6e3 100644
--- a/scripts/Muon/GUI/Common/validate_errors.py
+++ b/scripts/Muon/GUI/Common/validate_errors.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
def validateToErrors(alg):
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py
index b2f17882df804fae272ce8c5ad515f06e7b2e523..b510c34f3e60dd7130c4901ebac6d38fc22021cb 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
class DetectorsPresenter(object):
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_view.py b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_view.py
index 75ed5cfec54855f791de4e612372366256036ab8..acba523e33dec1de18927226b81402bf114adb26 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_view.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
from collections import OrderedDict
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py
index 22dadf60380986c1a972edb46f46fa358c3d4c4a..24185597f7c994e61f2fcc9a2498c3913cc86e2f 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
class LineSelectorPresenter(object):
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorView.py b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorView.py
index 6eb808d4411382a51d5ba9d4554f8ff3b861488a..cdec801ae32d6032e3aadc3c1796464a9a9534b4 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorView.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorView.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
from Muon.GUI.Common.checkbox import Checkbox
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_model.py b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_model.py
index 8f215fe2bcc334ba4eaed98cd4981e85514559eb..0cb5b64c7a89c565304185bd9eb0ce66c118e029 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_model.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
import mantid.simpleapi as mantid
from Muon.GUI.ElementalAnalysis.LoadWidget import load_utils as lutils
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py
index accef1154dedc791c0450ae7f03a4e60c4d42b55..034f41ef85bdcd6911faa158be40af0c13836ae2 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py
@@ -4,13 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
from collections import OrderedDict
import glob
import os
import numpy as np
-from six import iteritems
from mantid import config
import mantid.simpleapi as mantid
@@ -28,7 +26,7 @@ class LModel(object):
def _load(self, inputs):
""" inputs is a dict mapping filepaths to output names """
- for path, output in iteritems(inputs):
+ for path, output in inputs.items():
workspace = mantid.LoadAscii(path, OutputWorkspace=output)
workspace.getAxis(0).setUnit("Label").setLabel("Energy", "keV")
@@ -41,7 +39,7 @@ class LModel(object):
for filename in to_load if get_filename(filename, self.run) is not None
}
unique_workspaces = {}
- for path, workspace in iteritems(workspaces):
+ for path, workspace in workspaces.items():
if workspace not in unique_workspaces.values():
unique_workspaces[path] = workspace
workspaces = unique_workspaces
@@ -99,7 +97,7 @@ def merge_workspaces(run, workspaces):
tmp = mantid.CreateSampleWorkspace()
overall_ws = mantid.GroupWorkspaces(tmp, OutputWorkspace=str(run))
# merge each workspace list in detectors into a single workspace
- for detector, workspace_list in iteritems(detectors):
+ for detector, workspace_list in detectors.items():
if workspace_list:
# sort workspace list according to type_index
sorted_workspace_list = [None] * num_files_per_detector
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py
index e12e1cf5c6ad7784d89f5ff57d69b47b4c35854c..e46b38ca45ff7fedc6d97c6e1fe6ab7208a4c4dc 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
class PeaksPresenter(object):
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_view.py b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_view.py
index 443d5b67949681b7cf4b477dcc5f5d5c9582e6cb..97c4c28162a1abdc29d9a2d682624ffcbe50e54d 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_view.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
from Muon.GUI.Common.checkbox import Checkbox
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py
index 6649710971f25aad8543f282ee3ba85dc429065b..4fadfb61a88bdd8908eae314ec33099561c6389d 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
class PeakSelectorPresenter(object):
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py
index 13d8c6f85d0639b2753c199bf172077bc3da1337..e9de4acf4dd5e7d39f90f6b3e93ec1d99165d644 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py
@@ -4,10 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
from qtpy import QtWidgets, QtCore
-from six import iteritems
import numpy as np
from Muon.GUI.Common.checkbox import Checkbox
@@ -120,7 +118,7 @@ class PeakSelectorView(QtWidgets.QListWidget):
return self.new_data
def update_new_data(self, data):
- for el, values in iteritems(data):
+ for el, values in data.items():
if values is None:
data[el] = {}
new_data = data["Primary"].copy()
@@ -139,7 +137,7 @@ class PeakSelectorView(QtWidgets.QListWidget):
_heading = QtWidgets.QLabel(heading)
self.list.addWidget(_heading)
checkboxes = []
- for peak_type, value in iteritems(checkbox_data):
+ for peak_type, value in checkbox_data.items():
checkboxes.append(self._setup_checkbox("{}: {}".format(peak_type, value), checked))
return checkboxes
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_model.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_model.py
index 0471c74ce6e5755a44223cf4e6ce9bef8e933261..2c6fa7fb9291cfd962cf37ef7d7044555906af4f 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_model.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import os
import json
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py
index 545afb722172a2e78cabb462ffeb4b5ef85bf6bd..9b64a8fefa19f093103dbe2a09373f127893c7ac 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
from Muon.GUI.Common import message_box
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py
index cd9aa7647a79cc81555dfc8f7e2c4e70ff6c0510..3601dc9ab2d64a1d8e742c930c49ce787d84eb7f 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from qtpy import QtWidgets
from Muon.GUI.ElementalAnalysis.PeriodicTable import periodic_table
diff --git a/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py b/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py
index 5bf351f00ed767ff263262902807e65d0f2fee45..e10142e3e4d1cc8e696f24e15bbb48b3f8d774a4 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py
@@ -4,12 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from qtpy import QtWidgets
from copy import deepcopy
import matplotlib as mpl
-from six import iteritems
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table_presenter import PeriodicTablePresenter
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table_view import PeriodicTableView
@@ -234,7 +231,7 @@ class ElementalAnalysisGui(QtWidgets.QMainWindow):
# Select a different color, if all used then use the first
color = self.get_color(element)
- for name, x_value in iteritems(data):
+ for name, x_value in data.items():
try:
x_value = float(x_value)
except ValueError:
@@ -338,7 +335,7 @@ class ElementalAnalysisGui(QtWidgets.QMainWindow):
if data is None:
data = self.element_widgets[element].get_checked()
color = self.get_color(element)
- for name, x_value in iteritems(data):
+ for name, x_value in data.items():
if isinstance(x_value, float):
full_name = gen_name(element, name)
label = self._gen_label(full_name, x_value, element)
@@ -416,19 +413,19 @@ class ElementalAnalysisGui(QtWidgets.QMainWindow):
self._update_peak_data(element)
def electrons_changed(self, electron_peaks):
- for element, selector in iteritems(self.element_widgets):
+ for element, selector in self.element_widgets.items():
self.checked_data(element, selector.electron_checkboxes, electron_peaks.isChecked())
def gammas_changed(self, gamma_peaks):
- for element, selector in iteritems(self.element_widgets):
+ for element, selector in self.element_widgets.items():
self.checked_data(element, selector.gamma_checkboxes, gamma_peaks.isChecked())
def major_peaks_changed(self, major_peaks):
- for element, selector in iteritems(self.element_widgets):
+ for element, selector in self.element_widgets.items():
self.checked_data(element, selector.primary_checkboxes, major_peaks.isChecked())
def minor_peaks_changed(self, minor_peaks):
- for element, selector in iteritems(self.element_widgets):
+ for element, selector in self.element_widgets.items():
self.checked_data(element, selector.secondary_checkboxes, minor_peaks.isChecked())
def add_line_by_type(self, run, _type):
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py
index bad67e3c44ae364026f3f105c33c35c01f95c7a9..39c214d2259fdf19b0097a6079d157823c38e8ed 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py
@@ -4,10 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-from six import iteritems
-
import mantid.simpleapi as mantid
@@ -98,7 +94,7 @@ class FFTModel(object):
self.alg.initialize()
self.alg.setRethrows(True)
- for name, value in iteritems(preInputs):
+ for name, value in preInputs.items():
self.alg.setProperty(name, value)
self.alg.execute()
self.alg = None
@@ -111,7 +107,7 @@ class FFTModel(object):
self.alg.initialize()
self.alg.setRethrows(True)
- for name, value in iteritems(FFTInputs):
+ for name, value in FFTInputs.items():
self.alg.setProperty(name, value)
self.alg.execute()
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter.py
index a68735c1603905b8656686eea8e50c6ff597acb3..3fcfe7b3cca034f0e480a2c5d789712500ed7ac7 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
import mantid.simpleapi as mantid
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter_new.py
index 164257639d1c89a9c544a52788409a0391da19d8..847e611430e045d7fe3bf4dff382df4389ae9933 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view.py
index e58e83f59e6c42b6fa5ddf4813491f9c360ffd92..1adc87d638a99c1c20d11b720bd582e81f2144af 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view_new.py
index dcd9ccc953b8336c166da43bc7a23dfe2dd6ac0a..ef2163aac8d9a1a7c8d7dfe61ca846e5c1110c78 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget.py
index dd3247b9a4a86f4c0b8fc32278fbd0b4359f9a62..12db1e90b1f79362003ea7618850879ba4b02846 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_view import FFTView
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_presenter import FFTPresenter
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_model import FFTModel, FFTWrapper
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget_new.py
index 4e299e066f3ffc3063026a7a7b369b86c0e6157f..daebfdbffb32a1f4900cb107dce72ec86dcce0a9 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_view_new import FFTView
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_presenter_new import FFTPresenter
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_model import FFTModel, FFTWrapper
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py
index ffc8475b28cf876c626cac091344e04c564c5fb7..3a379386822f8827a190613857679fecb043c220 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py
@@ -4,10 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-from six import iteritems
-
import mantid.simpleapi as mantid
from Muon.GUI.Common.validate_errors import validateToErrors
@@ -71,7 +67,7 @@ class MaxEntModel(object):
self.alg = mantid.AlgorithmManager.create("MuonMaxent")
self.alg.initialize()
self.alg.setAlwaysStoreInADS(False)
- for name, value in iteritems(inputs):
+ for name, value in inputs.items():
self.alg.setProperty(name, value)
self.alg.setRethrows(True)
validateToErrors(self.alg)
@@ -92,7 +88,7 @@ class MaxEntModel(object):
self.alg.setAlwaysStoreInADS(False)
self.alg.setRethrows(True)
- for name, value in iteritems(inputs):
+ for name, value in inputs.items():
self.alg.setProperty(name, value)
# check for version 1
if inputs["InputWorkspace"] != "MuonAnalysis" and "MuonAnalysisGrouped" in inputs["InputWorkspace"]:
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py
index 01ddb16a71bcc9fc826c9b11343d4d928511ba0a..8ccf6b5698f45fc3a0cafd795329b07c8356552f 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
import math
from Muon.GUI.Common import thread_model
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter_new.py
index 40dc119eb90dd64431063231259bf2f159d79c75..d70a7004fb437dd3dca8c3b40fec1966db74ac37 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import functools
import math
import re
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view.py
index ef25f6be5719a2437cd564651573c5a4adb42793..4788ba04130f37fb13a9f4b337ccb7a1136c8ea1 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view_new.py
index 45026d915d9884c60f158a10d02013327c76f7bd..2c184051252fa0c6c9e89d1d3599619ad9e02ce4 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget.py
index d5f24f57c6ba108a6bf662259312ff16caeec4fb..68170ab34b0fb0891b08a783fd4cb5d27a4cafa4 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_view import MaxEntView
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_presenter import MaxEntPresenter
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_model import MaxEntModel, MaxEntWrapper
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget_new.py
index ffeb78509453643f93c26472e0dfdbc2907421ad..bad67eb534f8fe598bf1aa525f230bf39b9ab3c4 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_view_new import MaxEntView
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_presenter_new import MaxEntPresenter
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_view.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_view.py
index a25d2b23f0929ed698d26e588e792eb316b6e35c..66d4f3dc9af0d7f5383ed2007321c45b71134e4e 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_view.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_widget.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_widget.py
index 6abbe3c247d694e7d2699349a38fbd0173635be9..a7f467fd449a962a46cbb2de867fb9a5707dd2bd 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_widget.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.Transform.transform_view import TransformView
from Muon.GUI.FrequencyDomainAnalysis.TransformSelection.transform_selection_widget import TransformSelectionWidget
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py
index 4948750038327f7a1cbf1b4c98eadd5623c9eb28..85acf76df967c091da049ddf91970bc297f6e303 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
class TransformSelectionPresenter(object):
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_view.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_view.py
index a3435824ea5d2ed45a00e4985e7f890ee79fd0ff..d26ead698df7d845a4570df491179211fdd5e42b 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_view.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_widget.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_widget.py
index 39485ee0482985d7c3cb23aac1657898b536734b..396c1c02f15127a5cb067f23650fcfdd5074fe15 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_widget.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.TransformSelection.transform_selection_view import TransformSelectionView
from Muon.GUI.FrequencyDomainAnalysis.TransformSelection.transform_selection_presenter import TransformSelectionPresenter
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py
index 0b6c02295cfcbe989db07da7c4ec5c2c6f602abc..3606f22a112142b379ebf6b52d7fee9a7ec05f89 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py
@@ -4,9 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from re import findall
-from six import iteritems
from mantid import AnalysisDataService
@@ -74,13 +72,13 @@ class FrequencyContext(object):
def get_frequency_workspace_names(self, run_list, group, pair, phasequad, frequency_type):
# do MaxEnt first as it only has run number
names = []
- for name, maxEnt in iteritems(self._maxEnt_freq):
+ for name, maxEnt in self._maxEnt_freq.items():
for runs in run_list:
for run in runs:
if int(run) == int(maxEnt.run):
names.append(name)
# do FFT
- for name, fft in iteritems(self._FFT_freq):
+ for name, fft in self._FFT_freq.items():
for runs in run_list:
for run in runs:
# check Re part
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_domain_analysis_2.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_domain_analysis_2.py
index e7c8ed9ccce53590166d3741b8752f3812d1ff86..a3c9861ff2577df0f60ff35a7f09dda11a7d0963 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_domain_analysis_2.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_domain_analysis_2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QT_VERSION
from distutils.version import LooseVersion
diff --git a/scripts/Muon/GUI/MuonAnalysis/dock/dock_widget.py b/scripts/Muon/GUI/MuonAnalysis/dock/dock_widget.py
index 2bd5be10d7dff72018a1d191e6f0605ba04f018e..0b48320623145437f609eed790e8c0a436104937 100644
--- a/scripts/Muon/GUI/MuonAnalysis/dock/dock_widget.py
+++ b/scripts/Muon/GUI/MuonAnalysis/dock/dock_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
from Muon.GUI.Common.context_example.context_example_widget import ContextExampleWidget
diff --git a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget.py b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget.py
index 590ca2e068a3f670a194c52b3e757c84997cfd99..8d9791d241e231e1efe60b9b38bb88d8dfb56762 100644
--- a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget.py
+++ b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.load_file_widget.model import BrowseFileWidgetModel
from Muon.GUI.Common.load_file_widget.view import BrowseFileWidgetView
from Muon.GUI.Common.load_file_widget.presenter import BrowseFileWidgetPresenter
diff --git a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_model.py b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_model.py
index 15c91234d0bab0d589726bd7ab67a66b85f1d16e..4834d23b18f53fc2049e883f66e9f46ffcf86c17 100644
--- a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_model.py
+++ b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.muon_load_data import MuonLoadData
diff --git a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_presenter.py b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_presenter.py
index 99d8ab433d82ca7e4d7830c3d777f10ba798f92b..e15d4e70cc084bc0bea10b6f91d3d75ef5c72f03 100644
--- a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_presenter.py
+++ b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantidqt.utils.observer_pattern import Observer, Observable, GenericObserver
CO_ADD = 'Co-Add'
diff --git a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_view.py b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_view.py
index 2c02af93187773d30c7f85e2c4ee7e453e8673b8..4f9c5e24f44fd5c8116c29087b35bee8e7f46f06 100644
--- a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_view.py
+++ b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/MuonAnalysis/muon_analysis_2.py b/scripts/Muon/GUI/MuonAnalysis/muon_analysis_2.py
index 49073ee83051706b40c945e94ce8ff056bec91c9..4d51658339dc909cb4bcc14ac80a2b4176451c02 100644
--- a/scripts/Muon/GUI/MuonAnalysis/muon_analysis_2.py
+++ b/scripts/Muon/GUI/MuonAnalysis/muon_analysis_2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QT_VERSION
from distutils.version import LooseVersion
diff --git a/scripts/Muon/MaxentTools/back.py b/scripts/Muon/MaxentTools/back.py
index 4b21aa1052461efac4ae60d38d48b5da495d2c07..2be429a121b033ae975038ba3852c611ada1e0a3 100644
--- a/scripts/Muon/MaxentTools/back.py
+++ b/scripts/Muon/MaxentTools/back.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
"""
diff --git a/scripts/Muon/MaxentTools/chinow.py b/scripts/Muon/MaxentTools/chinow.py
index 75de4c5c8580ad43fdc19d76f5c3f70799af6cb2..c020b6cb78243b092528d9e56f547b3b03f55726 100644
--- a/scripts/Muon/MaxentTools/chinow.py
+++ b/scripts/Muon/MaxentTools/chinow.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.chosol import CHOSOL
diff --git a/scripts/Muon/MaxentTools/chosol.py b/scripts/Muon/MaxentTools/chosol.py
index 328ecc169bcc7198322782eeed096dcca58185d7..2a2f4a32f7cfb314d66796a7aeb91db7a47fc2a9 100644
--- a/scripts/Muon/MaxentTools/chosol.py
+++ b/scripts/Muon/MaxentTools/chosol.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import numpy as np
import math
diff --git a/scripts/Muon/MaxentTools/dead_detector_handler.py b/scripts/Muon/MaxentTools/dead_detector_handler.py
index fa3887063fcf8380cf476b5cdfd9875a27480d2b..b054842da55a217150b1f1a22a3c92ae14862adf 100644
--- a/scripts/Muon/MaxentTools/dead_detector_handler.py
+++ b/scripts/Muon/MaxentTools/dead_detector_handler.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/MaxentTools/deadfit.py b/scripts/Muon/MaxentTools/deadfit.py
index 856ff79dcb1b9d7c168824d93676048884b34f00..f567c76e5e3788daa5df1b17da1aae5fd8ca93bb 100644
--- a/scripts/Muon/MaxentTools/deadfit.py
+++ b/scripts/Muon/MaxentTools/deadfit.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/dist.py b/scripts/Muon/MaxentTools/dist.py
index 82d02c32e919c532a2fbc7bf9440446c4871e624..b05cd55b11e7666ef5b1f098dfa50f7dc1a7fbe7 100644
--- a/scripts/Muon/MaxentTools/dist.py
+++ b/scripts/Muon/MaxentTools/dist.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/scripts/Muon/MaxentTools/input.py b/scripts/Muon/MaxentTools/input.py
index 739531ab252cc6bbe115c7e848140e10e3b11b15..81430a8e1656eee19356afd0b333563bdb91e978 100644
--- a/scripts/Muon/MaxentTools/input.py
+++ b/scripts/Muon/MaxentTools/input.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import math
"""
diff --git a/scripts/Muon/MaxentTools/maxent.py b/scripts/Muon/MaxentTools/maxent.py
index ee2c46a47ec2dbe1e6466b6100620a7b7b56acd4..2de214d78ed9d63c0c243b892478d53a7d287f82 100644
--- a/scripts/Muon/MaxentTools/maxent.py
+++ b/scripts/Muon/MaxentTools/maxent.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import numpy as np
import math
from Muon.MaxentTools.opus import OPUS
diff --git a/scripts/Muon/MaxentTools/modab.py b/scripts/Muon/MaxentTools/modab.py
index 4b5b86110ad384e3b457d53e49ce34c4d7647624..6bb45f07c78c5f4e62a2cc4b28fc5a193d84948f 100644
--- a/scripts/Muon/MaxentTools/modab.py
+++ b/scripts/Muon/MaxentTools/modab.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/modamp.py b/scripts/Muon/MaxentTools/modamp.py
index 7ea44b1799eff05d3d8e889580c0e637ec4a19c3..8266718dd7cb592114aef04a0996ebf8e5a449d0 100644
--- a/scripts/Muon/MaxentTools/modamp.py
+++ b/scripts/Muon/MaxentTools/modamp.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/modbak.py b/scripts/Muon/MaxentTools/modbak.py
index c4d7ec2157364a64075680ac7c798b9dc34a65b8..5539e505dca6549355861e0a58019363b9b0d39f 100644
--- a/scripts/Muon/MaxentTools/modbak.py
+++ b/scripts/Muon/MaxentTools/modbak.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/move.py b/scripts/Muon/MaxentTools/move.py
index 59decbb33c25b25b375f268efb4dcc21e5de9ff5..c05d41226f5bb860bd960e09a94ef82cbfc639ae 100644
--- a/scripts/Muon/MaxentTools/move.py
+++ b/scripts/Muon/MaxentTools/move.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
from Muon.MaxentTools.chinow import CHINOW
diff --git a/scripts/Muon/MaxentTools/multimaxalpha.py b/scripts/Muon/MaxentTools/multimaxalpha.py
index 04e9f769a121b69bc03b83b3dc78f54e4a09cdd0..1f500586244298668858d39f8fed9c8df48be052 100644
--- a/scripts/Muon/MaxentTools/multimaxalpha.py
+++ b/scripts/Muon/MaxentTools/multimaxalpha.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.input import INPUT
diff --git a/scripts/Muon/MaxentTools/opus.py b/scripts/Muon/MaxentTools/opus.py
index 9093ed8e82382c3a096cf50196dcf1750add9f58..836a49f1192ce76e63a8c5ca0134d4e3b5172d56 100644
--- a/scripts/Muon/MaxentTools/opus.py
+++ b/scripts/Muon/MaxentTools/opus.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/scripts/Muon/MaxentTools/outspec.py b/scripts/Muon/MaxentTools/outspec.py
index 29221ce4737f49f3aa16e7b2bc273133fec5f7fb..da9b0683495ac259085bc5d9314c7d92c197843b 100644
--- a/scripts/Muon/MaxentTools/outspec.py
+++ b/scripts/Muon/MaxentTools/outspec.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/project.py b/scripts/Muon/MaxentTools/project.py
index cf505c95c614ad1edca71105a037cc6ad1f95964..d860e0349069e267a0660676ca56e6be9c4c1122 100644
--- a/scripts/Muon/MaxentTools/project.py
+++ b/scripts/Muon/MaxentTools/project.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/scripts/Muon/MaxentTools/start.py b/scripts/Muon/MaxentTools/start.py
index d48d33c531746fd46837d4c88e20654f7cfde96d..b777e75943f4d13e561297f44adb1afac7a2ae6e 100644
--- a/scripts/Muon/MaxentTools/start.py
+++ b/scripts/Muon/MaxentTools/start.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import math
diff --git a/scripts/Muon/MaxentTools/tropus.py b/scripts/Muon/MaxentTools/tropus.py
index b2ab8eb9294a67c9d55bd345660a80e9f77a788c..db96ef8d1532d2968c861d9e4bfb84f549940122 100644
--- a/scripts/Muon/MaxentTools/tropus.py
+++ b/scripts/Muon/MaxentTools/tropus.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/scripts/Muon/MaxentTools/zft.py b/scripts/Muon/MaxentTools/zft.py
index b81b67f6ec4b2c6346429e84d1381e8aa40f7577..ebeac7f62e9e70463148b00d10f2be953d737105 100644
--- a/scripts/Muon/MaxentTools/zft.py
+++ b/scripts/Muon/MaxentTools/zft.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
# param P not used!
diff --git a/scripts/Muon_Analysis.py b/scripts/Muon_Analysis.py
index 8522fe09dd3215d2e27d93e74e39b0df53a3170a..ae52da0fc3c28b0d352206a2bfe23a307e94f1ef 100644
--- a/scripts/Muon_Analysis.py
+++ b/scripts/Muon_Analysis.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from Muon.GUI.MuonAnalysis.muon_analysis_2 import MuonAnalysisGui
from qtpy import QtCore
from Muon.GUI.Common.usage_report import report_interface_startup
diff --git a/scripts/ORNL_SANS.py b/scripts/ORNL_SANS.py
index bb6289e02e6c1c952c2dd52f152e8fe55cb52876..dbadb86ac2789cf5bbf7e4f0cd0f8b270f80565c 100644
--- a/scripts/ORNL_SANS.py
+++ b/scripts/ORNL_SANS.py
@@ -8,7 +8,6 @@
"""
Script used to start the HFIR SANS reduction gui from Mantidplot
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_application import ReductionGUI
reducer = ReductionGUI(instrument_list=["BIOSANS", "GPSANS", "EQSANS"])
diff --git a/scripts/Powder_Diffraction_Reduction.py b/scripts/Powder_Diffraction_Reduction.py
index fe52af88b6737a51a9c69583435420ffc1bc582d..5e1862c96b92c95ac40e4f31239adf440c64c073 100644
--- a/scripts/Powder_Diffraction_Reduction.py
+++ b/scripts/Powder_Diffraction_Reduction.py
@@ -8,7 +8,6 @@
"""
Script used to start the DGS reduction GUI from MantidPlot
"""
-from __future__ import (absolute_import, division, print_function)
import os
from reduction_application import ReductionGUI
diff --git a/scripts/PyChop/Chop.py b/scripts/PyChop/Chop.py
index c4ef62a270ab432ae42eba5f983c8be535284798..49b0c2d937dce6e426539c0f1973530711d95d75 100644
--- a/scripts/PyChop/Chop.py
+++ b/scripts/PyChop/Chop.py
@@ -23,7 +23,6 @@ technical reports:
http://www.neutronresearch.com/parch/1993/01/199301013280.pdf
"""
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import collections
import warnings
diff --git a/scripts/PyChop/ISISDisk.py b/scripts/PyChop/ISISDisk.py
index 049c2eab9e652d77c4090f216ac29a663d191483..8d56cac44abc47b49d9dbc7f2bd32c1e91cc44e3 100644
--- a/scripts/PyChop/ISISDisk.py
+++ b/scripts/PyChop/ISISDisk.py
@@ -12,7 +12,6 @@ Contains the ISISDisk class which calculates resolution and flux for ISIS Disk c
spectrometer (LET) - using the functions in MulpyRep and additional tables of instrument parameters
"""
-from __future__ import (absolute_import, division, print_function)
import warnings
import numpy as np
from . import MulpyRep
diff --git a/scripts/PyChop/ISISFermi.py b/scripts/PyChop/ISISFermi.py
index e74a78fe7914060118559263d628ac54c8df9d13..a5f64ebffec1ccf55133314f3aae3e754f376e4c 100644
--- a/scripts/PyChop/ISISFermi.py
+++ b/scripts/PyChop/ISISFermi.py
@@ -13,7 +13,6 @@ Contains the ISISFermi class which calculates the resolution and flux for ISIS F
spectrometers (MAPS, MARI, MERLIN) - using the functions in Chop.py and addition lookup tables.
"""
-from __future__ import (absolute_import, division, print_function)
import warnings
import numpy as np
from . import Chop
diff --git a/scripts/PyChop/Instruments.py b/scripts/PyChop/Instruments.py
index 4ea8759b46133af0080e6071ce27d3e4cb8ba020..507c4b1df5af895e07cdecd07059839402c60847 100644
--- a/scripts/PyChop/Instruments.py
+++ b/scripts/PyChop/Instruments.py
@@ -9,8 +9,6 @@ This module is a wrapper around a set of instrument parameters (to be read from
and methods which then call either Chop.py or MulpyRep.py to do the resolution calculations.
"""
-from __future__ import (absolute_import, division, print_function)
-from six import string_types
import numpy as np
import yaml
import warnings
@@ -670,7 +668,7 @@ class Instrument(object):
__known_instruments = ['let', 'maps', 'mari', 'merlin']
def __init__(self, instrument, chopper=None, freq=None):
- if isinstance(instrument, string_types):
+ if isinstance(instrument, str):
# check if it is a file or instrument name we want
if instrument.lower() in self.__known_instruments:
import os.path
diff --git a/scripts/PyChop/MulpyRep.py b/scripts/PyChop/MulpyRep.py
index 030264e3cde7eaee1f8773d35ec6082071a494cf..89173d9124ef612bd6ba98d3af329dccea407fc6 100644
--- a/scripts/PyChop/MulpyRep.py
+++ b/scripts/PyChop/MulpyRep.py
@@ -12,8 +12,6 @@ Contains a class to calculate the possible reps, resolution and flux for a direc
spectrometer. Python implementation by D J Voneshen based on the original Matlab program of R I Bewley.
"""
-from __future__ import (absolute_import, division, print_function)
-from six import string_types
import numpy as np
import copy
@@ -224,8 +222,8 @@ def calcChopTimes(efocus, freq, instrumentpars, chop2Phase=5):
for i in range(len(dist)):
# loop over each chopper
# checks whether this chopper should have an independently set phase / delay
- islt = int(phase[i]) if (ph_ind[i] and isinstance(phase[i], string_types)) else 0
- if ph_ind[i] and not isinstance(phase[i], string_types):
+ islt = int(phase[i]) if (ph_ind[i] and isinstance(phase[i], str)) else 0
+ if ph_ind[i] and not isinstance(phase[i], str):
# effective chopper velocity (if 2 disks effective velocity is double)
chopVel = 2*np.pi*radius[i] * numDisk[i] * freq[i]
# full opening time
diff --git a/scripts/PyChop/PyChop2.py b/scripts/PyChop/PyChop2.py
index bcc91912b863ac58fd7c1befa6f66f9806b1f33c..e275232254193d6c675d05f52b63dffd747f3c68 100644
--- a/scripts/PyChop/PyChop2.py
+++ b/scripts/PyChop/PyChop2.py
@@ -11,7 +11,6 @@ This module contains the PyChop2 class which allows calculation of the resolutio
direct geometry time-of-flight inelastic neutron spectrometers.
"""
-from __future__ import (absolute_import, division, print_function)
from .ISISFermi import ISISFermi
from .ISISDisk import ISISDisk
import warnings
diff --git a/scripts/PyChop/PyChopGui.py b/scripts/PyChop/PyChopGui.py
index 589c45e954fd6c6cd0428ca149cebc1cfc498f6d..2183304b3f58b43c37a5c3bebe277cc49c880d4f 100755
--- a/scripts/PyChop/PyChopGui.py
+++ b/scripts/PyChop/PyChopGui.py
@@ -14,8 +14,6 @@
This module contains a class to create a graphical user interface for PyChop.
"""
-from __future__ import (absolute_import, division, print_function)
-from six import string_types
import sys
import re
import numpy as np
@@ -162,7 +160,7 @@ class PyChopGui(QMainWindow):
freq_in = [freq_in, freqpr]
if not self.widgets['Chopper2Phase']['Label'].isHidden():
chop2phase = self.widgets['Chopper2Phase']['Edit'].text()
- if isinstance(self.engine.chopper_system.defaultPhase[0], string_types):
+ if isinstance(self.engine.chopper_system.defaultPhase[0], str):
chop2phase = str(chop2phase)
else:
chop2phase = float(chop2phase) % (1e6 / self.engine.moderator.source_rep)
diff --git a/scripts/PyChop/__init__.py b/scripts/PyChop/__init__.py
index d7ada5a222e89ddb86c6fa8c2ddcfddd1bca7c50..e595c68ae3c073fb5e88af11d65f163e27f94251 100644
--- a/scripts/PyChop/__init__.py
+++ b/scripts/PyChop/__init__.py
@@ -23,5 +23,4 @@ resolution, flux = PyChop2.calculate(inst='maps', chtyp='a', freq=500, ei=600, e
PyChop2.showGUI()
"""
-from __future__ import (absolute_import, division, print_function)
from .Instruments import Instrument as PyChop2 # noqa: F401
diff --git a/scripts/QECoverage.py b/scripts/QECoverage.py
index 6d0447f7ff30c7cebeb691967f387b899d97706f..3a2bb7820d5219a1463a6495bc9031991e2df4e6 100644
--- a/scripts/QECoverage.py
+++ b/scripts/QECoverage.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=line-too-long, too-many-instance-attributes, invalid-name, missing-docstring, too-many-statements
# pylint: disable= too-many-branches, no-self-use
-from __future__ import (absolute_import, division, print_function)
from mantidqt.gui_helper import get_qapplication, show_interface_help
import numpy as np
import os
diff --git a/scripts/Reflectometry/isis_reflectometry/combineMulti.py b/scripts/Reflectometry/isis_reflectometry/combineMulti.py
index 59434f56c247d0a20b2a702d3353e2c2baa3d46f..2a32e8abadb0bb924abfc1e1234716846902c47a 100644
--- a/scripts/Reflectometry/isis_reflectometry/combineMulti.py
+++ b/scripts/Reflectometry/isis_reflectometry/combineMulti.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from .l2q import *
from mantid.simpleapi import *
from mantid.api import WorkspaceGroup
diff --git a/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py b/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py
index f69337ee7d036cf1680b90a75435125d8fb6fb8d..2b63662c85cb2f3cdaf3a0443d33fc5e8a5e01ea 100644
--- a/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py
+++ b/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as msi
import mantid.api
from mantid.kernel import logger
diff --git a/scripts/Reflectometry/isis_reflectometry/l2q.py b/scripts/Reflectometry/isis_reflectometry/l2q.py
index cb5b331047ea4b9d6b3753336140cd7a031730f6..31c806b93650787e5f558c4ff7f61dbf31a96df3 100644
--- a/scripts/Reflectometry/isis_reflectometry/l2q.py
+++ b/scripts/Reflectometry/isis_reflectometry/l2q.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.simpleapi import * # New API
diff --git a/scripts/Reflectometry/isis_reflectometry/load_live_runs.py b/scripts/Reflectometry/isis_reflectometry/load_live_runs.py
index 0e2789731228f08caacf24898a7d24ec8dcc7f3e..770ae600f496bf4318295c6971dc6bd86f145a83 100644
--- a/scripts/Reflectometry/isis_reflectometry/load_live_runs.py
+++ b/scripts/Reflectometry/isis_reflectometry/load_live_runs.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
diff --git a/scripts/Reflectometry/isis_reflectometry/procedures.py b/scripts/Reflectometry/isis_reflectometry/procedures.py
index 50aa9860465a5323ba411e806c43c9d0fe63e5bf..bb384df70a5ce1a0c61ad08b915000be2a1a1b63 100644
--- a/scripts/Reflectometry/isis_reflectometry/procedures.py
+++ b/scripts/Reflectometry/isis_reflectometry/procedures.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-lines, invalid-name, too-many-arguments, too-many-branches, too-many-locals
-from __future__ import (absolute_import, division, print_function)
from math import *
try:
diff --git a/scripts/Reflectometry/isis_reflectometry/quick.py b/scripts/Reflectometry/isis_reflectometry/quick.py
index 430f0be97e11e354365b860f800ec658221040e2..df65076ccbe60a97de0408aa595b697334362aa6 100644
--- a/scripts/Reflectometry/isis_reflectometry/quick.py
+++ b/scripts/Reflectometry/isis_reflectometry/quick.py
@@ -15,7 +15,6 @@
'''
# these need to be moved into one NR folder or so
# from ReflectometerCors import *
-from __future__ import (absolute_import, division, print_function)
from isis_reflectometry.l2q import *
from isis_reflectometry.combineMulti import *
from mantid.simpleapi import * # New API
@@ -26,7 +25,6 @@ from isis_reflectometry.convert_to_wavelength import ConvertToWavelength
import math
import re
import abc
-from six import with_metaclass
def enum(**enums):
@@ -36,7 +34,7 @@ def enum(**enums):
PolarisationCorrection = enum(PNR=1, PA=2, NONE=3)
-class CorrectionStrategy(with_metaclass(abc.ABCMeta, object)):
+class CorrectionStrategy(metaclass=abc.ABCMeta):
@abc.abstractmethod
def apply(self, to_correct):
pass
diff --git a/scripts/Reflectometry/isis_reflectometry/saveModule.py b/scripts/Reflectometry/isis_reflectometry/saveModule.py
index 9c8c63be26d501dc9e8d29c21e7ada373ec9f1ec..e6944ce16d336e05431a9feb2794dd23e4ad8ed3 100644
--- a/scripts/Reflectometry/isis_reflectometry/saveModule.py
+++ b/scripts/Reflectometry/isis_reflectometry/saveModule.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtCore
from mantid.simpleapi import *
import numpy as n
diff --git a/scripts/Reflectometry/isis_reflectometry/settings.py b/scripts/Reflectometry/isis_reflectometry/settings.py
index 9d3842f74e91886bbc53feb9ec12baa9f5201abf..47a49b023214d0ae6ef5836129c92f8d8093272a 100644
--- a/scripts/Reflectometry/isis_reflectometry/settings.py
+++ b/scripts/Reflectometry/isis_reflectometry/settings.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import xml.etree.ElementTree as XML
import os.path
diff --git a/scripts/SANS/DarkRunCorrection.py b/scripts/SANS/DarkRunCorrection.py
index 4aa9312a452479414a952fa780dbef42a74dd0aa..6f7051f87b7289cca2137d1125ce3cab29627b5e 100644
--- a/scripts/SANS/DarkRunCorrection.py
+++ b/scripts/SANS/DarkRunCorrection.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
diff --git a/scripts/SANS/ISISCommandInterface.py b/scripts/SANS/ISISCommandInterface.py
index c1423f59983901313604f61337cbaadb37dfa19a..e3373be720818cf50476cab2d9bd61805db4978f 100644
--- a/scripts/SANS/ISISCommandInterface.py
+++ b/scripts/SANS/ISISCommandInterface.py
@@ -9,7 +9,6 @@
Enables the SANS commands (listed at http://www.mantidproject.org/SANS) to
be run
"""
-from __future__ import (absolute_import, division, print_function)
import isis_instrument
from reducer_singleton import ReductionSingleton
from mantid.kernel import Logger
diff --git a/scripts/SANS/SANSBatchMode.py b/scripts/SANS/SANSBatchMode.py
index 8652fd5be5b9a751b3bec3206dbf98b471c5cb47..c3122c3082d0cf9fccf09bb92ae3f3fc15bd1898 100644
--- a/scripts/SANS/SANSBatchMode.py
+++ b/scripts/SANS/SANSBatchMode.py
@@ -36,7 +36,6 @@
# The save directory must currently be specified in the Mantid.user.properties file
#Make the reduction module available
-from __future__ import (absolute_import, division, print_function)
from ISISCommandInterface import *
import SANSUtility as su
from mantid.simpleapi import *
diff --git a/scripts/SANS/SANSUserFileParser.py b/scripts/SANS/SANSUserFileParser.py
index 08de9f88c3cadfd6057e15fd206cf9b507287162..cd315fe6eef9bacbdd5ae2f511bde9fe9c8b4b17 100644
--- a/scripts/SANS/SANSUserFileParser.py
+++ b/scripts/SANS/SANSUserFileParser.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from collections import namedtuple
import re
diff --git a/scripts/SANS/SANSUtility.py b/scripts/SANS/SANSUtility.py
index bdd25fcf2331cb7eb20982ea51781ec93ed33ea7..f74495fec95d446067c318077d3ca5e9c7e5e333 100644
--- a/scripts/SANS/SANSUtility.py
+++ b/scripts/SANS/SANSUtility.py
@@ -10,7 +10,6 @@
# This module contains utility functions common to the
# SANS data reduction scripts
########################################################
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import IEventWorkspace, MatrixWorkspace, WorkspaceGroup, FileLoaderRegistry, FileFinder
from mantid.kernel import DateAndTime
@@ -18,7 +17,7 @@ import inspect
import math
import os
import re
-from six import types, iteritems, PY3
+import types
import numpy as np
import h5py as h5
@@ -736,14 +735,9 @@ def check_if_is_event_data(file_name):
is_event_mode = False
for value in list(first_entry.values()):
if "NX_class" in value.attrs:
- if PY3:
- if "NXevent_data" == value.attrs["NX_class"].decode() :
- is_event_mode = True
- break
- else:
- if "NXevent_data" == value.attrs["NX_class"]:
- is_event_mode = True
- break
+ if "NXevent_data" == value.attrs["NX_class"].decode() :
+ is_event_mode = True
+ break
return is_event_mode
@@ -1971,7 +1965,7 @@ def createUnmanagedAlgorithm(name, **kwargs):
alg = AlgorithmManager.createUnmanaged(name)
alg.initialize()
alg.setChild(True)
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
return alg
diff --git a/scripts/SANS/SANSadd2.py b/scripts/SANS/SANSadd2.py
index 1b7c08f163e1464d6b21c80f6af0d6bc17e7d460..62eb72c924cadcc3021035503b473ee8be4ac896 100644
--- a/scripts/SANS/SANSadd2.py
+++ b/scripts/SANS/SANSadd2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import os
from shutil import copyfile
diff --git a/scripts/SANS/centre_finder.py b/scripts/SANS/centre_finder.py
index d3da5a8a9ad9160b662335c5bcc024060aee8042..d36c61efbf36fc218cc7dd985efe1ecb0b003444 100644
--- a/scripts/SANS/centre_finder.py
+++ b/scripts/SANS/centre_finder.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from isis_reduction_steps import StripEndNans
from isis_instrument import LARMOR
from mantid.simpleapi import *
diff --git a/scripts/SANS/isis_instrument.py b/scripts/SANS/isis_instrument.py
index 5a45796d008eb933cce393bef1a6df2f45acd899..2eb89630de797a95180feb3f0bca03059069b073 100644
--- a/scripts/SANS/isis_instrument.py
+++ b/scripts/SANS/isis_instrument.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-lines, invalid-name, bare-except, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import math
import os
import re
@@ -17,8 +16,6 @@ from mantid.kernel import Logger
from mantid.kernel import V3D
import SANSUtility as su
from math import copysign
-from six import iteritems
-
sanslog = Logger("SANS")
@@ -616,7 +613,7 @@ class ISISInstrument(BaseInstrument):
return self.DETECTORS['high-angle']
def getDetector(self, requested):
- for _n, detect in iteritems(self.DETECTORS):
+ for _n, detect in self.DETECTORS.items():
if detect.isAlias(requested):
return detect
sanslog.notice("getDetector: Detector " + requested + "not found")
diff --git a/scripts/SANS/isis_reducer.py b/scripts/SANS/isis_reducer.py
index b962d7d1e23586902789c4252750f683fdfdd8ed..d92cfcb86684d8e2816f4a27f56dc01a6f83e2f7 100644
--- a/scripts/SANS/isis_reducer.py
+++ b/scripts/SANS/isis_reducer.py
@@ -12,7 +12,6 @@
understand what's happening and how best to fit it in the Reducer design.
"""
-from __future__ import (absolute_import, division, print_function)
from reducer_singleton import Reducer
import isis_reduction_steps
import isis_instrument
diff --git a/scripts/SANS/isis_reduction_steps.py b/scripts/SANS/isis_reduction_steps.py
index d9adec0121918e04900d3419bbbb931679baf23f..3d2cb8d851397c53ea1249c2acc491a04c3fd9aa 100644
--- a/scripts/SANS/isis_reduction_steps.py
+++ b/scripts/SANS/isis_reduction_steps.py
@@ -14,7 +14,6 @@
Most of this code is a copy-paste from SANSReduction.py, organized to be used with
ReductionStep objects. The guts needs refactoring.
"""
-from __future__ import (absolute_import, division, print_function)
import os
import re
import math
diff --git a/scripts/SANS/reduction_settings.py b/scripts/SANS/reduction_settings.py
index df4eb1a370118737db2b0dbe125e78b1e80db550..7cea24348aee72e96a40c7f5355b216d99d1a2d2 100644
--- a/scripts/SANS/reduction_settings.py
+++ b/scripts/SANS/reduction_settings.py
@@ -68,7 +68,6 @@ between reduction steps. The benefits to this new method are as follows:
passing settings to each other via PropertyManager objects.
"""
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/scripts/SANS/sans/algorithm_detail/CreateSANSAdjustmentWorkspaces.py b/scripts/SANS/sans/algorithm_detail/CreateSANSAdjustmentWorkspaces.py
index b64471f3a085c3eeed479ac0dc3cddbee939b0f0..9cb27be639044ef50fe3e06e6a16ca004f5cb198 100644
--- a/scripts/SANS/sans/algorithm_detail/CreateSANSAdjustmentWorkspaces.py
+++ b/scripts/SANS/sans/algorithm_detail/CreateSANSAdjustmentWorkspaces.py
@@ -8,8 +8,6 @@
wavelength adjustment and pixel-and-wavelength adjustment workspaces.
"""
-from __future__ import (absolute_import, division, print_function)
-
from sans.algorithm_detail.calculate_sans_transmission import calculate_transmission
from sans.algorithm_detail.CreateSANSWavelengthPixelAdjustment import CreateSANSWavelengthPixelAdjustment
from sans.algorithm_detail.normalize_to_sans_monitor import normalize_to_monitor
diff --git a/scripts/SANS/sans/algorithm_detail/CreateSANSWavelengthPixelAdjustment.py b/scripts/SANS/sans/algorithm_detail/CreateSANSWavelengthPixelAdjustment.py
index 846d3b2a59cb4a186270f7bd995529acf94c0a24..888f9527e06778c005bc9db05bab595169fc9e3f 100644
--- a/scripts/SANS/sans/algorithm_detail/CreateSANSWavelengthPixelAdjustment.py
+++ b/scripts/SANS/sans/algorithm_detail/CreateSANSWavelengthPixelAdjustment.py
@@ -8,8 +8,6 @@
and wavelength adjustment.
"""
-from __future__ import (absolute_import, division, print_function)
-
from sans.algorithm_detail.crop_helper import get_component_name
from sans.common.constants import EMPTY_NAME
from sans.common.enums import (DetectorType)
diff --git a/scripts/SANS/sans/algorithm_detail/batch_execution.py b/scripts/SANS/sans/algorithm_detail/batch_execution.py
index 2b1d1cd1f5e2065f89b62a0558486c83267e4bbf..1af602dcae987420a5630704e9fc2bc845a37eac 100644
--- a/scripts/SANS/sans/algorithm_detail/batch_execution.py
+++ b/scripts/SANS/sans/algorithm_detail/batch_execution.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from copy import deepcopy
from mantid.api import AnalysisDataService, WorkspaceGroup
diff --git a/scripts/SANS/sans/algorithm_detail/bundles.py b/scripts/SANS/sans/algorithm_detail/bundles.py
index 5965a1c633ff2ba8467bdd3f424f018bec513718..060b58321a74894236e0356ee00fc2d93462be29 100644
--- a/scripts/SANS/sans/algorithm_detail/bundles.py
+++ b/scripts/SANS/sans/algorithm_detail/bundles.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" This module contains bundle definitions for passing reduction settings between functions."""
-from __future__ import (absolute_import, division, print_function)
from collections import namedtuple
# The ReductionSettingBundle contains the information and data for starting a SANSReductionCore reduction.
diff --git a/scripts/SANS/sans/algorithm_detail/calculate_sans_transmission.py b/scripts/SANS/sans/algorithm_detail/calculate_sans_transmission.py
index cd6b38671764f6e8db94c6e1e2498f76e90b225e..e951df0c5720ab17cac6530f5e10543de71c12d3 100644
--- a/scripts/SANS/sans/algorithm_detail/calculate_sans_transmission.py
+++ b/scripts/SANS/sans/algorithm_detail/calculate_sans_transmission.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from sans.algorithm_detail.calculate_transmission_helper import (get_detector_id_for_spectrum_number,
get_workspace_indices_for_monitors,
apply_flat_background_correction_to_monitors,
diff --git a/scripts/SANS/sans/algorithm_detail/calculate_transmission_helper.py b/scripts/SANS/sans/algorithm_detail/calculate_transmission_helper.py
index efcd70d92f91298f9d7b28084c7464d76aae0a08..4a572839bef0896ed2883e98a31470e44e29574c 100644
--- a/scripts/SANS/sans/algorithm_detail/calculate_transmission_helper.py
+++ b/scripts/SANS/sans/algorithm_detail/calculate_transmission_helper.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import ExperimentInfo
from sans.common.general_functions import (create_unmanaged_algorithm, sanitise_instrument_name)
from sans.common.constants import EMPTY_NAME
diff --git a/scripts/SANS/sans/algorithm_detail/calibration.py b/scripts/SANS/sans/algorithm_detail/calibration.py
index dcf9314a2182c5634425bf1fd7f19f71dcebffd9..28bbc8e6ff7158d56151528e6a221a53fc201bc2 100644
--- a/scripts/SANS/sans/algorithm_detail/calibration.py
+++ b/scripts/SANS/sans/algorithm_detail/calibration.py
@@ -7,7 +7,6 @@
# pylint: disable=invalid-name
""" Handles calibration of SANS workspaces."""
-from __future__ import (absolute_import, division, print_function)
from os.path import (basename, splitext, isfile)
from mantid.api import (AnalysisDataService)
diff --git a/scripts/SANS/sans/algorithm_detail/centre_finder_new.py b/scripts/SANS/sans/algorithm_detail/centre_finder_new.py
index 95546a289d35f8470cf5bb3b04346499460427a3..178a734c3d7d80cf6847ee8a386842516c927aba 100644
--- a/scripts/SANS/sans/algorithm_detail/centre_finder_new.py
+++ b/scripts/SANS/sans/algorithm_detail/centre_finder_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateEmptyTableWorkspace
from sans.algorithm_detail.batch_execution import (provide_loaded_data, get_reduction_packages)
from sans.common.enums import (SANSDataType, DetectorType)
diff --git a/scripts/SANS/sans/algorithm_detail/convert_to_q.py b/scripts/SANS/sans/algorithm_detail/convert_to_q.py
index 99265932ce40f1d873aa2b949439766a451a84a4..02d5962afe640cc152bd1b9b6dbf0949c24a45e2 100644
--- a/scripts/SANS/sans/algorithm_detail/convert_to_q.py
+++ b/scripts/SANS/sans/algorithm_detail/convert_to_q.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" Converts a workspace from wavelengths to momentum transfer."""
-from __future__ import (absolute_import, division, print_function)
-
from math import sqrt
from sans.common.constants import EMPTY_NAME
diff --git a/scripts/SANS/sans/algorithm_detail/crop_helper.py b/scripts/SANS/sans/algorithm_detail/crop_helper.py
index 9d2d1040535ca42470caec3dfe9b9a5c68a2d888..6ea9b47582d6c2fcb0ff97b4d5af67091a3dcba0 100644
--- a/scripts/SANS/sans/algorithm_detail/crop_helper.py
+++ b/scripts/SANS/sans/algorithm_detail/crop_helper.py
@@ -7,7 +7,6 @@
# pylint: disable=invalid-name
""" Helpers for CropToComponent for SANS."""
-from __future__ import (absolute_import, division, print_function)
from sans.common.general_functions import convert_instrument_and_detector_type_to_bank_name
from sans.common.enums import SANSInstrument
diff --git a/scripts/SANS/sans/algorithm_detail/load_data.py b/scripts/SANS/sans/algorithm_detail/load_data.py
index 56d940642c00c6777b120245917b4aee5d7656b8..4e75f0193b61f670d180295b7e91f71a1e1e3182 100644
--- a/scripts/SANS/sans/algorithm_detail/load_data.py
+++ b/scripts/SANS/sans/algorithm_detail/load_data.py
@@ -48,9 +48,7 @@ Adding to the cache(ADS) is supported for the TubeCalibration file.
Reading from the cache is supported for all files. This avoids data reloads if the correct file is already in the
cache.
"""
-from __future__ import (absolute_import, division, print_function)
from abc import (ABCMeta, abstractmethod)
-from six import with_metaclass
import os
from mantid.kernel import config
from mantid.api import (AnalysisDataService)
@@ -689,7 +687,7 @@ def load_isis(data_type, file_information, period, use_cached, calibration_file_
# ----------------------------------------------------------------------------------------------------------------------
# Load classes
# ----------------------------------------------------------------------------------------------------------------------
-class SANSLoadData(with_metaclass(ABCMeta, object)):
+class SANSLoadData(metaclass=ABCMeta):
""" Base class for all SANSLoad implementations."""
@abstractmethod
def do_execute(self, data_info, use_cached, publish_to_ads, progress, parent_alg):
@@ -789,7 +787,7 @@ class SANSLoadDataFactory(object):
# Corrections for a loaded transmission workspace
# -------------------------------------------------
-class TransmissionCorrection(with_metaclass(ABCMeta, object)):
+class TransmissionCorrection(metaclass=ABCMeta):
@abstractmethod
def correct(self, workspaces, parent_alg):
pass
diff --git a/scripts/SANS/sans/algorithm_detail/mask_functions.py b/scripts/SANS/sans/algorithm_detail/mask_functions.py
index bb1c590978e33a161dbe1f19634248caadbd276c..f0715a632106fb397645e195a37428e43670a71a 100644
--- a/scripts/SANS/sans/algorithm_detail/mask_functions.py
+++ b/scripts/SANS/sans/algorithm_detail/mask_functions.py
@@ -4,10 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from collections import (namedtuple, Sequence)
-from mantid.py3compat import Enum
+from enum import Enum
from sans.common.enums import (DetectorType, SANSInstrument)
from sans.common.xml_parsing import get_named_elements_from_ipf_file
diff --git a/scripts/SANS/sans/algorithm_detail/mask_sans_workspace.py b/scripts/SANS/sans/algorithm_detail/mask_sans_workspace.py
index 25d8fe10a5a7254a25dcf7ec38852866a3ef65ad..f0828ad0f01aa32f7f23fb3931a935b22b4a67e0 100644
--- a/scripts/SANS/sans/algorithm_detail/mask_sans_workspace.py
+++ b/scripts/SANS/sans/algorithm_detail/mask_sans_workspace.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from sans.algorithm_detail.mask_workspace import create_masker
from sans.common.enums import DetectorType
from sans.common.general_functions import append_to_sans_file_tag
diff --git a/scripts/SANS/sans/algorithm_detail/mask_workspace.py b/scripts/SANS/sans/algorithm_detail/mask_workspace.py
index 76cc42e74701f4ef1ddd894bba132b55cf2d6a2f..8457a49c3210a55d228eafb1190fefb43d852ba6 100644
--- a/scripts/SANS/sans/algorithm_detail/mask_workspace.py
+++ b/scripts/SANS/sans/algorithm_detail/mask_workspace.py
@@ -4,12 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from abc import (ABCMeta, abstractmethod)
-from six import with_metaclass
-
from mantid.kernel import Logger
from sans.algorithm_detail.mask_functions import SpectraBlock
@@ -356,7 +352,7 @@ def mask_beam_stop(mask_info, workspace, instrument, detector_names):
# Masker classes
# ------------------------------------------------------------------
-class Masker(with_metaclass(ABCMeta, object)):
+class Masker(metaclass=ABCMeta):
def __init__(self):
super(Masker, self).__init__()
diff --git a/scripts/SANS/sans/algorithm_detail/merge_reductions.py b/scripts/SANS/sans/algorithm_detail/merge_reductions.py
index a030ce0b1d55fe23636747ea46ee5293516e4f33..064e57965e60beee8e8cbe61028cadc3bdb9ba1e 100644
--- a/scripts/SANS/sans/algorithm_detail/merge_reductions.py
+++ b/scripts/SANS/sans/algorithm_detail/merge_reductions.py
@@ -6,19 +6,15 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Merges two reduction types to single reduction"""
-from __future__ import (absolute_import, division, print_function)
-
from abc import (ABCMeta, abstractmethod)
-from six import with_metaclass
-
import mantid.simpleapi as mantid_api
from sans.algorithm_detail.bundles import MergeBundle
from sans.common.enums import (SANSFacility, DataType)
from sans.common.general_functions import create_child_algorithm
-class Merger(with_metaclass(ABCMeta, object)):
+class Merger(metaclass=ABCMeta):
""" Merger interface"""
@abstractmethod
diff --git a/scripts/SANS/sans/algorithm_detail/move_sans_instrument_component.py b/scripts/SANS/sans/algorithm_detail/move_sans_instrument_component.py
index 43e7a7ebece4fd3de7e92cde49ac54d96dcf735a..b7aa21006b05a45bdcba929e58e73ccc8826e49c 100644
--- a/scripts/SANS/sans/algorithm_detail/move_sans_instrument_component.py
+++ b/scripts/SANS/sans/algorithm_detail/move_sans_instrument_component.py
@@ -4,7 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from mantid.py3compat.enum import Enum
+from enum import Enum
from sans.algorithm_detail.move_workspaces import create_mover
from sans.common.enums import DetectorType
diff --git a/scripts/SANS/sans/algorithm_detail/move_workspaces.py b/scripts/SANS/sans/algorithm_detail/move_workspaces.py
index 5669572bdf155a3f15480e670ed2655370f7b3ae..89c42c5e6cd89db8329794fd7301191e789741b2 100644
--- a/scripts/SANS/sans/algorithm_detail/move_workspaces.py
+++ b/scripts/SANS/sans/algorithm_detail/move_workspaces.py
@@ -6,10 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-few-public-methods, invalid-name
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.api import MatrixWorkspace
-from six import with_metaclass
from abc import (ABCMeta, abstractmethod)
from sans.state.StateObjects.StateMoveDetectors import StateMove
from sans.common.enums import CanonicalCoordinates, DetectorType, SANSInstrument
@@ -334,7 +332,7 @@ def move_low_angle_bank_for_SANS2D_and_ZOOM(move_info, workspace, coordinates, u
# -------------------------------------------------
# Move classes
# -------------------------------------------------
-class SANSMove(with_metaclass(ABCMeta, object)):
+class SANSMove(metaclass=ABCMeta):
def __init__(self):
super(SANSMove, self).__init__()
diff --git a/scripts/SANS/sans/algorithm_detail/normalize_to_sans_monitor.py b/scripts/SANS/sans/algorithm_detail/normalize_to_sans_monitor.py
index 619118e120f70afa9f6867cdffa249a2917eaf02..9761a40e4e49b56441fa23a445deed619f78f2fa 100644
--- a/scripts/SANS/sans/algorithm_detail/normalize_to_sans_monitor.py
+++ b/scripts/SANS/sans/algorithm_detail/normalize_to_sans_monitor.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" SANSNormalizeToMonitor algorithm calculates the normalization to the monitor."""
-from __future__ import (absolute_import, division, print_function)
-
from sans.common.constants import EMPTY_NAME
from sans.common.general_functions import create_unmanaged_algorithm
diff --git a/scripts/SANS/sans/algorithm_detail/save_workspace.py b/scripts/SANS/sans/algorithm_detail/save_workspace.py
index cf76a1b9dad65f4f3e7453731a5d176f778288e3..ba135ebb39787e9bd1969fbc7e1fd274b6a41d68 100644
--- a/scripts/SANS/sans/algorithm_detail/save_workspace.py
+++ b/scripts/SANS/sans/algorithm_detail/save_workspace.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from collections import namedtuple
from mantid.api import MatrixWorkspace
from mantid.dataobjects import EventWorkspace
diff --git a/scripts/SANS/sans/algorithm_detail/scale_sans_workspace.py b/scripts/SANS/sans/algorithm_detail/scale_sans_workspace.py
index 2204dd86195af6af9fa70179545022670e75df22..d60f89e47dfd687952baaf357a9a609e32ac8033 100644
--- a/scripts/SANS/sans/algorithm_detail/scale_sans_workspace.py
+++ b/scripts/SANS/sans/algorithm_detail/scale_sans_workspace.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Multiplies a SANS workspace by an absolute scale and divides it by the sample volume. """
-from __future__ import (absolute_import, division, print_function)
-
import math
from sans.common.constants import EMPTY_NAME
diff --git a/scripts/SANS/sans/algorithm_detail/single_execution.py b/scripts/SANS/sans/algorithm_detail/single_execution.py
index c71ae14321c9e6123b8612588b5fdf882df9e456..184f4970c61d30f33f3d4d54fea7377c7e6b2ee6 100644
--- a/scripts/SANS/sans/algorithm_detail/single_execution.py
+++ b/scripts/SANS/sans/algorithm_detail/single_execution.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import sys
from mantid.kernel import mpisetup
diff --git a/scripts/SANS/sans/algorithm_detail/slice_sans_event.py b/scripts/SANS/sans/algorithm_detail/slice_sans_event.py
index 021f308a1c48c45c92a9678d1bb4bd8fa78cbf76..86e727193e0992e5546e5bb8754f681b4d7c4086 100644
--- a/scripts/SANS/sans/algorithm_detail/slice_sans_event.py
+++ b/scripts/SANS/sans/algorithm_detail/slice_sans_event.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from SANSUtility import _clean_logs
from mantid.dataobjects import Workspace2D
from sans.common.constants import EMPTY_NAME
diff --git a/scripts/SANS/sans/algorithm_detail/strip_end_nans_and_infs.py b/scripts/SANS/sans/algorithm_detail/strip_end_nans_and_infs.py
index 02962641d2f847b78ec5f4ea407431c8848e2a92..3287449d852909580d8d2522892c4a4ffa49c6c8 100644
--- a/scripts/SANS/sans/algorithm_detail/strip_end_nans_and_infs.py
+++ b/scripts/SANS/sans/algorithm_detail/strip_end_nans_and_infs.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from math import (isinf, isnan)
from sans.common.constants import EMPTY_NAME
from sans.common.general_functions import create_child_algorithm
diff --git a/scripts/SANS/sans/algorithm_detail/xml_shapes.py b/scripts/SANS/sans/algorithm_detail/xml_shapes.py
index 76d765dcb4ed68051279ed45348a048e23886feb..583bd7001a8aef7fcb2573d9b24fe2107dcd3bcf 100644
--- a/scripts/SANS/sans/algorithm_detail/xml_shapes.py
+++ b/scripts/SANS/sans/algorithm_detail/xml_shapes.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from math import (pi, cos, sin)
from sans.common.enums import MaskingQuadrant
diff --git a/scripts/SANS/sans/command_interface/ISISCommandInterface.py b/scripts/SANS/sans/command_interface/ISISCommandInterface.py
index f1b85fe77713661ddbab0b7fa01b12bb1fa5957f..b4648c8091cf8dbd661593b16c938b35cf775cae 100644
--- a/scripts/SANS/sans/command_interface/ISISCommandInterface.py
+++ b/scripts/SANS/sans/command_interface/ISISCommandInterface.py
@@ -4,14 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import inspect
import os
import re
-import six
-from six import types
+import types
from SANSadd2 import add_runs
from mantid.api import (AnalysisDataService, WorkspaceGroup)
@@ -31,10 +28,6 @@ from sans.common.general_functions import (convert_bank_name_to_detector_type_is
from sans.gui_logic.models.RowEntries import RowEntries
from sans.sans_batch import SANSBatchReduction, SANSCentreFinder
-if six.PY2:
- # This can be swapped with in box FileNotFoundError
- FileNotFoundError = IOError
-
# Disable plotting if running outside Mantidplot
try:
diff --git a/scripts/SANS/sans/command_interface/batch_csv_parser.py b/scripts/SANS/sans/command_interface/batch_csv_parser.py
index 64d4417ef0fba37bbc90cf3f2e0825b71b73e007..bf4f71268b0586a0b4271baf44d89ed1d344e205 100644
--- a/scripts/SANS/sans/command_interface/batch_csv_parser.py
+++ b/scripts/SANS/sans/command_interface/batch_csv_parser.py
@@ -4,14 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import csv
import re
from csv import reader
from enum import Enum
-from mantid.py3compat import csv_open_type
from sans.common.constants import ALL_PERIODS
from sans.common.file_information import find_full_file_path
from sans.gui_logic.models.RowEntries import RowEntries
@@ -72,7 +69,7 @@ class BatchCsvParser(object):
for row in rows:
to_write.append(self._convert_row_to_list(row))
- with open(file_path, csv_open_type) as outfile:
+ with open(file_path, "w") as outfile:
writer_handle = csv.writer(outfile)
for line in to_write:
writer_handle.writerow(line)
diff --git a/scripts/SANS/sans/command_interface/command_interface_functions.py b/scripts/SANS/sans/command_interface/command_interface_functions.py
index b1edf7b22999463693f5aa128cabea1c1bc966ee..c5702ed52002ce769c25e6a2939b267d3bacccdb 100644
--- a/scripts/SANS/sans/command_interface/command_interface_functions.py
+++ b/scripts/SANS/sans/command_interface/command_interface_functions.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Logger
diff --git a/scripts/SANS/sans/command_interface/command_interface_state_director.py b/scripts/SANS/sans/command_interface/command_interface_state_director.py
index 4da3b57899710d187b99d7cc2cda5f1b88382372..95009f514966c201620b4608a546f09c8326d99d 100644
--- a/scripts/SANS/sans/command_interface/command_interface_state_director.py
+++ b/scripts/SANS/sans/command_interface/command_interface_state_director.py
@@ -4,9 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-from mantid.py3compat import Enum
+from enum import Enum
from sans.common.enums import DataType
from sans.common.file_information import SANSFileInformationFactory
from sans.state.StateRunDataBuilder import StateRunDataBuilder
diff --git a/scripts/SANS/sans/common/configurations.py b/scripts/SANS/sans/common/configurations.py
index f1bec969236312fcb60319cf6c435012759c27fd..2ed1353e419d497ddb2a1ff2c35a64dc3cd47228 100644
--- a/scripts/SANS/sans/common/configurations.py
+++ b/scripts/SANS/sans/common/configurations.py
@@ -7,8 +7,6 @@
""" The SANSConfigurations class holds instrument-specific configs to centralize instrument-specific magic numbers"""
# pylint: disable=too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
class Configurations(object):
diff --git a/scripts/SANS/sans/common/constants.py b/scripts/SANS/sans/common/constants.py
index 59a36544db0300263726750ff8235e8c1f672c56..039bb99d48958e5420867bd1b80125679d18581f 100644
--- a/scripts/SANS/sans/common/constants.py
+++ b/scripts/SANS/sans/common/constants.py
@@ -8,8 +8,6 @@
# pylint: disable=too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
# ----------------------------------------
# Property names for Algorithms
# ---------------------------------------
diff --git a/scripts/SANS/sans/common/enums.py b/scripts/SANS/sans/common/enums.py
index c02a235de1557c7900f9926b2b3f56c59500b485..00fd44bc7a3dd0646cdd276c35d09565f611dcdb 100644
--- a/scripts/SANS/sans/common/enums.py
+++ b/scripts/SANS/sans/common/enums.py
@@ -6,9 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" The elements of this module define typed enums which are used in the SANS reduction framework."""
-from __future__ import (absolute_import, division, print_function)
-
-from mantid.py3compat import Enum
+from enum import Enum
from sans.state.JsonSerializable import json_serializable
diff --git a/scripts/SANS/sans/common/file_information.py b/scripts/SANS/sans/common/file_information.py
index 867102bfe24e1ad6fd81d869f0a7c8889bc98675..314e7fe90fb0fcde3c83f8611338613a3964329a 100644
--- a/scripts/SANS/sans/common/file_information.py
+++ b/scripts/SANS/sans/common/file_information.py
@@ -8,7 +8,6 @@
# pylint: disable=too-few-public-methods, invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import h5py as h5
import re
@@ -18,8 +17,6 @@ from mantid.kernel import (DateAndTime, ConfigService, Logger)
from mantid.api import (AlgorithmManager, ExperimentInfo)
from sans.common.enums import (SANSInstrument, FileType, SampleShape)
from sans.common.general_functions import (get_instrument, instrument_name_correction, get_facility)
-from six import with_metaclass
-
# ----------------------------------------------------------------------------------------------------------------------
# Constants
# ----------------------------------------------------------------------------------------------------------------------
@@ -719,7 +716,7 @@ def get_geometry_information_raw(file_name):
# ----------------------------------------------------------------------------------------------------------------------
# SANS file Information
# ----------------------------------------------------------------------------------------------------------------------
-class SANSFileInformation(with_metaclass(ABCMeta, object)):
+class SANSFileInformation(metaclass=ABCMeta):
logger = Logger("SANS")
def __init__(self, full_file_name):
diff --git a/scripts/SANS/sans/common/general_functions.py b/scripts/SANS/sans/common/general_functions.py
index 64da771d430ef734cc395756ea1015bec3ffbd6b..a44e29072c31a0fa8e2944726c032b0ddb411f8d 100644
--- a/scripts/SANS/sans/common/general_functions.py
+++ b/scripts/SANS/sans/common/general_functions.py
@@ -8,7 +8,6 @@
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from math import (acos, sqrt, degrees)
import re
from copy import deepcopy
diff --git a/scripts/SANS/sans/common/log_tagger.py b/scripts/SANS/sans/common/log_tagger.py
index 3f44f2d2ccdd8ff193c41bd2e155b5d39b9938a7..4d1ca1b00d4081dd8ce79ffb7f4ca426f3a5b64f 100644
--- a/scripts/SANS/sans/common/log_tagger.py
+++ b/scripts/SANS/sans/common/log_tagger.py
@@ -8,10 +8,8 @@
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from hashlib import sha224
from mantid.api import (MatrixWorkspace, WorkspaceGroup)
-from six import string_types
def get_hash_value(value):
@@ -34,7 +32,7 @@ def check_if_valid_tag_and_workspace(tag, workspace):
:param tag: the tag
:param workspace: the workspace
"""
- if not(isinstance(tag, string_types) and isinstance(workspace, MatrixWorkspace)):
+ if not(isinstance(tag, str) and isinstance(workspace, MatrixWorkspace)):
raise RuntimeError("SANSLogTagger: Either tag {0} or workspace are invalid. The tag has to be a string"
" and the workspace {1} has to be a MatrixWorkspace".format(str(tag), str(workspace)))
diff --git a/scripts/SANS/sans/common/xml_parsing.py b/scripts/SANS/sans/common/xml_parsing.py
index f839d33a25ada015bff2a3c23da31e74009d05a8..34cfc21d71853d6df782ce620f11a0cb2efc6d12 100644
--- a/scripts/SANS/sans/common/xml_parsing.py
+++ b/scripts/SANS/sans/common/xml_parsing.py
@@ -8,8 +8,6 @@
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
try:
import xml.etree.cElementTree as eTree
except ImportError:
diff --git a/scripts/SANS/sans/gui_logic/models/RowEntries.py b/scripts/SANS/sans/gui_logic/models/RowEntries.py
index ee35d192ec481c0efd08c28a382aa3de32f5175a..3e602b7702ad9c9965fc291c801da7458f392bab 100644
--- a/scripts/SANS/sans/gui_logic/models/RowEntries.py
+++ b/scripts/SANS/sans/gui_logic/models/RowEntries.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import iteritems, iterkeys
from sans.common.enums import RowState, SampleShape
from sans.common.file_information import SANSFileInformationFactory
@@ -56,7 +55,7 @@ class RowEntries(_UserEntries):
self._start_observing = True # Allow init to use setattr without validation
- for k, v in iteritems(kwargs):
+ for k, v in kwargs.items():
setattr(self, k, v)
@property
@@ -100,7 +99,7 @@ class RowEntries(_UserEntries):
self.can_scatter_period, self.can_transmission_period, self.can_direct_period))
def is_empty(self):
- return not any(getattr(self, attr) for attr in iterkeys(self._data_vars))
+ return not any(getattr(self, attr) for attr in self._data_vars.keys())
def reset_row_state(self):
self.state = RowState.UNPROCESSED
diff --git a/scripts/SANS/sans/gui_logic/models/batch_process_runner.py b/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
index 4a15e81a4e94867f099c69f224127364c6eed9ec..9236e42b22e71c77663d13bdfe750a4fed7c7305 100644
--- a/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
+++ b/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
@@ -6,9 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import traceback
-import six
from qtpy.QtCore import Slot, QThreadPool, Signal, QObject
-from six import itervalues
from mantid.kernel import Logger
from sans.algorithm_detail.batch_execution import load_workspaces_from_states
@@ -73,10 +71,10 @@ class BatchProcessRunner(QObject):
assert len(states) + len(errors) == 1, \
"Expected 1 error to return got {0}".format(len(states) + len(errors))
- for error in itervalues(errors):
+ for error in errors.values():
self.row_failed_signal.emit(index, error)
- for state in itervalues(states):
+ for state in states.values():
try:
out_scale_factors, out_shift_factors = \
self.batch_processor([state], use_optimizations, output_mode, plot_results, output_graph, save_can)
@@ -100,10 +98,10 @@ class BatchProcessRunner(QObject):
self._handle_err(index, e)
continue
- for error in itervalues(errors):
+ for error in errors.values():
self.row_failed_signal.emit(index, error)
- for state in itervalues(states):
+ for state in states.values():
try:
load_workspaces_from_states(state)
self.row_processed_signal.emit(index, [], [])
@@ -113,7 +111,6 @@ class BatchProcessRunner(QObject):
def _handle_err(self, index, e):
# We manually have to extract out the traceback, since going to a str for Qt signals will strip this
- if six.PY3:
- self._logger.error(''.join(traceback.format_tb(e.__traceback__)))
+ self._logger.error(''.join(traceback.format_tb(e.__traceback__)))
self._logger.error(str(e))
self.row_failed_signal.emit(index, str(e))
diff --git a/scripts/SANS/sans/gui_logic/models/create_state.py b/scripts/SANS/sans/gui_logic/models/create_state.py
index 3638ddbdb5787cf6bad59d6c09f33e6acc4e45aa..3446c03d6a8dbea3cdb8f013d5d68a5cedef29a5 100644
--- a/scripts/SANS/sans/gui_logic/models/create_state.py
+++ b/scripts/SANS/sans/gui_logic/models/create_state.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from mantid.api import FileFinder
from sans.gui_logic.models.state_gui_model import StateGuiModel
diff --git a/scripts/SANS/sans/gui_logic/models/model_common.py b/scripts/SANS/sans/gui_logic/models/model_common.py
index 805164e0723f8103dcacf1c7a124a609cea5dd00..d78acffcabf57e6057ec514ba9bfd25dcfad7ff2 100644
--- a/scripts/SANS/sans/gui_logic/models/model_common.py
+++ b/scripts/SANS/sans/gui_logic/models/model_common.py
@@ -5,16 +5,12 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" The settings diagnostic tab which visualizes the SANS state object. """
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta
-from six import with_metaclass
-
from sans.common.enums import SANSInstrument
from sans.user_file.settings_tags import MonId, monitor_spectrum, DetectorId
-class ModelCommon(with_metaclass(ABCMeta)):
+class ModelCommon(metaclass=ABCMeta):
def __init__(self, user_file_items):
# Workaround to avoid refactoring becoming impossibly large
# TODO this should be encapsulated in sub-models
diff --git a/scripts/SANS/sans/gui_logic/models/settings_adjustment_model.py b/scripts/SANS/sans/gui_logic/models/settings_adjustment_model.py
index e0b61e44d3e6b50a96afccd8dc7b4b062b31fdb7..647fe72d44b53b8416f91537a58147953a7b1212 100644
--- a/scripts/SANS/sans/gui_logic/models/settings_adjustment_model.py
+++ b/scripts/SANS/sans/gui_logic/models/settings_adjustment_model.py
@@ -10,8 +10,6 @@ This is one of the two models which is used for the data reduction. It contains
are not available in the model associated with the data table.
"""
-from __future__ import (absolute_import, division, print_function)
-
from sans.common.enums import SANSInstrument, DataType, FitType, DetectorType
from sans.gui_logic.models.model_common import ModelCommon
from sans.user_file.settings_tags import TransId, MonId, FitId, fit_general, monitor_file
diff --git a/scripts/SANS/sans/gui_logic/models/state_gui_model.py b/scripts/SANS/sans/gui_logic/models/state_gui_model.py
index 844bb1f9b6bd40a04c850cdfeff30e8c664cf857..95a384078f5d413b32096794a373f76ef1a9e941 100644
--- a/scripts/SANS/sans/gui_logic/models/state_gui_model.py
+++ b/scripts/SANS/sans/gui_logic/models/state_gui_model.py
@@ -10,9 +10,6 @@ This is one of the two models which is used for the data reduction. It contains
are not available in the model associated with the data table.
"""
-from __future__ import (absolute_import, division, print_function)
-
-from mantid.py3compat import ensure_str
from sans.common.enums import (ReductionDimensionality, ReductionMode, RangeStepType, SaveType,
DetectorType)
from sans.gui_logic.models.model_common import ModelCommon
@@ -561,7 +558,7 @@ class StateGuiModel(ModelCommon):
@q_1d_rebin_string.setter
def q_1d_rebin_string(self, value):
- self._set_q_1d_limits(rebin_string=ensure_str(value))
+ self._set_q_1d_limits(rebin_string=value)
@property
def q_xy_max(self):
diff --git a/scripts/SANS/sans/gui_logic/models/table_model.py b/scripts/SANS/sans/gui_logic/models/table_model.py
index 8aa5d9e9cd250243c193ebd363e8d6f3e04895d7..bc889409aad60fc47f9dcab54feabf02f0f204ef 100644
--- a/scripts/SANS/sans/gui_logic/models/table_model.py
+++ b/scripts/SANS/sans/gui_logic/models/table_model.py
@@ -10,8 +10,6 @@ The main information in the table model are the run numbers and the selected per
information regarding the custom output name and the information in the options tab.
"""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import Logger
from sans.common.enums import RowState
from sans.gui_logic.models.RowEntries import RowEntries
diff --git a/scripts/SANS/sans/gui_logic/plotting.py b/scripts/SANS/sans/gui_logic/plotting.py
index 68bb30ede429241fa9793c73e4369591741a7c08..101114f3c5527fbceac3abac08b21fd02d7d8c6c 100644
--- a/scripts/SANS/sans/gui_logic/plotting.py
+++ b/scripts/SANS/sans/gui_logic/plotting.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import)
def get_plotting_module():
diff --git a/scripts/SANS/sans/gui_logic/presenter/add_runs_presenter.py b/scripts/SANS/sans/gui_logic/presenter/add_runs_presenter.py
index 28f82e19e11b54858d39b597bd28056bdeac3038..2f457a54b4d1af75ab2a9988d40e95e2ebe90d31 100644
--- a/scripts/SANS/sans/gui_logic/presenter/add_runs_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/add_runs_presenter.py
@@ -7,7 +7,7 @@
import os
from mantid.kernel import ConfigService
-from mantid.py3compat import Enum
+from enum import Enum
from sans.common.enums import BinningType
from sans.common.file_information import SANSFileInformationFactory
from sans.gui_logic.gui_common import SANSGuiPropertiesHandler
diff --git a/scripts/SANS/sans/gui_logic/presenter/beam_centre_presenter.py b/scripts/SANS/sans/gui_logic/presenter/beam_centre_presenter.py
index c91f96f0b5319f9671ec99aa277e9c781e27df65..a69e1b60b45f7c8fe8c543d4cdeb109076f2a400 100644
--- a/scripts/SANS/sans/gui_logic/presenter/beam_centre_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/beam_centre_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import copy
from mantid.kernel import Logger
diff --git a/scripts/SANS/sans/gui_logic/presenter/diagnostic_presenter.py b/scripts/SANS/sans/gui_logic/presenter/diagnostic_presenter.py
index 24a8f09f010b3aea27303565e9c0a87813026ae0..02889d8e6c67b3f3329535e3cbc7f0744e2c34dc 100644
--- a/scripts/SANS/sans/gui_logic/presenter/diagnostic_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/diagnostic_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import Logger
from ui.sans_isis.diagnostics_page import DiagnosticsPage
from ui.sans_isis.work_handler import WorkHandler
diff --git a/scripts/SANS/sans/gui_logic/presenter/gui_state_director.py b/scripts/SANS/sans/gui_logic/presenter/gui_state_director.py
index 169601fbac75c3ab285346149591e3e40bd02a74..c31fd97ed3b7386e973dc6fa969d8246a515826b 100644
--- a/scripts/SANS/sans/gui_logic/presenter/gui_state_director.py
+++ b/scripts/SANS/sans/gui_logic/presenter/gui_state_director.py
@@ -10,8 +10,6 @@ The GuiStateDirector gets the information from the table and state model and gen
the main part of the work to an StateDirectorISIS object.
"""
-from __future__ import (absolute_import, division, print_function)
-
import copy
from sans.common.file_information import SANSFileInformationBlank
diff --git a/scripts/SANS/sans/gui_logic/presenter/masking_table_presenter.py b/scripts/SANS/sans/gui_logic/presenter/masking_table_presenter.py
index a243d1478e5e9f71230cd5131e96a42063b5f19d..3061d98e5cf5a7d4bbbb84a0bfa682bbe6f5c0bb 100644
--- a/scripts/SANS/sans/gui_logic/presenter/masking_table_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/masking_table_presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" The presenter associated with the masking table view. """
-from __future__ import (absolute_import, division, print_function)
-
from collections import namedtuple
import copy
diff --git a/scripts/SANS/sans/gui_logic/presenter/presenter_common.py b/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
index 3f250ac1e020ba956c6b11cf4e314dc2dbba87ca..713e20692be7f4793e83c169369d3d02cc95b2a9 100644
--- a/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
+++ b/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
@@ -10,13 +10,10 @@ This abstract class allows other presenters to share functions which set attribu
the view or retrieve them from the view
"""
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-class PresenterCommon(with_metaclass(ABCMeta)):
+class PresenterCommon(metaclass=ABCMeta):
def __init__(self, view, model):
self._view = view
self._model = model
diff --git a/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py b/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py
index 4fe9f609ce592f432c50e2319192c65668df4654..e4fd6c0c37da97a6f8d7cccfaac67179979d5182 100644
--- a/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py
@@ -10,8 +10,6 @@ This presenter is essentially the brain of the reduction gui. It controls other
for presenting and generating the reduction settings.
"""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import os
import time
diff --git a/scripts/SANS/sans/gui_logic/presenter/settings_adjustment_presenter.py b/scripts/SANS/sans/gui_logic/presenter/settings_adjustment_presenter.py
index a4fc306c30393b91368b341d2ce11cfbc7a1e339..36da3766239a1fed15ce56adfcaa58ceb73a5964 100644
--- a/scripts/SANS/sans/gui_logic/presenter/settings_adjustment_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/settings_adjustment_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" The settings diagnostic tab which visualizes the SANS state object. """
-from __future__ import (absolute_import, division, print_function)
-
import copy
from sans.common.enums import FitType
diff --git a/scripts/SANS/sans/gui_logic/presenter/settings_diagnostic_presenter.py b/scripts/SANS/sans/gui_logic/presenter/settings_diagnostic_presenter.py
index 688106be1379034f28609ba16d1f7b12446d3c6a..74b476104fe3b0c4bfb97759011ec7ccfe425159 100644
--- a/scripts/SANS/sans/gui_logic/presenter/settings_diagnostic_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/settings_diagnostic_presenter.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" The settings diagnostic tab which visualizes the SANS state object. """
-from __future__ import (absolute_import, division, print_function)
-
-
import os
import json
diff --git a/scripts/SANS/sans/sans_batch.py b/scripts/SANS/sans/sans_batch.py
index 1302bca43c24b75ee6fbfa3e4375f8bc1bdae9d1..94cd8f6dd2387e5886206409c2f4f21d22912481 100644
--- a/scripts/SANS/sans/sans_batch.py
+++ b/scripts/SANS/sans/sans_batch.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
""" SANBatchReduction algorithm is the starting point for any new type reduction, event single reduction"""
-from __future__ import (absolute_import, division, print_function)
from sans.state.AllStates import AllStates
from sans.algorithm_detail.batch_execution import (single_reduction_for_batch)
from sans.common.enums import (OutputMode, FindDirectionEnum, DetectorType)
diff --git a/scripts/SANS/sans/state/AllStates.py b/scripts/SANS/sans/state/AllStates.py
index cc13dbc0f675520a59bfd6fcbc7bc0b05554b6b8..43c56bee76ef855c475d547f871924a32a47c3be 100644
--- a/scripts/SANS/sans/state/AllStates.py
+++ b/scripts/SANS/sans/state/AllStates.py
@@ -5,13 +5,9 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the main State object."""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import json
-from six import with_metaclass
-
from sans.common.enums import SANSFacility
from sans.state.JsonSerializable import JsonSerializable
from sans.state.StateObjects.StateCompatibility import get_compatibility_builder
@@ -24,7 +20,7 @@ from sans.state.automatic_setters import automatic_setters
# State
# ----------------------------------------------------------------------------------------------------------------------
-class AllStates(with_metaclass(JsonSerializable)):
+class AllStates(metaclass=JsonSerializable):
def __init__(self):
diff --git a/scripts/SANS/sans/state/IStateParser.py b/scripts/SANS/sans/state/IStateParser.py
index 113027855f667a41ae3ab53de479f9b8e903aa14..5471192a7269f468e90a2d9fed8691566fe20b39 100644
--- a/scripts/SANS/sans/state/IStateParser.py
+++ b/scripts/SANS/sans/state/IStateParser.py
@@ -6,12 +6,10 @@
# SPDX - License - Identifier: GPL - 3.0 +
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
from sans.state.AllStates import AllStates
-class IStateParser(with_metaclass(ABCMeta)):
+class IStateParser(metaclass=ABCMeta):
def get_all_states(self): # -> AllStates
all_states = AllStates()
all_states.data = self.get_state_data()
diff --git a/scripts/SANS/sans/state/JsonSerializable.py b/scripts/SANS/sans/state/JsonSerializable.py
index 603455249f79efc74c4d45258b585ffa6498c9bd..091f462c493dcc4fcf6da1dccced3618eea8990a 100644
--- a/scripts/SANS/sans/state/JsonSerializable.py
+++ b/scripts/SANS/sans/state/JsonSerializable.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from enum import Enum
diff --git a/scripts/SANS/sans/state/Serializer.py b/scripts/SANS/sans/state/Serializer.py
index 64c168574760688b6a9ce9209e8da2ef897411a6..d75fe4c9b570bd078b9e60bea7d6594fb29de1bd 100644
--- a/scripts/SANS/sans/state/Serializer.py
+++ b/scripts/SANS/sans/state/Serializer.py
@@ -7,7 +7,6 @@
import json
from enum import Enum
-import six
from sans.state.JsonSerializable import JsonSerializable
@@ -53,7 +52,7 @@ class SerializerImpl(json.JSONEncoder):
@staticmethod
def obj_hook(o):
for type_tag, internal_dict in o.items():
- assert isinstance(type_tag, six.string_types)
+ assert isinstance(type_tag, str)
cls_type = JsonSerializable.class_type_from_tag(type_tag)
if cls_type:
diff --git a/scripts/SANS/sans/state/StateObjects/StateAdjustment.py b/scripts/SANS/sans/state/StateObjects/StateAdjustment.py
index fb2a638258a1121175fcbdac3bbbda117fd5e664..9f47aa83cf2c12e5ee92dcb987e98fb43c72eff3 100644
--- a/scripts/SANS/sans/state/StateObjects/StateAdjustment.py
+++ b/scripts/SANS/sans/state/StateObjects/StateAdjustment.py
@@ -8,19 +8,15 @@
"""State describing the adjustment workspace creation of the SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import json
-from six import with_metaclass
-
from sans.common.enums import SANSFacility
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
-class StateAdjustment(with_metaclass(JsonSerializable)):
+class StateAdjustment(metaclass=JsonSerializable):
def __init__(self):
super(StateAdjustment, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py b/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
index 41940749be68de96b3830209ec9f0fb6e684acbd..c98c04f6a761d3d2ae51aec7568aee291c9cfc98 100644
--- a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
+++ b/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
@@ -8,11 +8,9 @@
"""State describing the calculation of the transmission for SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
import abc
-from six import with_metaclass, itervalues, add_metaclass
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (RebinType, RangeStepType, FitType, DataType, SANSInstrument)
@@ -23,7 +21,7 @@ from sans.state.state_functions import (is_pure_none_or_not_none, validation_mes
from sans.common.xml_parsing import get_named_elements_from_ipf_file
-class StateTransmissionFit(with_metaclass(JsonSerializable)):
+class StateTransmissionFit(metaclass=JsonSerializable):
def __init__(self):
super(StateTransmissionFit, self).__init__()
@@ -59,7 +57,7 @@ class StateTransmissionFit(with_metaclass(JsonSerializable)):
"Please see: {0}".format(json.dumps(is_invalid)))
-class StateCalculateTransmission(with_metaclass(JsonSerializable)):
+class StateCalculateTransmission(metaclass=JsonSerializable):
def __init__(self):
super(StateCalculateTransmission, self).__init__()
# -----------------------
@@ -257,7 +255,7 @@ class StateCalculateTransmission(with_metaclass(JsonSerializable)):
"background_TOF_monitor_stop": self.background_TOF_monitor_stop})
is_invalid.update(entry)
- for fit_type in itervalues(self.fit):
+ for fit_type in self.fit.values():
fit_type.validate()
if is_invalid:
@@ -337,8 +335,7 @@ def set_default_monitors(calculate_transmission_info, data_info):
# ---------------------------------------
# State builders
# ---------------------------------------
-@add_metaclass(abc.ABCMeta)
-class StateCalculateTransmissionBuilderCommon(object):
+class StateCalculateTransmissionBuilderCommon(object, metaclass=abc.ABCMeta):
def __init__(self, state):
self.state = state
diff --git a/scripts/SANS/sans/state/StateObjects/StateCompatibility.py b/scripts/SANS/sans/state/StateObjects/StateCompatibility.py
index e8cffd6825f9b92df989f41ed1410ff5bb4ea12e..9ca7c67d9491b35cf4460bd215d686bada6b956f 100644
--- a/scripts/SANS/sans/state/StateObjects/StateCompatibility.py
+++ b/scripts/SANS/sans/state/StateObjects/StateCompatibility.py
@@ -12,11 +12,8 @@
that we are dealing with a bug
"""
-from __future__ import (absolute_import, division, print_function)
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import SANSFacility
@@ -28,7 +25,7 @@ from sans.common.enums import SANSFacility
from sans.state.automatic_setters import automatic_setters
-class StateCompatibility(with_metaclass(JsonSerializable)):
+class StateCompatibility(metaclass=JsonSerializable):
def __init__(self):
super(StateCompatibility, self).__init__()
self.use_compatibility_mode = False # : Bool
diff --git a/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py b/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py
index 6084b6019efc074376e732e071d2cbb4f5d6c127..c569f22241cbf19eef98010f31cf64906550ee66 100644
--- a/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py
+++ b/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py
@@ -8,12 +8,9 @@
"""State describing the conversion to momentum transfer"""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (ReductionDimensionality, RangeStepType, SANSFacility)
from sans.state.automatic_setters import automatic_setters
@@ -25,7 +22,7 @@ from sans.state.state_functions import (is_pure_none_or_not_none, is_not_none_an
# State
# ----------------------------------------------------------------------------------------------------------------------
-class StateConvertToQ(with_metaclass(JsonSerializable)):
+class StateConvertToQ(metaclass=JsonSerializable):
def __init__(self):
super(StateConvertToQ, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateData.py b/scripts/SANS/sans/state/StateObjects/StateData.py
index a4ce9cb3e64d35fa997f62e559b68a0e7b7354cb..b56dbdbaedbbd1ccba7167489e96833e717d7b08 100644
--- a/scripts/SANS/sans/state/StateObjects/StateData.py
+++ b/scripts/SANS/sans/state/StateObjects/StateData.py
@@ -7,12 +7,9 @@
# pylint: disable=too-few-public-methods
"""State about the actual data which is to be reduced."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import SANSFacility, SANSInstrument
import sans.common.constants
@@ -24,7 +21,7 @@ from sans.state.state_functions import (is_pure_none_or_not_none, validation_mes
# State
# ----------------------------------------------------------------------------------------------------------------------
-class StateData(with_metaclass(JsonSerializable)):
+class StateData(metaclass=JsonSerializable):
ALL_PERIODS = sans.common.constants.ALL_PERIODS
def __init__(self):
diff --git a/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py b/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py
index e5720e82c828668228d751cbb90ae4ab185fc533..5d97c566ea9d1049c14c73dcaf313dcaf8d6cbb6 100644
--- a/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py
+++ b/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py
@@ -8,12 +8,9 @@
"""State describing the masking behaviour of the SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
from sans.state.state_functions import (is_pure_none_or_not_none, validation_message, set_detector_names)
@@ -83,7 +80,7 @@ def is_spectrum_range_all_on_one_detector(start, stop, invalid_dict, start_name,
# StateData
# ------------------------------------------------
-class StateMaskDetectors(with_metaclass(JsonSerializable)):
+class StateMaskDetectors(metaclass=JsonSerializable):
def __init__(self):
super(StateMaskDetectors, self).__init__()
# Vertical strip masks
@@ -171,7 +168,7 @@ class StateMaskDetectors(with_metaclass(JsonSerializable)):
"Please see: {0}".format(json.dumps(is_invalid)))
-class StateMask(with_metaclass(JsonSerializable)):
+class StateMask(metaclass=JsonSerializable):
def __init__(self):
super(StateMask, self).__init__()
# Radius Mask
diff --git a/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py b/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py
index 58e2f6db13dedb1bcf8b2a9ff738acaf09be5682..8f40b5f15835537f59d006dac570cc08d75c1217 100644
--- a/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py
+++ b/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py
@@ -8,13 +8,9 @@
"""State for moving workspaces."""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import json
-from six import with_metaclass
-
from sans.common.enums import (CanonicalCoordinates, SANSInstrument, DetectorType)
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
@@ -25,7 +21,7 @@ from sans.state.state_functions import (validation_message, set_detector_names,
# State
# ----------------------------------------------------------------------------------------------------------------------
-class StateMoveDetectors(with_metaclass(JsonSerializable)):
+class StateMoveDetectors(metaclass=JsonSerializable):
def __init__(self):
super(StateMoveDetectors, self).__init__()
# Translation correction
@@ -66,7 +62,7 @@ class StateMoveDetectors(with_metaclass(JsonSerializable)):
"Please see: {0}".format(json.dumps(is_invalid)))
-class StateMove(with_metaclass(JsonSerializable)):
+class StateMove(metaclass=JsonSerializable):
def __init__(self):
super(StateMove, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py b/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py
index 1c3b2bc3d33c8cbac70484cd0ed257ddbf198272..ad936dbd5825912500fa4f877257c489445b273f 100644
--- a/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py
+++ b/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py
@@ -8,12 +8,9 @@
"""State describing the normalization to the incident monitor for SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (RebinType, RangeStepType, SANSInstrument)
from sans.state.automatic_setters import automatic_setters
@@ -22,7 +19,7 @@ from sans.state.state_functions import (is_pure_none_or_not_none, is_not_none_an
from sans.common.xml_parsing import get_named_elements_from_ipf_file
-class StateNormalizeToMonitor(with_metaclass(JsonSerializable)):
+class StateNormalizeToMonitor(metaclass=JsonSerializable):
def __init__(self):
super(StateNormalizeToMonitor, self).__init__()
self.prompt_peak_correction_min = None # : Float (Optional)
diff --git a/scripts/SANS/sans/state/StateObjects/StateReductionMode.py b/scripts/SANS/sans/state/StateObjects/StateReductionMode.py
index 26e42ec18bac9cd52d234585762218ff791923e1..8f42a8b05f4765a3af8338c7f2ac26cc47ea2b47 100644
--- a/scripts/SANS/sans/state/StateObjects/StateReductionMode.py
+++ b/scripts/SANS/sans/state/StateObjects/StateReductionMode.py
@@ -6,13 +6,9 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the state of the reduction."""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import json
-from six import (with_metaclass)
-
from sans.common.enums import (ReductionMode, ReductionDimensionality, FitModeForMerge,
SANSFacility, DetectorType)
from sans.common.xml_parsing import get_named_elements_from_ipf_file
@@ -20,7 +16,7 @@ from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
-class StateReductionMode(with_metaclass(JsonSerializable)):
+class StateReductionMode(metaclass=JsonSerializable):
def __init__(self):
super(StateReductionMode, self).__init__()
self.reduction_mode = ReductionMode.LAB
diff --git a/scripts/SANS/sans/state/StateObjects/StateSave.py b/scripts/SANS/sans/state/StateObjects/StateSave.py
index af2f9a70158b707096e7feebfdfe17950e631ae5..5309ea1cf560259cc8624012b630afb1064e519c 100644
--- a/scripts/SANS/sans/state/StateObjects/StateSave.py
+++ b/scripts/SANS/sans/state/StateObjects/StateSave.py
@@ -8,17 +8,14 @@
""" Defines the state of saving."""
-from __future__ import (absolute_import, division, print_function)
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (SaveType, SANSFacility)
from sans.state.automatic_setters import automatic_setters
-class StateSave(with_metaclass(JsonSerializable)):
+class StateSave(metaclass=JsonSerializable):
def __init__(self):
super(StateSave, self).__init__()
self.zero_free_correction = True # : Bool
diff --git a/scripts/SANS/sans/state/StateObjects/StateScale.py b/scripts/SANS/sans/state/StateObjects/StateScale.py
index 2538e3108c864db406ccd1395746f7df914e9419..f54dad2b6839bc9fedbcea66e07e26e9ce448563 100644
--- a/scripts/SANS/sans/state/StateObjects/StateScale.py
+++ b/scripts/SANS/sans/state/StateObjects/StateScale.py
@@ -6,11 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the state of the geometry and unit scaling."""
-from __future__ import (absolute_import, division, print_function)
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import SampleShape, SANSFacility
@@ -21,7 +18,7 @@ from sans.common.enums import SampleShape, SANSFacility
from sans.state.automatic_setters import automatic_setters
-class StateScale(with_metaclass(JsonSerializable)):
+class StateScale(metaclass=JsonSerializable):
def __init__(self):
super(StateScale, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py b/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py
index f9fbb9a8058cdc783e0d2bac0b968d1beea78874..bb31aaa83547f33d95a6d9902ed8e79bb54f14f6 100644
--- a/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py
+++ b/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py
@@ -6,12 +6,9 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the state of the event slices which should be reduced."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
from sans.state.state_functions import (is_pure_none_or_not_none, validation_message)
@@ -22,7 +19,7 @@ from sans.common.enums import SANSFacility
# State
# ----------------------------------------------------------------------------------------------------------------------
-class StateSliceEvent(with_metaclass(JsonSerializable)):
+class StateSliceEvent(metaclass=JsonSerializable):
def __init__(self):
super(StateSliceEvent, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateWavelength.py b/scripts/SANS/sans/state/StateObjects/StateWavelength.py
index 349bca141b5521fb086b7fb6bd64ba4a2d66236c..0e35502c83bc74f3c0eef6c049d20be0599ab116 100644
--- a/scripts/SANS/sans/state/StateObjects/StateWavelength.py
+++ b/scripts/SANS/sans/state/StateObjects/StateWavelength.py
@@ -6,19 +6,16 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the state of the event slices which should be reduced."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (RebinType, RangeStepType, SANSFacility)
from sans.state.automatic_setters import automatic_setters
from sans.state.state_functions import (is_not_none_and_first_larger_than_second, one_is_none, validation_message)
-class StateWavelength(with_metaclass(JsonSerializable)):
+class StateWavelength(metaclass=JsonSerializable):
def __init__(self):
super(StateWavelength, self).__init__()
self.rebin_type = RebinType.REBIN
diff --git a/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py b/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py
index b358a189a75f8493ed29a1bf78eb4adf1480921f..b7248b1481994cef9b071df8ce32c2aa6a056813 100644
--- a/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py
+++ b/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py
@@ -8,19 +8,16 @@
"""State describing the creation of pixel and wavelength adjustment workspaces for SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
from sans.state.state_functions import (is_not_none_and_first_larger_than_second, one_is_none, validation_message)
from sans.common.enums import (RangeStepType, DetectorType, SANSFacility)
-class StateAdjustmentFiles(with_metaclass(JsonSerializable)):
+class StateAdjustmentFiles(metaclass=JsonSerializable):
def __init__(self):
super(StateAdjustmentFiles, self).__init__()
self.pixel_adjustment_file = None # : Str()
@@ -36,7 +33,7 @@ class StateAdjustmentFiles(with_metaclass(JsonSerializable)):
"Please see: {0}".format(json.dumps(is_invalid)))
-class StateWavelengthAndPixelAdjustment(with_metaclass(JsonSerializable)):
+class StateWavelengthAndPixelAdjustment(metaclass=JsonSerializable):
def __init__(self):
super(StateWavelengthAndPixelAdjustment, self).__init__()
self.wavelength_low = None # : List[Float] (Positive)
diff --git a/scripts/SANS/sans/state/automatic_setters.py b/scripts/SANS/sans/state/automatic_setters.py
index 07b7b08db266cd7754252657a7c38b0856588f27..f132c6f38cd912d07ec1779381c159fa2d73e418 100644
--- a/scripts/SANS/sans/state/automatic_setters.py
+++ b/scripts/SANS/sans/state/automatic_setters.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from functools import (partial, wraps)
import inspect
diff --git a/scripts/SANS/sans/state/state_functions.py b/scripts/SANS/sans/state/state_functions.py
index f62636079d69955817bc9bacfa11817b04bffc53..f83f0cf228c36563b4278ed45984512f36d2d4af 100644
--- a/scripts/SANS/sans/state/state_functions.py
+++ b/scripts/SANS/sans/state/state_functions.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Set of general purpose functions which are related to the SANSState approach."""
-from __future__ import (absolute_import, division, print_function)
-
from sans.common.enums import (DetectorType)
from sans.common.xml_parsing import (get_monitor_names_from_idf_file, get_named_elements_from_ipf_file)
diff --git a/scripts/SANS/sans/test_helper/mock_objects.py b/scripts/SANS/sans/test_helper/mock_objects.py
index c4b275d8a2f215259ba5af6e7cbc864724ebbb3d..54124d691afba235083e748fb394b51edf9ee715 100644
--- a/scripts/SANS/sans/test_helper/mock_objects.py
+++ b/scripts/SANS/sans/test_helper/mock_objects.py
@@ -4,13 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import)
-
from functools import (partial)
-from six import with_metaclass
-
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.run_tab_presenter import RunTabPresenter
from sans.common.enums import (RangeStepType, OutputMode, SANSFacility, SANSInstrument)
from sans.state.JsonSerializable import JsonSerializable
@@ -240,7 +236,7 @@ def create_mock_view2(user_file_path, batch_file_path=None):
return view
-class FakeState(with_metaclass(JsonSerializable)):
+class FakeState(metaclass=JsonSerializable):
def __init__(self):
super(FakeState, self).__init__()
self.dummy_state = "dummy_state"
diff --git a/scripts/SANS/sans/test_helper/test_director.py b/scripts/SANS/sans/test_helper/test_director.py
index a82aaf1363f97dd296105b57f5489d3d2f57ef73..2f217368778f7a22ba51dca2bcee0002c0a3df05 100644
--- a/scripts/SANS/sans/test_helper/test_director.py
+++ b/scripts/SANS/sans/test_helper/test_director.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" A Test director """
-from __future__ import (absolute_import, division, print_function)
from sans.state.StateObjects.StateData import get_data_builder
from sans.state.StateObjects.StateMoveDetectors import get_move_builder
from sans.state.StateObjects.StateReductionMode import get_reduction_mode_builder
diff --git a/scripts/SANS/sans/test_helper/user_file_test_helper.py b/scripts/SANS/sans/test_helper/user_file_test_helper.py
index 99467a5006e7e0b70f6a825bc742fcff8258820c..66e10dc04be82b136e550b9e09e430117b477285 100644
--- a/scripts/SANS/sans/test_helper/user_file_test_helper.py
+++ b/scripts/SANS/sans/test_helper/user_file_test_helper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import tempfile
base_user_file = ("PRINT for changer\n"
diff --git a/scripts/SANS/sans/user_file/settings_tags.py b/scripts/SANS/sans/user_file/settings_tags.py
index 37966f394e6ab83d95a36dce414e5ee610fec5ab..ac0f3795f001da25bf4dd5eaaa4a69738b17e1cc 100644
--- a/scripts/SANS/sans/user_file/settings_tags.py
+++ b/scripts/SANS/sans/user_file/settings_tags.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from collections import namedtuple
-from mantid.py3compat import Enum
+from enum import Enum
# ----------------------------------------------------------------------------------------------------------------------
# Named tuples for passing around data in a structured way, a bit like a plain old c-struct.
diff --git a/scripts/SANS/sans/user_file/user_file_parser.py b/scripts/SANS/sans/user_file/user_file_parser.py
index 49d80d182f9330017f1554c9cbedbca85d27e207..e4b7618d37e02cc81ecf70d1346586b079c5f3e9 100644
--- a/scripts/SANS/sans/user_file/user_file_parser.py
+++ b/scripts/SANS/sans/user_file/user_file_parser.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-lines, invalid-name, too-many-instance-attributes, too-many-branches, too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import abc
import re
from math import copysign
diff --git a/scripts/SANS/sans/user_file/user_file_reader.py b/scripts/SANS/sans/user_file/user_file_reader.py
index 9641f2e638c3a35f4bf0899025e2f429967a32dc..25ea4e1a1c84701504fa797c3c046e6878823415 100644
--- a/scripts/SANS/sans/user_file/user_file_reader.py
+++ b/scripts/SANS/sans/user_file/user_file_reader.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from sans.common.file_information import find_full_file_path
from sans.user_file.user_file_parser import UserFileParser
diff --git a/scripts/SCD_Reduction/BVGFitTools.py b/scripts/SCD_Reduction/BVGFitTools.py
index 20afbd64d45cb87d5358ddce50201af4585deb00..8a8ae09f2221aa8f1597ec5b2ee5e99ab543ef23 100644
--- a/scripts/SCD_Reduction/BVGFitTools.py
+++ b/scripts/SCD_Reduction/BVGFitTools.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import matplotlib.pyplot as plt
import ICCFitTools as ICCFT
diff --git a/scripts/SCD_Reduction/ICCFitTools.py b/scripts/SCD_Reduction/ICCFitTools.py
index 333bbee867610ec25fc4d4f9c9af81e747ac8db0..b566fabe9f844837bcfb103b3ff9f434356f2df3 100644
--- a/scripts/SCD_Reduction/ICCFitTools.py
+++ b/scripts/SCD_Reduction/ICCFitTools.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import matplotlib.pyplot as plt
import numpy as np
import sys
diff --git a/scripts/SCD_Reduction/ReduceDictionary.py b/scripts/SCD_Reduction/ReduceDictionary.py
index f9a1615947f883dda04005f3373188dbce389841..558d66775d4bd9f262d3406227de4b510404160b 100644
--- a/scripts/SCD_Reduction/ReduceDictionary.py
+++ b/scripts/SCD_Reduction/ReduceDictionary.py
@@ -19,7 +19,6 @@
# The run numbers themselves may be specified as a comma separated list of
# individual run numbers, or ranges specified with a colon separator.
#
-from __future__ import (absolute_import, division, print_function)
def LoadDictionary( *filenames, **kwargs ):
diff --git a/scripts/SCD_Reduction/ReduceSCD_OneRun.py b/scripts/SCD_Reduction/ReduceSCD_OneRun.py
index d35a0e36268acd24f5eb643305254fc60e0b7c4b..7f326ba5657aa51070fbded0b00268074fe0a9fd 100644
--- a/scripts/SCD_Reduction/ReduceSCD_OneRun.py
+++ b/scripts/SCD_Reduction/ReduceSCD_OneRun.py
@@ -41,7 +41,6 @@
# the use of either monitor counts (True) or proton charge (False) for
# scaling.
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import time
diff --git a/scripts/SCD_Reduction/ReduceSCD_Parallel.py b/scripts/SCD_Reduction/ReduceSCD_Parallel.py
index 0704b04f9bafd29315b01688e3c8f65df7d2f507..b4bd6f57a6a1d3551f90400a4d8f62971e321a0b 100644
--- a/scripts/SCD_Reduction/ReduceSCD_Parallel.py
+++ b/scripts/SCD_Reduction/ReduceSCD_Parallel.py
@@ -40,7 +40,6 @@
# run or the loaded matirix instead of the default FFT method
#
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import threading
diff --git a/scripts/SCD_Reduction/SCDCalibratePanelsResults.py b/scripts/SCD_Reduction/SCDCalibratePanelsResults.py
index 1d894a8ce841a732a2a65fa758ecba561b87805c..bdddb5f7fbb8e2b802fca4369d727922bce20c0e 100755
--- a/scripts/SCD_Reduction/SCDCalibratePanelsResults.py
+++ b/scripts/SCD_Reduction/SCDCalibratePanelsResults.py
@@ -10,7 +10,6 @@ Plot data in SCDcalib.log file from Mantid SCD Calibration.
A. J. Schultz, V. E. Lynch, August 2015
"""
-from __future__ import (absolute_import, division, print_function)
import pylab
import os
import math
diff --git a/scripts/SliceViewAnimator.py b/scripts/SliceViewAnimator.py
index c965c4f64eac171b15544b3b32222a0c5e674321..8cc2701b20006174a07e8aa6a825800e20a7a3d1 100644
--- a/scripts/SliceViewAnimator.py
+++ b/scripts/SliceViewAnimator.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import numpy
from wand.image import Image
from wand.drawing import Drawing
diff --git a/scripts/TemporaryREF_MScripts/testCenterREF_M.py b/scripts/TemporaryREF_MScripts/testCenterREF_M.py
index 9eae563e35387b64e89c3594e63b4b59a5ff242a..84cd1881356a1d087cc9f5a673422e828af418c9 100644
--- a/scripts/TemporaryREF_MScripts/testCenterREF_M.py
+++ b/scripts/TemporaryREF_MScripts/testCenterREF_M.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import mantid
diff --git a/scripts/TofConverter.py b/scripts/TofConverter.py
index 315bd032a038d5e46b07472243b9eb540888d06a..b3771cf72ff9d9a924e49321d49fa524043270f1 100644
--- a/scripts/TofConverter.py
+++ b/scripts/TofConverter.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from TofConverter import converterGUI
from mantidqt.gui_helper import get_qapplication
diff --git a/scripts/TofConverter/convertUnits.py b/scripts/TofConverter/convertUnits.py
index 1c916c6d3eea61745caad40328ab6fcebc46ac3e..de2fddb9e87e40033c84fe4b4ee35d37d419e496 100644
--- a/scripts/TofConverter/convertUnits.py
+++ b/scripts/TofConverter/convertUnits.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-branches
-from __future__ import (absolute_import, division, print_function)
import math
# Used by converter GUI to do unit conversions
diff --git a/scripts/TofConverter/converterGUI.py b/scripts/TofConverter/converterGUI.py
index 6e2de610d9ff1e2864f9b2a5b8b4ec02e5490347..44c95ca0433ba9b52a6b29a11a8381d01c3fe7ca 100644
--- a/scripts/TofConverter/converterGUI.py
+++ b/scripts/TofConverter/converterGUI.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import QMainWindow, QMessageBox
from qtpy.QtGui import QDoubleValidator
from qtpy import QtCore
diff --git a/scripts/Vates/SXD_NaCl.py b/scripts/Vates/SXD_NaCl.py
index f70465c2f88c86ef74ceb7cc5fe4b664d14b105f..38b3c6f505194cd952ee135cf08118cc80b7a172 100644
--- a/scripts/Vates/SXD_NaCl.py
+++ b/scripts/Vates/SXD_NaCl.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as mantid
diff --git a/scripts/directtools/__init__.py b/scripts/directtools/__init__.py
index b52c44adb2f81a9aec0e8c0b90685e9af018d79c..987286546ade402616ad7d3aeb8e417a10a422bf 100644
--- a/scripts/directtools/__init__.py
+++ b/scripts/directtools/__init__.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import collections
from directtools import _validate
from mantid import logger, mtd
diff --git a/scripts/directtools/_validate.py b/scripts/directtools/_validate.py
index 72d67a16ce117700d1f3dcd0970184d5bb63205d..e69a20155fa42fbdaabaa947d15e1596d488260a 100644
--- a/scripts/directtools/_validate.py
+++ b/scripts/directtools/_validate.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
def _isDOS(workspace):
diff --git a/scripts/plotting_test.py b/scripts/plotting_test.py
index 91df6bc12ec2e31b361863bad90b3f30a27739a8..cecfc43b99b0790db59090860839455a90687e24 100644
--- a/scripts/plotting_test.py
+++ b/scripts/plotting_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from PyQt4 import QtGui
import sys
diff --git a/scripts/pythonTSV.py b/scripts/pythonTSV.py
index 4143018b2d143be79e13b61c30c0281d2ba0f35a..d422e447dfbeeea1b48b993ede10c3706d9ab2a0 100644
--- a/scripts/pythonTSV.py
+++ b/scripts/pythonTSV.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
"""
Some simple helpers for dealing with the TSV
"""
diff --git a/scripts/reducer_singleton.py b/scripts/reducer_singleton.py
index e259d5dcd5609f2d7165076243620e67a764c0df..bd3ca52725b6b6c3f95905d90e19be7e191026b3 100644
--- a/scripts/reducer_singleton.py
+++ b/scripts/reducer_singleton.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import random
import string
import os
diff --git a/scripts/reduction/__init__.py b/scripts/reduction/__init__.py
index 65c20f65fb36ae621a4e42a08c2068d633fd472b..4b9ad48081b83eef158cba2ab6a9eb432011c525 100644
--- a/scripts/reduction/__init__.py
+++ b/scripts/reduction/__init__.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from reduction.reducer import * # noqa: F401
from reduction.instrument import * # noqa: F401
from reduction.find_data import find_data, find_file # noqa: F401
diff --git a/scripts/reduction/command_interface.py b/scripts/reduction/command_interface.py
index d8cfa7f3377958812c4aa4cb47da8982d99e375c..a749ca08d1e288fa9dd0346d5bb342c9c1d3db7d 100644
--- a/scripts/reduction/command_interface.py
+++ b/scripts/reduction/command_interface.py
@@ -8,7 +8,6 @@
"""
List of user commands.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction.reducer import Reducer
diff --git a/scripts/reduction/find_data.py b/scripts/reduction/find_data.py
index 3adb286336d6462673b3543eb4c16c31360d861c..dbd1d7909179e48b881216b402410a4e23d010ae 100644
--- a/scripts/reduction/find_data.py
+++ b/scripts/reduction/find_data.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
import os
import mantid.api as api
from mantid.simpleapi import *
diff --git a/scripts/reduction/instrument.py b/scripts/reduction/instrument.py
index 0431e867eabe5649d4f0cd985648c54ff68fb0b3..108112ed44796a6b0b1e713083bd9512559a195f 100644
--- a/scripts/reduction/instrument.py
+++ b/scripts/reduction/instrument.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.kernel import *
from mantid.api import *
diff --git a/scripts/reduction/instruments/example/ExampleRedStep.py b/scripts/reduction/instruments/example/ExampleRedStep.py
index 574f12ae1178be505155203411ad924875dc3054..299931bd81ea0fbf33d0dcbe62b1f94927ea11ae 100644
--- a/scripts/reduction/instruments/example/ExampleRedStep.py
+++ b/scripts/reduction/instruments/example/ExampleRedStep.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/scripts/reduction/instruments/example/example_reducer.py b/scripts/reduction/instruments/example/example_reducer.py
index f26589d176d799f924075c3c2b7d41c1e537d33e..ae9d46df30231a08025664be4937d7903aad3900 100644
--- a/scripts/reduction/instruments/example/example_reducer.py
+++ b/scripts/reduction/instruments/example/example_reducer.py
@@ -8,7 +8,6 @@
"""
Simple Reducer example
"""
-from __future__ import (absolute_import, division, print_function)
from reduction import Reducer
from reduction.instruments.example.ExampleRedStep import ExampleRedStep
# Validate_step is a decorator that allows both Python algorithms and ReductionStep objects to be passed to the Reducer.
diff --git a/scripts/reduction/instruments/inelastic/direct_command_interface.py b/scripts/reduction/instruments/inelastic/direct_command_interface.py
index 243e1d710e393cc365b9468df7bf44512c2ff418..8320b1700c35712e12bcda9ce1a23e53269256ca 100644
--- a/scripts/reduction/instruments/inelastic/direct_command_interface.py
+++ b/scripts/reduction/instruments/inelastic/direct_command_interface.py
@@ -8,7 +8,6 @@
"""
Command set for Direct Geometry reduction
"""
-from __future__ import (absolute_import, division, print_function)
# Import the specific commands that we need
from mantid.api import AlgorithmManager
from reduction.command_interface import *
diff --git a/scripts/reduction/instruments/sans/sans_reducer.py b/scripts/reduction/instruments/sans/sans_reducer.py
index e304c2820a178bcffa8465b3c98f7aaa129737f1..f7c5b9cc908a0989980075b77c6da7359d6dd1e2 100644
--- a/scripts/reduction/instruments/sans/sans_reducer.py
+++ b/scripts/reduction/instruments/sans/sans_reducer.py
@@ -9,7 +9,6 @@
a predefined set of reduction steps to be followed. The actual ReductionStep objects
executed for each of those steps can be modified.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction import Reducer
from reduction import ReductionStep
from reduction import validate_step
diff --git a/scripts/reduction/instruments/sans/sans_reduction_steps.py b/scripts/reduction/instruments/sans/sans_reduction_steps.py
index 122e3f1351e2df54ff4dffd08f64e2aa11af2cb3..e7e44ab53dcad5decfa1ad09942d2f5f46bb6ff4 100644
--- a/scripts/reduction/instruments/sans/sans_reduction_steps.py
+++ b/scripts/reduction/instruments/sans/sans_reduction_steps.py
@@ -8,7 +8,6 @@
"""
Implementation of reduction steps for SANS
"""
-from __future__ import (absolute_import, division, print_function)
import math
import pickle
from reduction import ReductionStep
diff --git a/scripts/reduction/reducer.py b/scripts/reduction/reducer.py
index f38d48478d56087eeac2a1883f6b872875e8be21..76c7527a1948ec23ce098957a93fc49a1010d0cf 100644
--- a/scripts/reduction/reducer.py
+++ b/scripts/reduction/reducer.py
@@ -26,7 +26,6 @@
instrument settings.
"""
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import time
diff --git a/scripts/reduction_workflow/command_interface.py b/scripts/reduction_workflow/command_interface.py
index 18172a08d2de0b04b294e1fd7caec90655eb3ff6..9e0a9b50a4a9f1006f91f2605b92c1126e9ebf71 100644
--- a/scripts/reduction_workflow/command_interface.py
+++ b/scripts/reduction_workflow/command_interface.py
@@ -8,7 +8,6 @@
"""
List of user commands.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_workflow.reducer import Reducer
diff --git a/scripts/reduction_workflow/find_data.py b/scripts/reduction_workflow/find_data.py
index c36f23c8c87010de1ebc315e28de2f26cd3c263b..2d5b7e41bd2da3cbbb2650cf59fb192f9f616077 100644
--- a/scripts/reduction_workflow/find_data.py
+++ b/scripts/reduction_workflow/find_data.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.kernel import ConfigService, Logger
from mantid.api import FileFinder
diff --git a/scripts/reduction_workflow/instruments/sans/hfir_command_interface.py b/scripts/reduction_workflow/instruments/sans/hfir_command_interface.py
index 05e5ce484c37fd3f90add5c4fe8fd309f4b9e0af..6138a7c8344489c400d02fb2abcabcf49566b427 100644
--- a/scripts/reduction_workflow/instruments/sans/hfir_command_interface.py
+++ b/scripts/reduction_workflow/instruments/sans/hfir_command_interface.py
@@ -10,7 +10,6 @@
List of common user commands for HFIR SANS
"""
-from __future__ import (absolute_import, division, print_function)
import os.path
import mantid
diff --git a/scripts/reduction_workflow/instruments/sans/hfir_instrument.py b/scripts/reduction_workflow/instruments/sans/hfir_instrument.py
index b2963de1eb10e50323906409967693674df3d7df..ae4cf028477cf64ed827aaf6e586d87252e9ef57 100644
--- a/scripts/reduction_workflow/instruments/sans/hfir_instrument.py
+++ b/scripts/reduction_workflow/instruments/sans/hfir_instrument.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-arguments,too-many-branches
-from __future__ import (absolute_import, division, print_function)
import sys
from mantid.kernel import Logger
diff --git a/scripts/reduction_workflow/instruments/sans/sns_command_interface.py b/scripts/reduction_workflow/instruments/sans/sns_command_interface.py
index 1928f771ada13f84ea4b0c7384fb157b1fe9dd09..4f2da87420a08abd012f1756152d48aa3be92fd9 100644
--- a/scripts/reduction_workflow/instruments/sans/sns_command_interface.py
+++ b/scripts/reduction_workflow/instruments/sans/sns_command_interface.py
@@ -9,7 +9,6 @@
Command set for EQSANS reduction
"""
# Import the specific commands that we need - some of these are used in systemtests
-from __future__ import (absolute_import, division, print_function)
from reduction_workflow.command_interface import *
# The following imports allow users to import this file and have all functionality automatically imported
diff --git a/scripts/reduction_workflow/instruments/sans/sns_instrument.py b/scripts/reduction_workflow/instruments/sans/sns_instrument.py
index fa4af710cd42907626e10a3a49ff28a1916e2c42..3a7af9acad99e415d5710b8bdf84c34ba26a4a65 100644
--- a/scripts/reduction_workflow/instruments/sans/sns_instrument.py
+++ b/scripts/reduction_workflow/instruments/sans/sns_instrument.py
@@ -8,8 +8,6 @@
"""
Instrument-specific utility functions for EQSANS
"""
-from __future__ import (absolute_import, division, print_function)
-
from .hfir_instrument import _get_pixel_info
diff --git a/scripts/reduction_workflow/reducer.py b/scripts/reduction_workflow/reducer.py
index 4dc396f5ded1c28f624653f7424bd506613ea045..72f93e9ef7b1c972442a569334529987c72faddb 100644
--- a/scripts/reduction_workflow/reducer.py
+++ b/scripts/reduction_workflow/reducer.py
@@ -8,7 +8,6 @@
"""
Base reduction class. Uses version 2 python API.
"""
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import time
diff --git a/scripts/test/Abins/AbinsAtomsDataTest.py b/scripts/test/Abins/AbinsAtomsDataTest.py
index bafa00118b75ff6b85a483044e72ba09ff10ec7b..ac446dd261da2588b1612946b6527393278c13b2 100644
--- a/scripts/test/Abins/AbinsAtomsDataTest.py
+++ b/scripts/test/Abins/AbinsAtomsDataTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsBroadeningTest.py b/scripts/test/Abins/AbinsBroadeningTest.py
index 05518c4e0ec066c542d87b0b30b6d12fb5d31136..b40d3979beecb523bb357d3db6d30f8bbcb1d3c6 100644
--- a/scripts/test/Abins/AbinsBroadeningTest.py
+++ b/scripts/test/Abins/AbinsBroadeningTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
@@ -13,6 +12,7 @@ from scipy.stats import norm as spnorm
from AbinsModules.Instruments import Broadening
+
class AbinsBroadeningTest(unittest.TestCase):
"""
Test Abins broadening functions
diff --git a/scripts/test/Abins/AbinsCalculateDWSingleCrystalTest.py b/scripts/test/Abins/AbinsCalculateDWSingleCrystalTest.py
index 3b5ab0d2f024dec084f6e9527d270c9140b943f7..6066f59e748c6524839c599d5958f4c58d5092b2 100644
--- a/scripts/test/Abins/AbinsCalculateDWSingleCrystalTest.py
+++ b/scripts/test/Abins/AbinsCalculateDWSingleCrystalTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import *
import numpy as np
diff --git a/scripts/test/Abins/AbinsCalculatePowderTest.py b/scripts/test/Abins/AbinsCalculatePowderTest.py
index 4e0bc67201474e7434b73759a6a757ebf15da678..6b56766a25ecdff98ac6d6195fa74f6690592925 100644
--- a/scripts/test/Abins/AbinsCalculatePowderTest.py
+++ b/scripts/test/Abins/AbinsCalculatePowderTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsCalculateQToscaTest.py b/scripts/test/Abins/AbinsCalculateQToscaTest.py
index e6114a5292117d873718c1f7d0d3d9f7709bc948..de2cd0637aac26d74ec9d422caa2ca7c3f2cd022 100644
--- a/scripts/test/Abins/AbinsCalculateQToscaTest.py
+++ b/scripts/test/Abins/AbinsCalculateQToscaTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
from mantid.simpleapi import *
diff --git a/scripts/test/Abins/AbinsCalculateSPowderTest.py b/scripts/test/Abins/AbinsCalculateSPowderTest.py
index ba6eebedeb77a151d4dcbfde0722b5175cc32248..455801eb6663ac488e215b7c6b309e0fd19e412f 100644
--- a/scripts/test/Abins/AbinsCalculateSPowderTest.py
+++ b/scripts/test/Abins/AbinsCalculateSPowderTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import json
diff --git a/scripts/test/Abins/AbinsCalculateSingleCrystalTest.py b/scripts/test/Abins/AbinsCalculateSingleCrystalTest.py
index 052f162000f6d0d55787c04ee546cccd9de82b13..caa137c224b648e8887f3f2a12d220e9948c3b7d 100644
--- a/scripts/test/Abins/AbinsCalculateSingleCrystalTest.py
+++ b/scripts/test/Abins/AbinsCalculateSingleCrystalTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsDWSingleCrystalDataTest.py b/scripts/test/Abins/AbinsDWSingleCrystalDataTest.py
index bfd0d1659b3fc6954bcf0fc8a82e6566e8e1f7b5..dfa632d6fd1c486add5da46aca296da9e0fa81d8 100644
--- a/scripts/test/Abins/AbinsDWSingleCrystalDataTest.py
+++ b/scripts/test/Abins/AbinsDWSingleCrystalDataTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py b/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py
index 7438a48bf87efa4ec88463477c0526b73f7b61e7..b7d07d67e5dcf1cd91362894c7e213b956ea6957 100644
--- a/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py
+++ b/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from itertools import product
import unittest
@@ -15,6 +14,7 @@ from mantid.simpleapi import logger
from AbinsModules import FrequencyPowderGenerator, AbinsParameters, AbinsConstants
from AbinsModules.AbinsConstants import INT_TYPE, FLOAT_TYPE
+
class AbinsFrequencyPowderGeneratorTest(unittest.TestCase):
def setUp(self):
diff --git a/scripts/test/Abins/AbinsIOmoduleTest.py b/scripts/test/Abins/AbinsIOmoduleTest.py
index f4a60685fcdcbac9531e615f5d22c224298961aa..6c91cef88c4f53bce577206328568425d462db00 100644
--- a/scripts/test/Abins/AbinsIOmoduleTest.py
+++ b/scripts/test/Abins/AbinsIOmoduleTest.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-
-from __future__ import (absolute_import, division, print_function)
-import six
import unittest
import numpy as np
from mantid.simpleapi import logger
@@ -102,31 +99,6 @@ class AbinsIOmoduleTest(unittest.TestCase):
self.assertRaises(ValueError, self.loader.load, list_of_datasets=1)
- def _py2_unicode_laundering(self):
- if six.PY2:
- unit_data_list = [u'1 Ã…', u'2 Ã…', u'3 Ã…']
- cleaned_data_list = IOmodule._convert_unicode_to_str(unit_data_list)
- self.assertNotIn(u'2 Ã…', cleaned_data_list)
- self.assertIn('2 \xc3\x85', cleaned_data_list)
-
- unit_data_nested = [[u'1 Ã…', u'2 Ã…'], [u'3 Ã…', u'4 Ã…']]
- cleaned_data_nested = IOmodule._convert_unicode_to_str(unit_data_nested)
- self.assertNotIn(u'3 Ã…', cleaned_data_nested[1])
- self.assertIn('3 \xc3\x85', cleaned_data_nested[1])
-
- unit_data_dict = {u'1 Ã…': 1, u'2 Ã…': 2,
- 'tens': {u'10 Ã…': 10, u'20 Ã…': 20}}
- cleaned_data_dict = IOmodule._convert_unicode_to_str(unit_data_dict)
- self.assertNotIn(u'2 Ã…', cleaned_data_dict)
- self.assertNotIn(u'10 Ã…', cleaned_data_dict['tens'])
- self.assertIn('10 \xc3\x85', cleaned_data_dict['tens'])
-
- for item in ('x', 1, 2.34, (1, 2)):
- self.assertEqual(IOmodule._convert_unicode_to_str(item), item)
-
- self.assertIsInstance(IOmodule._convert_unicode_to_str(np.ones(5)),
- np.ndarray)
-
def runTest(self):
self._save_stuff()
@@ -144,7 +116,6 @@ class AbinsIOmoduleTest(unittest.TestCase):
self._loading_datasets()
self._loading_structured_datasets()
- self._py2_unicode_laundering()
if __name__ == '__main__':
unittest.main()
diff --git a/scripts/test/Abins/AbinsInstrumentTest.py b/scripts/test/Abins/AbinsInstrumentTest.py
index c64f269d667889acb31cbc73f7e93f68540d3c34..da7da5353a1348b264a1f5148d9f8ee00eeb4413 100644
--- a/scripts/test/Abins/AbinsInstrumentTest.py
+++ b/scripts/test/Abins/AbinsInstrumentTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from AbinsModules.Instruments.Instrument import Instrument
diff --git a/scripts/test/Abins/AbinsKpointsDataTest.py b/scripts/test/Abins/AbinsKpointsDataTest.py
index f6aee35c9ed4749557f41035fa58a3c20d14ab40..ae553c6d022942e967b3a324e692dcbac6361ead 100644
--- a/scripts/test/Abins/AbinsKpointsDataTest.py
+++ b/scripts/test/Abins/AbinsKpointsDataTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
from mantid.simpleapi import logger
diff --git a/scripts/test/Abins/AbinsLoadCASTEPTest.py b/scripts/test/Abins/AbinsLoadCASTEPTest.py
index c44ca86abd524a08e9247615c83d19b681c9d385..a50fc7bccff05e0c008ed8dc9c4d9e4a4c0d3342 100644
--- a/scripts/test/Abins/AbinsLoadCASTEPTest.py
+++ b/scripts/test/Abins/AbinsLoadCASTEPTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid # has to be imported so that AbinsModules can be found
import AbinsModules
diff --git a/scripts/test/Abins/AbinsLoadCRYSTALTest.py b/scripts/test/Abins/AbinsLoadCRYSTALTest.py
index d14985b291c188c812d29ad3ec7cf7b2acb726d7..c3a8a0433e3da3905d51cbc1f7be77ca8bb19e40 100644
--- a/scripts/test/Abins/AbinsLoadCRYSTALTest.py
+++ b/scripts/test/Abins/AbinsLoadCRYSTALTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import AbinsModules
diff --git a/scripts/test/Abins/AbinsLoadDMOL3Test.py b/scripts/test/Abins/AbinsLoadDMOL3Test.py
index 56d0d2d752fb7151ea69ab217bb4cfc7e44e155e..cd5b6ac56ed9ba31bc719a97e8147bcb4828fcc9 100644
--- a/scripts/test/Abins/AbinsLoadDMOL3Test.py
+++ b/scripts/test/Abins/AbinsLoadDMOL3Test.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import AbinsModules
diff --git a/scripts/test/Abins/AbinsLoadGAUSSIANTest.py b/scripts/test/Abins/AbinsLoadGAUSSIANTest.py
index 54fba2e5e8eff720a0829667da1a8c9a51db09d0..981996ee1bb97299ce44c84ef51928dd19c2b0c2 100644
--- a/scripts/test/Abins/AbinsLoadGAUSSIANTest.py
+++ b/scripts/test/Abins/AbinsLoadGAUSSIANTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import AbinsModules
diff --git a/scripts/test/Abins/AbinsPowderDataTest.py b/scripts/test/Abins/AbinsPowderDataTest.py
index 684213c4525e0fc651e5b2169cd3121ff0063f6b..657548010e37eba0c372f0e6587286f82bf042fd 100644
--- a/scripts/test/Abins/AbinsPowderDataTest.py
+++ b/scripts/test/Abins/AbinsPowderDataTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsSDataTest.py b/scripts/test/Abins/AbinsSDataTest.py
index 7b842e166b9694a4dce90b2c000cf76f7826d71f..f620a62518298afade8b8d32e9021382e70fe907 100644
--- a/scripts/test/Abins/AbinsSDataTest.py
+++ b/scripts/test/Abins/AbinsSDataTest.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-
-from __future__ import (absolute_import, division, print_function)
-import six
import unittest
import numpy as np
import logging
@@ -34,11 +31,10 @@ class AbinsSDataTest(unittest.TestCase):
s_data.set({'frequencies': np.linspace(105, 145, 5),
'atom_1': {'s': {'order_1': np.array([0., 0.001, 1., 1., 0., 0.,])}}})
- if six.PY3: # assertLogs is available from Python 3.4 and up
- with self.assertRaises(AssertionError):
- with self.assertLogs(logger=self.logger, level='WARNING'):
- s_data.check_thresholds(logger=self.logger)
-
- AbinsParameters.sampling['s_absolute_threshold'] = 0.5
+ with self.assertRaises(AssertionError):
with self.assertLogs(logger=self.logger, level='WARNING'):
s_data.check_thresholds(logger=self.logger)
+
+ AbinsParameters.sampling['s_absolute_threshold'] = 0.5
+ with self.assertLogs(logger=self.logger, level='WARNING'):
+ s_data.check_thresholds(logger=self.logger)
diff --git a/scripts/test/AbsorptionShapesTest.py b/scripts/test/AbsorptionShapesTest.py
index 7d82a9ea9764f126dbc384520a3d00d557b0e088..a5e76536f01af6208743d269ce6fd5d0e52b08d1 100644
--- a/scripts/test/AbsorptionShapesTest.py
+++ b/scripts/test/AbsorptionShapesTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from mantid.simpleapi import *
from mantid import api
@@ -12,6 +11,7 @@ import unittest
import numpy as np
from Direct.AbsorptionShapes import (anAbsorptionShape,Cylinder,FlatPlate,HollowCylinder,Sphere)
+
class AbsorbtionShapesTest(unittest.TestCase):
def __init__(self, methodName):
return super(AbsorbtionShapesTest, self).__init__(methodName)
diff --git a/scripts/test/CrystalFieldTest.py b/scripts/test/CrystalFieldTest.py
index 9dfd62ff6ed73ce1c70d51a189bad966a295762f..da94610ecfc837971693eedfde56b2465c377c8f 100644
--- a/scripts/test/CrystalFieldTest.py
+++ b/scripts/test/CrystalFieldTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Test suite for the crystal field calculations in the Inelastic/CrystalField package
"""
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
import re
@@ -1505,7 +1504,7 @@ class CrystalFieldFitTest(unittest.TestCase):
def test_CrystalField_PointCharge_file(self):
from CrystalField import PointCharge
import mantid.simpleapi
- from mantid.py3compat import mock
+ from unittest import mock
# Just check that LoadCIF is called... we'll rely on LoadCIF working properly!
with mock.patch.object(mantid.simpleapi, 'LoadCIF') as loadcif:
diff --git a/scripts/test/DirectEnergyConversionTest.py b/scripts/test/DirectEnergyConversionTest.py
index 52d624d87450429bfdb998c10265f35faf06a1f4..5045fc6d1efc867e654e2f66984ca5efe49efa20 100644
--- a/scripts/test/DirectEnergyConversionTest.py
+++ b/scripts/test/DirectEnergyConversionTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os, sys
from mantid.simpleapi import *
from mantid import api
@@ -18,6 +17,8 @@ import Direct.dgreduce as dgreduce
#-----------------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------------
+
+
class DirectEnergyConversionTest(unittest.TestCase):
def __init__(self, methodName):
self.reducer = None
diff --git a/scripts/test/DirectPropertyManagerTest.py b/scripts/test/DirectPropertyManagerTest.py
index ebf9bdafc36787924b49012b18549334d5e237fe..e158e1ed1805d8815a8c664b0ff6cb7e3ecf050e 100644
--- a/scripts/test/DirectPropertyManagerTest.py
+++ b/scripts/test/DirectPropertyManagerTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
from mantid.simpleapi import *
from mantid import api
diff --git a/scripts/test/DirectPropertyManater_OldInterfaceXest.py b/scripts/test/DirectPropertyManater_OldInterfaceXest.py
index 15edc3ea68c550d601569defbde8557b6dca0546..4228a26614acfd5b2167b8aaa20a2120d3807933 100644
--- a/scripts/test/DirectPropertyManater_OldInterfaceXest.py
+++ b/scripts/test/DirectPropertyManater_OldInterfaceXest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
from mantid.simpleapi import *
import unittest
from DirectEnergyConversion import DirectEnergyConversion
diff --git a/scripts/test/DirectReductionHelpersTest.py b/scripts/test/DirectReductionHelpersTest.py
index 14f822d5c09a41e0dc79a7f1b324d2f9f3a9e315..f0476b4510867687c3f23c29bd6694c99d1071cf 100644
--- a/scripts/test/DirectReductionHelpersTest.py
+++ b/scripts/test/DirectReductionHelpersTest.py
@@ -4,13 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from mantid.simpleapi import *
from mantid import api
import unittest
import Direct.ReductionHelpers as helpers
+
class SomeDescriptor(object):
def __init__(self):
self._val=None
@@ -530,4 +530,3 @@ class DirectReductionHelpersTest(unittest.TestCase):
if __name__=="__main__":
unittest.main()
-
diff --git a/scripts/test/ErrorReportPresenterTest.py b/scripts/test/ErrorReportPresenterTest.py
index 1969e3fa8c1d5d64c9236e82de8f4fdf5824d7e2..b32a7b4eef98504230d3ed7f15e24d00a02ec358 100644
--- a/scripts/test/ErrorReportPresenterTest.py
+++ b/scripts/test/ErrorReportPresenterTest.py
@@ -7,7 +7,7 @@
import unittest
from ErrorReporter.error_report_presenter import ErrorReporterPresenter
-from mantid.py3compat import mock
+from unittest import mock
class ErrorReportPresenterTest(unittest.TestCase):
diff --git a/scripts/test/ISISDirecInelasticConfigTest.py b/scripts/test/ISISDirecInelasticConfigTest.py
index d7fc87b91b07c4e8ac699773604e95ab77d3efdd..34aefcd57321a65ced603e1f72b4650b31429d89 100644
--- a/scripts/test/ISISDirecInelasticConfigTest.py
+++ b/scripts/test/ISISDirecInelasticConfigTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import unittest
diff --git a/scripts/test/IndirectCommonTests.py b/scripts/test/IndirectCommonTests.py
index 116828f364cbb59e4c65dc10c2f03dc15de33f9f..4bda6fde5de53b221684ae5f15f9f0618de26bc3 100644
--- a/scripts/test/IndirectCommonTests.py
+++ b/scripts/test/IndirectCommonTests.py
@@ -16,6 +16,7 @@ import numpy as np
from mantid.simpleapi import *
import IndirectCommon as indirect_common
+
class IndirectCommonTests(unittest.TestCase):
_default_config = {}
@@ -322,7 +323,7 @@ class IndirectCommonTests(unittest.TestCase):
def assert_logs_match_expected(self, workspace, expected_logs):
run = mtd[workspace].getRun()
- for log_name, log_value in expected_logs.iteritems():
+ for log_name, log_value in expected_logs.items():
self.assertTrue(run.hasProperty(log_name),
"The log %s is missing from the workspace" % log_name)
self.assertEqual(str(run.getProperty(log_name).value), str(log_value),
diff --git a/scripts/test/MultiPlotting/AxisChangerTwoPresenter_test.py b/scripts/test/MultiPlotting/AxisChangerTwoPresenter_test.py
index b0802c7b5f8be2a91e5d493d16eb3d692446c51b..d8f5d210e47de96d6428b0bb1db7859d0193f330 100644
--- a/scripts/test/MultiPlotting/AxisChangerTwoPresenter_test.py
+++ b/scripts/test/MultiPlotting/AxisChangerTwoPresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.AxisChanger.axis_changer_presenter import AxisChangerPresenter
from MultiPlotting.AxisChanger.axis_changer_view import AxisChangerView
diff --git a/scripts/test/MultiPlotting/AxisChangerTwoView_test.py b/scripts/test/MultiPlotting/AxisChangerTwoView_test.py
index e319bd74871cad218c5c31f5c9714a51720654fd..22230da406fcbf1b78f0597f08405933b0442799 100644
--- a/scripts/test/MultiPlotting/AxisChangerTwoView_test.py
+++ b/scripts/test/MultiPlotting/AxisChangerTwoView_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from MultiPlotting.AxisChanger.axis_changer_view import AxisChangerView
diff --git a/scripts/test/MultiPlotting/MultiPlotWidget_test.py b/scripts/test/MultiPlotting/MultiPlotWidget_test.py
index d9a394da579b9f71d9ed615f011bea238e6f8a43..12307c8b33827e4a27397b5acc7a6bbdc1392f6e 100644
--- a/scripts/test/MultiPlotting/MultiPlotWidget_test.py
+++ b/scripts/test/MultiPlotting/MultiPlotWidget_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from MultiPlotting.multi_plotting_context import PlottingContext
diff --git a/scripts/test/MultiPlotting/MultiPlottingContext_test.py b/scripts/test/MultiPlotting/MultiPlottingContext_test.py
index 2ed8bd38abb0504e0e849795c2c35a31f4e469f1..a671c19bc7072ba0915a2b77b6ae08bbafb4fb1a 100644
--- a/scripts/test/MultiPlotting/MultiPlottingContext_test.py
+++ b/scripts/test/MultiPlotting/MultiPlottingContext_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.multi_plotting_context import PlottingContext
from MultiPlotting.subplot.subplot_context import subplotContext
from line_helper import line
diff --git a/scripts/test/MultiPlotting/QuickEditPresenter_test.py b/scripts/test/MultiPlotting/QuickEditPresenter_test.py
index 249b9ea91dca0753dc7069a620925ff233fa0cbc..95cfa4449eee91d6d64c2f1fb57bfdf80b4672fc 100644
--- a/scripts/test/MultiPlotting/QuickEditPresenter_test.py
+++ b/scripts/test/MultiPlotting/QuickEditPresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.QuickEdit.quickEdit_presenter import QuickEditPresenter
from MultiPlotting.QuickEdit.quickEdit_view import QuickEditView
diff --git a/scripts/test/MultiPlotting/QuickEditWidget_test.py b/scripts/test/MultiPlotting/QuickEditWidget_test.py
index 522fb58d09fc58fbef31380177578e1eb2c8d91d..cb2f419c58dff21a7e5ba9d25cceacc814664369 100644
--- a/scripts/test/MultiPlotting/QuickEditWidget_test.py
+++ b/scripts/test/MultiPlotting/QuickEditWidget_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from MultiPlotting.QuickEdit.quickEdit_presenter import QuickEditPresenter
diff --git a/scripts/test/MultiPlotting/SubPlotContext_test.py b/scripts/test/MultiPlotting/SubPlotContext_test.py
index 88581ee0fce85cfa4c75504f346cde18b996157a..06a4e3db028a5690b7af0696d5fa91da84ef3a9a 100644
--- a/scripts/test/MultiPlotting/SubPlotContext_test.py
+++ b/scripts/test/MultiPlotting/SubPlotContext_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.subplot.subplot_context import subplotContext
from mantid import plots
diff --git a/scripts/test/MultiPlotting/SubplotADSObserver_test.py b/scripts/test/MultiPlotting/SubplotADSObserver_test.py
index 382210555937b342914ff96207cc388ea8f8c31b..a5c1f9ccf4cee1d45c6251cf91deaedad8c9ff8c 100644
--- a/scripts/test/MultiPlotting/SubplotADSObserver_test.py
+++ b/scripts/test/MultiPlotting/SubplotADSObserver_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.subplot.subplot_ADS_observer import SubplotADSObserver
diff --git a/scripts/test/MultiPlotting/Subplot_test.py b/scripts/test/MultiPlotting/Subplot_test.py
index 1dc992905b3c84da0c21bbd020e8932b4084c082..c687d3f5db65e0c706d2d82a2ecbbbce73cc6186 100644
--- a/scripts/test/MultiPlotting/Subplot_test.py
+++ b/scripts/test/MultiPlotting/Subplot_test.py
@@ -7,7 +7,7 @@
import unittest
from matplotlib.gridspec import GridSpec
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from MultiPlotting.multi_plotting_context import PlottingContext
diff --git a/scripts/test/Muon/FFTModel_test.py b/scripts/test/Muon/FFTModel_test.py
index 8adaef52318df7be7d752fc59840833d9fbf51ac..ec31ab2e2e0a6f82cea5cb0c4347e9f3e9aa473f 100644
--- a/scripts/test/Muon/FFTModel_test.py
+++ b/scripts/test/Muon/FFTModel_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.FrequencyDomainAnalysis.FFT import fft_model
diff --git a/scripts/test/Muon/FFTPresenter_test.py b/scripts/test/Muon/FFTPresenter_test.py
index 5bb8785021c0b1aa13c0146c51526f2581bb1b68..22c67e7a15bfbe2ab217721793e850f1b84b76cd 100644
--- a/scripts/test/Muon/FFTPresenter_test.py
+++ b/scripts/test/Muon/FFTPresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.utilities import load_utils
from Muon.GUI.Common import thread_model
from Muon.GUI.FrequencyDomainAnalysis.FFT import fft_presenter
diff --git a/scripts/test/Muon/LoadWidgetPresenter_test.py b/scripts/test/Muon/LoadWidgetPresenter_test.py
index 2706b6c9df67dda8acde7dea2055ec801d131069..df1a421f50cef77a186dcf6ac9d1fc872a8b511d 100644
--- a/scripts/test/Muon/LoadWidgetPresenter_test.py
+++ b/scripts/test/Muon/LoadWidgetPresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.load_widget.load_presenter import LoadPresenter
@@ -14,6 +14,7 @@ from Muon.GUI.Common.load_widget.load_view import LoadView
from Muon.GUI.ElementalAnalysis.LoadWidget.load_model import LoadModel, CoLoadModel
from collections import OrderedDict
+
@start_qapplication
class LoadPresenterTest(unittest.TestCase):
def setUp(self):
diff --git a/scripts/test/Muon/LoadWidgetView_test.py b/scripts/test/Muon/LoadWidgetView_test.py
index ea17a98f35a364c860757f4299489d9fa3e2e7a6..9b56191827536958dfb2cd3bc12789a6d4db258c 100644
--- a/scripts/test/Muon/LoadWidgetView_test.py
+++ b/scripts/test/Muon/LoadWidgetView_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.load_widget.load_view import LoadView
diff --git a/scripts/test/Muon/MaxEntModel_test.py b/scripts/test/Muon/MaxEntModel_test.py
index c86e1f86b3afef6d3b6689eb8a312f67073b56d4..fd581cc306014bd3510d0e004ebc7d920a7495bc 100644
--- a/scripts/test/Muon/MaxEntModel_test.py
+++ b/scripts/test/Muon/MaxEntModel_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt import maxent_model
diff --git a/scripts/test/Muon/MaxEntPresenter_test.py b/scripts/test/Muon/MaxEntPresenter_test.py
index ae0a3d52a1db98e5fc732443e9e5671ad91cf6f2..3052865bf64c6527599860300933b9bd3ae03ee6 100644
--- a/scripts/test/Muon/MaxEntPresenter_test.py
+++ b/scripts/test/Muon/MaxEntPresenter_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.utilities import load_utils
from Muon.GUI.Common import thread_model
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt import maxent_presenter
diff --git a/scripts/test/Muon/PlottingView_test.py b/scripts/test/Muon/PlottingView_test.py
index 6bcdb06e5ec95d3d37063489b1bcc7ac7a564204..daac1f7b07db85e103dadbe5447dff2c556cc3a8 100644
--- a/scripts/test/Muon/PlottingView_test.py
+++ b/scripts/test/Muon/PlottingView_test.py
@@ -4,14 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
import sys
import unittest
from matplotlib.figure import Figure
from mantid import WorkspaceFactory, plots
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.ElementalAnalysis.Plotting.subPlot_object import subPlot
diff --git a/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py b/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py
index 7d0b6289b4cd97e1c9b6efe8393ee54279e661a9..ae158e1a7ead6e1b3e038e802e9425aeb7dc5f9d 100644
--- a/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py
+++ b/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table_model import PeriodicTableModel
diff --git a/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py b/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py
index 2bea4c6e89c77c7eac3825a9cbac10da97ca9b1d..41a5d7863805788eaa162043ded0b26428d90adb 100644
--- a/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py
+++ b/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table import PeriodicTable as silxPT, PeriodicTableItem
diff --git a/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py b/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py
index 73690b9f55b74c669ccf194bda58182d472c7490..aac65011d057d0b6ec1148b14d645815f82aaa79 100644
--- a/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py
+++ b/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.ElementalAnalysis.Detectors.detectors_presenter import DetectorsPresenter
diff --git a/scripts/test/Muon/elemental_analysis/element_button_test.py b/scripts/test/Muon/elemental_analysis/element_button_test.py
index c6e8c83671c4d4c83cccc1673c8fdcd8213d1c74..d5aeff0c41d7ee6496afdb3f31ba179f37388df3 100644
--- a/scripts/test/Muon/elemental_analysis/element_button_test.py
+++ b/scripts/test/Muon/elemental_analysis/element_button_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table import ColoredPeriodicTableItem, _ElementButton
diff --git a/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py b/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py
index 45f2c9218cb9996a38f757a31f452c9edce9be30..a42926908ee2bf571f6c11410518efe6e38d364d 100644
--- a/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py
+++ b/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import copy
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from testhelpers import assertRaisesNothing
diff --git a/scripts/test/Muon/elemental_analysis/lmodel_test.py b/scripts/test/Muon/elemental_analysis/lmodel_test.py
index 5170a98088390113e69e1f79f211a009cfede32b..4b39366be2e7547543c9db423132a4c5465a6a8c 100644
--- a/scripts/test/Muon/elemental_analysis/lmodel_test.py
+++ b/scripts/test/Muon/elemental_analysis/lmodel_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.ElementalAnalysis.LoadWidget.load_utils import LModel
diff --git a/scripts/test/Muon/elemental_analysis/load_model_test.py b/scripts/test/Muon/elemental_analysis/load_model_test.py
index c24b8ce1b53b6d0ab58a0a6cd40557203cb01965..00474d803544ec7b9309bda4523b6b5867f38c12 100644
--- a/scripts/test/Muon/elemental_analysis/load_model_test.py
+++ b/scripts/test/Muon/elemental_analysis/load_model_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
import mantid.simpleapi as mantid
from Muon.GUI.ElementalAnalysis.LoadWidget import load_model
diff --git a/scripts/test/Muon/elemental_analysis/load_utils_test.py b/scripts/test/Muon/elemental_analysis/load_utils_test.py
index 561e0e699902bbf6080ea7d702720c167d36c6d9..31b8c22e6d23b91cd3c09d05c8b41a52aadf7d70 100644
--- a/scripts/test/Muon/elemental_analysis/load_utils_test.py
+++ b/scripts/test/Muon/elemental_analysis/load_utils_test.py
@@ -5,14 +5,13 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.ElementalAnalysis.LoadWidget import load_utils as lutils
import mantid.simpleapi as mantid
from mantid import config
import numpy as np
-from six import iteritems
class LoadUtilsTest(unittest.TestCase):
@@ -26,7 +25,7 @@ class LoadUtilsTest(unittest.TestCase):
def test_pad_run(self):
tests = {123: "00123", 0: "00000", 12345: "12345", 123456: "123456"}
- for run, padded_run in iteritems(tests):
+ for run, padded_run in tests.items():
self.assertEqual(lutils.pad_run(run), padded_run)
@mock.patch('Muon.GUI.ElementalAnalysis.LoadWidget.load_utils.glob.iglob')
@@ -67,7 +66,7 @@ class LoadUtilsTest(unittest.TestCase):
def test_hyphenise(self):
tests = {"1-5": [1, 2, 3, 4, 5], "1, 4-5": [1, 4, 5], "1-3, 5": [1, 3, 2, 5], "1, 3, 5": [1, 5, 3]}
- for out, arg in iteritems(tests):
+ for out, arg in tests.items():
self.assertEqual(lutils.hyphenise(arg), out)
def test_merge_workspaces(self):
@@ -159,7 +158,7 @@ class LoadUtilsTest(unittest.TestCase):
def test_replace_workspace_name_suffix(self):
tests = {self.test_ws_name: "suffix", "_".join([self.test_ws_name, "test"]): "suffix"}
- for workspace_name, suffix in iteritems(tests):
+ for workspace_name, suffix in tests.items():
self.assertEquals(lutils.replace_workspace_name_suffix(workspace_name, suffix),
self.var_ws_name.format(1, suffix))
diff --git a/scripts/test/Muon/elemental_analysis/name_generator_test.py b/scripts/test/Muon/elemental_analysis/name_generator_test.py
index 82e5f26b71f52cfe6a681d44253a107ac0a5114b..8f83c5377e688c836314905d6eb480e06f63c252 100644
--- a/scripts/test/Muon/elemental_analysis/name_generator_test.py
+++ b/scripts/test/Muon/elemental_analysis/name_generator_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
import unittest
import sys
diff --git a/scripts/test/Muon/elemental_analysis/peak_data_file_test.py b/scripts/test/Muon/elemental_analysis/peak_data_file_test.py
index 8e2c999b554adda62f0ea7e19585c0dd7524dc7d..369ae7d903d55afe662aca7190337584795b8857 100644
--- a/scripts/test/Muon/elemental_analysis/peak_data_file_test.py
+++ b/scripts/test/Muon/elemental_analysis/peak_data_file_test.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
import unittest
import json
diff --git a/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py b/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py
index a8c5c7adf774153ce3329bc3479a48917d380b0e..766b19c395870c3c5f427225d90f8690811a6136 100644
--- a/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py
+++ b/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.checkbox import Checkbox
diff --git a/scripts/test/Muon/elemental_analysis/periodic_combo_test.py b/scripts/test/Muon/elemental_analysis/periodic_combo_test.py
index 97562c510dc35642feeb4c6e5b079f1fd6e9673d..306af99d87b3f7064c73138262c14772e235a9ef 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_combo_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_combo_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
import Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table as periodic_table
diff --git a/scripts/test/Muon/elemental_analysis/periodic_list_test.py b/scripts/test/Muon/elemental_analysis/periodic_list_test.py
index 641b8bc5a2212f4003c83bd3e26271d67fc0bd54..4739a34412993c907343d740329ec38a8cd8af74 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_list_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_list_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy import QtWidgets
diff --git a/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py b/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py
index c67fe8dbef2ccd33c9c605f2f1eb4405684b3636..ea6e46960bf65404f806d37790f44760ed5e3627 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py
@@ -4,12 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
import Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table as periodic_table
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table import PeriodicTableItem,\
diff --git a/scripts/test/Muon/elemental_analysis/periodic_table_test.py b/scripts/test/Muon/elemental_analysis/periodic_table_test.py
index 93888654fe90ee7adf86f0b36dbdca3e5d01892d..6a3bd1c170ae2a7edb409fb2ecba65f20f9ddccd 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_table_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_table_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from testhelpers import assertRaisesNothing
diff --git a/scripts/test/Muon/fft_presenter_context_interaction_test.py b/scripts/test/Muon/fft_presenter_context_interaction_test.py
index a3c392a722bba2361a433f7dc61ad47352028c00..dba5260bb3051ae43b7ae9d4b03be97ef867afa5 100644
--- a/scripts/test/Muon/fft_presenter_context_interaction_test.py
+++ b/scripts/test/Muon/fft_presenter_context_interaction_test.py
@@ -7,7 +7,7 @@
import unittest
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.muon_pair import MuonPair
@@ -19,6 +19,7 @@ from Muon.GUI.FrequencyDomainAnalysis.FFT import fft_model
from Muon.GUI.Common.utilities.algorithm_utils import convert_to_field
+
def retrieve_combobox_info(combo_box):
output_list = []
for i in range(combo_box.count()):
diff --git a/scripts/test/Muon/fit_information_test.py b/scripts/test/Muon/fit_information_test.py
index 66068b820e399f271f2fcc0765a94a8cc48fd0e6..ffb8d5de434567f244cabc3fa10423dd53ceadc3 100644
--- a/scripts/test/Muon/fit_information_test.py
+++ b/scripts/test/Muon/fit_information_test.py
@@ -4,13 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from mantid.api import AnalysisDataService, WorkspaceFactory
from mantid.kernel import FloatTimeSeriesProperty, StringPropertyWithValue
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.contexts.fitting_context import FitInformation
diff --git a/scripts/test/Muon/fit_parameters_test.py b/scripts/test/Muon/fit_parameters_test.py
index 947a2d2ad3cd6efeadc805eb057aebe25f58c7dc..b7f5d25e7f45991a4d1cd381e848271d0d9ab5d3 100644
--- a/scripts/test/Muon/fit_parameters_test.py
+++ b/scripts/test/Muon/fit_parameters_test.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from collections import OrderedDict
import unittest
-from mantid.py3compat import iteritems, mock
+from unittest import mock
from Muon.GUI.Common.contexts.fitting_context import FitParameters
@@ -19,7 +17,7 @@ def create_test_fit_parameters(test_parameters, global_parameters=None):
'Name': name,
'Value': value,
'Error': error
- } for name, (value, error) in iteritems(test_parameters)]
+ } for name, (value, error) in test_parameters.items()]
parameter_workspace = mock.MagicMock()
parameter_workspace.workspace.__iter__.return_value = fit_table
diff --git a/scripts/test/Muon/fitting_context_test.py b/scripts/test/Muon/fitting_context_test.py
index b165ebd9db626abe7db60d119d2d912eb47d9d52..31a0a5361c71afd43426eb58e0c9d395678b109a 100644
--- a/scripts/test/Muon/fitting_context_test.py
+++ b/scripts/test/Muon/fitting_context_test.py
@@ -4,15 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from collections import OrderedDict
import unittest
from mantidqt.utils.qt.testing import start_qapplication
from mantid.api import AnalysisDataService, WorkspaceFactory, WorkspaceGroup
from mantid.kernel import FloatTimeSeriesProperty, StringPropertyWithValue
-from mantid.py3compat import iteritems, mock
+from unittest import mock
from Muon.GUI.Common.contexts.fitting_context import FittingContext, FitInformation, FitParameters
@@ -76,7 +74,7 @@ def create_test_fit_parameters(test_parameters, global_parameters=None):
'Name': name,
'Value': value,
'Error': error
- } for name, (value, error) in iteritems(test_parameters)]
+ } for name, (value, error) in test_parameters.items()]
parameter_workspace = mock.MagicMock()
parameter_workspace.workspace.__iter__.return_value = fit_table
diff --git a/scripts/test/Muon/fitting_tab_widget/fitting_tab_model_test.py b/scripts/test/Muon/fitting_tab_widget/fitting_tab_model_test.py
index 21e54e552cfd8d8063ea2056787afcc0d0b7c065..f2eb4885c7d9487efcf8735c4fc3f9e7027a58ab 100644
--- a/scripts/test/Muon/fitting_tab_widget/fitting_tab_model_test.py
+++ b/scripts/test/Muon/fitting_tab_widget/fitting_tab_model_test.py
@@ -9,7 +9,7 @@ from Muon.GUI.Common.fitting_tab_widget.fitting_tab_model import FittingTabModel
from Muon.GUI.Common.test_helpers.context_setup import setup_context
from mantid.api import FunctionFactory, AnalysisDataService
from mantid.simpleapi import CreateWorkspace
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/scripts/test/Muon/fitting_tab_widget/fitting_tab_presenter_test.py b/scripts/test/Muon/fitting_tab_widget/fitting_tab_presenter_test.py
index 7f4a8c776313047dcaa189902a1bdd848ec3e872..c88c97fd0fe1f8ffcb69554c0a429d0ff648fbf5 100644
--- a/scripts/test/Muon/fitting_tab_widget/fitting_tab_presenter_test.py
+++ b/scripts/test/Muon/fitting_tab_widget/fitting_tab_presenter_test.py
@@ -7,7 +7,7 @@
import unittest
from mantid.api import FunctionFactory, MultiDomainFunction
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy import QtWidgets
from Muon.GUI.Common.fitting_tab_widget.fitting_tab_widget import FittingTabWidget
diff --git a/scripts/test/Muon/fitting_tab_widget/workspace_selector_dialog_presenter_test.py b/scripts/test/Muon/fitting_tab_widget/workspace_selector_dialog_presenter_test.py
index 09318ac1db62673ca4a2cc2632a587874d3c8cbd..6a42735fd040c122cac0d1339618bdb0270d7bef 100644
--- a/scripts/test/Muon/fitting_tab_widget/workspace_selector_dialog_presenter_test.py
+++ b/scripts/test/Muon/fitting_tab_widget/workspace_selector_dialog_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.fitting_tab_widget.workspace_selector_view import WorkspaceSelectorView
diff --git a/scripts/test/Muon/frequency_domain_context_test.py b/scripts/test/Muon/frequency_domain_context_test.py
index 7355d5a9730d520327c0c00d9de009166d36253f..8b4ba58bfcd69f0ce33ead88dc95fb9b3f20ce1b 100644
--- a/scripts/test/Muon/frequency_domain_context_test.py
+++ b/scripts/test/Muon/frequency_domain_context_test.py
@@ -4,14 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
-import six
import sys
import unittest
from Muon.GUI.FrequencyDomainAnalysis.frequency_context import MaxEnt, FFT, FrequencyContext, FREQUENCY_EXTENSIONS
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import CreateWorkspace, AnalysisDataService
@@ -48,7 +45,7 @@ class MuonFreqContextTest(unittest.TestCase):
self.assertEquals(self.context.maxEnt_freq, ["MUSR62260_raw_data FD; MaxEnt"])
def test_add_FFT(self):
- six.assertCountEqual(self,list(self.context._FFT_freq.keys()),[FFT_NAME_RE_2, FFT_NAME_RE_MOD] )
+ self.assertCountEqual(list(self.context._FFT_freq.keys()),[FFT_NAME_RE_2, FFT_NAME_RE_MOD] )
self.assertEquals(self.context._FFT_freq[FFT_NAME_RE_2].Re_run, "62260")
self.assertEquals(self.context._FFT_freq[FFT_NAME_RE_2].Re, "fwd" )
self.assertEquals(self.context._FFT_freq[FFT_NAME_RE_2].Im, None )
@@ -59,7 +56,7 @@ class MuonFreqContextTest(unittest.TestCase):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_RE, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_IM, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_MOD, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
- six.assertCountEqual(self,list(self.context._FFT_freq.keys()),[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD, FFT_NAME_RE_2, FFT_NAME_RE_MOD] )
+ self.assertCountEqual(list(self.context._FFT_freq.keys()),[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD, FFT_NAME_RE_2, FFT_NAME_RE_MOD] )
self.assertEquals(self.context._FFT_freq[FFT_NAME_COMPLEX_RE].Re_run, "62260")
self.assertEquals(self.context._FFT_freq[FFT_NAME_COMPLEX_RE].Re, "top" )
self.assertEquals(self.context._FFT_freq[FFT_NAME_COMPLEX_RE].Im, "fwd" )
@@ -72,19 +69,19 @@ class MuonFreqContextTest(unittest.TestCase):
def test_get_freq_names_FFT_no_Im_all_parts(self):
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="FFT All")
- six.assertCountEqual(self,output,[FFT_NAME_RE_2, FFT_NAME_RE_MOD])
+ self.assertCountEqual(output,[FFT_NAME_RE_2, FFT_NAME_RE_MOD])
def test_get_freq_names_FFT_no_Im_Re_parts(self):
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="Re")
- six.assertCountEqual(self,output,[FFT_NAME_RE_2])
+ self.assertCountEqual(output,[FFT_NAME_RE_2])
def test_get_freq_names_FFT_no_Im_Mod_parts(self):
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="Mod")
- six.assertCountEqual(self,output,[FFT_NAME_RE_MOD])
+ self.assertCountEqual(output,[FFT_NAME_RE_MOD])
def test_get_freq_names_FFT_no_Im_Im_parts(self):
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="Im")
- six.assertCountEqual(self,output,[])
+ self.assertCountEqual(output,[])
def test_get_freq_names_FFT_run(self):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_RE, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
@@ -92,7 +89,7 @@ class MuonFreqContextTest(unittest.TestCase):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_MOD, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
output = self.context.get_frequency_workspace_names(run_list=[["62261","62262"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="FFT All")
- six.assertCountEqual(self,output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD])
+ self.assertCountEqual(output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD])
def test_get_freq_names_FFT_group(self):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_RE, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
@@ -100,7 +97,7 @@ class MuonFreqContextTest(unittest.TestCase):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_MOD, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["top"],pair=[],phasequad=False,frequency_type="FFT All")
- six.assertCountEqual(self,output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD])
+ self.assertCountEqual(output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD])
def test_get_freq_names_all(self):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_RE, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
@@ -108,28 +105,28 @@ class MuonFreqContextTest(unittest.TestCase):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_MOD, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
output = self.context.get_frequency_workspace_names(run_list=[[62260],[62261]],group=["fwd"],pair=[],phasequad=False,frequency_type="All")
- six.assertCountEqual(self,output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
+ self.assertCountEqual(output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
def test_get_freq_names_all_with_phasequad(self):
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_RE, Re_run="62261",Re= "", Im_run="", Im="",phasequad=True)
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_IM, Re_run="62261",Re= "", Im_run="62260", Im="",phasequad=True)
output = self.context.get_frequency_workspace_names(run_list=[[62260],[62261]],group=["fwd"],pair=[],phasequad=True,frequency_type="All")
- six.assertCountEqual(self,output,[PHASEQUAD_NAME_RE, PHASEQUAD_NAME_IM, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
+ self.assertCountEqual(output,[PHASEQUAD_NAME_RE, PHASEQUAD_NAME_IM, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
def test_get_freq_names_all_with_phasequad_Re_run(self):
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_RE, Re_run="62261",Re= "", Im_run="", Im="",phasequad=True)
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_IM, Re_run="62261",Re= "", Im_run="62260", Im="",phasequad=True)
output = self.context.get_frequency_workspace_names(run_list=[[62261]],group=["fwd"],pair=[],phasequad=True,frequency_type="All")
- six.assertCountEqual(self,output,[PHASEQUAD_NAME_RE, PHASEQUAD_NAME_IM])
+ self.assertCountEqual(output,[PHASEQUAD_NAME_RE, PHASEQUAD_NAME_IM])
def test_get_freq_names_all_with_phasequad_Im_run(self):
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_RE, Re_run="62261",Re= "", Im_run="", Im="",phasequad=True)
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_IM, Re_run="62261",Re= "", Im_run="62260", Im="",phasequad=True)
output = self.context.get_frequency_workspace_names(run_list=[[62260]],group=["fwd"],pair=[],phasequad=True,frequency_type="All")
- six.assertCountEqual(self,output,[PHASEQUAD_NAME_IM, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
+ self.assertCountEqual(output,[PHASEQUAD_NAME_IM, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
if __name__ == '__main__':
diff --git a/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py b/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
index 246ddc539a119e4614edc9aba9131f0ca53c8ae6..7e20a06f47a846dd55041fcd8aa633ec05ab9c0d 100644
--- a/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
@@ -5,8 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-import six
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from mantid import ConfigService
from mantid.api import FileFinder
@@ -143,8 +142,8 @@ class GroupingTabPresenterTest(unittest.TestCase):
mock_load.return_value = (groups, pairs, 'description', 'pair1')
self.view.load_grouping_button.clicked.emit(True)
- six.assertCountEqual(self, self.model.group_names, ["grp1", "grp2"])
- six.assertCountEqual(self, self.model.pair_names, ["pair1"])
+ self.assertCountEqual(self.model.group_names, ["grp1", "grp2"])
+ self.assertCountEqual(self.model.pair_names, ["pair1"])
self.assertEqual(self.grouping_table_view.num_rows(), 2)
self.assertEqual(self.pairing_table_view.num_rows(), 1)
self.assertEqual(self.pairing_table_view.pairing_table.cellWidget(0, 2).currentText(), "grp1")
@@ -162,8 +161,8 @@ class GroupingTabPresenterTest(unittest.TestCase):
self.view.load_grouping_button.clicked.emit(True)
self.view.display_warning_box.assert_called_once_with('Invalid detectors in group grp2')
- six.assertCountEqual(self, self.model.group_names, ["grp1"])
- six.assertCountEqual(self, self.model.pair_names, [])
+ self.assertCountEqual(self.model.group_names, ["grp1"])
+ self.assertCountEqual(self.model.pair_names, [])
self.assertEqual(self.grouping_table_view.num_rows(), 1)
self.assertEqual(self.pairing_table_view.num_rows(), 0)
diff --git a/scripts/test/Muon/grouping_tab/grouping_table_presenter_test.py b/scripts/test/Muon/grouping_tab/grouping_table_presenter_test.py
index af7861836480f2779a05e681e87ef8ae339aa2bd..d6829685bdc2a6b98b78c7e7ae8b3e6be4a97425 100644
--- a/scripts/test/Muon/grouping_tab/grouping_table_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/grouping_table_presenter_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
diff --git a/scripts/test/Muon/grouping_tab/pairing_table_alpha_test.py b/scripts/test/Muon/grouping_tab/pairing_table_alpha_test.py
index 44414050c172d4bb4486e337aba0884b64879b1e..42805ad84b2d2f02d48a533890425e14c6f96dd0 100644
--- a/scripts/test/Muon/grouping_tab/pairing_table_alpha_test.py
+++ b/scripts/test/Muon/grouping_tab/pairing_table_alpha_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
diff --git a/scripts/test/Muon/grouping_tab/pairing_table_group_selector_test.py b/scripts/test/Muon/grouping_tab/pairing_table_group_selector_test.py
index 0416f97783cb3ed118db8dfc34556164af0bb913..4bc8b9988130cd2a9fa7687294dd53cebd04b84d 100644
--- a/scripts/test/Muon/grouping_tab/pairing_table_group_selector_test.py
+++ b/scripts/test/Muon/grouping_tab/pairing_table_group_selector_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
diff --git a/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py b/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
index 022b166a271c1fedcfd1fe816be819545e02cc05..7267782fe6290f3e3535759ebf9a59761f43d783 100644
--- a/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
@@ -5,9 +5,8 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
-import six
from qtpy.QtWidgets import QWidget
from Muon.GUI.Common.grouping_tab_widget.grouping_tab_widget_model import GroupingTabModel
@@ -257,7 +256,7 @@ class PairingTablePresenterTest(unittest.TestCase):
self.assertEqual(str(self.view.get_table_item_text(0, 0)), "pair_1")
self.assertEqual(str(self.view.get_table_item_text(1, 0)), "pair_2")
self.assertEqual(str(self.view.get_table_item_text(2, 0)), "pair_3")
- six.assertCountEqual(self, self.model.pair_names, ["pair_1", "pair_2", "pair_3"])
+ self.assertCountEqual(self.model.pair_names, ["pair_1", "pair_2", "pair_3"])
if __name__ == '__main__':
diff --git a/scripts/test/Muon/help_widget_presenter_test.py b/scripts/test/Muon/help_widget_presenter_test.py
index 19405ce185f516501e8e7fa9a5798e43af1ab377..d358adbcc687b732db1d03351a572baccf2e3f13 100644
--- a/scripts/test/Muon/help_widget_presenter_test.py
+++ b/scripts/test/Muon/help_widget_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.widgets import manageuserdirectories
diff --git a/scripts/test/Muon/home_instrument_widget_test.py b/scripts/test/Muon/home_instrument_widget_test.py
index 88b83e76f70ff4cc131253887b08f55fd7b5cb4d..2f8987454323f85ae62f6aa2fb84ea420d7ae2e3 100644
--- a/scripts/test/Muon/home_instrument_widget_test.py
+++ b/scripts/test/Muon/home_instrument_widget_test.py
@@ -8,7 +8,7 @@ import unittest
from mantid.api import FileFinder, AnalysisDataService
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
from mantid.simpleapi import LoadMuonNexus, CompareWorkspaces
diff --git a/scripts/test/Muon/home_runinfo_presenter_test.py b/scripts/test/Muon/home_runinfo_presenter_test.py
index 2d10bac54ccc6fbade7174510041146967a8cd73..c440d74ed74e93c739432ff495bcec5bebb1f3ad 100644
--- a/scripts/test/Muon/home_runinfo_presenter_test.py
+++ b/scripts/test/Muon/home_runinfo_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
diff --git a/scripts/test/Muon/list_selector/list_selector_presenter_test.py b/scripts/test/Muon/list_selector/list_selector_presenter_test.py
index 882c89f28bf26e1517b206a28bdf7356102575ce..73f2b5c0dffec870b07b724dd2fe8ef3d14c9c3f 100644
--- a/scripts/test/Muon/list_selector/list_selector_presenter_test.py
+++ b/scripts/test/Muon/list_selector/list_selector_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.list_selector.list_selector_presenter import ListSelectorPresenter
diff --git a/scripts/test/Muon/load_file_widget/loadfile_model_test.py b/scripts/test/Muon/load_file_widget/loadfile_model_test.py
index dbf2335c28d2412ba520c1fee8659ad206712360..bf323863e83b858ae230e68b44495e8ef7b7fff1 100644
--- a/scripts/test/Muon/load_file_widget/loadfile_model_test.py
+++ b/scripts/test/Muon/load_file_widget/loadfile_model_test.py
@@ -8,8 +8,6 @@ import os
import unittest
from mantidqt.utils.qt.testing import start_qapplication
-import six
-
from Muon.GUI.Common.load_file_widget.model import BrowseFileWidgetModel
from Muon.GUI.Common.test_helpers.context_setup import setup_context_for_tests
@@ -44,8 +42,8 @@ class LoadFileWidgetModelTest(unittest.TestCase):
self.model.execute()
- six.assertCountEqual(self, [os.path.split(filename)[-1] for filename in self.model.loaded_filenames], files)
- six.assertCountEqual(self, self.model.loaded_runs, [[19489], [6473], [6475]])
+ self.assertCountEqual([os.path.split(filename)[-1] for filename in self.model.loaded_filenames], files)
+ self.assertCountEqual(self.model.loaded_runs, [[19489], [6473], [6475]])
def test_model_is_cleared_correctly(self):
files = ['EMU00019489.nxs', 'emu00006473.nxs', 'emu00006475.nxs']
@@ -64,9 +62,9 @@ class LoadFileWidgetModelTest(unittest.TestCase):
with self.assertRaises(ValueError):
self.model.execute()
- six.assertCountEqual(self, [os.path.split(filename)[-1] for filename in self.model.loaded_filenames],
+ self.assertCountEqual([os.path.split(filename)[-1] for filename in self.model.loaded_filenames],
['EMU00019489.nxs', 'emu00006473.nxs'])
- six.assertCountEqual(self, self.model.loaded_runs, [[19489], [6473]])
+ self.assertCountEqual(self.model.loaded_runs, [[19489], [6473]])
if __name__ == '__main__':
diff --git a/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py b/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
index bafb3549d7769682db1a9479331b6008de0b2008..268b90193d764ac34b89cf4df63e7158a3538a06 100644
--- a/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
@@ -6,11 +6,9 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication
-import six
-
from Muon.GUI.Common.load_file_widget.model import BrowseFileWidgetModel
from Muon.GUI.Common.load_file_widget.presenter import BrowseFileWidgetPresenter
from Muon.GUI.Common.load_file_widget.view import BrowseFileWidgetView
@@ -147,9 +145,9 @@ class LoadFileWidgetPresenterMultipleFileModeTest(unittest.TestCase):
self.wait_for_thread(self.presenter._load_thread)
# Load will take the last occurrence of the run from the list
- six.assertCountEqual(self, self.model.loaded_filenames, ["C:/dir1/file2.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [workspace_2])
- six.assertCountEqual(self, self.model.loaded_runs, [[1234]])
+ self.assertCountEqual(self.model.loaded_filenames, ["C:/dir1/file2.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [workspace_2])
+ self.assertCountEqual(self.model.loaded_runs, [[1234]])
#
@run_test_with_and_without_threading
@@ -165,9 +163,9 @@ class LoadFileWidgetPresenterMultipleFileModeTest(unittest.TestCase):
self.wait_for_thread(self.presenter._load_thread)
# Load will take the last occurrence of the run from the user input
- six.assertCountEqual(self, self.model.loaded_filenames, ["C:/dir1/file2.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [workspace_2])
- six.assertCountEqual(self, self.model.loaded_runs, [[1234]])
+ self.assertCountEqual(self.model.loaded_filenames, ["C:/dir1/file2.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [workspace_2])
+ self.assertCountEqual(self.model.loaded_runs, [[1234]])
@run_test_with_and_without_threading
def test_that_loading_two_files_from_browse_sets_model_and_interface_correctly(self):
@@ -246,10 +244,10 @@ class LoadFileWidgetPresenterMultipleFileModeTest(unittest.TestCase):
self.presenter.on_browse_button_clicked()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames,
+ self.assertCountEqual(self.model.loaded_filenames,
["C:/dir1/file1.nxs", "C:/dir2/file2.nxs", "C:/dir1/file3.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [workspace_1, workspace_2, workspace_3])
- six.assertCountEqual(self, self.model.loaded_runs, [[1234], [1235], [1236]])
+ self.assertCountEqual(self.model.loaded_workspaces, [workspace_1, workspace_2, workspace_3])
+ self.assertCountEqual(self.model.loaded_runs, [[1234], [1235], [1236]])
self.assertEqual(self.view.get_file_edit_text(), "C:/dir1/file3.nxs")
@@ -271,9 +269,9 @@ class LoadFileWidgetPresenterMultipleFileModeTest(unittest.TestCase):
self.presenter.on_browse_button_clicked()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["C:/dir2/file1.nxs", "C:/dir2/file2.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [workspace_3, workspace_2])
- six.assertCountEqual(self, self.model.loaded_runs, [[1234], [1235]])
+ self.assertCountEqual(self.model.loaded_filenames, ["C:/dir2/file1.nxs", "C:/dir2/file2.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [workspace_3, workspace_2])
+ self.assertCountEqual(self.model.loaded_runs, [[1234], [1235]])
self.assertEqual(self.view.get_file_edit_text(), "C:/dir2/file1.nxs")
diff --git a/scripts/test/Muon/load_file_widget/loadfile_presenter_single_file_test.py b/scripts/test/Muon/load_file_widget/loadfile_presenter_single_file_test.py
index ded224c8d3d9ddfbb647ba0ebf91b8947f733740..994a355ba90f1f60d683fd064b94f0174676a10f 100644
--- a/scripts/test/Muon/load_file_widget/loadfile_presenter_single_file_test.py
+++ b/scripts/test/Muon/load_file_widget/loadfile_presenter_single_file_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication
diff --git a/scripts/test/Muon/load_run_widget/loadrun_model_test.py b/scripts/test/Muon/load_run_widget/loadrun_model_test.py
index 07a7d2f8259cf79e321738dd7029eae2a2ce094c..ba9a730c4164e71638eb50ab3495e94d7aa6e425 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_model_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_model_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.load_run_widget.load_run_model import LoadRunWidgetModel
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
index 0e7b0bfbf179ad79d5d6f10762f51d45af06d611..cc02c7cce379d0a97379aace27064b982ac4480b 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
@@ -5,8 +5,8 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch
+from unittest import mock
+from unittest.mock import patch
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QMessageBox, QWidget
@@ -20,6 +20,8 @@ from Muon.GUI.Common.test_helpers.context_setup import setup_context_for_tests
# this class is required to keep track of error signal emissions since the output is garbage collected by the time
# we reach the equal assertion
+
+
class MockSignalHandler(object):
def __init__(self, parent=None):
self.call_count = 0
@@ -27,6 +29,7 @@ class MockSignalHandler(object):
def signalReceived(self):
self.call_count+=1
+
@start_qapplication
class LoadRunWidgetLoadCurrentRunTest(unittest.TestCase):
def run_test_with_and_without_threading(test_function):
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py
index 2972e6a8c34e1654f104daafad28f16e8f97ce10..2d9b5ec4d81aa48bb27a349f0787c179f6681b94 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py
@@ -7,7 +7,7 @@
import os
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
index 5e4b2b85795116b20e2fafcba4cba67dceff915f..2062f0dd861dea8fdeedb3dbd4201e6701737d12 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
@@ -6,11 +6,9 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
-import six
-
from Muon.GUI.Common.load_run_widget.load_run_model import LoadRunWidgetModel
from Muon.GUI.Common.load_run_widget.load_run_presenter import LoadRunWidgetPresenter
from Muon.GUI.Common.load_run_widget.load_run_view import LoadRunWidgetView
@@ -114,9 +112,9 @@ class LoadRunWidgetIncrementDecrementMultipleFileModeTest(unittest.TestCase):
self.presenter.handle_decrement_run()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["file1.nxs", "file2.nxs", "file3.nxs", "file4.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [[1], [2], [3], [4]])
- six.assertCountEqual(self, self.model.loaded_runs, [[1], [2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_filenames, ["file1.nxs", "file2.nxs", "file3.nxs", "file4.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [[1], [2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_runs, [[1], [2], [3], [4]])
self.assertEqual(self.view.get_run_edit_text(), "1")
@@ -128,9 +126,9 @@ class LoadRunWidgetIncrementDecrementMultipleFileModeTest(unittest.TestCase):
self.presenter.handle_increment_run()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs", "file5.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [[2], [3], [4], [5]])
- six.assertCountEqual(self, self.model.loaded_runs, [[2], [3], [4], [5]])
+ self.assertCountEqual(self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs", "file5.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [[2], [3], [4], [5]])
+ self.assertCountEqual(self.model.loaded_runs, [[2], [3], [4], [5]])
self.assertEqual(self.view.get_run_edit_text(), "5")
@@ -143,9 +141,9 @@ class LoadRunWidgetIncrementDecrementMultipleFileModeTest(unittest.TestCase):
self.presenter.handle_decrement_run()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [[2], [3], [4]])
- six.assertCountEqual(self, self.model.loaded_runs, [[2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [[2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_runs, [[2], [3], [4]])
self.assertEqual(self.view.get_run_edit_text(), '2-4')
@@ -158,9 +156,9 @@ class LoadRunWidgetIncrementDecrementMultipleFileModeTest(unittest.TestCase):
self.presenter.handle_increment_run()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [[2], [3], [4]])
- six.assertCountEqual(self, self.model.loaded_runs, [[2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [[2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_runs, [[2], [3], [4]])
self.assertEqual(self.view.get_run_edit_text(), '2-4')
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py
index b1dcf15a3d96085c67ecae64d8417fafb35edee4..fe7039204c7bbc505c9d72621ee0379f5b521fe8 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/loading_tab/loadwidget_presenter_failure_test.py b/scripts/test/Muon/loading_tab/loadwidget_presenter_failure_test.py
index debf6dce5808a228f1e8fa86f4a2a19581aa8724..cffe14f6f5ea95bafecff803cfc6f50cff6f34ac 100644
--- a/scripts/test/Muon/loading_tab/loadwidget_presenter_failure_test.py
+++ b/scripts/test/Muon/loading_tab/loadwidget_presenter_failure_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/loading_tab/loadwidget_presenter_multiple_file_test.py b/scripts/test/Muon/loading_tab/loadwidget_presenter_multiple_file_test.py
index ee6f53e7bfe72df22981e1969a05b041d72301da..fd0a9dc2c2312b5f6f8f5c7af4d4946ef41c1392 100644
--- a/scripts/test/Muon/loading_tab/loadwidget_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/loading_tab/loadwidget_presenter_multiple_file_test.py
@@ -9,7 +9,7 @@ import time
from mantid import ConfigService
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/loading_tab/loadwidget_presenter_test.py b/scripts/test/Muon/loading_tab/loadwidget_presenter_test.py
index 639f27c4d0e44642b1190c45d09f3bb5a0aed797..ac0b87936fb1c4ca722f105d59c02d15a7b7d09e 100644
--- a/scripts/test/Muon/loading_tab/loadwidget_presenter_test.py
+++ b/scripts/test/Muon/loading_tab/loadwidget_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/max_ent_presenter_load_interaction_test.py b/scripts/test/Muon/max_ent_presenter_load_interaction_test.py
index c8f17ec62ef18461a3668df90cc35d0274239c15..8c1852e70e07bc8c23f6cd55a53687a06b22a632 100644
--- a/scripts/test/Muon/max_ent_presenter_load_interaction_test.py
+++ b/scripts/test/Muon/max_ent_presenter_load_interaction_test.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy import QtCore
diff --git a/scripts/test/Muon/muon_context_with_frequency_test.py b/scripts/test/Muon/muon_context_with_frequency_test.py
index e45ff09b51d8c1ab6f199d89231162361bf63895..b608b8e45beaf66e37b72f4988d8897dbddbf223 100644
--- a/scripts/test/Muon/muon_context_with_frequency_test.py
+++ b/scripts/test/Muon/muon_context_with_frequency_test.py
@@ -8,7 +8,7 @@ import unittest
from mantidqt.utils.qt.testing import start_qapplication
from mantid.api import AnalysisDataService, FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantid import ConfigService
from mantid.dataobjects import Workspace2D
from mantid.simpleapi import CreateWorkspace
diff --git a/scripts/test/Muon/muon_data_context_test.py b/scripts/test/Muon/muon_data_context_test.py
index 8a85f13df263e65632bf8990c98e6c49d230e24b..596d59ef762662968e77b225c8fa30f6f5742cda 100644
--- a/scripts/test/Muon/muon_data_context_test.py
+++ b/scripts/test/Muon/muon_data_context_test.py
@@ -9,7 +9,7 @@ import unittest
from mantidqt.utils.qt.testing import start_qapplication
from mantid.api import AnalysisDataService, FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.contexts.muon_data_context import MuonDataContext
from Muon.GUI.Common.muon_load_data import MuonLoadData
@@ -90,4 +90,4 @@ class MuonDataContextTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main(buffer=False, verbosity=2)
\ No newline at end of file
+ unittest.main(buffer=False, verbosity=2)
diff --git a/scripts/test/Muon/muon_group_pair_context_test.py b/scripts/test/Muon/muon_group_pair_context_test.py
index 67f1c137a20e3075301c33aaa3f7607586f957b3..3477de36934cf48fcc20c9bf6ff8b84cf3d312f3 100644
--- a/scripts/test/Muon/muon_group_pair_context_test.py
+++ b/scripts/test/Muon/muon_group_pair_context_test.py
@@ -9,7 +9,7 @@ import unittest
from Muon.GUI.Common.contexts.muon_group_pair_context import MuonGroupPairContext
from Muon.GUI.Common.muon_group import MuonGroup
from Muon.GUI.Common.muon_pair import MuonPair
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.test_helpers.general_test_helpers import create_group_populated_by_two_workspace
diff --git a/scripts/test/Muon/muon_gui_context_test.py b/scripts/test/Muon/muon_gui_context_test.py
index 31d479c5431d59f1613cff111db4aac5e1c67308..1ddd58bf39a7d95d2373011ef71621f84d151caa 100644
--- a/scripts/test/Muon/muon_gui_context_test.py
+++ b/scripts/test/Muon/muon_gui_context_test.py
@@ -4,16 +4,15 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
import sys
import unittest
from Muon.GUI.Common.contexts.muon_gui_context import MuonGuiContext
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.observer_pattern import Observer
from mantidqt.utils.qt.testing import start_qapplication
+
@start_qapplication
class MuonGUIContextTest(unittest.TestCase):
def test_can_set_variables(self):
diff --git a/scripts/test/Muon/phase_table_widget/phase_table_presenter_test.py b/scripts/test/Muon/phase_table_widget/phase_table_presenter_test.py
index c2bffaaf43c5218ee1dc454241e7447c3e64f787..edaaac7e289ca5d347b168154dfe1ff1ee9ca3e3 100644
--- a/scripts/test/Muon/phase_table_widget/phase_table_presenter_test.py
+++ b/scripts/test/Muon/phase_table_widget/phase_table_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication
from qtpy import QtCore
diff --git a/scripts/test/Muon/plotting_widget_freq_test.py b/scripts/test/Muon/plotting_widget_freq_test.py
index 70c8413aafcfa6579ad295946e96288228e55c40..affdd4d25163cc9ccf56485b66c0fb2d2abcc863 100644
--- a/scripts/test/Muon/plotting_widget_freq_test.py
+++ b/scripts/test/Muon/plotting_widget_freq_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.plotting_widget.plotting_widget_presenter import PlotWidgetPresenter
diff --git a/scripts/test/Muon/plotting_widget_model_test.py b/scripts/test/Muon/plotting_widget_model_test.py
index 2925c404bab0caa7a4d27938716346035e063ed6..d48e00815bb09bf4e8a31c3a3458cdca1d7c2552 100644
--- a/scripts/test/Muon/plotting_widget_model_test.py
+++ b/scripts/test/Muon/plotting_widget_model_test.py
@@ -6,8 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch
+from unittest import mock
+from unittest.mock import patch
from Muon.GUI.Common.plotting_widget.plotting_widget_model import PlotWidgetModel
from mantid.simpleapi import *
diff --git a/scripts/test/Muon/plotting_widget_test.py b/scripts/test/Muon/plotting_widget_test.py
index da98b429c563569ea85e71e5f0512551d68a5410..18a7ae44007bdbed3b8198fa0a1d3fe556cc94d3 100644
--- a/scripts/test/Muon/plotting_widget_test.py
+++ b/scripts/test/Muon/plotting_widget_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.plotting_widget.plotting_widget_presenter import PlotWidgetPresenter
diff --git a/scripts/test/Muon/plotting_widget_tiled_test.py b/scripts/test/Muon/plotting_widget_tiled_test.py
index 5339cc0e7fa186f05a80d9ffe31e04742b47849c..49c13098d01168451756cd8d09d4ba99696524dd 100644
--- a/scripts/test/Muon/plotting_widget_tiled_test.py
+++ b/scripts/test/Muon/plotting_widget_tiled_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.plotting_widget.plotting_widget_presenter import PlotWidgetPresenter
from Muon.GUI.Common.contexts.fitting_context import FitInformation
diff --git a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
index f5fd29855c46d17e8719e10db9c1935cfaf33a56..a05bd82c2921219bad548d6f19914fae09104136 100644
--- a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
+++ b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, print_function, unicode_literals)
-
from collections import OrderedDict
from copy import deepcopy
import datetime
@@ -14,7 +12,7 @@ import unittest
from mantid.api import AnalysisDataService, ITableWorkspace, WorkspaceFactory, WorkspaceGroup
from mantid.kernel import FloatTimeSeriesProperty, StringPropertyWithValue
-from mantid.py3compat import iteritems, mock, string_types
+from unittest import mock
from mantid.simpleapi import Load
from mantidqt.utils.qt.testing import start_qapplication
@@ -51,7 +49,7 @@ def create_test_fits(input_workspaces,
'Name': name,
'Value': value,
'Error': error
- } for name, (value, error) in iteritems(parameters)]
+ } for name, (value, error) in parameters.items()]
fits = []
for name in input_workspaces:
@@ -382,7 +380,7 @@ class ResultsTabModelTest(unittest.TestCase):
self.assertEqual(len(expected_row), len(actual_row))
for col_index, expected in enumerate(expected_row):
actual = table.cell(row_index, col_index)
- if isinstance(expected, string_types):
+ if isinstance(expected, str):
self.assertEqual(expected, actual)
else:
# Fit pushes things back/forth through strings so exact match is not possible
diff --git a/scripts/test/Muon/results_tab_widget/results_tab_presenter_test.py b/scripts/test/Muon/results_tab_widget/results_tab_presenter_test.py
index 5b094817e14c16dd7a1d9a42d024c920ca0b52d9..85b6d348ac8e4c9e9f9e48b747a9a3b7d7d1eb9a 100644
--- a/scripts/test/Muon/results_tab_widget/results_tab_presenter_test.py
+++ b/scripts/test/Muon/results_tab_widget/results_tab_presenter_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.results_tab_widget.results_tab_presenter import ResultsTabPresenter
RESULTS_TAB_MODEL_CLS = 'Muon.GUI.Common.results_tab_widget.results_tab_model.ResultsTabModel'
diff --git a/scripts/test/Muon/seq_fitting_tab_widget/seq_fitting_tab_presenter_test.py b/scripts/test/Muon/seq_fitting_tab_widget/seq_fitting_tab_presenter_test.py
index 96b3f6d400f58cb0b28bd7414eae2a84b3a7768d..18565d9c08d0a0bbd9941ccd7fce3a02eda70977 100644
--- a/scripts/test/Muon/seq_fitting_tab_widget/seq_fitting_tab_presenter_test.py
+++ b/scripts/test/Muon/seq_fitting_tab_widget/seq_fitting_tab_presenter_test.py
@@ -7,7 +7,7 @@
import unittest
from mantid.api import FunctionFactory, MultiDomainFunction
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.seq_fitting_tab_widget.seq_fitting_tab_presenter import SeqFittingTabPresenter
from Muon.GUI.Common.test_helpers.context_setup import setup_context
diff --git a/scripts/test/Muon/transformWidget_test.py b/scripts/test/Muon/transformWidget_test.py
index c1c6bc3d39e06ec04f5a882b7fa5d788c3dff3bf..3349f91756a9502611b34d12fa2e2e097825bba2 100644
--- a/scripts/test/Muon/transformWidget_test.py
+++ b/scripts/test/Muon/transformWidget_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.utilities import load_utils
diff --git a/scripts/test/Muon/transform_widget_new_test.py b/scripts/test/Muon/transform_widget_new_test.py
index a8f3c21fe7929f9d06a2ce45960305e278d2ce1d..6150293de123a214421f53739f36f17be1c74202 100644
--- a/scripts/test/Muon/transform_widget_new_test.py
+++ b/scripts/test/Muon/transform_widget_new_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
# need to write tests for new GUI
diff --git a/scripts/test/Muon/utilities/load_utils_test.py b/scripts/test/Muon/utilities/load_utils_test.py
index 4f4efaa045751b91553af1fb57dcdd6a0a07f3aa..adf6ac05fec2cc4ac6460306c6e7247c42b4b231 100644
--- a/scripts/test/Muon/utilities/load_utils_test.py
+++ b/scripts/test/Muon/utilities/load_utils_test.py
@@ -10,7 +10,7 @@ import unittest
from mantid import simpleapi, ConfigService
from mantid.api import AnalysisDataService, ITableWorkspace
-from mantid.py3compat import mock
+from unittest import mock
def create_simple_workspace(data_x, data_y, run_number=0):
diff --git a/scripts/test/Muon/utilities/muon_file_utils_test.py b/scripts/test/Muon/utilities/muon_file_utils_test.py
index 8eb53adc91e4ff8d9c0a9be7046e2ef74d4ca3f9..abf1cc6f5e77d8b03d0b7454dd3662d4e187a49d 100644
--- a/scripts/test/Muon/utilities/muon_file_utils_test.py
+++ b/scripts/test/Muon/utilities/muon_file_utils_test.py
@@ -8,7 +8,7 @@ import os
from io import StringIO
import unittest
-from mantid.py3compat import mock
+from unittest import mock
import Muon.GUI.Common.utilities.muon_file_utils as utils
diff --git a/scripts/test/Muon/utilities/muon_load_data_test.py b/scripts/test/Muon/utilities/muon_load_data_test.py
index 8562ecd03647646be36c4e1e99031264898dd762..28343b3a1ff3e747b9756163f84a7527a1f02e52 100644
--- a/scripts/test/Muon/utilities/muon_load_data_test.py
+++ b/scripts/test/Muon/utilities/muon_load_data_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.muon_load_data import MuonLoadData
diff --git a/scripts/test/Muon/utilities/muon_workspace_wrapper_directory_test.py b/scripts/test/Muon/utilities/muon_workspace_wrapper_directory_test.py
index 3fe2696e9629cbe2355b86bff9f46086273418df..c5b835c2563c04a38d04899cbc906d66422d47ed 100644
--- a/scripts/test/Muon/utilities/muon_workspace_wrapper_directory_test.py
+++ b/scripts/test/Muon/utilities/muon_workspace_wrapper_directory_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid.simpleapi as simpleapi
diff --git a/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py b/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
index 8fc91086fa1087cc1889e70fe513f2d82e5c33ce..1f741d8f7bd49d27a5f6288cf3f33ef8743db4e2 100644
--- a/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
+++ b/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
@@ -4,11 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-import six
-
import mantid.simpleapi as simpleapi
from mantid.api import ITableWorkspace, WorkspaceGroup
from mantid.dataobjects import Workspace2D
@@ -124,8 +120,8 @@ class MuonWorkspaceTest(unittest.TestCase):
self.assertTrue(simpleapi.mtd.doesExist("test"))
ads_workspace = simpleapi.mtd["test"]
- six.assertCountEqual(self, ads_workspace.readX(0), [1, 2, 3, 4])
- six.assertCountEqual(self, ads_workspace.readY(0), [10, 10, 10, 10])
+ self.assertCountEqual(ads_workspace.readX(0), [1, 2, 3, 4])
+ self.assertCountEqual(ads_workspace.readY(0), [10, 10, 10, 10])
def test_that_hiding_the_workspace_removes_it_from_ADS(self):
workspace_handle = MuonWorkspaceWrapper(workspace=self.workspace)
@@ -141,8 +137,8 @@ class MuonWorkspaceTest(unittest.TestCase):
ws_property = workspace_handle.workspace
- six.assertCountEqual(self, ws_property.readX(0), [1, 2, 3, 4])
- six.assertCountEqual(self, ws_property.readY(0), [10, 10, 10, 10])
+ self.assertCountEqual(ws_property.readX(0), [1, 2, 3, 4])
+ self.assertCountEqual(ws_property.readY(0), [10, 10, 10, 10])
def test_that_workspace_property_returns_workspace_when_in_ADS(self):
workspace_handle = MuonWorkspaceWrapper(workspace=self.workspace)
@@ -150,8 +146,8 @@ class MuonWorkspaceTest(unittest.TestCase):
workspace_handle.show("arbitrary_name")
ws_property = workspace_handle.workspace
- six.assertCountEqual(self, ws_property.readX(0), [1, 2, 3, 4])
- six.assertCountEqual(self, ws_property.readY(0), [10, 10, 10, 10])
+ self.assertCountEqual(ws_property.readX(0), [1, 2, 3, 4])
+ self.assertCountEqual(ws_property.readY(0), [10, 10, 10, 10])
def test_that_can_change_name_when_workspace_not_in_ADS(self):
workspace_handle = MuonWorkspaceWrapper(workspace=self.workspace)
diff --git a/scripts/test/Muon/utilities/thread_model_test.py b/scripts/test/Muon/utilities/thread_model_test.py
index 151ca9497eca3e31f0a294c29a3fa2a7421fb27b..b323721483fc9d439cd3c202c6a17d986491fa6b 100644
--- a/scripts/test/Muon/utilities/thread_model_test.py
+++ b/scripts/test/Muon/utilities/thread_model_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication
diff --git a/scripts/test/Muon/workspace_finder_test.py b/scripts/test/Muon/workspace_finder_test.py
index df5c62f0e0bf63fe9f3ebc3dd638be558333310a..016451b3727dacd87c2ad6c042f1baed9b6616f1 100644
--- a/scripts/test/Muon/workspace_finder_test.py
+++ b/scripts/test/Muon/workspace_finder_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.test_helpers.context_setup import setup_context
from Muon.GUI.Common.plotting_widget.workspace_finder import WorkspaceFinder
diff --git a/scripts/test/ReductionWrapperTest.py b/scripts/test/ReductionWrapperTest.py
index da744f2275652ed55eb34cf2171d7bab027c2afa..3856b3b88c5e8b8561bc7b6b21292b92f41fcd93 100644
--- a/scripts/test/ReductionWrapperTest.py
+++ b/scripts/test/ReductionWrapperTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os,sys
from mantid.simpleapi import *
@@ -18,6 +17,7 @@ import MariReduction as mr
import unittest
import imp
+
class test_helper(ReductionWrapper):
def __init__(self,web_var=None):
""" sets properties defaults for the instrument with Name"""
@@ -81,6 +81,8 @@ class test_helper(ReductionWrapper):
#-----------------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------------
+
+
class ReductionWrapperTest(unittest.TestCase):
def __init__(self, methodName):
@@ -306,4 +308,3 @@ class ReductionWrapperTest(unittest.TestCase):
if __name__=="__main__":
unittest.main()
-
diff --git a/scripts/test/ReflectometryQuickAuxiliaryTest.py b/scripts/test/ReflectometryQuickAuxiliaryTest.py
index d022db02487e49a453ccc449b3edd58587bdba05..310b15c286e2a8035c4aeefa8b0baf72af25d508 100644
--- a/scripts/test/ReflectometryQuickAuxiliaryTest.py
+++ b/scripts/test/ReflectometryQuickAuxiliaryTest.py
@@ -4,12 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy
from mantid.simpleapi import *
from isis_reflectometry import quick
+
class ReflectometryQuickAuxiliaryTest(unittest.TestCase):
__wsName = None
diff --git a/scripts/test/RunDescriptorTest.py b/scripts/test/RunDescriptorTest.py
index b19b56ddbfa00d203045f83002a4e736330cf15b..bbe774e063110353c7f70cb9c91203f35a1af11e 100644
--- a/scripts/test/RunDescriptorTest.py
+++ b/scripts/test/RunDescriptorTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os,sys,inspect
from mantid.simpleapi import *
from mantid import api
diff --git a/scripts/test/SANS/algorithm_detail/batch_execution_test.py b/scripts/test/SANS/algorithm_detail/batch_execution_test.py
index 61be4dd7e895032b53cda30bf56bf4f4e25e958a..191cd51349017280804148fe1e5cfea1fc904f4f 100644
--- a/scripts/test/SANS/algorithm_detail/batch_execution_test.py
+++ b/scripts/test/SANS/algorithm_detail/batch_execution_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import CreateSampleWorkspace
from sans.algorithm_detail.batch_execution import (get_all_names_to_save, get_transmission_names_to_save,
ReductionPackage, select_reduction_alg, save_workspace_to_file)
diff --git a/scripts/test/SANS/algorithm_detail/calculate_sans_transmission_test.py b/scripts/test/SANS/algorithm_detail/calculate_sans_transmission_test.py
index b9f060ef1f569672eb6ea3ba8bc603a3e18377db..86c537c512a905bc3a22a3d32fa51095a1cb18df 100644
--- a/scripts/test/SANS/algorithm_detail/calculate_sans_transmission_test.py
+++ b/scripts/test/SANS/algorithm_detail/calculate_sans_transmission_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import unittest
diff --git a/scripts/test/SANS/algorithm_detail/calculate_transmission_helper_test.py b/scripts/test/SANS/algorithm_detail/calculate_transmission_helper_test.py
index 80e0387948f44a5afb902210fbb2e2d768a00d70..a0e17a954ffed7c7d83968ab1670a289919998a3 100644
--- a/scripts/test/SANS/algorithm_detail/calculate_transmission_helper_test.py
+++ b/scripts/test/SANS/algorithm_detail/calculate_transmission_helper_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py b/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py
index 69380d5f5457af0c18e57150fd6f60d89c203969..73a69ae600be1ba8b863d47edd6a7b02ae4d59dc 100644
--- a/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py
+++ b/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.algorithm_detail.centre_finder_new import centre_finder_new, centre_finder_mass
from sans.common.enums import (SANSDataType, FindDirectionEnum, DetectorType)
from sans.test_helper.test_director import TestDirector
diff --git a/scripts/test/SANS/algorithm_detail/convert_to_q_test.py b/scripts/test/SANS/algorithm_detail/convert_to_q_test.py
index de9efbed3b62095d918d77e262423073d8f038aa..bb66b69399a7db943e2b175207ce47189d389b58 100644
--- a/scripts/test/SANS/algorithm_detail/convert_to_q_test.py
+++ b/scripts/test/SANS/algorithm_detail/convert_to_q_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import DeleteWorkspace
diff --git a/scripts/test/SANS/algorithm_detail/create_sans_adjustment_workspaces_test.py b/scripts/test/SANS/algorithm_detail/create_sans_adjustment_workspaces_test.py
index 02bd80f13a71d5fdd7d69671c14b10d904a5b686..1d018ff39a25039ebc567f2b8b26eec9f712000f 100644
--- a/scripts/test/SANS/algorithm_detail/create_sans_adjustment_workspaces_test.py
+++ b/scripts/test/SANS/algorithm_detail/create_sans_adjustment_workspaces_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace, CloneWorkspace, Load, Rebin
diff --git a/scripts/test/SANS/algorithm_detail/create_sans_wavelength_pixel_adjustment_test.py b/scripts/test/SANS/algorithm_detail/create_sans_wavelength_pixel_adjustment_test.py
index 610a44c77faa0e558773e9d8f5050f2b83457fc7..20177caab952336d9ca0fbd8cc98e9e7b560c439 100644
--- a/scripts/test/SANS/algorithm_detail/create_sans_wavelength_pixel_adjustment_test.py
+++ b/scripts/test/SANS/algorithm_detail/create_sans_wavelength_pixel_adjustment_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import os
import unittest
diff --git a/scripts/test/SANS/algorithm_detail/crop_helper_test.py b/scripts/test/SANS/algorithm_detail/crop_helper_test.py
index b55e8e1f400631ee1bfb069ee1b294cbe3f68f85..ca9df6248e526a6a0b5f20335f21e51f561d0c2a 100644
--- a/scripts/test/SANS/algorithm_detail/crop_helper_test.py
+++ b/scripts/test/SANS/algorithm_detail/crop_helper_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import FileFinder
diff --git a/scripts/test/SANS/algorithm_detail/merge_reductions_test.py b/scripts/test/SANS/algorithm_detail/merge_reductions_test.py
index f4be8a8351f5a1b37ad61f69e2dbf683f435c24f..2396dc7c17b3930c20b4357456920af827dd3685 100644
--- a/scripts/test/SANS/algorithm_detail/merge_reductions_test.py
+++ b/scripts/test/SANS/algorithm_detail/merge_reductions_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.algorithm_detail.bundles import OutputPartsBundle
diff --git a/scripts/test/SANS/algorithm_detail/move_sans_instrument_component_test.py b/scripts/test/SANS/algorithm_detail/move_sans_instrument_component_test.py
index f214c9accb1604e1315432d74ede9cf49ac77052..d7076a810e43159787292ca1dc919243e3c1f074 100644
--- a/scripts/test/SANS/algorithm_detail/move_sans_instrument_component_test.py
+++ b/scripts/test/SANS/algorithm_detail/move_sans_instrument_component_test.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import (Quat, V3D)
diff --git a/scripts/test/SANS/algorithm_detail/move_workspaces_test.py b/scripts/test/SANS/algorithm_detail/move_workspaces_test.py
index 726329c05a5098f70e24ac7f0e7146a8a1ad8771..ae4b8692ac2f232e32e166ad6ff469586b2efdec 100644
--- a/scripts/test/SANS/algorithm_detail/move_workspaces_test.py
+++ b/scripts/test/SANS/algorithm_detail/move_workspaces_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid.simpleapi
diff --git a/scripts/test/SANS/algorithm_detail/normalize_to_sans_monitor_test.py b/scripts/test/SANS/algorithm_detail/normalize_to_sans_monitor_test.py
index 11698b4d651fb9fb5a8cc867954d7ef858d9bfa8..59d3c26b8f1fd3e571817d12aada9528916ebf43 100644
--- a/scripts/test/SANS/algorithm_detail/normalize_to_sans_monitor_test.py
+++ b/scripts/test/SANS/algorithm_detail/normalize_to_sans_monitor_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AnalysisDataService
diff --git a/scripts/test/SANS/algorithm_detail/sans_slice_event_test.py b/scripts/test/SANS/algorithm_detail/sans_slice_event_test.py
index e3c56a8840c1e6cda25566d5dd18e932777d25c5..c2271d8a46d85e1b752c01d65d83602958f77630 100644
--- a/scripts/test/SANS/algorithm_detail/sans_slice_event_test.py
+++ b/scripts/test/SANS/algorithm_detail/sans_slice_event_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.dataobjects import Workspace2D
diff --git a/scripts/test/SANS/algorithm_detail/scale_sans_workspace_test.py b/scripts/test/SANS/algorithm_detail/scale_sans_workspace_test.py
index d24ad7961bfd474a2a5e2288cfa2e415537ddccc..2feeb5f06aaa32f3709bdc2f7e90ae4ffbff4b68 100644
--- a/scripts/test/SANS/algorithm_detail/scale_sans_workspace_test.py
+++ b/scripts/test/SANS/algorithm_detail/scale_sans_workspace_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import math
import unittest
diff --git a/scripts/test/SANS/algorithm_detail/strip_end_nans_test.py b/scripts/test/SANS/algorithm_detail/strip_end_nans_test.py
index cbc3b81c3d91fd51f918f7215033ac452499fa4a..64efcf849b189ac5b6ef2fc34ff543159fc591c3 100644
--- a/scripts/test/SANS/algorithm_detail/strip_end_nans_test.py
+++ b/scripts/test/SANS/algorithm_detail/strip_end_nans_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, FrameworkManager
diff --git a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
index cac6b5b9594c19f35247e3732915fec4fe84eafa..c0b2b1306014c434fd8feb1fb83ca227474f8d80 100644
--- a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
+++ b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
@@ -4,15 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
-import six
-
import mantid
-from mantid.py3compat import csv_open_type, mock
+from unittest import mock
from sans.command_interface.batch_csv_parser import BatchCsvParser
from sans.common.constants import ALL_PERIODS
from sans.gui_logic.models.RowEntries import RowEntries
@@ -225,11 +221,11 @@ class BatchCsvParserTest(unittest.TestCase):
expected_file_path = "/foo/bar.csv"
parser = BatchCsvParser()
- patchable = "__builtin__.open" if six.PY2 else "builtins.open"
+ patchable = "builtins.open"
with mock.patch(patchable, mocked_handle):
parser.save_batch_file(rows=[], file_path=expected_file_path)
- mocked_handle.assert_called_with(expected_file_path, csv_open_type)
+ mocked_handle.assert_called_with(expected_file_path, "w")
def test_parses_row_to_csv_correctly(self):
test_row = RowEntries()
@@ -257,7 +253,7 @@ class BatchCsvParserTest(unittest.TestCase):
mocked_handle = mock.mock_open()
parser = BatchCsvParser()
- patchable = "__builtin__.open" if six.PY2 else "builtins.open"
+ patchable = "builtins.open"
with mock.patch(patchable, mocked_handle):
parser.save_batch_file(rows=[test_row], file_path='')
diff --git a/scripts/test/SANS/command_interface/command_interface_state_director_test.py b/scripts/test/SANS/command_interface/command_interface_state_director_test.py
index 0aa3a53b81ee3727438c6ebb93425220c66bf9a3..49b51b194efb0d3dfb61ee77eb91cbefb27ae638 100644
--- a/scripts/test/SANS/command_interface/command_interface_state_director_test.py
+++ b/scripts/test/SANS/command_interface/command_interface_state_director_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.command_interface.command_interface_state_director import (NParameterCommand, NParameterCommandId,
diff --git a/scripts/test/SANS/command_interface/isis_command_interface_test.py b/scripts/test/SANS/command_interface/isis_command_interface_test.py
index d8f735253570fe988a75fe504f3d4ae0e0b7c9ea..04f1db90ec7b1affc041cdb273ad5da134dd668e 100644
--- a/scripts/test/SANS/command_interface/isis_command_interface_test.py
+++ b/scripts/test/SANS/command_interface/isis_command_interface_test.py
@@ -9,14 +9,10 @@ import tempfile
import unittest
import uuid
-import six
-from mantid.py3compat import mock
+from unittest import mock
from sans.command_interface.ISISCommandInterface import MaskFile
-if six.PY2:
- FileNotFoundError = IOError
-
class ISISCommandInterfaceTest(unittest.TestCase):
def test_mask_file_raises_for_empty_file_name(self):
diff --git a/scripts/test/SANS/common/file_information_test.py b/scripts/test/SANS/common/file_information_test.py
index 897435d20482649017eab84f7069ed05aad76ea3..32a05b38d7319f6f87c9919f65646fd18a2d8829 100644
--- a/scripts/test/SANS/common/file_information_test.py
+++ b/scripts/test/SANS/common/file_information_test.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import SampleShape
from sans.common.file_information import (SANSFileInformationFactory, FileType,
SANSInstrument, get_instrument_paths_for_sans_file)
diff --git a/scripts/test/SANS/common/general_functions_test.py b/scripts/test/SANS/common/general_functions_test.py
index 12a68beb8607d78e38dd3afa19114cb52a40fac8..4c940b201794e2790405307be50d365cc988bcd5 100644
--- a/scripts/test/SANS/common/general_functions_test.py
+++ b/scripts/test/SANS/common/general_functions_test.py
@@ -4,13 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AnalysisDataService, FrameworkManager
from mantid.kernel import (V3D, Quat)
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.constants import (SANS2D, LOQ, LARMOR)
from sans.common.enums import (ReductionMode, ReductionDimensionality, OutputParts,
SANSInstrument, DetectorType, SANSFacility, DataType)
diff --git a/scripts/test/SANS/common/log_tagger_test.py b/scripts/test/SANS/common/log_tagger_test.py
index 8c51519ff626a36ec056834b171517b96471bd3e..45fe26fd041d07ff6b95b9f9424392de4e5e5e32 100644
--- a/scripts/test/SANS/common/log_tagger_test.py
+++ b/scripts/test/SANS/common/log_tagger_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, FrameworkManager
diff --git a/scripts/test/SANS/common/xml_parsing_test.py b/scripts/test/SANS/common/xml_parsing_test.py
index 88cb19776b1aa6e590c1e99be9a700aab6289ae4..4b3796c3ce153772fdafc9fe692731b856095648 100644
--- a/scripts/test/SANS/common/xml_parsing_test.py
+++ b/scripts/test/SANS/common/xml_parsing_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
@@ -89,5 +87,3 @@ class XMLParsingTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
-
diff --git a/scripts/test/SANS/gui_logic/add_runs_presenter_test.py b/scripts/test/SANS/gui_logic/add_runs_presenter_test.py
index 406560eced2f6442675a42f8052cff17458af0d9..80ce7e4f6080dbfb6b1f1f169e3569b4ac7c992c 100644
--- a/scripts/test/SANS/gui_logic/add_runs_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/add_runs_presenter_test.py
@@ -10,7 +10,7 @@ import unittest
from assert_called import assert_called
from fake_signal import FakeSignal
from mantid.kernel import ConfigService
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import SANSInstrument
from sans.gui_logic.models import SumRunsModel
from sans.gui_logic.models.SumRunsModel import SumRunsModel
@@ -179,6 +179,7 @@ def create_mocked_runs(start, len):
mock_instance.display_name.return_value = start + x
return run_selection
+
class BaseFileNameTest(AddRunsPagePresenterTestCase):
def setUp(self):
self.view = self._make_mock_view()
diff --git a/scripts/test/SANS/gui_logic/batch_process_runner_test.py b/scripts/test/SANS/gui_logic/batch_process_runner_test.py
index 23b26e0f3cbe2205eef4d2f388e20183e07b5af5..a1d45680e89e4671ce234e269925754d7f687d0c 100644
--- a/scripts/test/SANS/gui_logic/batch_process_runner_test.py
+++ b/scripts/test/SANS/gui_logic/batch_process_runner_test.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from qtpy.QtCore import QThreadPool
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import (OutputMode)
from sans.gui_logic.models.batch_process_runner import BatchProcessRunner
diff --git a/scripts/test/SANS/gui_logic/beam_centre_model_test.py b/scripts/test/SANS/gui_logic/beam_centre_model_test.py
index ba804546e688f3da30c1219e5ffa4be320d3a086..f91116221378441912b0547e0324e34a4b522f01 100644
--- a/scripts/test/SANS/gui_logic/beam_centre_model_test.py
+++ b/scripts/test/SANS/gui_logic/beam_centre_model_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import FindDirectionEnum, SANSInstrument, DetectorType
from sans.gui_logic.models.beam_centre_model import BeamCentreModel
diff --git a/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py b/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py
index 28dcdd74fd6ad426f29ded65c968cb6772c45afe..7648fe7051fe5cb1eec3560970a6f7757a49faa5 100644
--- a/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import SANSInstrument
from sans.gui_logic.presenter.beam_centre_presenter import BeamCentrePresenter
from sans.test_helper.mock_objects import create_mock_beam_centre_tab
diff --git a/scripts/test/SANS/gui_logic/create_state_test.py b/scripts/test/SANS/gui_logic/create_state_test.py
index 7f2b7126bc03100417d2e3ab5cabc102d419d4b6..a0899c819dd8b14d8767a43a71f2ec850d9cd3c9 100644
--- a/scripts/test/SANS/gui_logic/create_state_test.py
+++ b/scripts/test/SANS/gui_logic/create_state_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import (SANSFacility, SaveType)
from sans.gui_logic.models.RowEntries import RowEntries
from sans.gui_logic.models.create_state import (create_states, create_gui_state_from_userfile)
diff --git a/scripts/test/SANS/gui_logic/diagnostics_page_model_test.py b/scripts/test/SANS/gui_logic/diagnostics_page_model_test.py
index 6e270a4ee832ef3bb0296278ac67cd18b17a5fd0..7f28064b00abb8e890e89ca8316a058aca07fb18 100644
--- a/scripts/test/SANS/gui_logic/diagnostics_page_model_test.py
+++ b/scripts/test/SANS/gui_logic/diagnostics_page_model_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import SANSFacility
diff --git a/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py b/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py
index 04c7d9d33a70490bdbbf69ee07c7267eaa5cffac..293fa8d0a10a5d5007247d533cfb9230bc1e9897 100644
--- a/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import SANSInstrument, DetectorType, IntegralEnum, SANSFacility
from sans.gui_logic.presenter.diagnostic_presenter import DiagnosticsPagePresenter
from sans.test_helper.mock_objects import create_mock_diagnostics_tab
diff --git a/scripts/test/SANS/gui_logic/gui_common_test.py b/scripts/test/SANS/gui_logic/gui_common_test.py
index 00feccb4b840ab27e10f0f1b2cc03537eeb40e60..9dfd627c38f8f35f22ad73e4fe5c33636d089561 100644
--- a/scripts/test/SANS/gui_logic/gui_common_test.py
+++ b/scripts/test/SANS/gui_logic/gui_common_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import (SANSInstrument, ReductionMode)
from sans.gui_logic.gui_common import (get_reduction_mode_strings_for_gui, get_reduction_selection,
get_string_for_gui_from_reduction_mode,
diff --git a/scripts/test/SANS/gui_logic/gui_state_director_test.py b/scripts/test/SANS/gui_logic/gui_state_director_test.py
index 5f9bd10dd46fcd981bb43c9f5c2ec1f72763b0d1..87b3696e4f7e5546f9e660af168bb0d42785ecdd 100644
--- a/scripts/test/SANS/gui_logic/gui_state_director_test.py
+++ b/scripts/test/SANS/gui_logic/gui_state_director_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/scripts/test/SANS/gui_logic/masking_table_presenter_test.py b/scripts/test/SANS/gui_logic/masking_table_presenter_test.py
index a386998af70398f8f68d08003ce72bb16f49c34b..40e13f81515c63208cd2a1bf801c9aaeb1d5906a 100644
--- a/scripts/test/SANS/gui_logic/masking_table_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/masking_table_presenter_test.py
@@ -4,11 +4,9 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.masking_table_presenter import (MaskingTablePresenter, masking_information)
from sans.test_helper.mock_objects import (FakeState, create_mock_masking_table, create_run_tab_presenter_mock)
diff --git a/scripts/test/SANS/gui_logic/model_tests/RowEntriesTest.py b/scripts/test/SANS/gui_logic/model_tests/RowEntriesTest.py
index 78a0bfb4ae57092b8b5264092925ed9f04ce606b..8d552c92886f8824ffd3c14de846ebbafdb7cd8f 100644
--- a/scripts/test/SANS/gui_logic/model_tests/RowEntriesTest.py
+++ b/scripts/test/SANS/gui_logic/model_tests/RowEntriesTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from six import iterkeys
-
from sans.common.enums import RowState
from sans.gui_logic.models.RowEntries import RowEntries, _UserEntries
@@ -16,7 +14,7 @@ class RowEntriesTest(unittest.TestCase):
def test_settings_attr_resets_state(self):
observed_attrs = vars(_UserEntries())
- for observed_attr in iterkeys(observed_attrs):
+ for observed_attr in observed_attrs.keys():
obj = RowEntries()
obj.state = RowState.PROCESSED
setattr(obj, observed_attr, "")
@@ -47,7 +45,7 @@ class RowEntriesTest(unittest.TestCase):
blank_obj = RowEntries()
self.assertTrue(blank_obj.is_empty(), "Default Row Entries is not blank")
- for attr in iterkeys(vars(_UserEntries())):
+ for attr in vars(_UserEntries()).keys():
obj = RowEntries()
setattr(obj, attr, 1.0)
self.assertFalse(obj.is_empty())
diff --git a/scripts/test/SANS/gui_logic/presenter_tests/presenter_common_test.py b/scripts/test/SANS/gui_logic/presenter_tests/presenter_common_test.py
index 878613d3e88abc55da42c80215509f8533df02f0..aff1e6bf6ae22bbd6f16272d291234ccc4717534 100644
--- a/scripts/test/SANS/gui_logic/presenter_tests/presenter_common_test.py
+++ b/scripts/test/SANS/gui_logic/presenter_tests/presenter_common_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.presenter_common import PresenterCommon
diff --git a/scripts/test/SANS/gui_logic/presenter_tests/settings_adjustment_presenter_test.py b/scripts/test/SANS/gui_logic/presenter_tests/settings_adjustment_presenter_test.py
index f3b493ae9bb582b5ffb476c727fe1b3f7ad30f97..ab517513df4c6b61ad38820b8ebb86af6ba6807d 100644
--- a/scripts/test/SANS/gui_logic/presenter_tests/settings_adjustment_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/presenter_tests/settings_adjustment_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from sans.common.enums import SANSInstrument
from sans.gui_logic.presenter.settings_adjustment_presenter import SettingsAdjustmentPresenter
diff --git a/scripts/test/SANS/gui_logic/run_selector_presenter_test.py b/scripts/test/SANS/gui_logic/run_selector_presenter_test.py
index a7796b5c40a2cab5cff95ed2d16597aeec1dfef9..89fe7ae1029b7ecd6bcae8866abbc2a5b1b20504 100644
--- a/scripts/test/SANS/gui_logic/run_selector_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/run_selector_presenter_test.py
@@ -8,7 +8,7 @@ import unittest
from assert_called import assert_called
from fake_signal import FakeSignal
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.models.RunSelectionModel import RunSelectionModel
from sans.gui_logic.models.run_file import SummableRunFile
from sans.gui_logic.models.run_finder import SummableRunFinder
diff --git a/scripts/test/SANS/gui_logic/run_tab_presenter_test.py b/scripts/test/SANS/gui_logic/run_tab_presenter_test.py
index acefe8b09c8594870eea2fe65fdf53eb3f13dd48..d55b5055617f5e0fca715d12e8d5b9918acc9e9b 100644
--- a/scripts/test/SANS/gui_logic/run_tab_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/run_tab_presenter_test.py
@@ -4,13 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import PropertyManagerDataService
from mantid.kernel import config
-from mantid.py3compat import mock
+from unittest import mock
from sans.command_interface.batch_csv_parser import BatchCsvParser
from sans.common.enums import SANSInstrument
from sans.common.enums import (SANSFacility, ReductionDimensionality, SaveType, ReductionMode,
diff --git a/scripts/test/SANS/gui_logic/save_other_presenter_test.py b/scripts/test/SANS/gui_logic/save_other_presenter_test.py
index 76d932e3004fe55c279c9676ba8e537da4e195f0..ba3d9c6c0a0cf739701050b760c0d637951a2c7a 100644
--- a/scripts/test/SANS/gui_logic/save_other_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/save_other_presenter_test.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import ConfigService
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.save_other_presenter import SaveOtherPresenter
diff --git a/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py b/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py
index e2e39cf0980e600cd64baa7d78bba95829adf8f4..6b8325149a207e9e3afe263bafd23eabf49e9022 100644
--- a/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py
@@ -4,14 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import json
import os
import tempfile
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.settings_diagnostic_presenter import SettingsDiagnosticPresenter
from sans.state.Serializer import Serializer
from sans.test_helper.mock_objects import (create_run_tab_presenter_mock, FakeState,
diff --git a/scripts/test/SANS/gui_logic/state_gui_model_test.py b/scripts/test/SANS/gui_logic/state_gui_model_test.py
index 165dce58d291e3dfb39e0715d255add1052e9b08..a74cc8ae89bfdaf639b22f8163580d45f763c1d2 100644
--- a/scripts/test/SANS/gui_logic/state_gui_model_test.py
+++ b/scripts/test/SANS/gui_logic/state_gui_model_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (ReductionDimensionality, ReductionMode, RangeStepType, SampleShape, SaveType,
@@ -319,8 +317,8 @@ class StateGuiModelTest(unittest.TestCase):
state_gui_model.q_1d_rebin_string = b"test"
q_1d_rebin_string = state_gui_model.q_1d_rebin_string
- self.assertEqual(type(q_1d_rebin_string), str)
- self.assertEqual(q_1d_rebin_string, "test")
+ self.assertEqual(type(q_1d_rebin_string), bytes)
+ self.assertEqual(q_1d_rebin_string, b"test")
# ------------------------------------------------------------------------------------------------------------------
# Gravity
diff --git a/scripts/test/SANS/gui_logic/summation_settings_presenter_test.py b/scripts/test/SANS/gui_logic/summation_settings_presenter_test.py
index 86effd2679231c4d03b3e139ecb1ce8c8d1d7138..5f5eea157804b18d56aac9a125926b5f501df1ad 100644
--- a/scripts/test/SANS/gui_logic/summation_settings_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/summation_settings_presenter_test.py
@@ -8,7 +8,7 @@ import unittest
from assert_called import assert_called
from fake_signal import FakeSignal
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import BinningType
from sans.gui_logic.models.SummationSettingsModel import SummationSettingsModel
from sans.gui_logic.presenter.summation_settings_presenter import SummationSettingsPresenter
diff --git a/scripts/test/SANS/gui_logic/table_model_test.py b/scripts/test/SANS/gui_logic/table_model_test.py
index 1e589a642e2fee08fdc2856947fa1378c83eb754..327cf168ed5a36ce894170ffa1397bf75885f062 100644
--- a/scripts/test/SANS/gui_logic/table_model_test.py
+++ b/scripts/test/SANS/gui_logic/table_model_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import RowState
diff --git a/scripts/test/SANS/state/JsonSerializerTest.py b/scripts/test/SANS/state/JsonSerializerTest.py
index 069537451ab724d5bc0d82b4682c34ceeabd6f95..1cc5803ecc7132d046914256fe7bc17b82c8720e 100644
--- a/scripts/test/SANS/state/JsonSerializerTest.py
+++ b/scripts/test/SANS/state/JsonSerializerTest.py
@@ -4,14 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
-from six import with_metaclass
-
from mantid.api import Algorithm
-from mantid.py3compat import Enum
+from enum import Enum
# ----------------------------------------------------------------------------------------------------------------------
@@ -23,7 +19,7 @@ from sans.state.JsonSerializable import JsonSerializable, json_serializable
from sans.state.Serializer import Serializer
-class TestClass(with_metaclass(JsonSerializable)):
+class TestClass(metaclass=JsonSerializable):
string_parameter = None # : Str()
bool_parameter = None # : Bool
float_parameter = None # : Float
@@ -49,7 +45,7 @@ class FakeEnumClass(Enum):
BAR = "2"
-class ExampleWrapper(with_metaclass(JsonSerializable)):
+class ExampleWrapper(metaclass=JsonSerializable):
# This has to be at the top module level, else the module name finding will fail
def __init__(self):
self._foo = FakeEnumClass.FOO
@@ -59,7 +55,7 @@ class ExampleWrapper(with_metaclass(JsonSerializable)):
return True
-class VerySimpleState(with_metaclass(JsonSerializable)):
+class VerySimpleState(metaclass=JsonSerializable):
string_parameter = None # : Str()
def __init__(self):
@@ -70,7 +66,7 @@ class VerySimpleState(with_metaclass(JsonSerializable)):
pass
-class SimpleState(with_metaclass(JsonSerializable)):
+class SimpleState(metaclass=JsonSerializable):
def __init__(self):
super(SimpleState, self).__init__()
self.string_parameter = "String_in_SimpleState"
@@ -90,7 +86,7 @@ class SimpleState(with_metaclass(JsonSerializable)):
pass
-class ComplexState(with_metaclass(JsonSerializable)):
+class ComplexState(metaclass=JsonSerializable):
def __init__(self):
super(ComplexState, self).__init__()
self.float_parameter = 23.
diff --git a/scripts/test/SANS/state/StateBuilderTest.py b/scripts/test/SANS/state/StateBuilderTest.py
index 5c82072ef009d4ef2b633bf1ca856755dadd95e2..757439099e0bde135eee2c777e7619ffada0df09 100644
--- a/scripts/test/SANS/state/StateBuilderTest.py
+++ b/scripts/test/SANS/state/StateBuilderTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.state.IStateParser import IStateParser
from sans.state.StateRunDataBuilder import StateRunDataBuilder
diff --git a/scripts/test/SANS/state/StateRunDataBuilderTest.py b/scripts/test/SANS/state/StateRunDataBuilderTest.py
index d56154dec0641687757c0db2a0d9c4c5c4be678a..23a17d85f58a35c01b83d3f915980d8797bcf6ea 100644
--- a/scripts/test/SANS/state/StateRunDataBuilderTest.py
+++ b/scripts/test/SANS/state/StateRunDataBuilderTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.state.StateRunDataBuilder import StateRunDataBuilder
from sans.state.StateObjects.StateScale import StateScale
diff --git a/scripts/test/SANS/state/adjustment_test.py b/scripts/test/SANS/state/adjustment_test.py
index 05baee5dd614310637c934da251bb630b12a68f4..77d0150efe05b79ec600dc534e11725903673ce0 100644
--- a/scripts/test/SANS/state/adjustment_test.py
+++ b/scripts/test/SANS/state/adjustment_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/calculate_transmission_test.py b/scripts/test/SANS/state/calculate_transmission_test.py
index 0c96dfb22b7e76190eebb72cff49405642fd74c8..7dcbb41257f2b9ca5832f8a19774c8f32be379c0 100644
--- a/scripts/test/SANS/state/calculate_transmission_test.py
+++ b/scripts/test/SANS/state/calculate_transmission_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (RebinType, RangeStepType, FitType, DataType, SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/convert_to_q_test.py b/scripts/test/SANS/state/convert_to_q_test.py
index 00a2d5e49620318466519881efa82e974c97320c..0f9e2a5893d3d14e94c35d8cc6bb3475f21bb996 100644
--- a/scripts/test/SANS/state/convert_to_q_test.py
+++ b/scripts/test/SANS/state/convert_to_q_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (RangeStepType, ReductionDimensionality, SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/data_test.py b/scripts/test/SANS/state/data_test.py
index 1c65c4ffac3c04df3437655ce16d0532643eb8c9..813def2e7580acec1a252e56b3fe86c2ad1e5c40 100644
--- a/scripts/test/SANS/state/data_test.py
+++ b/scripts/test/SANS/state/data_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/mask_test.py b/scripts/test/SANS/state/mask_test.py
index 41f6fcd8e00799df0b63942bb1ca2d6431825d84..0383088e365bf5c8591ade2452fb02d82da2406b 100644
--- a/scripts/test/SANS/state/mask_test.py
+++ b/scripts/test/SANS/state/mask_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, DetectorType)
diff --git a/scripts/test/SANS/state/move_test.py b/scripts/test/SANS/state/move_test.py
index f972ec4e3dced7953f696197822f662150d0537a..dea9d9bcc7dee3072098f3b3cf83343af75b7190 100644
--- a/scripts/test/SANS/state/move_test.py
+++ b/scripts/test/SANS/state/move_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (CanonicalCoordinates, SANSFacility, DetectorType, SANSInstrument)
diff --git a/scripts/test/SANS/state/normalize_to_monitor_test.py b/scripts/test/SANS/state/normalize_to_monitor_test.py
index 08f469a37384ec26e47a6bdc372b7bdcb18c056e..7f6fdb15a519db6ea9121793926a014ae076e9aa 100644
--- a/scripts/test/SANS/state/normalize_to_monitor_test.py
+++ b/scripts/test/SANS/state/normalize_to_monitor_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (RebinType, RangeStepType, SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/reduction_mode_test.py b/scripts/test/SANS/state/reduction_mode_test.py
index 47d5051c12888508fd3b5bd7811880aec867e846..3e939a0acfdf4287284a43c17db2567e14caf1df 100644
--- a/scripts/test/SANS/state/reduction_mode_test.py
+++ b/scripts/test/SANS/state/reduction_mode_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (ReductionMode, ReductionDimensionality, FitModeForMerge,
diff --git a/scripts/test/SANS/state/save_test.py b/scripts/test/SANS/state/save_test.py
index fb9a0240505158926ff0b73c861d04d28d2227dc..b68f555f9d89c6a65c0783391cea1be6d7816051 100644
--- a/scripts/test/SANS/state/save_test.py
+++ b/scripts/test/SANS/state/save_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SaveType, SANSInstrument)
@@ -52,4 +50,4 @@ class StateReductionBuilderTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/scripts/test/SANS/state/scale_test.py b/scripts/test/SANS/state/scale_test.py
index 685dd257c9ef262218a2f6b0d7ee408ec37ba105..2dc29c00af3167570dda0505e48a20f5559f4d8e 100644
--- a/scripts/test/SANS/state/scale_test.py
+++ b/scripts/test/SANS/state/scale_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SampleShape)
diff --git a/scripts/test/SANS/state/slice_event_test.py b/scripts/test/SANS/state/slice_event_test.py
index bdc76a18054f6543a801de4180955bf86b3b8f22..e4fc6f14deffb487b6f343fe042e66a6ab242bef 100644
--- a/scripts/test/SANS/state/slice_event_test.py
+++ b/scripts/test/SANS/state/slice_event_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/state_functions_test.py b/scripts/test/SANS/state/state_functions_test.py
index 0c7c823f2d304a634b8d762d9c26a533033c2daa..1330bbf4e3ba052c832db71bed4cf599e769e941 100644
--- a/scripts/test/SANS/state/state_functions_test.py
+++ b/scripts/test/SANS/state/state_functions_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (ReductionDimensionality)
diff --git a/scripts/test/SANS/state/state_test.py b/scripts/test/SANS/state/state_test.py
index 678137e17a7752ac73b575c2e573f47ed96d58dc..28dc4d3e0aa6452b7a4916527b1a40775d81a488 100644
--- a/scripts/test/SANS/state/state_test.py
+++ b/scripts/test/SANS/state/state_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSInstrument, SANSFacility)
diff --git a/scripts/test/SANS/state/wavelength_and_pixel_adjustment_test.py b/scripts/test/SANS/state/wavelength_and_pixel_adjustment_test.py
index c1091c061c2503e83288f14d9dc7c33a0dff1150..9f1e435ded63c5bbedd7b7cb0444cdd86a12aca3 100644
--- a/scripts/test/SANS/state/wavelength_and_pixel_adjustment_test.py
+++ b/scripts/test/SANS/state/wavelength_and_pixel_adjustment_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (RangeStepType, DetectorType, SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/wavelength_test.py b/scripts/test/SANS/state/wavelength_test.py
index ae36df743d59ac68b3ccc26bda129179313dd98d..c5dd3cf435ce9e4898c28272ca172efeac5b37c1 100644
--- a/scripts/test/SANS/state/wavelength_test.py
+++ b/scripts/test/SANS/state/wavelength_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SANSInstrument, RebinType, RangeStepType)
diff --git a/scripts/test/SANS/user_file/user_file_parser_test.py b/scripts/test/SANS/user_file/user_file_parser_test.py
index dd2ee7fde0130287584ae398dc0d259430c76455..019b20f9217c49d6f46e91dfc3493acb0a0f0ef3 100644
--- a/scripts/test/SANS/user_file/user_file_parser_test.py
+++ b/scripts/test/SANS/user_file/user_file_parser_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (ReductionMode, DetectorType, RangeStepType, FitType, DataType, SANSInstrument)
diff --git a/scripts/test/SANS/user_file/user_file_reader_test.py b/scripts/test/SANS/user_file/user_file_reader_test.py
index 68719c15df720ef159e4db8176f7c69e58989cd0..d4194cb3b1d632d035fa5fd1cda38d2ba968951e 100644
--- a/scripts/test/SANS/user_file/user_file_reader_test.py
+++ b/scripts/test/SANS/user_file/user_file_reader_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/scripts/test/SANSBatchModeTest.py b/scripts/test/SANSBatchModeTest.py
index 80fa251f30ccc3a10d9fd1525d7c6dff66afbc6d..7417155c0ee611df4c692ec9c4cc34a1cae01087 100644
--- a/scripts/test/SANSBatchModeTest.py
+++ b/scripts/test/SANSBatchModeTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import re
# Need to import mantid before we import SANSUtility
diff --git a/scripts/test/SANSCentreFinderTest.py b/scripts/test/SANSCentreFinderTest.py
index 6bd5298be7998ace7c840e6ad97ba7fd2718df4c..cb635ea71c1502e28b2792d89bae917b5d10c483 100644
--- a/scripts/test/SANSCentreFinderTest.py
+++ b/scripts/test/SANSCentreFinderTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
from mantid.simpleapi import *
@@ -69,6 +68,7 @@ class SANSBeamCentrePositionUpdater(unittest.TestCase):
self.assertEqual(x_expected, x_new, "The x value should have been incremented.")
self.assertEqual(y_expected, y_new, "The y value should have been incremented.")
+
class TestPositionProvider(unittest.TestCase):
workspace_name = 'dummy_ws'
diff --git a/scripts/test/SANSCommandInterfaceTest.py b/scripts/test/SANSCommandInterfaceTest.py
index 1ade0f6bb650fd8a84517fd934128f9ffccff12f..1fd68b67c5f02df0efa95eadd2a0ce453d74e445 100644
--- a/scripts/test/SANSCommandInterfaceTest.py
+++ b/scripts/test/SANSCommandInterfaceTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
import os
@@ -17,6 +16,7 @@ from mantid.kernel import DateAndTime
import random
import math
+
class SANSCommandInterfaceGetAndSetTransmissionSettings(unittest.TestCase):
def test_that_gets_transmission_monitor(self):
# Arrange
@@ -203,6 +203,7 @@ class SANSCommandInterfaceGetAndSetTransmissionSettings(unittest.TestCase):
# Assert
self.assertEqual(0, len(ReductionSingleton().transmission_calculator.mask_files), 'The transmission mask list should be empty.')
+
class TestEventWorkspaceCheck(unittest.TestCase):
def _create_file_name(self, name):
temp_save_dir = config['defaultsave.directory']
@@ -237,6 +238,7 @@ class TestEventWorkspaceCheck(unittest.TestCase):
self._clean_up(file_name)
DeleteWorkspace(ws)
+
class SANSCommandInterfaceGetAndSetQResolutionSettings(unittest.TestCase):
#Test the input and output mechanims for the QResolution settings
def test_full_setup_for_circular_apertures(self):
@@ -364,6 +366,7 @@ class SANSCommandInterfaceGetAndSetQResolutionSettings(unittest.TestCase):
delta_r_expected = delta_r/1000.
self.assertEqual(delta_r_stored, delta_r_expected)
+
class TestLARMORCommand(unittest.TestCase):
def test_that_default_idf_is_being_selected(self):
command_iface.Clean()
@@ -397,6 +400,7 @@ class TestLARMORCommand(unittest.TestCase):
self.assertFalse(command_iface.LARMOR(selected_idf),
"A non existent idf path should return false")
+
class TestMaskFile(unittest.TestCase):
def test_throws_for_user_file_with_invalid_extension(self):
# Arrange
@@ -407,6 +411,7 @@ class TestMaskFile(unittest.TestCase):
args = [file_name]
self.assertRaises(RuntimeError, command_iface.MaskFile, *args)
+
class SANSCommandInterfaceGetAndSetBackgroundCorrectionSettings(unittest.TestCase):
def _do_test_correct_setting(self, run_number, is_time, is_mon, is_mean, mon_numbers):
# Assert that settings were set
diff --git a/scripts/test/SANSIsisInstrumentTest.py b/scripts/test/SANSIsisInstrumentTest.py
index 9fdcdec6fc86b9c8400a75d5c373eec0e5dfdb17..38f8b679f17462ef5753cdb10ec26e693fcaa8e0 100644
--- a/scripts/test/SANSIsisInstrumentTest.py
+++ b/scripts/test/SANSIsisInstrumentTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
from mantid.simpleapi import *
@@ -41,6 +40,7 @@ class SANSIsisInstrumentTest(unittest.TestCase):
self.assertEqual(None, start_Tof)
self.assertEqual(None, end_Tof)
+
class TestParameterMapModifications(unittest.TestCase):
def create_sample_workspace(self, ws_name, types, values, names):
ws = CreateSampleWorkspace(OutputWorkspace = ws_name)
diff --git a/scripts/test/SANSReducerTest.py b/scripts/test/SANSReducerTest.py
index 7257f191e74b5e67200022f53914578e05e1814f..f4003f74ddb8c27ea6aa405762484980d23914e5 100644
--- a/scripts/test/SANSReducerTest.py
+++ b/scripts/test/SANSReducerTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
diff --git a/scripts/test/SANSReductionStepsUserFileTest.py b/scripts/test/SANSReductionStepsUserFileTest.py
index f502e6d54c5af891ab28a4dc880eb3eb552c9f67..fdda1df601fb995678745d81b5337b181453bb48 100644
--- a/scripts/test/SANSReductionStepsUserFileTest.py
+++ b/scripts/test/SANSReductionStepsUserFileTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
import isis_instrument as instruments
@@ -111,6 +110,7 @@ class SANSReductionStepsUserFileTest(unittest.TestCase):
self.assertEqual(merge_Range.q_max, None, 'The q_max should have been read in')
self.assertEqual(merge_Range.q_merge_range, False, 'q_merge_range should be true')
+
class MockConvertTOQISISQResolution(object):
def __init__(self):
super(MockConvertTOQISISQResolution, self).__init__()
@@ -152,11 +152,13 @@ class MockConvertTOQISISQResolution(object):
def set_use_q_resolution(self, enabled):
self.on_off = enabled
+
class MockReducerQResolution(object):
def __init__(self):
super(MockReducerQResolution, self).__init__()
self.to_Q = MockConvertTOQISISQResolution()
+
class TestQResolutionInUserFile(unittest.TestCase):
def test_that_good_input_is_accepted(self):
# Arrange
diff --git a/scripts/test/SANSUtilityTest.py b/scripts/test/SANSUtilityTest.py
index 65e9ca1a041a95b0a4b6b6d69d3cba0c03b446d7..632f7c3f4f2fe9d3e3627728321e0085031380d4 100644
--- a/scripts/test/SANSUtilityTest.py
+++ b/scripts/test/SANSUtilityTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
# Need to import mantid before we import SANSUtility
import mantid
@@ -32,11 +31,13 @@ TEST_STRING_MON2 = TEST_STRING_MON + '_2'
TEST_STRING_DATA3 = TEST_STRING_DATA + '_3'
TEST_STRING_MON3 = TEST_STRING_MON + '_3'
+
def provide_group_workspace_for_added_event_data(event_ws_name, monitor_ws_name, out_ws_name):
CreateWorkspace(DataX = [1,2,3], DataY = [2,3,4], OutputWorkspace = monitor_ws_name)
CreateSampleWorkspace(WorkspaceType= 'Event', OutputWorkspace = event_ws_name)
GroupWorkspaces(InputWorkspaces = [event_ws_name, monitor_ws_name ], OutputWorkspace = out_ws_name)
+
def addSampleLogEntry(log_name, ws, start_time, extra_time_shift, make_linear = False):
number_of_times = 10
for i in range(0, number_of_times):
@@ -49,6 +50,7 @@ def addSampleLogEntry(log_name, ws, start_time, extra_time_shift, make_linear =
date += int(extra_time_shift*1e9)
AddTimeSeriesLog(ws, Name=log_name, Time=date.__str__().strip(), Value=val)
+
def provide_event_ws_with_entries(name, start_time,number_events =0, extra_time_shift = 0.0, proton_charge = True, proton_charge_empty = False, log_names= None, make_linear = False):
# Create the event workspace
ws = CreateSampleWorkspace(WorkspaceType= 'Event', NumEvents = number_events, OutputWorkspace = name)
@@ -68,17 +70,21 @@ def provide_event_ws_with_entries(name, start_time,number_events =0, extra_time_
addSampleLogEntry(name, ws, start_time, extra_time_shift, make_linear)
return ws
+
def provide_event_ws_custom(name, start_time, extra_time_shift = 0.0, proton_charge = True, proton_charge_empty = False):
return provide_event_ws_with_entries(name=name, start_time=start_time,
number_events = 100, extra_time_shift = extra_time_shift,
proton_charge=proton_charge, proton_charge_empty=proton_charge_empty)
+
def provide_event_ws(name, start_time, extra_time_shift):
return provide_event_ws_custom(name = name, start_time = start_time, extra_time_shift = extra_time_shift, proton_charge = True)
+
def provide_event_ws_wo_proton_charge(name, start_time, extra_time_shift):
return provide_event_ws_custom(name = name, start_time = start_time, extra_time_shift = extra_time_shift, proton_charge = False)
+
def provide_histo_workspace_with_one_spectrum(ws_name, x_start, x_end, bin_width):
CreateSampleWorkspace(OutputWorkspace = ws_name,
NumBanks=1,
@@ -204,6 +210,7 @@ class SANSUtilityTest(unittest.TestCase):
self.assertEqual([[1, 3], [5, 5], [7, 9]], su._merge_to_ranges([1, 2, 3, 5, 7, 8, 9]))
self.assertEqual([[1, 1]], su._merge_to_ranges([1]))
+
class TestBundleAddedEventDataFilesToGroupWorkspaceFile(unittest.TestCase):
def _prepare_workspaces(self, names):
CreateSampleWorkspace(WorkspaceType = 'Event', OutputWorkspace = names[0])
@@ -258,6 +265,7 @@ class TestBundleAddedEventDataFilesToGroupWorkspaceFile(unittest.TestCase):
if os.path.exists(file_names[0]):
os.remove(file_names[0])
+
class TestLoadingAddedEventWorkspaceNameParsing(unittest.TestCase):
def do_test_load_check(self, event_name, monitor_name):
@@ -323,6 +331,7 @@ class TestLoadingAddedEventWorkspaceNameParsing(unittest.TestCase):
monitor_name3 = TEST_STRING_MON3
self.do_test_load_check(event_name = event_name3, monitor_name = monitor_name3)
+
class TestLoadingAddedEventWorkspaceExtraction(unittest.TestCase):
_appendix = '_monitors'
@@ -567,6 +576,7 @@ class TestCombineWorkspacesFactory(unittest.TestCase):
alg = factory.create_add_algorithm(False)
self.assertTrue(isinstance(alg, su.PlusWorkspaces))
+
class TestOverlayWorkspaces(unittest.TestCase):
def test_time_from_proton_charge_log_is_recovered(self):
# Arrange
@@ -649,6 +659,7 @@ class TestOverlayWorkspaces(unittest.TestCase):
if name in mtd.getObjectNames():
DeleteWorkspace(name)
+
class TestTimeShifter(unittest.TestCase):
def test_zero_shift_when_out_of_range(self):
# Arrange
@@ -672,6 +683,7 @@ class TestTimeShifter(unittest.TestCase):
self.assertEqual(time_shifter.get_Nth_time_shift(2), -232.0)
self.assertEqual(time_shifter.get_Nth_time_shift(3), 0.0)
+
class TestZeroErrorFreeWorkspace(unittest.TestCase):
def _setup_workspace(self, name, type):
ws = CreateSampleWorkspace(OutputWorkspace = name, WorkspaceType=type, Function='One Peak',NumBanks=1,BankPixelWidth=2,NumEvents=0,XMin=0.5,XMax=1,BinWidth=1,PixelSpacing=1,BankDistanceFromSample=1)
@@ -856,6 +868,7 @@ class TestRenameMonitorsForMultiPeriodEventData(unittest.TestCase):
if element in mtd:
DeleteWorkspace(element)
+
class TestConvertibleToInteger(unittest.TestCase):
def test_converts_true_to_integer_when_integer(self):
# Arrange
@@ -881,6 +894,7 @@ class TestConvertibleToInteger(unittest.TestCase):
# Assert
self.assertFalse(result)
+
class TestConvertibleToFloat(unittest.TestCase):
def test_converts_true_to_float_when_float(self):
# Arrange
@@ -906,6 +920,7 @@ class TestConvertibleToFloat(unittest.TestCase):
# Assert
self.assertFalse(result)
+
class TestValidXmlFileList(unittest.TestCase):
def test_finds_valid_xml_file_list(self):
# Arrange
@@ -931,6 +946,7 @@ class TestValidXmlFileList(unittest.TestCase):
# Assert
self.assertFalse(result)
+
class TestConvertToAndFromPythonStringList(unittest.TestCase):
def test_converts_from_string_to_list(self):
# Arrange
@@ -949,6 +965,7 @@ class TestConvertToAndFromPythonStringList(unittest.TestCase):
expected = "test1.xml,test2.xml,test3.xml"
self.assertEqual(expected, result)
+
class HelperRescaleShift(object):
def __init__(self, hasValues=True, min= 1, max= 2):
super(HelperRescaleShift, self).__init__()
@@ -956,6 +973,7 @@ class HelperRescaleShift(object):
self.qMin = min
self.qMax = max
+
class TestExtractionOfQRange(unittest.TestCase):
def _delete_workspace(self, workspace_name):
if workspace_name in mtd:
@@ -1246,6 +1264,7 @@ class TestGetQResolutionForMergedWorkspaces(unittest.TestCase):
DeleteWorkspace(rear)
DeleteWorkspace(result)
+
class TestDetectingValidUserFileExtensions(unittest.TestCase):
def _do_test(self, file_name, expected):
result = su.is_valid_user_file_extension(file_name)
diff --git a/scripts/test/SansIsisGuiSettings.py b/scripts/test/SansIsisGuiSettings.py
index abbcde8c81193c6a3c846e2526e659e514a1b9aa..24bfa5e946b586b7f46b09ba9f7e82379052caac 100644
--- a/scripts/test/SansIsisGuiSettings.py
+++ b/scripts/test/SansIsisGuiSettings.py
@@ -4,13 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import *
import ISISCommandInterface as i
MASKFILE = 'MaskSANS2D.txt'
+
class Sans2DIsisGuiSettings(unittest.TestCase):
def setUp(self):
diff --git a/scripts/test/SettingsTest.py b/scripts/test/SettingsTest.py
index 9be1fe2d74258655abd4dc7132644f89d0db195b..ba54d97a173f046f5ac5df1b2a5a0b1ad0d4fc17 100644
--- a/scripts/test/SettingsTest.py
+++ b/scripts/test/SettingsTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import os
from mantid.simpleapi import *
@@ -15,6 +14,8 @@ RAII Test helper class. Equivalent to the ScopedFileHelper.
If this proves useful. It would be sensible to make it more accessible for other testing classes.
'''
+
+
class TempFile(object):
__tempFile = None
@@ -38,6 +39,8 @@ class TempFile(object):
'''
Determine if all tests should be skipped. Check for the expat module to decide.
'''
+
+
def skipAllTests():
skiptests = False
try:
diff --git a/scripts/test/TOFTOF/TOFTOFGUITest.py b/scripts/test/TOFTOF/TOFTOFGUITest.py
index 38b089507ce1b4005fb1c23f5eb497d7f713b4a7..24254df8383b8ae19556debda9d5ab6949ba311d 100644
--- a/scripts/test/TOFTOF/TOFTOFGUITest.py
+++ b/scripts/test/TOFTOF/TOFTOFGUITest.py
@@ -4,12 +4,10 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy.QtWidgets import QApplication
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from reduction_gui.reduction.toftof.toftof_reduction import TOFTOFScriptElement, OptionalFloat
from reduction_gui.widgets.toftof.toftof_setup import TOFTOFSetupWidget
diff --git a/scripts/test/TOFTOF/TOFTOFScriptElementTest.py b/scripts/test/TOFTOF/TOFTOFScriptElementTest.py
index ef6a203f2cb1ff511ed260c568487f65909c99cd..1d9395ce7214b7d5d5f4f5c84bc7e8e370996bbb 100644
--- a/scripts/test/TOFTOF/TOFTOFScriptElementTest.py
+++ b/scripts/test/TOFTOF/TOFTOFScriptElementTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from reduction_gui.reduction.toftof.toftof_reduction import TOFTOFScriptElement, OptionalFloat
import testhelpers
import unittest
diff --git a/scripts/test/directtools/DirectToolsTest.py b/scripts/test/directtools/DirectToolsTest.py
index 64ca1fd151e772e158d24cce518d1a32e2e21eff..d20f3e449f6853b2dda73a1538f141b9c759a992 100644
--- a/scripts/test/directtools/DirectToolsTest.py
+++ b/scripts/test/directtools/DirectToolsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Set matplotlib backend to AGG before anything else. Otherwise some build servers
# need to have extra packages (tkinter) installed.
import matplotlib
diff --git a/tools/Copyright/copyrightupdate.py b/tools/Copyright/copyrightupdate.py
index 7233a60a94027675b9529450875c8573d4113613..698270d5eba52d3e487b6b4adfddab7b858cac13 100755
--- a/tools/Copyright/copyrightupdate.py
+++ b/tools/Copyright/copyrightupdate.py
@@ -11,7 +11,6 @@ import os
import pprint
import re
-
######################################################################################################################
# Script level variables
@@ -252,7 +251,7 @@ process_file_tree(root_path)
if not args.noreport:
#write out reporting files
for reporting_filename, reporting_dict in reporting_dictionaries.items():
- with open(reporting_filename,"w") as reporting_file:
+ with open(reporting_filename, "w") as reporting_file:
for key, value in reporting_dict.items():
reporting_file.write("{0}\t{1}{2}".format(key,value,os.linesep))
diff --git a/tools/DOI/doi.py b/tools/DOI/doi.py
index 4c0cbf30a1297e85fe122ed26a8bdccb59b8fa26..9cc361880c494c929d9fee7d0b4ac00fe29ec51f 100644
--- a/tools/DOI/doi.py
+++ b/tools/DOI/doi.py
@@ -62,7 +62,6 @@ USEFUL LINKS:
http://docs.python.org/2/library/httplib.html#httplib.HTTPS_PORT
"""
-from __future__ import (absolute_import, division, print_function)
import argparse
import getpass
import os
diff --git a/tools/DefaultConfigFiles/configToCpp.py b/tools/DefaultConfigFiles/configToCpp.py
index ab1dc191a00ef5fbb5dfc14ad24f850e8564e3d5..75cfee1894d9687fbdffc48dbdb8549be4a0b090 100644
--- a/tools/DefaultConfigFiles/configToCpp.py
+++ b/tools/DefaultConfigFiles/configToCpp.py
@@ -9,7 +9,6 @@
## Dan Nixon
-from __future__ import (absolute_import, division, print_function)
import sys
with open(sys.argv[2]) as f:
diff --git a/tools/Documentation/wiki2rst.py b/tools/Documentation/wiki2rst.py
index 351be27e016af0a08c18c034697b0541868902f6..f0cff3f22a54b6fc98c0a1003a81ca5aef5415c3 100755
--- a/tools/Documentation/wiki2rst.py
+++ b/tools/Documentation/wiki2rst.py
@@ -20,7 +20,6 @@ The bulk of the work is done by pandoc, which is expected to be in the PATH. The
the inline to normal format.
3. Image links cannot have spaces in the filename in rst.
The spaces are removed in the downloaded file names, but not the links in the rst files."""
-from __future__ import (absolute_import, division, print_function)
import argparse
import json
import os
@@ -102,7 +101,7 @@ class WikiURL(object):
raise RuntimeError("Failed to fetch JSON describing image page: {}".format(str(err)))
apicall = json.loads(json_str)
pages = apicall['query']['pages']
- for _, page in pages.iteritems():
+ for _, page in pages.items():
return page['imageinfo'][0]['url']
# ------------------------------------------------------------------------------
diff --git a/tools/PeriodicTable/generate_atom_code.py b/tools/PeriodicTable/generate_atom_code.py
index 16fe17194755daf39e0b82ce6c5b6bfe94def6fe..62f442d85873846677877761538637a9dc233532 100755
--- a/tools/PeriodicTable/generate_atom_code.py
+++ b/tools/PeriodicTable/generate_atom_code.py
@@ -6,8 +6,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-from six.moves import range
import optparse
import sys
try:
diff --git a/tools/Pylint/fixPylint.py b/tools/Pylint/fixPylint.py
index 781ba49cdf6011cbba26dab468792583ccec3622..1cb629669a697eaa2db5904c2cf64b607feb5849 100644
--- a/tools/Pylint/fixPylint.py
+++ b/tools/Pylint/fixPylint.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,anomalous-backslash-in-string
-from __future__ import (absolute_import, division, print_function)
-from __future__ import (absolute_import, division, print_function)
import os
import re
import argparse
diff --git a/tools/Pylint/run_pylint.py b/tools/Pylint/run_pylint.py
index 47b0e7756bc9b22c1591998c320ef1109f327ec9..e71aa0952e07c1fcf35d9af81b86d361313c0718 100644
--- a/tools/Pylint/run_pylint.py
+++ b/tools/Pylint/run_pylint.py
@@ -12,7 +12,6 @@
"""
-from __future__ import (absolute_import, division, print_function)
import logging
from optparse import OptionParser
import os.path
diff --git a/tools/VTKConverter/processISISData.py b/tools/VTKConverter/processISISData.py
index facd6a02c4e3af9d1d6f5249961e18051e3c964e..b235e0578b54177f2f692a13b2c54e46bcd224a3 100644
--- a/tools/VTKConverter/processISISData.py
+++ b/tools/VTKConverter/processISISData.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
#!/usr/bin/python
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import VTKConvert
diff --git a/tools/release_generator/patch.py b/tools/release_generator/patch.py
index 1422b1d4a615247139ba9f189aabd2a12806eaf6..cc36d4948c7437ad9d8345bde4b17093f4524382 100755
--- a/tools/release_generator/patch.py
+++ b/tools/release_generator/patch.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import requests
diff --git a/tools/release_generator/release.py b/tools/release_generator/release.py
index a17550b4b6e02a8c6eb0badc506b5d48fd96347e..cf0b6dfe4dd10381b3f188713ed60ac75dff7138 100755
--- a/tools/release_generator/release.py
+++ b/tools/release_generator/release.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import sys
diff --git a/tools/reports/commits-report.py b/tools/reports/commits-report.py
new file mode 100644
index 0000000000000000000000000000000000000000..a974b9b58483038b5454d2204fb1109b205e60ef
--- /dev/null
+++ b/tools/reports/commits-report.py
@@ -0,0 +1,285 @@
+# Mantid Repository : https://github.com/mantidproject/mantid
+#
+# Copyright © 2018 ISIS Rutherford Appleton Laboratory UKRI,
+# NScD Oak Ridge National Laboratory, European Spallation Source,
+# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
+# SPDX - License - Identifier: GPL - 3.0 +
+#pylint: disable=invalid-name
+
+import datetime
+import csv
+import os
+import re
+
+temp_filename = 'all-commits.stdout'
+regex_git_log_entry = re.compile(
+ r"Author:\s+(.+?)\s+Date:\s+(.+?)\B\s+(\S+).*?((\d+)\sfile.+?)?((\d+)+\sinsertion.+?)?((\d+)+\sdeletion.+?)?(commit\s[0-9a-f]{40}|$)",
+ re.DOTALL)
+regex_git_log_splitter = re.compile(
+ r"commit\s[0-9a-f]{40}")
+regex_name_email_address = re.compile(r"(.*?)<(\S+)>")
+
+organisations = ['STFC', 'ORNL', 'ESS', 'ILL', 'PSI', 'ANSTO', 'KITWARE', 'JUELICH', 'OTHERS', 'CSNS']
+
+domains = {'stfc.ac.uk': 'STFC',
+ 'clrc.ac.uk': 'STFC',
+ 'tessella.com': 'STFC',
+ 'ornl.gov': 'ORNL',
+ 'sns.gov': 'ORNL',
+ 'esss.se': 'ESS',
+ 'ill.fr': 'ILL',
+ 'ill.eu': 'ILL',
+ 'psi.ch': 'PSI',
+ 'ansto.gov.au': 'ANSTO',
+ 'ansto': 'ANSTO',
+ 'mantidproject.org': 'OTHERS',
+ 'MichaelWedel@users.noreply.github.com': 'PSI',
+ 'stuart.i.campbell@gmail.com': 'ORNL',
+ 'uwstout.edu': 'ORNL',
+ 'kitware.com': 'KITWARE',
+ 'juelich.de': 'JUELICH',
+ 'ian.bush@tessella.com': 'STFC',
+ 'dan@dan-nixon.com': 'STFC',
+ 'peterfpeterson@gmail.com': 'ORNL',
+ 'stuart@stuartcampbell.me': 'ORNL',
+ 'harry@exec64.co.uk': 'STFC',
+ 'martyn.gigg@gmail.com': 'STFC',
+ 'raquelalvarezbanos@users.noreply.github.com': 'STFC',
+ 'torben.nielsen@nbi.dk': 'ESS',
+ 'borreguero@gmail.com': 'ORNL',
+ 'raquel.alvarez.banos@gmail.com': 'STFC',
+ 'anton.piccardo-selg@tessella.com': 'STFC',
+ 'rosswhitfield@users.noreply.github.com': 'ORNL',
+ 'mareuternh@gmail.com': 'ORNL',
+ 'quantumsteve@gmail.com': 'ORNL',
+ 'ricleal@gmail.com': 'ORNL',
+ 'jawrainey@gmail.com': 'STFC',
+ 'xingxingyao@gmail.com': 'ORNL',
+ 'owen@laptop-ubuntu': 'STFC',
+ 'picatess@users.noreply.github.com': 'STFC',
+ 'Janik@Janik': 'ORNL',
+ 'debdepba@dasganma.tk': 'OTHERS',
+ 'matd10@yahoo.com': 'OTHERS',
+ 'diegomon93@gmail.com': 'OTHERS',
+ 'mgt110@ic.ac.uk': 'OTHERS',
+ 'granrothge@users.noreply.github.com': 'ORNL',
+ 'tom.g.r.brooks@gmail.com': 'STFC',
+ 'ross.whitfield@gmail.com': 'ORNL',
+ 'samueljackson@outlook.com': 'STFC',
+ 'AntonPiccardoSelg@users.noreply.github.com': 'STFC',
+ 'antibones@users.noreply.github.com': 'ILL',
+ 'MikeHart85@users.noreply.github.com': 'STFC',
+ 'dbt@aber.ac.uk': 'STFC',
+ 'DavidFair@users.noreply.github.com': 'STFC',
+ 'reimundILL@users.noreply.github.com': 'ILL',
+ 'jan@c53.be': 'JUELICH',
+ 'reimund@il.eu': 'ILL',
+ 'davidfair@users.noreply.github.com': 'STFC',
+ 'louisemccann@users.noreply.github.com': 'STFC',
+ 'DimitarTasev@users.noreply.github.com': 'STFC',
+ 'dimtasev@gmail.com': 'STFC',
+ 'fedepou@gmail.com': 'STFC',
+ 'cip.pruteanu@gmail.com': 'OTHERS',
+ 'kdymkowski84@gmail.com': 'OTHERS',
+ 'mayer.ali@t-online.de': 'OTHERS',
+ 'gagikvar@gmail.com': 'ILL',
+ 'bartomeu.llopis.vidal@gmail.com': 'STFC',
+ 'anton.piccardo-selg@tessella.ac.uk': 'STFC',
+ 'jamesphysics@users.noreply.github.com': 'STFC',
+ 'michaeljturner@live.com': 'STFC',
+ 'rprospero@gmail.com': 'STFC',
+ 'roman.tolchenov@gmail.com': 'STFC',
+ 'jiao.lin@gmail.com': 'ORNL',
+ 'erkn@fysik.dtu.dk': 'ESS',
+ 'daniel@pajerowski.com': 'ORNL',
+ 'ElliotAOram@users.noreply.github.com': 'STFC',
+ '37333817+thomueller@users.noreply.github.com': 'ESS',
+ 't.w.jubb@gmail.com': 'STFC',
+ 'edward.brown.96@live.co.uk': 'STFC',
+ 'bhuvan_777@outlook.com': 'STFC',
+ 'joachimcoenen@icloud.com': 'JUELICH',
+ 'anton.piccardo.selg@gmail.com': 'STFC',
+ '29330338+JoachimCoenen@users.noreply.github.com': 'JUELICH',
+ 'samjones714@gmail.com': 'STFC',
+ '5237234+ewancook@users.noreply.github.com': 'STFC',
+ '40766142+SamJenkins1@users.noreply.github.com': 'STFC',
+ 'aybamidele@gmail.com': 'STFC',
+ '5237234+ewancook@users.noreply.github.com': 'STFC',
+ 'samjones714@gmail.com': 'STFC',
+ '40830825+robertapplin@users.noreply.github.com': 'STFC',
+ 'robertgjapplin@gmail.com': 'STFC',
+ 'luzpaz@users.noreply.github.com': 'OTHERS',
+ 't.j.titcombe@gmail.com': 'STFC',
+ '32938439+TTitcombe@users.noreply.github.com': 'STFC',
+ '35809089+EdwardsLT@users.noreply.github.com': 'STFC',
+ 'EdwardsLT@cardiff.ac.uk': 'STFC',
+ '39047984+nvaytet@users.noreply.github.com': 'ESS',
+ 'igudich@gmail.com': 'ESS',
+ '46603316+alicerussell1@users.noreply.github.com': 'STFC',
+ '31194136+aybamidele@users.noreply.github.com': 'STFC',
+ '49688535+Harrietbrown@users.noreply.github.com': 'STFC',
+ 'takudzwamilli@gmail.com': 'STFC',
+ 'lorenzobasso@unseen.is': 'STFC',
+ 'a.j.jackson@physics.org': 'STFC',
+ '32895149+LolloB@users.noreply.github.com': 'STFC',
+ 'philipc99@hotmail.co.uk': 'STFC',
+ 'conor.m.finn.99@gmail.com': 'STFC',
+ '52415735+PhilColebrooke@users.noreply.github.com': 'STFC',
+ 'giodisiena@gmail.com': 'STFC',
+ 'matthew-d-jones@users.noreply.github.com': 'STFC',
+ '32419974+TakudzwaMakoni@users.noreply.github.com': 'STFC',
+ 'hankwu@Hanks-MacBook-Air.local': 'STFC',
+ '55147936+hankwustfc@users.noreply.github.com': 'STFC',
+ '55979119+RichardWaiteSTFC@users.noreply.github.com': 'STFC',
+ 'Waite': 'STFC',
+ '47181718+ConorMFinn@users.noreply.github.com': 'STFC',
+ '31892119+Fahima-Islam@users.noreply.github.com': 'ORNL',
+ '56431339+StephenSmith25@users.noreply.github.com': 'STFC',
+ 'williamfgc@yahoo.com': 'ORNL'}
+
+aliases = {'Anthony':'Anthony Lim',
+ 'AnthonyLim23':'Anthony Lim',
+ 'abuts':'Alex Buts',
+ 'Ayomide Bamidele':'Andre Bamidele',
+ 'DanielMurphy22':'Daniel Murphy',
+ 'Harrietbrown':'Harriet Brown',
+ 'PhilColebrooke':'Phil Colebrooke',
+ 'Phil':'Phil Colebrooke',
+ 'Richard':'Richard Waite',
+ 'RichardWaiteSTFC':'Richard Waite',
+ 'Stephen':'Stephen Smith',
+ 'StephenSmith25':'Stephen Smith',
+ 'StephenSmith':'Stephen Smith',
+ 'Anders-Markvardsen':'Anders Markvardsen',
+ 'AndreiSavici':'Andrei Savici',
+ 'Antti Soininnen':'Antti Soininen',
+ 'Bilheux':'Jean Bilheux',
+ 'brandonhewer':'Brandon Hewer',
+ 'celinedurniak':'Celine Durniak',
+ 'DavidFair':'David Fairbrother',
+ 'DiegoMonserrat':'Diego Monserrat',
+ 'Dimitar Borislavov Tasev':'Dimitar Tasev',
+ 'Tasev':'Dimitar Tasev',
+ 'giovannidisiena':'Giovanni Di Siena ',
+ 'hankwustfc':'Hank Wu ',
+ 'igudich':'Igor Gudich',
+ 'josephframsay':'Joseph Ramsay',
+ 'LamarMoore':'Lamar Moore',
+ 'Moore':'Lamar Moore',
+ 'LolloB':'Lorenzo Basso',
+ 'NickDraper':'Nick Draper',
+ 'Pete Peterson':'Peter Peterson',
+ 'Parker, Peter G':'Peter Parker',
+ 'Raquel Alvarez':'Raquel Alvarez Banos',
+ 'reimundILL':'Verena Reimund ',
+ 'Ricardo Leal':'Ricardo Ferraz Leal',
+ 'Ricardo M. Ferraz Leal':'Ricardo Ferraz Leal',
+ 'Rob':'Robert Applin',
+ 'Rob Applin':'Robert Applin',
+ 'robertapplin ':'Robert Applin',
+ 'Sam':'Sam Jenkins',
+ 'SamJenkins1':'Sam Jenkins',
+ 'simonfernandes':'Simon Fernandes',
+ 'MichaelWedel':'Michael Wedel',
+ 'Steven E. Hahn':'Steven Hahn',
+ 'VickieLynch':'Vickie Lynch'
+ }
+
+
+def generate_commit_data():
+ print('Generating git commit data...')
+ os.system("git --no-pager log --shortstat > " + temp_filename)
+
+
+def parse_commit_data():
+ print("Reading the file")
+ # Open a file: file
+ commit_entries = []
+ commit_entry = ""
+ with open (temp_filename, "r", encoding="utf-8") as file:
+ # read all lines at once
+ log_line = file.readline()
+ while (log_line):
+ if regex_git_log_splitter.match(log_line):
+ commit_entries.append(commit_entry)
+ commit_entry = log_line
+ else:
+ commit_entry += log_line
+ log_line = file.readline()
+
+ #find the matches
+ print("searching for regex matches")
+ with open('commits-report.csv', mode='w', newline='') as output_file:
+ commit_writer = csv.writer(output_file, delimiter=',', quotechar='"', quoting=csv.QUOTE_MINIMAL)
+ commit_writer.writerow(["Author", "Email", "Facility", "Date_time", "Year", "Quarter", "Month", "Week", "Commits",
+ "Files Changed", "Insertions", "Deletions", "Net Lines Changed"])
+ for commit_text in commit_entries:
+ parse_log_entry(commit_text,commit_writer)
+
+
+def parse_log_entry(commit_text,commit_writer):
+ if commit_text =="":
+ return
+ # black listed log entry that crashes the regex engine
+ if commit_text.startswith("commit 4a6c0077a1dff965d767dc45a1517c7411a69070") or \
+ commit_text.startswith("commit 16a4f16c99e3dc3b59d214067781c932f5a9eb8a"):
+ return
+ try:
+ match = regex_git_log_entry.search(commit_text)
+ #skip merges
+ if match.group(3) != "Merge":
+ author = match.group(1)
+ name, email = extract_name_email_from_author(author)
+ date_time_str = match.group(2).strip()
+ date_time = None
+ try:
+ date_time = datetime.datetime.strptime(date_time_str, '%a %b %d %H:%M:%S %Y %z')
+ except ValueError as e:
+ print ("Date Parsing failed")
+ print(date_time_str, e)
+ print(commit_text)
+ return
+ files = 0 if match.group(5) is None else int(match.group(5))
+ insertions = 0 if match.group(7) is None else int(match.group(7))
+ deletions = 0 if match.group(9) is None else int(match.group(9))
+ facility = get_user_facility(email,date_time)
+ commit_writer.writerow([name,email,facility,date_time.strftime("%Y-%m-%d %H:%M"),
+ date_time.strftime("%Y"), (date_time.month-1)//3 + 1, date_time.strftime("%m"),
+ date_time.isocalendar()[1], 1,
+ files,insertions,deletions, insertions-deletions])
+ except RuntimeError as e:
+ print("Match failed", e)
+ print(commit_text)
+
+
+def extract_name_email_from_author(author):
+ match = regex_name_email_address.search(author)
+ if match:
+ original_name = match.group(1).strip()
+ name = aliases[original_name] if original_name in aliases.keys() else original_name
+ return name,match.group(2)
+ else:
+ return None
+
+
+def get_user_facility(email, datetime):
+ facility = "UNKNOWN"
+ for domain in domains.keys():
+ if domain in email:
+ # ORNL didn't join until 2009
+ if domains[domain] == 'ORNL' and datetime.year < 2009:
+ domain = 'stfc.ac.uk'
+ facility = domains[domain]
+ if facility == "UNKNOWN":
+ print("Unmatached email", email)
+ return facility
+
+
+if __name__ == '__main__':
+ print("Generating github commit metrics...\n")
+
+ generate_commit_data()
+ parse_commit_data()
+ os.remove(temp_filename)
+
+ print("\n\nAll done!\n")
diff --git a/tools/reports/display_jenkins_build_queue.py b/tools/reports/display_jenkins_build_queue.py
index 2c2989ac629b48d2f42729cbe6b10a9b65186fd2..8cb5dbe279ff8c8d8bc439a5448dcb3995931275 100755
--- a/tools/reports/display_jenkins_build_queue.py
+++ b/tools/reports/display_jenkins_build_queue.py
@@ -5,8 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
import posixpath as path
import pprint
diff --git a/tools/reports/facility-code-changes.py b/tools/reports/facility-code-changes.py
index 09c2a2b8399a372bdaf3d3415cdbb7b7fb1ea75c..d01cd20e77bf2bf307557a1069edc48e7b0158cf 100644
--- a/tools/reports/facility-code-changes.py
+++ b/tools/reports/facility-code-changes.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import datetime
import subprocess
import csv
diff --git a/tools/reports/release-list.py b/tools/reports/release-list.py
index 920974cd681573c47de02a57ac0b4ef9ba78e821..c7f19d46c6c08856ea3892f91954bea9898bad2c 100644
--- a/tools/reports/release-list.py
+++ b/tools/reports/release-list.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import datetime
import os
import requests
diff --git a/tools/scripts/ConvertBadAlgmLinks.py b/tools/scripts/ConvertBadAlgmLinks.py
index 1eab649ef0e076aded455b07857683d6a04cd8bb..a85fdfff6004dd1f4e6e9ae9629a0286d5759393 100644
--- a/tools/scripts/ConvertBadAlgmLinks.py
+++ b/tools/scripts/ConvertBadAlgmLinks.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import re
import glob
import os
diff --git a/tools/scripts/CorrectConceptLinksinAlgPages.py b/tools/scripts/CorrectConceptLinksinAlgPages.py
index df40d8d8e6a02b7babc5158d27015ec6889371ad..7945c17f52c8bd2b7615c41b53dc16359e7fc3c1 100644
--- a/tools/scripts/CorrectConceptLinksinAlgPages.py
+++ b/tools/scripts/CorrectConceptLinksinAlgPages.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import re
from mantid.api import AlgorithmFactory
diff --git a/tools/scripts/FindIncompleteAlgRSTPages.py b/tools/scripts/FindIncompleteAlgRSTPages.py
index 2c5356aa374b4bb888e0dc44fa61b182d186b0ea..56c2bdc3fe9b2bb18343014a67eec12d5ed582ec 100644
--- a/tools/scripts/FindIncompleteAlgRSTPages.py
+++ b/tools/scripts/FindIncompleteAlgRSTPages.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import re
import urllib2
diff --git a/tools/scripts/TestWikiPython.py b/tools/scripts/TestWikiPython.py
index 58e8e760bd60b76d842dcc582ccfb5802ffeb35d..b33ec8e31c03af3d0445876d1a8f4480f63c6e0a 100644
--- a/tools/scripts/TestWikiPython.py
+++ b/tools/scripts/TestWikiPython.py
@@ -10,7 +10,6 @@
# run with -h for command line arguments
#
##########################################################################################
-from __future__ import (absolute_import, division, print_function)
import os
import re
import sys
diff --git a/tools/scripts/extractAlgorithmNames.py b/tools/scripts/extractAlgorithmNames.py
index 70ae15f0233db55dfc295dc03041914b97ab241c..1dedd93046d8ea85dbf8eccb21c1fc2ca2d5674f 100644
--- a/tools/scripts/extractAlgorithmNames.py
+++ b/tools/scripts/extractAlgorithmNames.py
@@ -7,7 +7,6 @@
#pylint: disable=invalid-name
# simply just print out all algorithm names in a directory which can be piped
# to a file
-from __future__ import (absolute_import, division, print_function)
import os
import glob
diff --git a/tools/scripts/extractAuthorNamesFromGit.py b/tools/scripts/extractAuthorNamesFromGit.py
index 5656ab8b36b18870bfa72c6affe1b47009d48777..c60bf23a777bed05a7d67c912f9c7d0fef07789d 100644
--- a/tools/scripts/extractAuthorNamesFromGit.py
+++ b/tools/scripts/extractAuthorNamesFromGit.py
@@ -12,7 +12,6 @@
# was original used in connection with creating usage examples for algorithms
# and creating an algorithm list for each developer to have a go at
-from __future__ import (absolute_import, division, print_function)
import os
import subprocess
diff --git a/tools/scripts/pyqt4_to_qtpy.py b/tools/scripts/pyqt4_to_qtpy.py
index 312eb14ddee02567e6dc5705adcbcbbf99d9b071..2473d04619942053a2215874812aecab209647f7 100755
--- a/tools/scripts/pyqt4_to_qtpy.py
+++ b/tools/scripts/pyqt4_to_qtpy.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import sys
diff --git a/tools/scripts/update-pr-base-branch.py b/tools/scripts/update-pr-base-branch.py
index af8a8ef20a895bbed7ee27013892b86cb4e9e2dc..9093f865b4b7508f88613c41e2afcbf564304f19 100644
--- a/tools/scripts/update-pr-base-branch.py
+++ b/tools/scripts/update-pr-base-branch.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
# std library
import argparse
import json
diff --git a/tools/sip/sipwrapper.py b/tools/sip/sipwrapper.py
index fc256e99b5e484cc3568c3f63a7cdce8624a92ee..3825d8d51d386a30d38e28196bbeb61d0cb09a73 100755
--- a/tools/sip/sipwrapper.py
+++ b/tools/sip/sipwrapper.py
@@ -9,8 +9,6 @@
Wraps a call to the sip code generation executable to strip any throw specifications
from the generated code as these have been removed from C++17.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
# system imports
import argparse
import logging
diff --git a/tools/skipped_systemtests.py b/tools/skipped_systemtests.py
index b699ee4f3d37593b98f32857f5cc9907e74b5f8f..dec309fd70085dd1b1358c30bd2c82447a49cfdf 100755
--- a/tools/skipped_systemtests.py
+++ b/tools/skipped_systemtests.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
#!/usr/bin/env python
-from __future__ import absolute_import, division, print_function
import datetime
import requests # python-requests