Skip to content

Updates to MCMerger #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andrsmit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updates to MCMerger #166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Utilities/MCMerger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ def bash_root(name_map, path, mc_dir):
for tup in name_map["trees"].keys():
fold_name, suffix = tup[0], tup[1]
fold_name = fold_name.rstrip("_")
return_code += subprocess.run([f"mkdir {path + '/' + dir_type + '/' + fold_name}"], shell=True).returncode
return_code += subprocess.run([f"mkdir {checkpointpath + '/' + dir_type + '/' + fold_name}"], shell=True).returncode
return_code += subprocess.run([f"mkdir -p {path + '/' + dir_type + '/' + fold_name}"], shell=True).returncode
return_code += subprocess.run([f"mkdir -p {checkpointpath + '/' + dir_type + '/' + fold_name}"], shell=True).returncode
for run in name_map["trees"][tup]["run_nums"]:
if os.path.isfile(checkpointpath + '/' + dir_type + '/' + fold_name + '/' + tup[0] + run + tup[1] + '.done'):
continue
# success = subprocess.run([f"/home/mcwrap/tools/hadd -v 1 -f {path + '/' + dir_type + '/' + fold_name + '/' + tup[0] + run + tup[1]} {mc_dir + '/' + 'root' + '/' + dir_type + '/' + tup[0]+run}*{tup[1]}"], shell=True)
# success = subprocess.run([f"hadd -v 1 -f {path + '/' + dir_type + '/' + fold_name + '/' + tup[0] + run + tup[1]} {mc_dir + '/' + 'root' + '/' + dir_type + '/' + tup[0]+run}*{tup[1]}"], shell=True)
success = subprocess.run([f"/home/mcwrap/sw/root-6.24.04/install/bin/hadd -v 1 -f {path + '/' + dir_type + '/' + fold_name + '/' + tup[0] + run + tup[1]} {mc_dir + '/' + 'root' + '/' + dir_type + '/' + tup[0]+run}*{tup[1]}"], shell=True)
success = subprocess.run([f"/home/mcwrap/sw/root-6.32.20-gcc11.5.0/bin/hadd -v 1 -f {path + '/' + dir_type + '/' + fold_name + '/' + tup[0] + run + tup[1]} {mc_dir + '/' + 'root' + '/' + dir_type + '/' + tup[0]+run}*{tup[1]}"], shell=True)
return_code += success.returncode
if success.returncode == 0:
open(checkpointpath + '/' + dir_type + '/' + fold_name + '/' + tup[0] + run + tup[1] + '.done', 'a').close()
Expand All @@ -106,7 +106,7 @@ def bash_root(name_map, path, mc_dir):
continue
# success = subprocess.run([f"/home/mcwrap/tools/hadd -v 1 -f {path + '/' + dir_type + '/' + tup[0] + run + tup[1]} {mc_dir + '/' + 'root' + '/' + dir_type + '/' + tup[0]+run}*{tup[1]}"], shell=True)
# success = subprocess.run([f"hadd -v 1 -f {path + '/' + dir_type + '/' + tup[0] + run + tup[1]} {mc_dir + '/' + 'root' + '/' + dir_type + '/' + tup[0]+run}*{tup[1]}"], shell=True)
success = subprocess.run([f"/home/mcwrap/sw/root-6.24.04/install/bin/hadd -v 1 -f {path + '/' + dir_type + '/' + tup[0] + run + tup[1]} {mc_dir + '/' + 'root' + '/' + dir_type + '/' + tup[0]+run}*{tup[1]}"], shell=True)
success = subprocess.run([f"/home/mcwrap/sw/root-6.32.20-gcc11.5.0/bin/hadd -v 1 -f {path + '/' + dir_type + '/' + tup[0] + run + tup[1]} {mc_dir + '/' + 'root' + '/' + dir_type + '/' + tup[0]+run}*{tup[1]}"], shell=True)
return_code += success.returncode
if success.returncode == 0:
open(checkpointpath + '/' + dir_type + '/' + tup[0] + run + tup[1] + '.done', 'a').close()
Expand Down Expand Up @@ -277,7 +277,7 @@ def recurse_name_map(name_map, path, mc_dir, hddm=False):
k = "hddm_merge"
if ("bash_" + k) in bash.keys():
dir_type = re.split("/", path)[-1]
return_code = bash["bash_" + k](name_map[k], path+k+"/", mc_dir)
return_code += bash["bash_" + k](name_map[k], path+k+"/", mc_dir)
return return_code


Expand Down