Skip to content

Commit 79d4f92

Browse files
MSieczczynskiMSieczczynski
committed
Resolving problem with ghostscript
1 parent ccbb584 commit 79d4f92

File tree

9 files changed

+22
-35
lines changed

9 files changed

+22
-35
lines changed

‎benchmarks/nhcal_acceptance/Snakefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ rule nhcal_acceptance_analysis:
4949
combined="sim_output/nhcal_acceptance/sim_{DETECTOR_CONFIG}_E{ENERGY}GeV_combined_{N}files.edm4hep.root",
5050
script="benchmarks/nhcal_acceptance/scripts/acceptance_analysis.cxx",
5151
output:
52-
f"results/nhcal_acceptance/analysis_{{DETECTOR_CONFIG}}_E{{ENERGY}}GeV_combined_{{N}}files.pdf",
52+
png=f"results/nhcal_acceptance/analysis_{{DETECTOR_CONFIG}}_E{{ENERGY}}GeV_combined_{{N}}files.png",
53+
pdf=f"results/nhcal_acceptance/analysis_{{DETECTOR_CONFIG}}_E{{ENERGY}}GeV_combined_{{N}}files.pdf",
5354
shell:
5455
"""
55-
root -l -b -q '{input.script}("{input.combined}","{output}")'
56+
root -l -b -q '{input.script}("{input.combined}","{output.pdf}","{output.png}")'
5657
"""

‎benchmarks/nhcal_acceptance/config.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,4 @@ collect_results:nhcal_acceptance:
3131
- ls -lrht
3232
- mv results{,_save}/
3333
- snakemake $SNAKEMAKE_FLAGS --cores 1 --delete-all-output results/nhcal_acceptance/analysis_epic_backward_hcal_only_E${ENERGY}_combined_10files.pdf
34-
- mv results{_save,}/
35-
- |
36-
gs -sDEVICE=pngalpha -dUseCropBox -r144 \
37-
-o "results/nhcal_acceptance/analysis_epic_backward_hcal_only_E${ENERGY}_combined_10files.png" \
38-
results/nhcal_acceptance/analysis_epic_backward_hcal_only_E${ENERGY}_combined_10files.pdf
34+
- mv results{_save,}/

‎benchmarks/nhcal_acceptance/scripts/acceptance_analysis.cxx‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@
1212

1313
using namespace std;
1414

15-
int acceptance_analysis(TString filename, TString outname)
15+
int acceptance_analysis(TString filename, string outname_pdf, string outname_png)
1616
{
1717
TChain *chain = new TChain("events");
1818
chain->Add(filename);
1919

20-
2120
TTreeReader reader(chain);
22-
2321

2422
TTreeReaderArray<int> mc_pdg(reader, "MCParticles.PDG");
2523
TTreeReaderArray<int> mc_genStatus(reader, "MCParticles.generatorStatus");
@@ -30,8 +28,6 @@ int acceptance_analysis(TString filename, TString outname)
3028
TTreeReaderArray<int> contrib_particle_idx(reader, "_HcalEndcapNHitsContributions_particle.index");
3129
TTreeReaderArray<unsigned int> contrib_particle_cid(reader, "_HcalEndcapNHitsContributions_particle.collectionID");
3230

33-
34-
// Histograms eta-phi
3531
int nEtaBins = 100;
3632
int nPhiBins = 100;
3733
double etaMin = -5, etaMax = 0;
@@ -42,9 +38,6 @@ int acceptance_analysis(TString filename, TString outname)
4238
TH2D* hEtaPhiDetected = new TH2D("hEtaPhiDetected", "#pi- detected in nHCal; #eta[1]; #phi[rad]",
4339
nEtaBins, etaMin, etaMax, nPhiBins, -TMath::Pi(), TMath::Pi());
4440

45-
// TH2D* hAcceptance = new TH2D("hAcceptance", "Acceptance: pi- in nHCal / all; #eta[1]; #phi[rad]",
46-
// nEtaBins, etaMin, etaMax, nPhiBins, -TMath::Pi(), TMath::Pi());
47-
4841
while (reader.Next())
4942
{
5043
map<int, pair<double, double>> pi_minus_eta_phi;
@@ -66,15 +59,13 @@ int acceptance_analysis(TString filename, TString outname)
6659
}
6760
}
6861

69-
// Check, if pi- have contributions nHCal
7062
for (size_t i = 0; i < contrib_particle_idx.GetSize(); i++) {
7163
int idx = contrib_particle_idx[i];
7264
if (pi_minus_eta_phi.count(idx)) {
7365
detected.insert(idx);
7466
}
7567
}
7668

77-
// Filling histogram with detected pi-
7869
for (auto idx : detected) {
7970
auto [eta, phi] = pi_minus_eta_phi[idx];
8071
hEtaPhiDetected->Fill(eta, phi);
@@ -96,7 +87,9 @@ int acceptance_analysis(TString filename, TString outname)
9687
canvas->cd(3);
9788
hAcceptance->Draw("COLZ");
9889

99-
canvas->Print(outname);
90+
canvas->SaveAs(outname_pdf.c_str());
91+
canvas->SaveAs(outname_png.c_str());
92+
10093
return 0;
10194
}
10295

‎benchmarks/nhcal_basic_distribution/Snakefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ rule nhcal_basic_distribution_analysis:
4949
combined="sim_output/nhcal_basic_distribution/sim_{DETECTOR_CONFIG}_E{ENERGY}GeV_combined_{N}files.edm4hep.root",
5050
script="benchmarks/nhcal_basic_distribution/scripts/basic_distribution_analysis.cxx",
5151
output:
52-
f"results/nhcal_basic_distribution/analysis_{{DETECTOR_CONFIG}}_E{{ENERGY}}GeV_combined_{{N}}files.pdf",
52+
pdf=f"results/nhcal_basic_distribution/analysis_{{DETECTOR_CONFIG}}_E{{ENERGY}}GeV_combined_{{N}}files.pdf",
53+
png=f"results/nhcal_basic_distribution/analysis_{{DETECTOR_CONFIG}}_E{{ENERGY}}GeV_combined_{{N}}files.png",
5354
shell:
5455
"""
55-
root -l -b -q '{input.script}("{input.combined}","{output}")'
56+
root -l -b -q '{input.script}("{input.combined}","{output.pdf}","{output.png}")'
5657
"""

‎benchmarks/nhcal_basic_distribution/config.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,4 @@ collect_results:nhcal_basic_distribution:
5656
- mv results{,_save}/
5757
- snakemake $SNAKEMAKE_FLAGS --cores 1 --delete-all-output results/nhcal_basic_distribution/analysis_${DETECTOR_CONFIG}_E${ENERGY}_combined_10files.pdf
5858
- mv results{_save,}/
59-
- |
60-
gs -sDEVICE=pngalpha -dUseCropBox -r144 \
61-
-o "results/nhcal_basic_distribution/analysis_${DETECTOR_CONFIG}_E${ENERGY}_combined_10files.png" \
62-
results/nhcal_basic_distribution/analysis_${DETECTOR_CONFIG}_E${ENERGY}_combined_10files.pdf
6359

‎benchmarks/nhcal_basic_distribution/scripts/basic_distribution_analysis.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ using namespace ROOT;
7575
using namespace TMath;
7676
using namespace edm4hep;
7777

78-
int basic_distribution_analysis(const string &filename, TString outname)
78+
int basic_distribution_analysis(const string &filename, string outname_pdf, string outname_png)
7979
{
8080
podio::ROOTReader *reader = new podio::ROOTReader();
8181
reader->openFile(filename);
@@ -224,7 +224,8 @@ int basic_distribution_analysis(const string &filename, TString outname)
224224
canvas->cd(7);
225225
h_XYEnergy->Draw("COLZ");
226226

227-
canvas->Print(outname);
227+
canvas->SaveAs(outname_pdf.c_str());
228+
canvas->SaveAs(outname_png.c_str());
228229

229230
return 0;
230231
}

‎benchmarks/nhcal_sampling_fraction/Snakefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ rule nhcal_sampling_fraction_analysis:
5050
combined="sim_output/nhcal_sampling_fraction/sim_{N}files_per.edm4hep.root",
5151
script="benchmarks/nhcal_sampling_fraction/scripts/sampling_fraction_analysis.cxx",
5252
output:
53-
f"results/nhcal_sampling_fraction/analysis_{{N}}files_per.pdf",
53+
pdf=f"results/nhcal_sampling_fraction/analysis_{{N}}files_per.pdf",
54+
png=f"results/nhcal_sampling_fraction/analysis_{{N}}files_per.png",
5455
shell:
5556
"""
56-
root -l -b -q '{input.script}("{input.combined}","{output}","{DETECTOR_PATH}/{DETECTOR_CONFIG}")'
57+
root -l -b -q '{input.script}("{input.combined}","{output.pdf}","{output.png}","{DETECTOR_PATH}/{DETECTOR_CONFIG}")'
5758
"""

‎benchmarks/nhcal_sampling_fraction/config.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,4 @@ collect_results:nhcal_sampling_fraction:
2727
- mv results{,_save}/
2828
- snakemake $SNAKEMAKE_FLAGS --cores 1 --delete-all-output results/nhcal_sampling_fraction/analysis_5files_per.pdf
2929
- mv results{_save,}/
30-
- |
31-
gs -sDEVICE=pngalpha -dUseCropBox -r144 \
32-
-o "results/nhcal_sampling_fraction/analysis_5files_per.png" \
33-
results/nhcal_sampling_fraction/analysis_5files_per.pdf
3430

‎benchmarks/nhcal_sampling_fraction/scripts/sampling_fraction_analysis.cxx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ using namespace edm4hep;
6868

6969
dd4hep::Detector* det = NULL;
7070

71-
int sampling_fraction_analysis(const string &inputname, TString outputname, TString compact_file)
71+
int sampling_fraction_analysis(const string &filename, string outname_pdf, string outname_png, TString compact_file)
7272
{
7373

7474
podio::ROOTReader *reader = new podio::ROOTReader();
75-
reader->openFile(inputname);
75+
reader->openFile(filename);
7676
unsigned nEvents = reader->getEntries("events");
7777
cout << "Number of events: " << nEvents << endl;
7878

@@ -181,7 +181,9 @@ int sampling_fraction_analysis(const string &inputname, TString outputname, TStr
181181
p_sampF_n->Draw("SAME");
182182
canvas->cd(4);
183183
p_e_over_pi->Draw("HIST");
184-
canvas->Print(outputname);
184+
185+
canvas->SaveAs(outname_pdf.c_str());
186+
canvas->SaveAs(outname_png.c_str());
185187

186188
return 0;
187189
}

0 commit comments

Comments
 (0)