Skip to content
Snippets Groups Projects
Commit b7ebca44 authored by Gagik Vardanyan's avatar Gagik Vardanyan
Browse files

Re #24105 removed obsolete code

parent 731e4b7a
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 1230 deletions
Framework/WorkflowAlgorithms/CMakeLists.txt
+ 2
− 4
View file @ b7ebca44
......@@ -34,8 +34,7 @@ set ( SRC_FILES
src/SANSSensitivityCorrection.cpp
src/SANSSolidAngleCorrection.cpp
src/SetupEQSANSReduction.cpp
src/SetupHFIRReduction.cpp
src/SetupILLD33Reduction.cpp
src/SetupHFIRReduction.cpp
src/StepScan.cpp
src/WorkflowAlgorithmHelpers.cpp
)
......@@ -79,8 +78,7 @@ set ( INC_FILES
inc/MantidWorkflowAlgorithms/SANSSensitivityCorrection.h
inc/MantidWorkflowAlgorithms/SANSSolidAngleCorrection.h
inc/MantidWorkflowAlgorithms/SetupEQSANSReduction.h
inc/MantidWorkflowAlgorithms/SetupHFIRReduction.h
inc/MantidWorkflowAlgorithms/SetupILLD33Reduction.h
inc/MantidWorkflowAlgorithms/SetupHFIRReduction.h
inc/MantidWorkflowAlgorithms/StepScan.h
inc/MantidWorkflowAlgorithms/WorkflowAlgorithmHelpers.h
)
......
Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupILLD33Reduction.h deleted 100644 → 0
+ 0
− 57
View file @ 731e4b7a
// Mantid Repository : https://github.com/mantidproject/mantid
//
// Copyright © 2011 ISIS Rutherford Appleton Laboratory UKRI,
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_ALGORITHMS_SETUPEQSANSREDUCTION_H_
#define MANTID_ALGORITHMS_SETUPEQSANSREDUCTION_H_
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/DeprecatedAlgorithm.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidKernel/PropertyManager.h"
namespace Mantid {
namespace WorkflowAlgorithms {
/**
Set up the reduction options for ILL D33 reduction.
*/
class DLLExport SetupILLD33Reduction : public API::Algorithm,
public API::DeprecatedAlgorithm {
public:
/// Algorithm's name
const std::string name() const override { return "SetupILLD33Reduction"; }
/// Summary of algorithms purpose
const std::string summary() const override {
return "Set up ILL D33 SANS reduction options.";
}
/// Algorithm's version
int version() const override { return (1); }
/// Algorithm's category for identification
const std::string category() const override { return "Workflow\\SANS"; }
private:
/// Initialisation code
void init() override;
/// Execution code
void exec() override;
std::string _findFile(std::string dataRun);
void
setupSensitivity(boost::shared_ptr<Kernel::PropertyManager> reductionManager);
void setupTransmission(
boost::shared_ptr<Kernel::PropertyManager> reductionManager);
void
setupBackground(boost::shared_ptr<Kernel::PropertyManager> reductionManager);
};
} // namespace WorkflowAlgorithms
} // namespace Mantid
#endif /*MANTID_ALGORITHMS_SETUPEQSANSREDUCTION_H_*/
Framework/WorkflowAlgorithms/src/SetupILLD33Reduction.cpp deleted 100644 → 0
+ 0
− 950
View file @ 731e4b7a
This diff is collapsed.
Testing/Data/SystemTest/ILL/001420.nxs.md5 deleted 100644 → 0
+ 0
− 1
View file @ 731e4b7a
3d7981dda48aed0b6b4abf1e8e03b118
\ No newline at end of file
Testing/Data/SystemTest/ILL/001422.nxs.md5 deleted 100644 → 0
+ 0
− 1
View file @ 731e4b7a
5dee58331051229ab32045bfb5dd19b5
\ No newline at end of file
Testing/Data/SystemTest/ILL/001425.nxs.md5 deleted 100644 → 0
+ 0
− 1
View file @ 731e4b7a
a5c7449af9f0d4a46dd06b5074d9da60
\ No newline at end of file
Testing/Data/SystemTest/ILL/001427.nxs.md5 deleted 100644 → 0
+ 0
− 1
View file @ 731e4b7a
687284902a5639ad30a9fbf392531521
\ No newline at end of file
Testing/Data/SystemTest/ILL/001428.nxs.md5 deleted 100644 → 0
+ 0
− 1
View file @ 731e4b7a
899de6ba09da9137a863d420d6b5da7a
\ No newline at end of file
Testing/Data/SystemTest/ILL/001431.nxs.md5 deleted 100644 → 0
+ 0
− 1
View file @ 731e4b7a
37685dac3fc533fe858ea492ad08f586
\ No newline at end of file
Testing/SystemTests/tests/analysis/ILLD33Test.py deleted 100644 → 0
+ 0
− 120
View file @ 731e4b7a
# Mantid Repository : https://github.com/mantidproject/mantid
#
# Copyright &copy; 2018 ISIS Rutherford Appleton Laboratory UKRI,
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
import systemtesting
from mantid.api import mtd
import mantid.simpleapi as ms
import unittest
class ILLD33SANSTest(unittest.TestCase):
prefix = "D33"
def tearDown(self):
for wsName in mtd.getObjectNames():
if wsName.startswith(self.prefix):
mtd.remove(wsName)
def test_all(self):
ms.SetupILLD33Reduction(
# Beam center shouldn't work
#BeamCenterMethod="None",
MaskedDetectorList=[14709,14710,14711,14712,14713,14714,14715,14716,14717,14718,14719,
14720,14721,14722,14723,14724,14725,14726,14727,14728,14729,14730,
14731,14732,14733,14734,14735,14965,14966,14967,14968,14969,14970,
14971,14972,14973,14974,14975,14976,14977,14978,14979,14980,14981,
14982,14983,14984,14985,14986,14987,14988,14989,14990,14991,15221,
15222,15223,15224,15225,15226,15227,15228,15229,15230,15231,15232,
15233,15234,15235,15236,15237,15238,15239,15240,15241,15242,15243,
15244,15245,15246,15247,15477,15478,15479,15480,15481,15482,15483,
15484,15485,15486,15487,15488,15489,15490,15491,15492,15493,15494,
15495,15496,15497,15498,15499,15500,15501,15502,15503,15733,15734,
15735,15736,15737,15738,15739,15740,15741,15742,15743,15744,15745,
15746,15747,15748,15749,15750,15751,15752,15753,15754,15755,15756,
15757,15758,15759,15989,15990,15991,15992,15993,15994,15995,15996,
15997,15998,15999,16000,16001,16002,16003,16004,16005,16006,16007,
16008,16009,16010,16011,16012,16013,16014,16015,16245,16246,16247,
16248,16249,16250,16251,16252,16253,16254,16255,16256,16257,16258,
16259,16260,16261,16262,16263,16264,16265,16266,16267,16268,16269,
16270,16271,16501,16502,16503,16504,16505,16506,16507,16508,16509,
16510,16511,16512,16513,16514,16515,16516,16517,16518,16519,16520,
16521,16522,16523,16524,16525,16526,16527,16757,16758,16759,16760,
16761,16762,16763,16764,16765,16766,16767,16768,16769,16770,16771,
16772,16773,16774,16775,16776,16777,16778,16779,16780,16781,16782,
16783,17013,17014,17015,17016,17017,17018,17019,17020,17021,17022,
17023,17024,17025,17026,17027,17028,17029,17030,17031,17032,17033,
17034,17035,17036,17037,17038,17039,17269,17270,17271,17272,17273,
17274,17275,17276,17277,17278,17279,17280,17281,17282,17283,17284,
17285,17286,17287,17288,17289,17290,17291,17292,17293,17294,17295,
17525,17526,17527,17528,17529,17530,17531,17532,17533,17534,17535,
17536,17537,17538,17539,17540,17541,17542,17543,17544,17545,17546,
17547,17548,17549,17550,17551],
BeamCenterMethod="DirectBeam",
BeamCenterFile='ILL/001427.nxs',
Normalisation="Timer",
DarkCurrentFile= 'ILL/001420.nxs',
TransmissionMethod="DirectBeam",
TransmissionSampleDataFile= 'ILL/001431.nxs',
TransmissionEmptyDataFile= 'ILL/001427.nxs',
BckTransmissionEmptyDataFile= 'ILL/001427.nxs',
TransmissionBeamRadius = 3,
TransmissionUseSampleDC=False,
BackgroundFiles='ILL/001422.nxs',
BckTransmissionSampleDataFile='ILL/001428.nxs',
DoAzimuthalAverage=False,
Do2DReduction=False,
ComputeResolution=True,
ReductionProperties=self.prefix + "props")
ms.SANSReduction(Filename='ILL/001425.nxs', ReductionProperties=self.prefix + "props",
OutputWorkspace=self.prefix + "out")
ms.Rebin(InputWorkspace=self.prefix + 'out',OutputWorkspace=self.prefix + 'out_rebin',
Params='4,0.1,15')
ms.SANSAzimuthalAverage1D(InputWorkspace=self.prefix + 'out_rebin',Binning='0.001,0.0002,0.03',
OutputWorkspace=self.prefix + 'final')
# Check some data
wsOut = mtd[self.prefix + 'out']
self.assertEqual(wsOut.getNumberHistograms(), 65538)
wsOut = mtd[self.prefix + 'out_rebin']
self.assertEqual(wsOut.getNumberHistograms(), 65538)
wsOut = mtd[self.prefix + 'final']
self.assertEqual(wsOut.getNumberHistograms(), 1)
#================== Failure cases ================================
# TODO
#====================================================================================
class ILLD33Test(systemtesting.MantidSystemTest):
_success = False
def requiredMemoryMB(self):
"""Set a limit of 2.5Gb to avoid 32-bit environment"""
return 2500
def runTest(self):
self._success = False
# Custom code to create and run this single test suite
suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite(ILLD33SANSTest, "test") )
runner = unittest.TextTestRunner()
# Run using either runner
res = runner.run(suite)
if res.wasSuccessful():
self._success = True
else:
self._success = False
def validate(self):
return self._success
docs/source/algorithms/SetupILLD33Reduction-v1.rst deleted 100644 → 0
+ 0
− 93
View file @ 731e4b7a
.. algorithm::
.. summary::
.. relatedalgorithms::
.. properties::
Description
-----------
Create a PropertyManager object setting the reduction options for ILL
D33 SANS TOF instrument. The property manager object is then added to
the PropertyManagerDataService.
This was based on the :ref:`SetupEQSANSReduction <algm-SetupEQSANSReduction>`.
See :ref:`SANSReduction <algm-SANSReduction>` for details.
Usage
-----
**Example - Reduces D33 data from a set of NeXus files:**
.. code-block:: python
# List of detector IDs masked
maskedDetectors = [14709,14710,14711,14712,14713,14714,14715,14716,14717,14718,
14719,14720,14721,14722,14723,14724,14725,14726,14727,14728,14729,14730,14731,
14732,14733,14734,14735,14965,14966,14967,14968,14969,14970,14971,14972,14973,
14974,14975,14976,14977,14978,14979,14980,14981,14982,14983,14984,14985,14986,
14987,14988,14989,14990,14991,15221,15222,15223,15224,15225,15226,15227,15228,
15229,15230,15231,15232,15233,15234,15235,15236,15237,15238,15239,15240,15241,
15242,15243,15244,15245,15246,15247,15477,15478,15479,15480,15481,15482,15483,
15484,15485,15486,15487,15488,15489,15490,15491,15492,15493,15494,15495,15496,
15497,15498,15499,15500,15501,15502,15503,15733,15734,15735,15736,15737,15738,
15739,15740,15741,15742,15743,15744,15745,15746,15747,15748,15749,15750,15751,
15752,15753,15754,15755,15756,15757,15758,15759,15989,15990,15991,15992,15993,
15994,15995,15996,15997,15998,15999,16000,16001,16002,16003,16004,16005,16006,
16007,16008,16009,16010,16011,16012,16013,16014,16015,16245,16246,16247,16248,
16249,16250,16251,16252,16253,16254,16255,16256,16257,16258,16259,16260,16261,
16262,16263,16264,16265,16266,16267,16268,16269,16270,16271,16501,16502,16503,
16504,16505,16506,16507,16508,16509,16510,16511,16512,16513,16514,16515,16516,
16517,16518,16519,16520,16521,16522,16523,16524,16525,16526,16527,16757,16758,
16759,16760,16761,16762,16763,16764,16765,16766,16767,16768,16769,16770,16771,
16772,16773,16774,16775,16776,16777,16778,16779,16780,16781,16782,16783,17013,
17014,17015,17016,17017,17018,17019,17020,17021,17022,17023,17024,17025,17026,
17027,17028,17029,17030,17031,17032,17033,17034,17035,17036,17037,17038,17039,
17269,17270,17271,17272,17273,17274,17275,17276,17277,17278,17279,17280,17281,
17282,17283,17284,17285,17286,17287,17288,17289,17290,17291,17292,17293,17294,
17295,17525,17526,17527,17528,17529,17530,17531,17532,17533,17534,17535,17536,
17537,17538,17539,17540,17541,17542,17543,17544,17545,17546,17547,17548,17549,
17550,17551]
# Set all the necessary parameters to reduce the data
SetupILLD33Reduction(
MaskedDetectorList=maskedDetectors,
BeamCenterMethod="DirectBeam",
BeamCenterFile="ILLD33_direct_beam_transm_001427.nxs",
Normalisation="Timer",
DarkCurrentFile= "ILLD33_b4c_001420.nxs",
TransmissionMethod="DirectBeam",
TransmissionSampleDataFile= "ILLD33_sample_transm_001431.nxs",
TransmissionEmptyDataFile= "ILLD33_direct_beam_transm_001427.nxs",
BckTransmissionEmptyDataFile= "ILLD33_direct_beam_transm_001427.nxs",
TransmissionBeamRadius = 3,
TransmissionUseSampleDC=False,
BackgroundFiles= "ILLD33_empty_cell_001422.nxs",
BckTransmissionSampleDataFile="ILLD33_empty_cell_transm_001428.nxs",
DoAzimuthalAverage=False,
Do2DReduction=False,
ComputeResolution=True,
ReductionProperties="d33")
# Reduce the sample data
output=SANSReduction(Filename="ILLD33_sample_001425.nxs", ReductionProperties="d33",OutputWorkspace="d33out")
# Rebin
Rebin(InputWorkspace='d33out',OutputWorkspace='d33out_rebin',Params='4,0.1,15')
# Do a radial integration
SANSAzimuthalAverage1D(InputWorkspace='d33out_rebin',Binning='0.001,0.0002,0.03',OutputWorkspace='IQ_curve')
# Get the OutputWorkspace as a python workspace
iq = mtd['IQ_curve']
print("This workspace has {} dimensions and has {} histograms.".format(iq.getNumDims(), iq.getNumberHistograms()))
Output:
This workspace has 2 dimensions and has 1 histograms.
.. categories::
.. sourcelink::
docs/source/release/v3.14.0/sans.rst
+ 5
− 0
View file @ b7ebca44
......@@ -38,4 +38,9 @@ Improvements
- :ref:`Q1DWeighted <algm-Q1DWeighted>` now supports the option of asymmetric wedges for unisotropic scatterer.
Removed
#######
- Obsolete *SetupILLD33Reduction* algorithm was removed.
:ref:`Release 3.14.0 <v3.14.0>`
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment