Skip to content

Commit afbfb3e

Browse files
committed
Modified hybrid example + included SimExamples folder in installation
1 parent a6acb8d commit afbfb3e

File tree

8 files changed

+14
-210345
lines changed

8 files changed

+14
-210345
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ CMakeLists.txt.user
6969
gphysi.dat
7070
*.root
7171
*.o2tf
72-
!run/SimExamples/Hybrid/evtpool.root
7372

7473
# rbenv files
7574
.ruby-version

run/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,3 +331,7 @@ set_tests_properties(o2sim_G4_checklogs
331331
endif()
332332

333333
install(FILES o2-sim-client.py PERMISSIONS GROUP_READ GROUP_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ DESTINATION ${CMAKE_INSTALL_BINDIR})
334+
install(DIRECTORY SimExamples/
335+
DESTINATION examples
336+
PATTERN *
337+
PERMISSIONS GROUP_READ GROUP_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ)

run/SimExamples/Hybrid/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
The usage of the Hybrid generator with the o2-sim is presented in this short manual.
66
All the other generators are implemented as sub-generators and they can be called thanks to a
7-
JSON file, fed to o2-sim via the GeneratorHybrid.configFile parameter.
7+
JSON file, fed to o2-sim via the GeneratorHybrid.configFile parameter. The O2sim package needs to be loaded in order to use this example.
88

99
The example can be run automatically using the runo2sim.sh script, which contains most of the
1010
available generators in O2. The JSON template can be generated using the ${O2DPG_ROOT}/MC/bin/o2_hybrid_gen.py script. To use this example the user can simply copy the entire Hybrid example folder and execute the script after giving it execution permissions (`chmod +x runo2sim.sh`).

run/SimExamples/Hybrid/epos4.hepmc

Lines changed: 0 additions & 210326 deletions
This file was deleted.
-34.6 MB
Binary file not shown.

run/SimExamples/Hybrid/hybridconfig.json

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,7 @@
7878
"confighepmc": {
7979
"version": 2,
8080
"eventsToSkip": 0,
81-
"fileName": "${PWD}/epos4.hepmc",
82-
"prune": false
83-
}
84-
}
85-
},
86-
{
87-
"name": "hepmc",
88-
"config": {
89-
"configcmd": {
90-
"fileNames": "",
91-
"cmd": "${O2DPG_ROOT}/MC/config/examples/epos4/epos.sh -i example"
92-
},
93-
"confighepmc": {
94-
"version": 2,
95-
"eventsToSkip": 0,
96-
"fileName": "",
81+
"fileName": "${PWD}/slight.hepmc",
9782
"prune": false
9883
}
9984
}
@@ -114,7 +99,6 @@
11499
1,
115100
1,
116101
1,
117-
1,
118102
1
119103
]
120104
}

run/SimExamples/Hybrid/runo2sim.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,11 @@ else
6262
NEV=10
6363
fi
6464

65+
# Generation of 1000 events using STARlight in a slight.hepmc file
66+
${O2_ROOT}/examples/HepMC_STARlight/run-starlight.sh
67+
68+
# Generation of event pool with pythia8 (10000 events) in a evtpool.root file
69+
${O2DPG_ROOT}/MC/run/examples/event_pool.sh --make
70+
6571
# Starting simulation with Hybrid generator
6672
${O2_ROOT}/bin/o2-sim --noGeant -j $JOBS --field ccdb --vertexMode kCCDB --run 300000 --configKeyValues "MFTBase.buildAlignment=true;GeneratorHybrid.configFile=$PWD/hybridconfig.json;GeneratorHybrid.randomize=false;${more}" -g hybrid -o genevents --timestamp 1546300800000 --seed 836302859 -n $NEV

run/SimExamples/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* \subpage refrunSimExamplesAliRoot_AMPT
1515
* \subpage refrunSimExamplesHepMC
1616
* \subpage refrunSimExamplesHepMC_STARlight
17+
* \subpage refrunSimExamplesHepMC_EPOS4
18+
* \subpage refrunSimExamplesHybrid
1719
* \subpage refrunSimExamplesJet_Embedding_Pythia8
1820
* \subpage refrunSimExamplesMcTracksToAOD
1921
* \subpage refrunSimExamplesMcTracksToAOD

0 commit comments

Comments
 (0)