fix error from merge and make raw data dir location platform independent

libeos/file_reader.py

@@ -181,7 +181,7 @@ class AmorData:
         self.read_event_stream()
         totalNumber = np.shape(self.tof_e)[0]
 
-        self.sort_events_by_pulse()
+        self.sort_pulses()
 
         self.define_monitor()
 
@@ -443,7 +443,7 @@ class AmorData:
                 )
         self.header.sample = fileio.Sample(
                 name=sampleName,
-                model=model,
+                model=SampleModel(stack=model),
                 sample_parameters=None,
                 )
         self.header.measurement_scheme = 'angle- and energy-dispersive'

libeos/options.py

@@ -4,13 +4,14 @@ Classes for stroing various configurations needed for reduction.
 from dataclasses import dataclass, field
 from typing import Optional, Tuple
 from datetime import datetime
+from os import path
 
 import logging
 
 class Defaults:
     # fileIdentifier
     dataPath                    = '.'
-    raw                         = ['.', './raw', '../raw', '../../raw']
+    raw                         = ['.', path.join('.','raw'), path.join('..','raw'), path.join('..','..','raw')]
     year                        = datetime.now().year
     normalisationFileIdentifier = []
     normalisationMethod         = 'o'