refactored code to load filepaths from loadFilePaths

KerrPy/Figure/processFigures.py

@@ -10,9 +10,11 @@
 
 from hashlib import sha1
 
-from globalVariables import debug, proc_dir, figs_folder, samplename
+from globalVariables import debug
 from globalVariables import saveFigures
 
+from KerrPy.File.loadFilePaths import figs_root
+
 from KerrPy.Fits.loadFits import loadFits
 
 from KerrPy.Fits.filterSpace import filterSpace
@@ -36,7 +38,7 @@ def extractSubspace(list_exp_indices, space ):
 
 
 
-def saveFigsSpace( avg_space, prefix, list_figs_files, list_figs, parent_dir_abs):
+def saveFigsSpace( avg_space, prefix, list_figs_files, list_figs):
     """
         0. Save list of figs
         1. Save the iteration parameters as csv file.
@@ -47,15 +49,6 @@ def saveFigsSpace( avg_space, prefix, list_figs_files, list_figs, parent_dir_abs
 
     if debug: print("L0 saveFigsSpace() started")
 
-    proc_dir_abs = os.path.abspath(os.path.join(parent_dir_abs, proc_dir))
-    if not os.path.isdir(proc_dir_abs): os.mkdir(proc_dir_abs)
-
-    figs_dir_abs = os.path.abspath(os.path.join(proc_dir_abs, figs_folder))
-    if not os.path.isdir(figs_dir_abs): os.mkdir(figs_dir_abs)
-
-    figs_root = os.path.abspath(os.path.join(figs_dir_abs,samplename))
-    if not os.path.isdir(figs_root): os.mkdir(figs_root)
-
     #change to images root folder (LEVEL 0)
     os.chdir(figs_root)
 
@@ -105,7 +98,7 @@ def saveFigsSpace( avg_space, prefix, list_figs_files, list_figs, parent_dir_abs
     os.chdir(cur_path)
 
 
-def saveFigsExperiment(exp_index, avg_iteration, list_figs_files, list_figs, parent_dir_abs):
+def saveFigsExperiment(exp_index, avg_iteration, list_figs_files, list_figs):
     """
         0. Save list of figs
         1. Save the iteration parameters as csv file.
