Merge branch 'feature/8435_redesign_load_data' into develop

mantidproject · Nov 14, 2013 · 652a4d6 · 652a4d6
2 parents d3194f9 + 2ba1ac1
commit 652a4d6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/SystemTests/AnalysisTests/SANS2DReductionGUIAdded.py b/SystemTests/AnalysisTests/SANS2DReductionGUIAdded.py
@@ -24,11 +24,13 @@ def runTest(self):
         SANSadd2.add_runs(('22048','22048'),'SANS2D', '.nxs', rawTypes=('.add','.raw','.s*'), lowMem=False)
         SANSadd2.add_runs(('22023','22023'),'SANS2D', '.nxs', rawTypes=('.add','.raw','.s*'), lowMem=False)
 
-        self.loadSettings()
-
-        # replace sample and can: 
+        # load values: 
+        i.SetCentre('155.45','-169.6','rear') 
+        i.SetCentre('155.45','-169.6','front')
         SCATTER_SAMPLE, logvalues = i.AssignSample(r'SANS2D00022048-add.nxs', reload = True, period = 1)
         SCATTER_SAMPLE, logvalues = i.AssignCan(r'SANS2D00022023-add.nxs', reload = True, period = 1)
+        i.TransmissionSample(r'SANS2D00022041.nxs', r'SANS2D00022024.nxs', period_t=1, period_d=1)
+        i.TransmissionCan(r'SANS2D00022024.nxs', r'SANS2D00022024.nxs', period_t=1, period_d=1)
 
         self.checkAfterLoad()
 
@@ -53,4 +55,4 @@ def validate(self):
 
 if __name__ == "__main__":
   test = SANS2DReductionGUIAddedFiles()
-  test.execute()
+  test.execute()