Skip to content

Commit

Permalink
Keep Pylint happy Refs #10855
Browse files Browse the repository at this point in the history
  • Loading branch information
DanNixon committed Jun 2, 2015
1 parent 342140e commit 0d57760
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
@@ -1,14 +1,28 @@
#pylint: disable=no-init,too-many-instance-attributes

from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
from mantid import config

import os
import numpy as np


class ISISIndirectDiffractionReduction(DataProcessorAlgorithm):

_workspace_names = None
_chopped_data = None
_output_ws = None
_data_files = None
_instrument_name = None
_mode = None
_spectra_range = None
_grouping_method = None
_rebin_string = None
_ipf_filename = None
_sum_files = None


def category(self):
return 'Diffraction;PythonAlgorithms'

Expand Down
7 changes: 5 additions & 2 deletions Code/Mantid/scripts/Inelastic/IndirectReductionCommon.py
@@ -1,4 +1,4 @@
#pylint: disable=invalid-name,too-many-branches
#pylint: disable=invalid-name,too-many-branches,too-many-arguments,deprecated-module,no-name-in-module
from mantid.api import WorkspaceGroup, AlgorithmManager
from mantid import mtd, logger, config

Expand All @@ -7,7 +7,7 @@

#-------------------------------------------------------------------------------

def load_files(data_files, ipf_filename, spec_min, spec_max, sum_files, load_opts=dict()):
def load_files(data_files, ipf_filename, spec_min, spec_max, sum_files, load_opts=None):
"""
Loads a set of files and extracts just the spectra we care about (i.e. detector range and monitor).
Expand All @@ -24,6 +24,9 @@ def load_files(data_files, ipf_filename, spec_min, spec_max, sum_files, load_opt
ChopData, ExtractSingleSpectrum,
CropWorkspace)

if load_opts is None:
load_opts = {}

workspace_names = []

for filename in data_files:
Expand Down

0 comments on commit 0d57760

Please sign in to comment.