Merge remote-tracking branch 'origin/feature/8116_fltabs_code_tidy'

mantidproject · Nov 19, 2013 · af1e394 · af1e394
2 parents 23cf945 + 0236140
commit af1e394
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Code/Mantid/scripts/Inelastic/IndirectAbsCor.py b/Code/Mantid/scripts/Inelastic/IndirectAbsCor.py
@@ -237,14 +237,13 @@ def calcThicknessAtSec(xSection, thickness, sec):
 
     return thickSec1, thickSec2
 
-def calcFlatAbsCan(ass, canXSection, thick, sec):
+def calcFlatAbsCan(ass, canXSection, canThickness1, canThickness2, sampleSec1, sampleSec2, sec):
+    nlam = len(canXSection)
+
     assc = np.ones(nlam)
     acsc = np.ones(nlam)
     acc = np.ones(nlam)
 
-    #thickness of the can
-    canThickness1, canThickness2 = thick
-
     sec1, sec2 = sec
 
     #vector version of fact
@@ -341,6 +340,6 @@ def FlatAbs(ncan, thick, density, sigs, siga, angles, waves):
         if useCan:
             #calculate can cross section
             canXSection = (canScatt + canAbs * waves /1.8) * canDensity
-            assc, acsc, acc = calcFlatAbsCan(ass, canXSection, [canThickness1, canThickness2], [sec1, sec2])
+            assc, acsc, acc = calcFlatAbsCan(ass, canXSection, canThickness1, canThickness2, sampleSec1, sampleSec2, [sec1, sec2])
 
     return ass, assc, acsc, acc