@@ -116,15 +109,6 @@ def saveFigsExperiment(exp_index, avg_iteration, list_figs_files, list_figs, par
 
     if debug: print(f"    L1 saveFigsExperiment() started at E:{exp_index}")
 
-    proc_dir_abs = os.path.abspath(os.path.join(parent_dir_abs, proc_dir))
-    if not os.path.isdir(proc_dir_abs): os.mkdir(proc_dir_abs)
-
-    figs_dir_abs = os.path.abspath(os.path.join(proc_dir_abs, figs_folder))
-    if not os.path.isdir(figs_dir_abs): os.mkdir(figs_dir_abs)
-
-    figs_root = os.path.abspath(os.path.join(figs_dir_abs,samplename))
-    if not os.path.isdir(figs_root): os.mkdir(figs_root)
-
     #change to images root folder (LEVEL 0)
     os.chdir(figs_root)
 
@@ -161,7 +145,7 @@ def saveFigsExperiment(exp_index, avg_iteration, list_figs_files, list_figs, par
     os.chdir(cur_path)
 
 
-def saveFigsIteration( iter_index, exp_index, iteration, list_figs_files, list_figs, parent_dir_abs):
+def saveFigsIteration( iter_index, exp_index, iteration, list_figs_files, list_figs):
     """
         0. Save list of figs
         1. Save the iteration parameters as csv file.
@@ -172,15 +156,6 @@ def saveFigsIteration( iter_index, exp_index, iteration, list_figs_files, list_f
 
     if debug: print(f"        L2 saveFigList() started at E:{exp_index} I:{iter_index}")
 
-    proc_dir_abs = os.path.abspath(os.path.join(parent_dir_abs, proc_dir))
-    if not os.path.isdir(proc_dir_abs): os.mkdir(proc_dir_abs)
-
-    figs_dir_abs = os.path.abspath(os.path.join(proc_dir_abs, figs_folder))
-    if not os.path.isdir(figs_dir_abs): os.mkdir(figs_dir_abs)
-
-    figs_root = os.path.abspath(os.path.join(figs_dir_abs,samplename))
-    if not os.path.isdir(figs_root): os.mkdir(figs_root)
-
     #change to images root folder (LEVEL 0)
     os.chdir(figs_root)
 
@@ -224,7 +199,7 @@ def saveFigsIteration( iter_index, exp_index, iteration, list_figs_files, list_f
     os.chdir(cur_path)
 
 
-def drawIterationFigures(space, controls, parent_dir_abs):
+def drawIterationFigures(space, controls):
     """
         0. Iterate over all the iterations of all experiments
         
@@ -254,13 +229,13 @@ def drawIterationFigures(space, controls, parent_dir_abs):
 
             # save the list of figures and iteration parameters
 
-            saveFigsIteration(iter_index, exp_index, iteration, list_figs_files, list_figs, parent_dir_abs)
+            saveFigsIteration(iter_index, exp_index, iteration, list_figs_files, list_figs)
 
 
 
 
 
-def drawExperimentFigures(space, controls, parent_dir_abs):
+def drawExperimentFigures(space, controls):
     """
         Plot the average values for the parameters
         over the iterations
@@ -293,11 +268,11 @@ def drawExperimentFigures(space, controls, parent_dir_abs):
 
         # save the list of figures and iteration parameters
 
-        saveFigsExperiment(exp_index, avg_iteration, list_figs_files, list_figs, parent_dir_abs)
+        saveFigsExperiment(exp_index, avg_iteration, list_figs_files, list_figs)
 
 
 
-def drawSpaceFigures(space, controls, parent_dir_abs):
+def drawSpaceFigures(space, controls):
     """
         Plot 2D surface plots for each parameter over the entire
         space
@@ -337,10 +312,10 @@ def drawSpaceFigures(space, controls, parent_dir_abs):
 
     # save the list of figures and experiment parameters
 
-    saveFigsSpace( avg_space, prefix, list_figs_files, list_figs, parent_dir_abs)
+    saveFigsSpace( avg_space, prefix, list_figs_files, list_figs)
 
 
-def processFigures(parent_dir_abs, **kwargs):
+def processFigures(**kwargs):
     """
         Plot the figures and save the figures
     """
@@ -352,9 +327,9 @@ def processFigures(parent_dir_abs, **kwargs):
 
     # plot the figures
     if saveFigures:
-        drawIterationFigures(filtered_space, controls, parent_dir_abs)
-        drawExperimentFigures(filtered_space, controls, parent_dir_abs)
-        drawSpaceFigures(filtered_space, controls, parent_dir_abs)
+        drawIterationFigures(filtered_space, controls)
+        drawExperimentFigures(filtered_space, controls)
+        drawSpaceFigures(filtered_space, controls)
 
     return controls, filtered_space
 

KerrPy/Figure/routinesMatplotLib.py

@@ -8,18 +8,13 @@
 
 import matplotlib as mpl
 
-from globalVariables import mpl_stylesheet, use_tex
+from globalVariables import use_tex
 
-mpl.style.use(mpl_stylesheet)
+from KerrPy.File.loadFilePaths import mpl_stylesheet_file
+
+mpl.style.use(mpl_stylesheet_file)
 mpl.rcParams['text.usetex'] =  use_tex
 
-# mpl.use('pdf', force=True)  # set noninteractive backend 'pdf'
-# to check the available non gui backends
-#   non_gui_backends = mpl.rcsetup.non_interactive_bk
-#   print(non_gui_backends)
-#   to check gui backends
-#   gui_backends = mpl.rcsetup.interactive_bk
-#   Reference : https://stackoverflow.com/questions/3285193/how-to-change-backends-in-matplotlib-python
 import matplotlib.pyplot as plt
 
 import numpy as np

KerrPy/File/loadFilePaths.py

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Thu Oct  8 12:15:29 2020
+
+@author: fubar
+"""
+
+import os, os.path
+
+from globalVariables import debug, raw_dir, proc_dir, seq_file, samplename
+
+from globalVariables import mpl_stylesheet
+
+
+#### global read only #######
+
+imgs_folder = r'Images'
+fits_folder = r'Fits'
+restored_folder = r'Restored'
+figs_folder = r'Figures'
+vel_folder = r'Velocity'
+
+space_filename = 'space.npy'
+controls_filename = 'controls.npy'
+
+######### Post Processing folders and files ###################
+parent_dir_abs = os.path.abspath(os.path.join(os.pardir, os.pardir))
+
+if debug: print(f'parent_dir_abs: {parent_dir_abs}')
+
+raw_dir_abs = os.path.abspath(os.path.join(parent_dir_abs, raw_dir))
+if not os.path.isdir(raw_dir_abs): os.mkdir(raw_dir_abs)
+
+proc_dir_abs = os.path.abspath(os.path.join(parent_dir_abs, proc_dir))
+if not os.path.isdir(proc_dir_abs): os.mkdir(proc_dir_abs)
+
+fits_dir_abs = os.path.abspath(os.path.join(proc_dir_abs,fits_folder))
+if not os.path.isdir(fits_dir_abs): os.mkdir(fits_dir_abs)
+
+fits_root = os.path.abspath(os.path.join(fits_dir_abs,samplename))
+if not os.path.isdir(fits_root): os.mkdir(fits_root)
+
+space_filepath = os.path.abspath(os.path.join(fits_root,space_filename))
+
+controls_filepath = os.path.abspath(os.path.join(fits_root, controls_filename))
+
+######images folders#########
+
+# image fits folder root
+img_dir_abs = os.path.abspath(os.path.join(proc_dir_abs, imgs_folder))
+if not os.path.isdir(img_dir_abs): os.mkdir(img_dir_abs)
+
+img_root = os.path.abspath(os.path.join(img_dir_abs,samplename))
+if not os.path.isdir(img_root): os.mkdir(img_root)
+
+# restored image fits folder root
+restored_dir_abs = os.path.abspath(os.path.join(proc_dir_abs, restored_folder))
+if not os.path.isdir(restored_dir_abs): os.mkdir(restored_dir_abs)
+
+restored_root = os.path.abspath(os.path.join(restored_dir_abs,samplename))
+if not os.path.isdir(restored_root): os.mkdir(restored_root)
+
+
+######### figures folder ########
+
+figs_dir_abs = os.path.abspath(os.path.join(proc_dir_abs, figs_folder))
+if not os.path.isdir(figs_dir_abs): os.mkdir(figs_dir_abs)
+
+figs_root = os.path.abspath(os.path.join(figs_dir_abs,samplename))
+if not os.path.isdir(figs_root): os.mkdir(figs_root)
+
+######## velocity folder #######
+
+vel_dir_abs = os.path.abspath(os.path.join(proc_dir_abs, vel_folder))
+if not os.path.isdir(vel_dir_abs): os.mkdir(vel_dir_abs)
+
+vel_root = os.path.abspath(os.path.join(vel_dir_abs,samplename))
+if not os.path.isdir(vel_root): os.mkdir(vel_root)
+
+######## matplotlib stylesheet file #######
+
+mpl_stylesheet_file = os.path.abspath(os.path.join(parent_dir_abs, mpl_stylesheet))
+

KerrPy/File/processControls.py

@@ -8,10 +8,9 @@
 import os, os.path
 import numpy as np
 
-from globalVariables import seq_file
-from globalVariables import debug, proc_dir, fits_folder, samplename
-from globalVariables import save_controls_file
+from globalVariables import debug, seq_file
 
+from KerrPy.File.loadFilePaths import controls_filepath
 
 def getControls():
     """
@@ -48,35 +47,19 @@ def getControls():
 
     return controls
 
-def saveControls(controls, parent_dir_abs):
+def saveControls(controls):
     """
         Take controls array as input and save
         as numpy array file at level 0 of fits
     """
 
-    #Store the current location before relocating
-    cur_path = os.path.abspath(os.curdir)
-
     if debug: print("L0 saveControls() started")
 
-    proc_dir_abs = os.path.abspath(os.path.join(parent_dir_abs, proc_dir))
-    if not os.path.isdir(proc_dir_abs): os.mkdir(proc_dir_abs)
-
-    fits_dir_abs = os.path.abspath(os.path.join(proc_dir_abs,fits_folder))
-    fits_root = os.path.abspath(os.path.join(fits_dir_abs,samplename))
-
-    #change to Fits root folder (LEVLEL 0)
-    os.chdir(fits_root)
-
     # save the controls
-    controls_filename = save_controls_file
-    controls_filepath = os.path.abspath(os.path.join(fits_root,controls_filename))
     np.save(controls_filepath, np.array(controls, dtype=object))
 
-    #Restore the path
-    os.chdir(cur_path)
 
-def processControls(parent_dir_abs):
+def processControls():
     """
         0. Scan through the sequence file and get the controls
         1. Save the controls to global {save_controls_file} file
@@ -91,7 +74,7 @@ def processControls(parent_dir_abs):
     controls = getControls()
 
     # save the controls
-    saveControls(controls, parent_dir_abs)
+    saveControls(controls)
 
     #Restore the path
     os.chdir(cur_path)