From 432cc496dc3d407cc5712bfb345ad2a57a898bf9 Mon Sep 17 00:00:00 2001
From: Joosep Pata <joosep.pata@gmail.com>
Date: Tue, 12 Nov 2024 22:06:57 +0900
Subject: [PATCH] final fixes for v2.1.0 (#375)

---
 README.md                      |  1 +
 mlpf/model/training.py         |  2 +-
 scripts/tallinn/deploy_clic.sh | 25 +++++++++++++++++++++++++
 scripts/tallinn/deploy_cms.sh  | 22 ++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100755 scripts/tallinn/deploy_clic.sh
 create mode 100755 scripts/tallinn/deploy_cms.sh

diff --git a/README.md b/README.md
index 0ebd777e6..30b71f5e4 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ The following table specifies which version of the jpata/particleflow software s
 | ----- | ----------- | ------------ |
 | [1.9.0](https://github.com/jpata/particleflow/releases/v1.9.0) | 2.4.0    | 2.2.0    |
 | [2.0.0](https://github.com/jpata/particleflow/releases/v2.0.0) | 2.4.0    | 2.3.0    |
+| [2.1.0](https://github.com/jpata/particleflow/releases/v2.1.0) | 2.5.0    | 2.5.0    |
 
 ## MLPF on open datasets
 
diff --git a/mlpf/model/training.py b/mlpf/model/training.py
index 102116618..ee5323f86 100644
--- a/mlpf/model/training.py
+++ b/mlpf/model/training.py
@@ -1076,7 +1076,7 @@ def run(rank, world_size, config, args, outdir, logfile):
 
                 jetdef = fastjet.JetDefinition(fastjet.ee_genkt_algorithm, 0.4, -1.0)
                 jet_ptcut = 5
-            if config["dataset"] == "cms":
+            elif config["dataset"] == "cms":
                 import fastjet
 
                 jetdef = fastjet.JetDefinition(fastjet.antikt_algorithm, 0.4)
diff --git a/scripts/tallinn/deploy_clic.sh b/scripts/tallinn/deploy_clic.sh
new file mode 100755
index 000000000..3405255db
--- /dev/null
+++ b/scripts/tallinn/deploy_clic.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+
+rm -f files_to_copy.txt
+maxfiles=100
+path=experiments/pyg-clic_20241106_104416_929167/./preds_checkpoint-20-1.914489
+targetpath=/home/joosep/huggingface/particleflow/clic/clusters/v2.1.0/pyg-clic_20241106_104416_929167/
+
+mkdir -p $targetpath
+cp $path/../* $targetpath/
+cp -R $path/../checkpoints $targetpath/
+cp -R $path/../history $targetpath/
+cp -R $path/../runs $targetpath/
+
+samplestocopy=(
+    "clic_edm_qq_pf"
+    "clic_edm_ttbar_pf"
+    "clic_edm_ww_fullhad_pf"
+)
+
+for sample in "${samplestocopy[@]}"; do
+    find "$path/$sample" -type f | sort | head -n$maxfiles >> files_to_copy.txt
+done
+
+# rsync --progress --relative --files-from files_to_copy.txt `pwd` $targetpath
diff --git a/scripts/tallinn/deploy_cms.sh b/scripts/tallinn/deploy_cms.sh
new file mode 100755
index 000000000..6950614a6
--- /dev/null
+++ b/scripts/tallinn/deploy_cms.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+
+rm -f files_to_copy.txt
+maxfiles=100
+path=experiments/pyg-cms_20241101_090645_682892/./preds_checkpoint-08-2.986092
+targetpath=/home/joosep/huggingface/particleflow/cms/v2.1.0/pyg-cms_20241101_090645_682892/
+
+samplestocopy=(
+    "cms_pf_qcd"
+    "cms_pf_qcd_nopu"
+    "cms_pf_ttbar"
+    "cms_pf_ttbar_nopu"
+    "cms_pf_ztt"
+    "cms_pf_ztt_nopu"
+)
+
+for sample in "${samplestocopy[@]}"; do
+    find "$path/$sample" -type f | sort | head -n$maxfiles >> files_to_copy.txt
+done
+
+rsync --progress --relative --files-from files_to_copy.txt `pwd` $targetpath