diff --git a/Code/Mantid/DataHandling/inc/MantidDataHandling/SetScalingPSD.h b/Code/Mantid/DataHandling/inc/MantidDataHandling/SetScalingPSD.h index e4dcc845c8008f8cb89572873c498d39c2dae95b..9a18ac3ba2405c9ad36aad6a58342d5876d5a657 100644 --- a/Code/Mantid/DataHandling/inc/MantidDataHandling/SetScalingPSD.h +++ b/Code/Mantid/DataHandling/inc/MantidDataHandling/SetScalingPSD.h @@ -17,15 +17,19 @@ namespace Mantid { /** @class SetScalingPSD SetScalingPSD.h MantidAlgorithm/SetScalingPSD.h + Read the scaling information from a file (e.g. merlin_detector.sca) or from the RAW file (.raw) + and adjusts the detectors positions and scaling appropriately. + Required Properties: <UL> - <LI> Filename - The name of and path to the input Nexus file </LI> - <LI> OutputWorkspace - The name of the workspace in which to store the imported data </LI> - </UL> - Optional Properties: - <UL> - <LI> spectrum_list - integer list of spectra numbers to load</LI> - <LI> spectrum_min, spectrum_max - range of spectra to load</LI> + <LI> ScalingFilename - The path to the file containing the detector ositions to use either .raw or .sca</LI> + <LI> Workspace - The name of the workspace to adjust </LI> + </UL> + Optional Properties: + <UL> + <LI> scalingOption - 0 => use average of left and right scaling (default). + 1 => use maximum scaling. + 2 => maximum + 5%</LI> </UL> @author Ronald Fowler diff --git a/Code/Mantid/DataHandling/src/SetScalingPSD.cpp b/Code/Mantid/DataHandling/src/SetScalingPSD.cpp index e8759f103c9f2aff4151ed44b30edaffdace11e2..7d8fa61a926f0fa0b17ad434931d053e4b0c31ad 100644 --- a/Code/Mantid/DataHandling/src/SetScalingPSD.cpp +++ b/Code/Mantid/DataHandling/src/SetScalingPSD.cpp @@ -193,7 +193,7 @@ namespace Algorithms Geometry::V3D detPos = det->getPos(); Geometry::V3D shift=truepos[i]-detPos; double scale; - if(detIdLast==detIndex-1 && detIndex>100) // merlin monitors are <100, dets >100 + if(detIdLast==detIndex-1 && !det->isMonitor()) { Geometry::V3D diffI=detPos-detPosLast; Geometry::V3D diffT=truepos[i]-truPosLast;