Skip to content
Snippets Groups Projects
Commit 970716d5 authored by Gloria Corti's avatar Gloria Corti
Browse files

Merge branch 'v49r11-release' into 'Sim09'

Documentation and dependencies for v49r11 release

See merge request lhcb/Gauss!355
parents b2f3ed44 22cf6e43
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,7 @@ endmacro() ...@@ -22,7 +22,7 @@ endmacro()
# Declare project name and version # Declare project name and version
gaudi_project(Gauss v49r11 gaudi_project(Gauss v49r11
FORTRAN FORTRAN
USE LHCb v39r1p1 USE LHCb v39r1p3
Geant4 v96r4p3 Geant4 v96r4p3
DATA AppConfig VERSION v3r* DATA AppConfig VERSION v3r*
BcVegPyData VERSION v2r* BcVegPyData VERSION v2r*
......
2018-09-21 Gauss v49r11
2018-10-15 Gauss v49r11
=== ===
This version uses LHCb v39r1, Geant4 v96r4p3, Gaudi v26r4 and LCGCMT_79 with This version uses LHCb **v39r1p3**, Geant4 v96r4p3, Gaudi v26r4 and LCGCMT_79 with
HepMC 2.06.09 and Root 6.04.02 HepMC 2.06.09 and Root 6.04.02
The generators used (via LCG_79/MCGenerators) are The generators used (via LCG_79/MCGenerators) are
...@@ -11,7 +12,7 @@ The generators used (via LCG_79/MCGenerators) are ...@@ -11,7 +12,7 @@ The generators used (via LCG_79/MCGenerators) are
hijing 1.383bs.2, crmc 1.5.6 (epos), alpgen 2.1.4, powhegbox r2092, hijing 1.383bs.2, crmc 1.5.6 (epos), alpgen 2.1.4, powhegbox r2092,
herwig++ 2.7.1, thepeg 1.9.2p1, herwig++ 2.7.1, thepeg 1.9.2p1,
rivet 2.4.2, yoda 1.5.9. rivet 2.4.2, yoda 1.5.9.
**startlight r300** startlight r300
and the internal implementation of: and the internal implementation of:
EvtGen with EvtGenExtras, AmpGen, Mint, EvtGen with EvtGenExtras, AmpGen, Mint,
BcVegPy and GenXicc, SuperChic, LPair, MIB BcVegPy and GenXicc, SuperChic, LPair, MIB
...@@ -53,7 +54,7 @@ It is to be used for productions referred to as **Sim09e** ...@@ -53,7 +54,7 @@ It is to be used for productions referred to as **Sim09e**
#### Generators #### Generators
- Gen/GenCuts: Minor update for LoKi::GenCutTool & new LoKi::GenCutToolWithDecay !318 (@ibelyaev) - Gen/GenCuts: Minor update for LoKi::GenCutTool & new LoKi::GenCutToolWithDecay, !318 (@ibelyaev) [LHCBGAUSS-1437]
see LHCBGAUSS-1437 see LHCBGAUSS-1437
- Minor update for `LoKi::GenCutTool`: - Minor update for `LoKi::GenCutTool`:
...@@ -70,51 +71,75 @@ It is to be used for productions referred to as **Sim09e** ...@@ -70,51 +71,75 @@ It is to be used for productions referred to as **Sim09e**
Essentially this new single tool can replaced all zoo of all specific `Bc*`, `Xicc*` and `Upsilon*` tools altogather Essentially this new single tool can replaced all zoo of all specific `Bc*`, `Xicc*` and `Upsilon*` tools altogather
#### Fast Simulation
### Fast Simulation
- Split simulation stage to search for gamma-conversion, !286 (@dmuller) - Split simulation stage to search for gamma-conversion, !286 (@dmuller)
Use-case: Eventtypes with selections on the outcome of the detector simulation (e.g. Gamma converted to e+e- within a certain volume and with kinematic requirements). Use-case: Eventtypes with selections on the outcome of the detector simulation (e.g. Gamma converted to e+e- within a certain volume and with kinematic requirements).
- To check whether a gamma produced in the signal event was converted currently requires running the simulation for all particles in the event (+ in all spill-over events in Run 2) which is very CPU intensive and highly inefficient. - To check whether a gamma produced in the signal event was converted currently requires running the simulation for all particles in the event (+ in all spill-over events in Run 2) which is very CPU intensive and highly inefficient.
- This MR contains a prototype that splits the HepMC event and removes all photons which are descendants of the signal particle which are placed in a second dummy HepMC event that is then converted to our/G4's event model and simulated. The check for successful conversion is then applied and only if the gamma is accepted is the simulation for the remaining event run. If it does not pass, the remaining event loop is skipped and the next event is generated. - This MR contains a prototype that splits the HepMC event and removes all photons which are descendants of the signal particle which are placed in a second dummy HepMC event that is then converted to our/G4's event model and simulated. The check for successful conversion is then applied and only if the gamma is accepted is the simulation for the remaining event run. If it does not pass, the remaining event loop is skipped and the next event is generated.
- Using the event-type 27162212 which requires gamma-conversion, the time required to run the gamma simulation + check is significantly shorter than the time required to generate the full event in the first place. - Using the event-type 27162212 which requires gamma-conversion, the time required to run the gamma simulation + check is significantly shorter than the time required to generate the full event in the first place.
- **Implementation:** - **Implementation:**
* Quickly hacked together using the existing ReDecay infrastructure which provides almost all required pieces of cpp (but with its services might be a slight overkill). * Quickly hacked together using the existing ReDecay infrastructure which provides almost all required pieces of cpp (but with its services might be a slight overkill).
* The decision which particles to extract and simulate first is hard-coded to photons from the signal particle (which have no end-vertex though this should be true for all of them by construction). More flexibility is probably desirable? * The decision which particles to extract and simulate first is hard-coded to photons from the signal particle (which have no end-vertex though this should be true for all of them by construction). More flexibility is probably desirable?
- **Question**: - **Question:**
* As the simulation of one photon is significantly faster than the event generation, repeating it multiple times and check for gamma conversion would be even better. However, this current prototype is build around existing algorithms and passes data via the TES. Repeating the simulation would require looping over the sequencer multiple times. While I can write a modified sequencer that does this, I believe the algorithms won't execute a second time and I don't know if it is possible to reset them or make them re-entrant? * As the simulation of one photon is significantly faster than the event generation, repeating it multiple times and check for gamma conversion would be even better. However, this current prototype is build around existing algorithms and passes data via the TES. Repeating the simulation would require looping over the sequencer multiple times. While I can write a modified sequencer that does this, I believe the algorithms won't execute a second time and I don't know if it is possible to reset them or make them re-entrant?
### Bug fixes ### Bug fixes
- Fix time units in EPOS boost algorithm, !349 (@robbep) [LHCBGAUSS-1493]
Closes LHCBGAUSS-1493
Usage of bad time units in EPOS boost algorithm caused bad values for Ks0 lifetimes in EPOS pPb and Pbp simulated events.
Can be ported also to Sim10
- Add Omegacc and Omegabc with their anti particles, !347 (@jingyi) [LHCBGAUSS-1490]
I have added 4 files, Omegacc and Omegabc with their anti particles,*.cpp and *.h.
I have also updated the GiGaPhysUnknownParticles.cpp file by adding these 4 files in place.
Closes LHCBGAUSS-1490
- Initial solution for fixed quarkonia masses., !323 (@philten) [LHCBGAUSS-1167] - Initial solution for fixed quarkonia masses., !323 (@philten) [LHCBGAUSS-1167]
Closes LHCBGAUSS-1167 Closes LHCBGAUSS-1167
Since this changes the behaviour of some EventTypes it causes the change to Sim09e Since this changes the behaviour of some EventTypes it causes the change to Sim09e
### Monitoring changes and Changes to tests ### Monitoring changes and Changes to tests
- Update Sim09 references for nightly tests, !350 (@gcorti)
This is needed because MR !347 introduced a few more lines in the log files of type:
```
+ -------- WWWW ------- G4Exception-START -------- WWWW -------
+ *** G4Exception : PART102
+ issued by : G4ParticleDefintion::G4ParticleDefintion
+ Strange PDGEncoding
+ -------- WWWW -------- G4Exception-END --------- WWWW -------
+ -------- WWWW ------- G4Exception-START -------- WWWW -------
+ *** G4Exception : PART102
+ issued by : G4ParticleDefintion::G4ParticleDefintion
+ Strange PDGEncoding
+ -------- WWWW -------- G4Exception-END --------- WWWW -------
```
- Update reference for nightly tests, !342 (@gcorti) - Update reference for nightly tests, !342 (@gcorti)
- Set Log Output to WARNING to greatly reduce log size and run time, !311 (@gcorti) [LHCBGAUSS-869]
- LHCBGAUSS-869: Set Log Output to WARNING to greatly reduce log size and run time, !311 (@gcorti)
Port merging of branch 'LHCBGAUSS-869.OutputSuppression' into 'Sim09' Port merging of branch 'LHCBGAUSS-869.OutputSuppression' into 'Sim09'
See merge request lhcb/Gauss!308 for 'master' and lhcb/Gauss!310 for 'Sim09-upgrade' See merge request lhcb/Gauss!308 for 'master' and lhcb/Gauss!310 for 'Sim09-upgrade'
(cherry picked from commit 60f1aeca6007e70bb376b24849e226e5efdebea4) (cherry picked from commit 60f1aeca6007e70bb376b24849e226e5efdebea4)
f6ccf3b6 Set Log Output to WARNING to greatly reduce log size and run time f6ccf3b6 Set Log Output to WARNING to greatly reduce log size and run time
- LHCBGAUSS-876: Fixed Incorrect Rich1 Plane2Plane for Sim09, !307 (@gcorti) - Fixed Incorrect Rich1 Plane2Plane for Sim09, !307 (@gcorti) [LHCBGAUSS-876]
Port the merge of branch 'LHCBGAUSS-876.Rich1P2PFix' into 'Sim09' Port the merge of branch 'LHCBGAUSS-876.Rich1P2PFix' into 'Sim09'
Corresponds to merge request lhcb/Gauss!296 for 'master' and lhcb/Gauss!306 for 'Sim09-upgrade' Corresponds to merge request lhcb/Gauss!296 for 'master' and lhcb/Gauss!306 for 'Sim09-upgrade'
(cherry picked from commit 3b958349a4d3f5156d7f2a45fb68a3754c4b91ec) (cherry picked from commit 3b958349a4d3f5156d7f2a45fb68a3754c4b91ec)
209b738c Fixed Incorrect Rich1 Plane2Plane 209b738c Fixed Incorrect Rich1 Plane2Plane
bd8942dd Removed Sizing of Marker in VELO scan for LHCbPR bd8942dd Removed Sizing of Marker in VELO scan for LHCbPR
e6102efb Set Option for Maximum in Z so TProfiles are not saturated by beam pipe… e6102efb Set Option for Maximum in Z so TProfiles are not saturated by beam pipe…
...@@ -122,3 +147,7 @@ It is to be used for productions referred to as **Sim09e** ...@@ -122,3 +147,7 @@ It is to be used for productions referred to as **Sim09e**
2adfab10 Set Z limit option in main test script 2adfab10 Set Z limit option in main test script
### Other
- Documentation and dependencies for v49r11 release, !344 (@clemenci, @gcorti)
Prepare v49r11 release
project GAUSS project GAUSS
use LHCB LHCB_v39r1p1 use LHCB LHCB_v39r1p3
use GEANT4 GEANT4_v96r4p3 use GEANT4 GEANT4_v96r4p3
build_strategy with_installarea build_strategy with_installarea
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment