IAP GITLAB
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
corsika
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Air Shower Physics
corsika
Commits
0cac30ac
Commit
0cac30ac
authored
5 years ago
by
Maximilian Reininghaus
Browse files
Options
Downloads
Plain Diff
Merge branch '256-sibyll-corsika-conversion-of-98-impossible' into 'master'
Resolve "SIBYLL/CORSIKA conversion of 98 impossible" Closes
#256
See merge request
!187
parents
c027201d
83d721da
No related branches found
No related tags found
1 merge request
!187
Resolve "SIBYLL/CORSIKA conversion of 98 impossible"
Pipeline
#1259
passed
5 years ago
Stage: config
Stage: build_test
Stage: optional
Changes
3
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Framework/Particles/ParticleData.xml
+4
-4
4 additions, 4 deletions
Framework/Particles/ParticleData.xml
Processes/Sibyll/sibyll_codes.dat
+4
-0
4 additions, 0 deletions
Processes/Sibyll/sibyll_codes.dat
Processes/Sibyll/testSibyll.cc
+3
-0
3 additions, 0 deletions
Processes/Sibyll/testSibyll.cc
with
11 additions
and
4 deletions
Framework/Particles/ParticleData.xml
+
4
−
4
View file @
0cac30ac
...
@@ -3791,26 +3791,26 @@
...
@@ -3791,26 +3791,26 @@
<channel onMode="1" bRatio="1.0000000" products="4132 22"/>
<channel onMode="1" bRatio="1.0000000" products="4132 22"/>
</particle>
</particle>
<!--
<particle id="4314" name="Xi*_c0" antiName="Xi*_cbar0" spinType="4" chargeType="0" colType="0"
<particle id="4314" name="Xi*_c0" antiName="Xi*_cbar0" spinType="4" chargeType="0" colType="0"
m0="2.64590" mWidth="0.0026" mMin="2.63590" mMax="2.65590">
m0="2.64590" mWidth="0.0026" mMin="2.63590" mMax="2.65590">
<channel onMode="1" bRatio="0.5000000" products="4132 111"/>
<channel onMode="1" bRatio="0.5000000" products="4132 111"/>
<channel onMode="1" bRatio="0.5000000" products="4132 22"/>
<channel onMode="1" bRatio="0.5000000" products="4132 22"/>
</particle>
</particle>
-->
<particle id="4322" name="Xi'_c+" antiName="Xi'_cbar-" spinType="2" chargeType="3" colType="0"
<particle id="4322" name="Xi'_c+" antiName="Xi'_cbar-" spinType="2" chargeType="3" colType="0"
m0="2.57560">
m0="2.57560">
<channel onMode="1" bRatio="1.0000000" products="4232 22"/>
<channel onMode="1" bRatio="1.0000000" products="4232 22"/>
</particle>
</particle>
<!--
<particle id="4324" name="Xi*_c+" antiName="Xi*_cbar-" spinType="4" chargeType="3" colType="0"
<particle id="4324" name="Xi*_c+" antiName="Xi*_cbar-" spinType="4" chargeType="3" colType="0"
m0="2.64590" mWidth="0.0026" mMin="2.63590" mMax="2.65590">
m0="2.64590" mWidth="0.0026" mMin="2.63590" mMax="2.65590">
<channel onMode="1" bRatio="0.5000000" products="4232 111"/>
<channel onMode="1" bRatio="0.5000000" products="4232 111"/>
<channel onMode="1" bRatio="0.5000000" products="4232 22"/>
<channel onMode="1" bRatio="0.5000000" products="4232 22"/>
</particle>
</particle>
-->
<particle id="4332" name="Omega_c0" antiName="Omega_cbar0" spinType="2" chargeType="0" colType="0"
<particle id="4332" name="Omega_c0" antiName="Omega_cbar0" spinType="2" chargeType="0" colType="0"
m0="2.69520" tau0="2.10000e-02">
m0="2.69520" tau0="2.10000e-02">
...
...
This diff is collapsed.
Click to expand it.
Processes/Sibyll/sibyll_codes.dat
+
4
−
0
View file @
0cac30ac
...
@@ -115,6 +115,10 @@ SigmaStarCPlusPlus 94 0 0
...
@@ -115,6 +115,10 @@ SigmaStarCPlusPlus 94 0 0
SigmaStarCMinusMinusBar -94 0 0
SigmaStarCMinusMinusBar -94 0 0
XiCPlus 87 1 1
XiCPlus 87 1 1
XiCMinusBar -87 1 1
XiCMinusBar -87 1 1
XiStarCPlus 97 0 0
XiStarCMinusBar -97 0 0
XiStarC0 98 0 0
XiStarC0Bar -98 0 0
OmegaC0 99 0 0
OmegaC0 99 0 0
OmegaC0Bar -99 0 0
OmegaC0Bar -99 0 0
Jpsi 83 0 0
Jpsi 83 0 0
...
...
This diff is collapsed.
Click to expand it.
Processes/Sibyll/testSibyll.cc
+
3
−
0
View file @
0cac30ac
...
@@ -36,6 +36,9 @@ TEST_CASE("Sibyll", "[processes]") {
...
@@ -36,6 +36,9 @@ TEST_CASE("Sibyll", "[processes]") {
REQUIRE
(
process
::
sibyll
::
ConvertToSibyll
(
particles
::
Electron
::
GetCode
())
==
REQUIRE
(
process
::
sibyll
::
ConvertToSibyll
(
particles
::
Electron
::
GetCode
())
==
process
::
sibyll
::
SibyllCode
::
Electron
);
process
::
sibyll
::
SibyllCode
::
Electron
);
REQUIRE
(
process
::
sibyll
::
ConvertToSibyllRaw
(
particles
::
Proton
::
GetCode
())
==
13
);
REQUIRE
(
process
::
sibyll
::
ConvertToSibyllRaw
(
particles
::
Proton
::
GetCode
())
==
13
);
REQUIRE
(
process
::
sibyll
::
ConvertToSibyll
(
particles
::
XiStarC0
::
GetCode
())
==
process
::
sibyll
::
SibyllCode
::
XiStarC0
);
}
}
SECTION
(
"canInteractInSibyll"
)
{
SECTION
(
"canInteractInSibyll"
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment