Skip to content

Commit 8e1f756

Browse files
DraTeotsDraTeots
committed
Documentation and campaign update
1 parent c88a863 commit 8e1f756

9 files changed

+157
-25
lines changed

‎csv_convert/convert_campaign.slurm.sh‎ renamed to ‎csv_convert/convert_campaign.10x100.slurm.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
#SBATCH --account=eic
33
#SBATCH --partition=production
44
#SBATCH --job-name=convertCSV
5-
#SBATCH --time=2-02:00:00 # format days-hours:minutes:seconds
5+
#SBATCH --time=1-00:00:00 # format days-hours:minutes:seconds
66
#SBATCH --cpus-per-task=1
77
#SBATCH --mem-per-cpu=2G
8-
#SBATCH --output=/volatile/eic/romanov/meson-structure-2025-06/convert_csv.%j.log
9-
#SBATCH --error=/volatile/eic/romanov/meson-structure-2025-06/convert_csv.%j.err
8+
#SBATCH --output=/volatile/eic/romanov/meson-structure-2025-08/convert_csv.%j.log
9+
#SBATCH --error=/volatile/eic/romanov/meson-structure-2025-08/convert_csv.%j.err
1010

1111
set -euo pipefail
1212

13-
CAMPAIGN=/volatile/eic/romanov/meson-structure-2025-06/reco
13+
CAMPAIGN=/volatile/eic/romanov/meson-structure-2025-08/reco/10x100-priority
1414
CSV_CONVERT_DIR=/work/eic/users/romanov/meson-structure-work/meson-structure/csv_convert
15-
IMG=/cvmfs/singularity.opensciencegrid.org/eicweb/eic_xl:nightly
15+
IMG=/cvmfs/singularity.opensciencegrid.org/eicweb/eic_xl:25.08-stable
1616

1717
echo "[INFO] Running convert_campaign.py in $(hostname)"
1818
echo "[INFO] Campaign directory : $CAMPAIGN"

‎csv_convert/convert_campaign.10x130.slurm.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
#SBATCH --account=eic
3+
#SBATCH --partition=production
4+
#SBATCH --job-name=convertCSV
5+
#SBATCH --time=1-00:00:00 # format days-hours:minutes:seconds
6+
#SBATCH --cpus-per-task=1
7+
#SBATCH --mem-per-cpu=2G
8+
#SBATCH --output=/volatile/eic/romanov/meson-structure-2025-08/convert_csv.%j.log
9+
#SBATCH --error=/volatile/eic/romanov/meson-structure-2025-08/convert_csv.%j.err
10+
11+
set -euo pipefail
12+
13+
CAMPAIGN=/volatile/eic/romanov/meson-structure-2025-08/reco/10x130-priority
14+
CSV_CONVERT_DIR=/work/eic/users/romanov/meson-structure-work/meson-structure/csv_convert
15+
IMG=/cvmfs/singularity.opensciencegrid.org/eicweb/eic_xl:25.08-stable
16+
17+
echo "[INFO] Running convert_campaign.py in $(hostname)"
18+
echo "[INFO] Campaign directory : $CAMPAIGN"
19+
echo "[INFO] Container image : $IMG"
20+
echo "[INFO] CSV_CONVERT_DIR : $CSV_CONVERT_DIR"
21+
22+
23+
# Bind the whole campaign so script sees reco/ inside /work
24+
singularity exec -B "$CAMPAIGN":/work -B "$CSV_CONVERT_DIR":/code "$IMG" \
25+
bash -c 'cd /code && python3 convert_campaign.py /work && cd /work && for f in *.csv; do zip "${f}.zip" "$f"; done'
26+
27+
echo "[DONE] Conversion job finished"

