@@ -33,14 +33,14 @@ class RunDir:
33
33
g_run_dir_name = None
34
34
35
35
@classmethod
36
- def set_run_dir_name (cls , current_run_dir_name ):
36
+ def set_user_run_dir_name (cls , current_run_dir_name ):
37
37
"""
38
38
Set the run directory name passed by the user.
39
39
"""
40
40
cls .g_run_dir_name = current_run_dir_name
41
41
42
42
@classmethod
43
- def get_run_dir_name (cls ):
43
+ def get_user_run_dir_name (cls ):
44
44
"""
45
45
Get the run directory name passed by the user.
46
46
"""
@@ -250,13 +250,6 @@ def run_system_command(
250
250
# pylint: enable=too-many-arguments, too-many-instance-attributes, too-few-public-methods, too-many-locals
251
251
252
252
253
- def set_global_run_dir (current_run_dir_name ):
254
- """
255
- Set the global run directory name.
256
- """
257
- RunDir .set_run_dir_name (current_run_dir_name )
258
-
259
-
260
253
def check_cmd (command ):
261
254
"""
262
255
Return True if command can be run, False otherwise.
@@ -557,7 +550,7 @@ def get_latest_run_dir(base_dir):
557
550
"""
558
551
Returns the run directory with the highest run number in base_dir
559
552
"""
560
- latest_run_dir_name = get_latest_run_dir_name (base_dir )
553
+ latest_run_dir_name = get_active_run_dir_name (base_dir )
561
554
562
555
run_dir = None
563
556
if latest_run_dir_name :
@@ -582,7 +575,7 @@ def get_next_run_number(base_dir):
582
575
"""
583
576
Returns the next available (i.e. non-existing) run number in base_dir
584
577
"""
585
- latest_run_dir_name = get_latest_run_dir_name (base_dir )
578
+ latest_run_dir_name = get_active_run_dir_name (base_dir )
586
579
match = re .match (r"^run(\d{3})$" , latest_run_dir_name )
587
580
next_run_number = 1
588
581
if match :
@@ -592,13 +585,16 @@ def get_next_run_number(base_dir):
592
585
return next_run_number
593
586
594
587
595
- def get_latest_run_dir_name (base_dir ):
588
+ def get_active_run_dir_name (base_dir ):
596
589
"""
597
- Returns the highest run number of all run directories with in base_dir
590
+ Returns the active run directory name. If the user has specified
591
+ a run directory name, it will be returned. Otherwise, the
592
+ highest run number of all run directories within in base_dir
593
+ will be returned.
598
594
"""
599
- latest_run_dir_name = ""
600
- if RunDir .get_run_dir_name () is not None :
601
- latest_run_dir_name = RunDir .get_run_dir_name ()
595
+ active_run_dir_name = ""
596
+ if RunDir .get_user_run_dir_name () is not None :
597
+ active_run_dir_name = RunDir .get_user_run_dir_name ()
602
598
else :
603
599
run_number = 1
604
600
run_dir = Path (base_dir ) / run_dir_name (run_number )
@@ -610,9 +606,9 @@ def get_latest_run_dir_name(base_dir):
610
606
611
607
# Currently one-past the last existing run dir,
612
608
# to get latest existing, subtract one
613
- latest_run_dir_name = run_dir_name (run_number - 1 )
609
+ active_run_dir_name = run_dir_name (run_number - 1 )
614
610
615
- return latest_run_dir_name
611
+ return active_run_dir_name
616
612
617
613
618
614
def run_dir_name (run_num ):
0 commit comments