Migrating from master-slave jargon

ImportLCmp.py

@@ -336,7 +336,7 @@ def Import_and_Process_LC(folder, nProc=1, outfile = "LC-MS.msh5",
     # and close
     HF.flush()
     if nProc>1:
-        Pool.close()    # finally closes multiprocessing slaves
+        Pool.close()    # finally closes multiprocessing subordinates
     return data
 
 class Proc_Parameters(object):

processing_4EU.py

@@ -843,7 +843,7 @@ def main(argv = None):
         if v != 0.0:
             opt_param[p] = v
     if param.mp:
-        Pool = mp.Pool(param.nproc)     # if multiprocessing, creates slaves early, while memory is empty !
+        Pool = mp.Pool(param.nproc)     # if multiprocessing, creates subordinates early, while memory is empty !
     param.report()
     logflux.log.flush()     # flush logfile
     ######## determine files and load inputfile
@@ -1026,7 +1026,7 @@ def main(argv = None):
     hfar.close()
 
     if param.mp:
-        Pool.close()    # finally closes multiprocessing slaves
+        Pool.close()    # finally closes multiprocessing subordinates
     logflux.log.flush()     # flush logfile
 
 # default values
@@ -1035,8 +1035,8 @@ def main(argv = None):
     if mpiutil.MPI_size < 2:            # this is single processor
         main()
     else:                       # this is a MPI run
-        if mpiutil.MPI_rank == 0:   # master proc
+        if mpiutil.MPI_rank == 0:   # main proc
             main()
             mpiutil.shutdown()
-        else:               # slave proc
-            mpiutil.slave()
+        else:               # subordinate proc
+            mpiutil.subordinate()