‎csv_convert/convert_campaign.18x275.slurm.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
#SBATCH --account=eic
3+
#SBATCH --partition=production
4+
#SBATCH --job-name=convertCSV
5+
#SBATCH --time=1-00:00:00 # format days-hours:minutes:seconds
6+
#SBATCH --cpus-per-task=1
7+
#SBATCH --mem-per-cpu=2G
8+
#SBATCH --output=/volatile/eic/romanov/meson-structure-2025-08/convert_csv.%j.log
9+
#SBATCH --error=/volatile/eic/romanov/meson-structure-2025-08/convert_csv.%j.err
10+
11+
set -euo pipefail
12+
13+
CAMPAIGN=/volatile/eic/romanov/meson-structure-2025-08/reco/18x275-priority
14+
CSV_CONVERT_DIR=/work/eic/users/romanov/meson-structure-work/meson-structure/csv_convert
15+
IMG=/cvmfs/singularity.opensciencegrid.org/eicweb/eic_xl:25.08-stable
16+
17+
echo "[INFO] Running convert_campaign.py in $(hostname)"
18+
echo "[INFO] Campaign directory : $CAMPAIGN"
19+
echo "[INFO] Container image : $IMG"
20+
echo "[INFO] CSV_CONVERT_DIR : $CSV_CONVERT_DIR"
21+
22+
23+
# Bind the whole campaign so script sees reco/ inside /work
24+
singularity exec -B "$CAMPAIGN":/work -B "$CSV_CONVERT_DIR":/code "$IMG" \
25+
bash -c 'cd /code && python3 convert_campaign.py /work && cd /work && for f in *.csv; do zip "${f}.zip" "$f"; done'
26+
27+
echo "[DONE] Conversion job finished"

‎csv_convert/convert_campaign.5x41.slurm.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
#SBATCH --account=eic
3+
#SBATCH --partition=production
4+
#SBATCH --job-name=convertCSV
5+
#SBATCH --time=1-00:00:00 # format days-hours:minutes:seconds
6+
#SBATCH --cpus-per-task=1
7+
#SBATCH --mem-per-cpu=2G
8+
#SBATCH --output=/volatile/eic/romanov/meson-structure-2025-08/convert_csv.%j.log
9+
#SBATCH --error=/volatile/eic/romanov/meson-structure-2025-08/convert_csv.%j.err
10+
11+
set -euo pipefail
12+
13+
CAMPAIGN=/volatile/eic/romanov/meson-structure-2025-08/reco/5x41-priority
14+
CSV_CONVERT_DIR=/work/eic/users/romanov/meson-structure-work/meson-structure/csv_convert
15+
IMG=/cvmfs/singularity.opensciencegrid.org/eicweb/eic_xl:25.08-stable
16+
17+
echo "[INFO] Running convert_campaign.py in $(hostname)"
18+
echo "[INFO] Campaign directory : $CAMPAIGN"
19+
echo "[INFO] Container image : $IMG"
20+
echo "[INFO] CSV_CONVERT_DIR : $CSV_CONVERT_DIR"
21+
22+
23+
# Bind the whole campaign so script sees reco/ inside /work
24+
singularity exec -B "$CAMPAIGN":/work -B "$CSV_CONVERT_DIR":/code "$IMG" \
25+
bash -c 'cd /code && python3 convert_campaign.py /work && cd /work && for f in *.csv; do python3 -m zipfile -c "$f.zip" "$f"; done'
26+
27+
echo "[DONE] Conversion job finished"

