From e87d4ba4a0efeade2b4011bca4787d9cb7bd369f Mon Sep 17 00:00:00 2001
From: simonge <simon.gardner@glasgow.ac.uk>
Date: Tue, 11 Mar 2025 17:42:35 +0000
Subject: [PATCH] Make canvas name more useful
---
benchmarks/beamline/Snakefile | 10 +++++-----
benchmarks/beamline/analysis.C | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/benchmarks/beamline/Snakefile b/benchmarks/beamline/Snakefile
index 94b5c1e..13cd66a 100644
--- a/benchmarks/beamline/Snakefile
+++ b/benchmarks/beamline/Snakefile
@@ -2,9 +2,9 @@ rule beamline_sim:
input:
macro="beamGPS.mac",
output:
- "/scratch/EIC/G4out/beamline/beamlineTest.edm4hep.root",
+ "/scratch/EIC/G4out/beamline/beamlineTest{tag}.edm4hep.root",
log:
- "/scratch/EIC/G4out/beamline/beamlineTest.edm4hep.root.log",
+ "/scratch/EIC/G4out/beamline/beamlineTest{tag}.edm4hep.root.log",
shell:
"""
exec npsim \
@@ -17,11 +17,11 @@ rule beamline_sim:
rule beamline_analysis:
input:
- "/scratch/EIC/G4out/beamline/beamlineTest.edm4hep.root",
+ "/scratch/EIC/G4out/beamline/beamlineTest{tag}.edm4hep.root",
output:
- "/scratch/EIC/ReconOut/beamline/beamlineTestAnalysis.root"
+ "/scratch/EIC/ReconOut/beamline/beamlineTestAnalysis{tag}.root"
log:
- "/scratch/EIC/ReconOut/beamline/beamlineTestAnalysis.root.log"
+ "/scratch/EIC/ReconOut/beamline/beamlineTestAnalysis{tag}.root.log"
params:
xml=os.getenv("DETECTOR_PATH")+"/epic_ip6_extended.xml",
shell:
diff --git a/benchmarks/beamline/analysis.C b/benchmarks/beamline/analysis.C
index 0c4c946..7767205 100644
--- a/benchmarks/beamline/analysis.C
+++ b/benchmarks/beamline/analysis.C
@@ -110,7 +110,7 @@ void analysis( TString inFile = "/scratch/EIC/G4out/beamline/beamlineTest.
}
- TCanvas *cX = new TCanvas("c1","c1",3000,1600);
+ TCanvas *cX = new TCanvas("x_px_canvas","x_px_canvas",3000,1600);
cX->Divide(4,2);
int i=1;
@@ -121,7 +121,7 @@ void analysis( TString inFile = "/scratch/EIC/G4out/beamline/beamlineTest.
}
- TCanvas *cY = new TCanvas("c2","c2",3000,1600);
+ TCanvas *cY = new TCanvas("y_py_canvas","y_py_canvas",3000,1600);
cY->Divide(4,2);
i=1;
--
GitLab