old_contents: # -----------------------------------------------------------------------------------------------------
  # CONDOR
  # Simulator for diffractive single-particle imaging experiments with X-ray lasers
  # http://xfel.icm.uu.se/condor/
  # -----------------------------------------------------------------------------------------------------
  # Copyright 2016 Max Hantke, Filipe R.N.C. Maia, Tomas Ekeberg
  # Condor is distributed under the terms of the BSD 2-Clause License
  # -----------------------------------------------------------------------------------------------------
  # Redistribution and use in source and binary forms, with or without
  # modification, are permitted provided that the following conditions are met:
  # 
  # 1. Redistributions of source code must retain the above copyright notice, this
  #    list of conditions and the following disclaimer.
  # 2. Redistributions in binary form must reproduce the above copyright notice,
  #    this list of conditions and the following disclaimer in the documentation
  #    and/or other materials provided with the distribution.
  # 
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
  # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  # -----------------------------------------------------------------------------------------------------
  # General note:
  # All variables are in SI units by default. Exceptions explicit by variable name.
  # -----------------------------------------------------------------------------------------------------
  import pickle
  
  def load_atomic_scattering_factors(data_dir):
      with open(os.path.join(data_dir, 'sf.dat', 'rb') as f:
          atomic_scattering_factors = pickle.load(f)
      return atomic_scattering_factors
  
  def load_atomic_masses(data_dir):
      with open(os.path.join(data_dir, 'sw.dat'), 'rb') as f:
          atomic_masses = pickle.load(f)
      return atomic_masses
  
  def load_atomic_numbers(data_dir):
      with open(os.path.join(data_dir, 'z.dat'), 'rb') as f:
          atomic_numbers = pickle.load(f)
      return atomic_numbers
  
new_contents: # -----------------------------------------------------------------------------------------------------
  # CONDOR
  # Simulator for diffractive single-particle imaging experiments with X-ray lasers
  # http://xfel.icm.uu.se/condor/
  # -----------------------------------------------------------------------------------------------------
  # Copyright 2016 Max Hantke, Filipe R.N.C. Maia, Tomas Ekeberg
  # Condor is distributed under the terms of the BSD 2-Clause License
  # -----------------------------------------------------------------------------------------------------
  # Redistribution and use in source and binary forms, with or without
  # modification, are permitted provided that the following conditions are met:
  # 
  # 1. Redistributions of source code must retain the above copyright notice, this
  #    list of conditions and the following disclaimer.
  # 2. Redistributions in binary form must reproduce the above copyright notice,
  #    this list of conditions and the following disclaimer in the documentation
  #    and/or other materials provided with the distribution.
  # 
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
  # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  # -----------------------------------------------------------------------------------------------------
  # General note:
  # All variables are in SI units by default. Exceptions explicit by variable name.
  # -----------------------------------------------------------------------------------------------------
  import pickle
  import os
  
  def load_atomic_scattering_factors(data_dir):
      with open(os.path.join(data_dir, 'sf.dat'), 'rb') as f:
          atomic_scattering_factors = pickle.load(f)
      return atomic_scattering_factors
  
  def load_atomic_masses(data_dir):
      with open(os.path.join(data_dir, 'sw.dat'), 'rb') as f:
          atomic_masses = pickle.load(f)
      return atomic_masses
  
  def load_atomic_numbers(data_dir):
      with open(os.path.join(data_dir, 'z.dat'), 'rb') as f:
          atomic_numbers = pickle.load(f)
      return atomic_numbers
  
subject: Fix syntax error