public release 3.0.0 - see README and CHANGES for details

pmsco/handlers.py

@@ -40,23 +40,20 @@ the scan and domain handlers call methods of the project class to invoke project
 
 @author Matthias Muntwiler, matthias.muntwiler@psi.ch
 
-@copyright (c) 2015-18 by Paul Scherrer Institut @n
+@copyright (c) 2015-21 by Paul Scherrer Institut @n
 Licensed under the Apache License, Version 2.0 (the "License"); @n
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
   http://www.apache.org/licenses/LICENSE-2.0
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import datetime
 from functools import reduce
 import logging
 import math
 import numpy as np
 import os
+from pathlib import Path
 
 from pmsco.compat import open
 import pmsco.data as md
@@ -377,7 +374,7 @@ class SingleModelHandler(ModelHandler):
         keys = [key for key in self.result]
         keys.sort(key=lambda t: t[0].lower())
         vals = (str(self.result[key]) for key in keys)
-        filename = self._project.output_file + ".dat"
+        filename = Path(self._project.output_file).with_suffix(".dat")
         with open(filename, "w") as outfile:
             outfile.write("# ")
             outfile.write(" ".join(keys))
@@ -437,11 +434,11 @@ class ScanHandler(TaskHandler):
 
         if project.combined_scan is not None:
             ext = md.format_extension(project.combined_scan)
-            filename = project.output_file + ext
+            filename = Path(project.output_file).with_suffix(ext)
             md.save_data(filename, project.combined_scan)
         if project.combined_modf is not None:
             ext = md.format_extension(project.combined_modf)
-            filename = project.output_file + ".modf" + ext
+            filename = Path(project.output_file).with_suffix(".modf" + ext)
             md.save_data(filename, project.combined_modf)
 
         return len(self._project.scans)
@@ -695,7 +692,7 @@ class EmitterHandler(TaskHandler):
             the estimate is based on the start parameters, scan 0 and domain 0.
         """
         super(EmitterHandler, self).setup(project, slots)
-        mock_model = self._project.create_model_space().start
+        mock_model = self._project.model_space.start
         mock_index = dispatch.CalcID(-1, 0, 0, -1, -1)
         n_emitters = project.cluster_generator.count_emitters(mock_model, mock_index)
         return n_emitters