‎csv_convert/csv_reco_dis.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ std::tuple<TLorentzVector, TLorentzVector, TLorentzVector, TLorentzVector> find_
174174
* @param ff_lambdas Collection of reconstructed Lambdas
175175
* @return TLorentzVector of first Lambda (or empty if none found)
176176
*/
177-
TLorentzVector process_ff_lambda(const ReconstructedParticleCollection& ff_lambdas) {
177+
TLorentzVector process_ff_lambda(const edm4eic::ReconstructedParticleCollection& ff_lambdas) {
178178
TLorentzVector lam_vec;
179179

180180
// Process first Lambda in collection
@@ -275,7 +275,7 @@ void process_event(const podio::Frame& event, int evt_id) {
275275
/*---------------------------------------------------------------------------
276276
Process reconstructed far-forward Lambda
277277
---------------------------------------------------------------------------*/
278-
const auto& ffLambdas = event.get<ReconstructedParticleCollection>("ReconstructedFarForwardZDCLambdas");
278+
const auto& ffLambdas = event.get<edm4eic::ReconstructedParticleCollection>("ReconstructedFarForwardZDCLambdas");
279279
TLorentzVector ff_lambda_vec = process_ff_lambda(ffLambdas);
280280

281281
double ff_lambda_t_tb = 0.0; // FF Lambda with true beam

‎docs/campaign-2025-08/campaign-2025-08.md‎

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,57 @@ run
4444
. /home/romanov/meson-structure-work/meson-structure/full-sim-pipeline/eg_analysis.sh
4545
```
4646

47+
### Sortout mc files
48+
49+
```bash
50+
mkdir /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/{5x41,10x100,10x130,18x275}-priority
51+
mkdir /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/{5x41,10x100,10x130,18x275}-rest
52+
53+
mv /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/k_lambda_5x41_5000evt_{001..100}.hepmc /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/5x41-priority
54+
mv /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/k_lambda_10x100_5000evt_{001..100}.hepmc /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/10x100-priority
55+
mv /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/k_lambda_10x130_5000evt_{001..100}.hepmc /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/10x130-priority
56+
mv /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/k_lambda_18x275_5000evt_{001..100}.hepmc /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/18x275-priority
57+
mv /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/k_lambda_5x41* /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/5x41-rest
58+
mv /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/k_lambda_10x100* /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/10x100-rest &&\
59+
mv /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/k_lambda_10x130* /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/10x130-rest &&\
60+
mv /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/k_lambda_18x275* /volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/18x275-rest
61+
```
62+
4763
### Priority queue
4864

49-
mkdir -p /volatile/eic/romanov/meson-structure-2025-07/eg-hepmc-priority-{5x41,10x100,10x130,18x275}
65+
```bash
66+
mkdir -p /volatile/eic/romanov/meson-structure-2025-08/reco/{5x41,10x100,10x130,18x275}-priority
67+
68+
python create_jobs.py \
69+
-b /volatile/eic/romanov/meson-structure-2025-08 \
70+
-o /volatile/eic/romanov/meson-structure-2025-08/reco/5x41-priority \
71+
--container /cvmfs/singularity.opensciencegrid.org/eicweb/eic_xl:25.08-stable \
72+
-e 5000 \
73+
/volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/5x41-priority/*.hepmc
74+
75+
python create_jobs.py \
76+
-b /volatile/eic/romanov/meson-structure-2025-08 \
77+
-o /volatile/eic/romanov/meson-structure-2025-08/reco/10x100-priority \
78+
--container /cvmfs/singularity.opensciencegrid.org/eicweb/eic_xl:25.08-stable \
79+
-e 5000 \
80+
/volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/10x100-priority/*.hepmc
81+
82+
python create_jobs.py \
83+
-b /volatile/eic/romanov/meson-structure-2025-08 \
84+
-o /volatile/eic/romanov/meson-structure-2025-08/reco/10x130-priority \
85+
--container /cvmfs/singularity.opensciencegrid.org/eicweb/eic_xl:25.08-stable \
86+
-e 5000 \
87+
/volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/10x130-priority/*.hepmc
88+
89+
python create_jobs.py \
90+
-b /volatile/eic/romanov/meson-structure-2025-08 \
91+
-o /volatile/eic/romanov/meson-structure-2025-08/reco/18x275-priority \
92+
--container /cvmfs/singularity.opensciencegrid.org/eicweb/eic_xl:25.08-stable \
93+
-e 5000 \
94+
/volatile/eic/romanov/meson-structure-2025-08/eg-hepmc/18x275-priority/*.hepmc
95+
96+
```
5097

51-
### Processing Commands
5298

5399
The exact commands used in this campaign:
54100

‎docs/data.md‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,36 @@
55
The meson structure data is available from the following locations:
66

77
**LATEST PROCESSED FILES**
8-
*(last update of Jone 2025)*
8+
*(last update of August 2025)*
99

1010
On JLab ifarm:
1111

12-
```
13-
/volatile/eic/romanov/meson-structure-2025-06/reco
14-
```
12+
```bash
13+
/volatile/eic/romanov/meson-structure-2025-08/reco
1514

16-
CSV-s are available via link (ask for the link)
15+
# priority queues (first 100 files from each energy range):
16+
/volatile/eic/romanov/meson-structure-2025-08/reco/5x41-priority
17+
/volatile/eic/romanov/meson-structure-2025-08/reco/10x100-priority
18+
/volatile/eic/romanov/meson-structure-2025-08/reco/10x130-priority
19+
/volatile/eic/romanov/meson-structure-2025-08/reco/18x275-priority
20+
21+
```
1722

1823
On XRootD (open for universities and public)
1924

2025
```bash
2126
xrdfs root://dtn-eic.jlab.org
22-
ls /volatile/eic/romanov/meson-structure-2025-06/reco
27+
ls /volatile/eic/romanov/meson-structure-2025-08/reco
2328
```
2429

2530
Writing libraries versions (important for C++ readout compatibility):
2631
- podio: v01-02
2732
- edm4hep: v00-99-01
28-
- edm4eic: v8.2.0
33+
- edm4eic: v8.0.1
2934

30-
**Original MCEG files** on ifarm:
31-
`/work/eic/users/singhav/JLEIC/USERS/trottar/OUTPUTS/raty_eic/`
32-
*(last update of October 2024)*
35+
**Original MCEG files** on ifarm:
36+
`/volatile/eic/romanov/meson-structure-2025-08/eg-orig-kaon-lambda`
37+
*(last update of August 2025)*
3338

3439

3540
## File names:
@@ -72,13 +77,13 @@ root://dtn-eic.jlab.org
7277

7378
```bash
7479
xrdfs root://dtn-eic.jlab.org
75-
ls /volatile/eic/romanov/meson-structure-2025-06/reco
80+
ls /volatile/eic/romanov/meson-structure-2025-08/reco
7681
```
7782

7883
**To download** files:
7984

8085
```bash
81-
xrdcp root://dtn-eic.jlab.org//volatile/eic/romanov/meson-structure-2025-06/reco/k_lambda_5x41_5000evt_200.edm4eic.root ./
86+
xrdcp root://dtn-eic.jlab.org//volatile/eic/romanov/meson-structure-2025-08/reco/5x41-priority/k_lambda_5x41_5000evt_001.edm4eic.root ./
8287
```
8388

8489
**To use directly in scripts**:
@@ -87,5 +92,5 @@ xrdcp root://dtn-eic.jlab.org//volatile/eic/romanov/meson-structure-2025-06/reco
8792
# Both uproot and pyroot can work with links directly
8893
# if XRootD is installed in the system
8994
import uproot
90-
file = uproot.open("root://dtn-eic.jlab.org//volatile/eic/romanov/meson-structure-2025-06/reco/k_lambda_5x41_5000evt_200.edm4eic.root")
95+
file = uproot.open("root://dtn-eic.jlab.org//volatile/eic/romanov/meson-structure-2025-08/reco/5x41-priority/k_lambda_5x41_5000evt_001.edm4eic.root")
9196
```

‎requirements-campaign.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Requirements for campaign file processing
2-
HepMC3
3-
# snakemake>=8.1.2
2+
pyhepmc
3+
snakemake

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
uproot>=5.6.4
33
boost-histogram>=1.6.1
44
hist[plot]>=2.9.0
5-
matplotlib>=3.10.5
5+
matplotlib>=3.8.0
66
json_fix
77
scipy
88
numpy

0 commit comments

Comments
 (0)