From 253f331049f7e5bd3dfb6fb0bad68b3ea2bfff20 Mon Sep 17 00:00:00 2001
From: Wenduo Zhou <zhouw@ornl.gov>
Date: Tue, 25 Jul 2017 09:47:49 -0400
Subject: [PATCH] Refs #19406. Fixed issues from Martyn's comment.
---
.../Algorithms/inc/MantidAlgorithms/FilterEvents.h | 10 +---------
Framework/Algorithms/src/GenerateEventsFilter.cpp | 9 ---------
.../plugins/algorithms/SNSPowderReduction.py | 6 +-----
3 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h b/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
index 83455957d73..8ffdd7161b9 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
@@ -74,8 +74,6 @@ public:
}
private:
- friend struct Mantid::Kernel::CreateUsingNew<FilterEvents>;
-
// Implement abstract Algorithm methods
void init() override;
// Implement abstract Algorithm methods
@@ -141,22 +139,16 @@ private:
/// Run object
std::vector<std::string> getTimeSeriesLogNames();
- // Kernel::TimeSplitterType generateSplitters(int wsindex);
-
void generateSplitterTSP(
std::vector<Kernel::TimeSeriesProperty<int> *> &split_tsp_vec);
void generateSplitterTSPalpha(
std::vector<Kernel::TimeSeriesProperty<int> *> &split_tsp_vec);
- ///
+ /// Add time series property 'Splitter' to each child workspace
void mapSplitterTSPtoWorkspaces(
const std::vector<Kernel::TimeSeriesProperty<int> *> &split_tsp_vec);
- // void splitTSPLogInPlace(DataObjects::EventWorkspace_sptr eventws,
- // std::string logname,
- // Kernel::TimeSplitterType &splitters);
-
void copyNoneSplitLogs(
std::vector<Kernel::TimeSeriesProperty<int> *> &int_tsp_name_vector,
std::vector<Kernel::TimeSeriesProperty<double> *> &dbl_tsp_name_vector,
diff --git a/Framework/Algorithms/src/GenerateEventsFilter.cpp b/Framework/Algorithms/src/GenerateEventsFilter.cpp
index c35f00abee6..806801bedc0 100644
--- a/Framework/Algorithms/src/GenerateEventsFilter.cpp
+++ b/Framework/Algorithms/src/GenerateEventsFilter.cpp
@@ -889,15 +889,6 @@ void GenerateEventsFilter::makeFilterBySingleValue(
addNewTimeFilterSplitter(start, stop, wsindex, empty);
}
- // add the row for information table workspace
- // std::stringstream infoss;
- // infoss << "DaDa Log." << m_dblLog->name() << ".From." << min << ".To." <<
- // max
- // << ".Direction=Increase" << filterIncrease << "DirectionDecrease="
- // << filterDecrease;
- // API::TableRow row = m_filterInfoWS->appendRow();
- // row << wsindex << infoss.str();
-
return;
}
diff --git a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
index 6d0f18d2974..f1544cfbcc5 100644
--- a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
@@ -723,7 +723,7 @@ class SNSPowderReduction(DataProcessorAlgorithm):
# Normalize by current with new name
if self._normalisebycurrent is True:
- self.log().warning('[SPECIAL DB] Normalize current to workspace %s' % sample_ws_name)
+ self.log().information('Normalize current to workspace %s' % sample_ws_name)
# temp_ws = self.get_workspace(sample_ws_name)
if not (is_event_workspace(sample_ws_name) and get_workspace(sample_ws_name).getNumberEvents() == 0):
api.NormaliseByCurrent(InputWorkspace=sample_ws_name,
@@ -891,9 +891,6 @@ class SNSPowderReduction(DataProcessorAlgorithm):
ReductionProperties="__snspowderreduction",
**self._focusPos)
# logging (ignorable)
- #for iws in range(out_ws_c_s.getNumberHistograms()):
- # spec = out_ws_c_s.getSpectrum(iws)
- # self.log().debug("[DBx131] ws %d: spectrum No = %d. " % (iws, spec.getSpectrumNo()))
if is_event_workspace(out_ws_name_chunk_split):
self.log().information('After being aligned and focused, workspace %s: Number of events = %d '
'of chunk %d ' % (out_ws_name_chunk_split,
@@ -1474,7 +1471,6 @@ class SNSPowderReduction(DataProcessorAlgorithm):
SplitterWorkspace=split_ws_name, GroupWorkspaces=True, RelativeTime=is_relative_time)
else:
# split with information table
- self.log().notice('[DB...BAT] Raw Name: {0}. Base Name: {1}'.format(raw_ws_name, base_name))
api.FilterEvents(InputWorkspace=raw_ws_name, OutputWorkspaceBaseName=base_name,
SplitterWorkspace=split_ws_name, InformationWorkspace=str(self._splitinfotablews),
GroupWorkspaces=True, RelativeTime=is_relative_time)
--
GitLab