diff --git a/scripts/Inelastic/Direct/AbsorptionShapes.py b/scripts/Inelastic/Direct/AbsorptionShapes.py index a0440b39fc1529029dfac8c489acdf60ffb841c3..8d90defe2bcd68f272b2043099e7e238cefd95f0 100644 --- a/scripts/Inelastic/Direct/AbsorptionShapes.py +++ b/scripts/Inelastic/Direct/AbsorptionShapes.py @@ -282,7 +282,7 @@ class anAbsorptionShape(object): val = float(val) shape_dict[all_prop[i]] = val elif isinstance(value,dict): - for key,val in value.iteritems(): + for key,val in value.items(): if isinstance(val,(list,tuple)): val = map(lambda x: float(x),val) else: diff --git a/scripts/Inelastic/Direct/DirectEnergyConversion.py b/scripts/Inelastic/Direct/DirectEnergyConversion.py index 333636a56b6ef98e75c5bdffc9d17cae2fbf9c60..822ddbff1c7036fdeff233b5e4883a91458ca008 100644 --- a/scripts/Inelastic/Direct/DirectEnergyConversion.py +++ b/scripts/Inelastic/Direct/DirectEnergyConversion.py @@ -1929,11 +1929,11 @@ class DirectEnergyConversion(object): object.__setattr__(self,'_old_runs_list',[]) # - def do_preprocessing(self,ws): + def do_preprocessing(self,ws,*argi): """ stub for custom preprocessing function""" return ws - def do_postprocessing(self,ws): + def do_postprocessing(self,ws,*argi): """ stub for custom postprocessing function""" return ws diff --git a/scripts/test/AbsorptionShapesTest.py b/scripts/test/AbsorptionShapesTest.py index 52dc97b2daad65e6e543f04fc2fc4ad22af96c8b..45408b6bc878b1f56b369909f0aa122b1eb2e9a4 100644 --- a/scripts/test/AbsorptionShapesTest.py +++ b/scripts/test/AbsorptionShapesTest.py @@ -183,14 +183,18 @@ class AdsorbtionShapesTest(unittest.TestCase): ash.shape = [5,[1,0,0]] res = ash.shape; - self.assertEqual(res['Radius'],5) - self.assertEqual(res['Center'],[1,0,0]) + rad = res['Radius'] + self.assertEqual(rad,5) + cen = res['Center'] + self.assertEqualcen(cen,[1,0,0]) ash.shape = {'Radius':3,'Center':[0.,0.,0.]} res = ash.shape; - self.assertEqual(res['Radius'],3) - self.assertEqual(res['Center'],[0,0,0]) + rad = res['Radius'] + self.assertEqual(rad,3) + cen = res['Center'] + self.assertEqual(cen,[0,0,0]) test_ws = CreateSampleWorkspace(NumBanks=1,BankPixelWidth=1)