From b1e7b68a21c4976d5820bf6d216e65649a6a19d5 Mon Sep 17 00:00:00 2001
From: Artur Glavic <artur.glavic@psi.ch>
Date: Wed, 30 Oct 2024 12:32:24 +0100
Subject: [PATCH] update tests to new configuration parameters

---
 tests/test_full_analysis.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/test_full_analysis.py b/tests/test_full_analysis.py
index 9eff6d0..fb6e003 100644
--- a/tests/test_full_analysis.py
+++ b/tests/test_full_analysis.py
@@ -21,15 +21,14 @@ class FullAmorTest(TestCase):
         self.pr.enable()
         self.reader_config = options.ReaderConfig(
                 year=2023,
-                dataPath=os.path.join('..', "test_data"),
-                raw=(os.path.join('..', "test_data"),)
+                rawPath=(os.path.join('..', "test_data"),),
                 )
 
     def tearDown(self):
         self.pr.disable()
         for fi in ['test.Rqz.ort', '614.norm']:
             try:
-                os.unlink(os.path.join(self.reader_config.dataPath, fi))
+                os.unlink(os.path.join(self.reader_config.rawPath[0], fi))
             except FileNotFoundError:
                 pass
 
@@ -38,6 +37,8 @@ class FullAmorTest(TestCase):
         experiment_config = options.ExperimentConfig(
                 chopperPhase=-13.5,
                 chopperPhaseOffset=-5,
+                monitorType=options.Defaults.monitorType,
+                lowCurrentThreshold=options.Defaults.lowCurrentThreshold,
                 yRange=(11., 41.),
                 lambdaRange=(2., 15.),
                 qzRange=(0.005, 0.30),
@@ -60,7 +61,8 @@ class FullAmorTest(TestCase):
                 )
         output_config = options.OutputConfig(
                 outputFormats=["Rqz.ort"],
-                outputName='test'
+                outputName='test',
+                outputPath=options.Defaults.outputPath,
                 )
         config=options.EOSConfig(self.reader_config, experiment_config, reduction_config, output_config)
         # run three times to get similar timing to noslicing runs
@@ -75,6 +77,8 @@ class FullAmorTest(TestCase):
         experiment_config = options.ExperimentConfig(
                 chopperPhase=-13.5,
                 chopperPhaseOffset=-5,
+                monitorType=options.Defaults.monitorType,
+                lowCurrentThreshold=options.Defaults.lowCurrentThreshold,
                 yRange=(11., 41.),
                 lambdaRange=(2., 15.),
                 qzRange=(0.005, 0.30),
@@ -96,7 +100,8 @@ class FullAmorTest(TestCase):
                 )
         output_config = options.OutputConfig(
                 outputFormats=["Rqz.ort"],
-                outputName='test'
+                outputName='test',
+                outputPath=options.Defaults.outputPath,
                 )
         config=options.EOSConfig(self.reader_config, experiment_config, reduction_config, output_config)
         reducer = reduction.AmorReduction(config)