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
fc91d2a2
Commit
fc91d2a2
authored
6 years ago
by
Felix Riehn
Browse files
Options
Downloads
Patches
Plain Diff
added number of wounded nucleons to sibyll interface
parent
f4bf3233
No related branches found
No related tags found
1 merge request
!42
Resolve "missing rotation between corsika stack and sibyll stack"
Pipeline
#115
failed
6 years ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Processes/Sibyll/Interaction.h
+5
-3
5 additions, 3 deletions
Processes/Sibyll/Interaction.h
Processes/Sibyll/sibyll2.3c.cc
+2
-0
2 additions, 0 deletions
Processes/Sibyll/sibyll2.3c.cc
Processes/Sibyll/sibyll2.3c.h
+8
-0
8 additions, 0 deletions
Processes/Sibyll/sibyll2.3c.h
with
15 additions
and
3 deletions
Processes/Sibyll/Interaction.h
+
5
−
3
View file @
fc91d2a2
...
@@ -16,10 +16,11 @@ namespace corsika::process::sibyll {
...
@@ -16,10 +16,11 @@ namespace corsika::process::sibyll {
class
Interaction
:
public
corsika
::
process
::
InteractionProcess
<
Interaction
>
{
class
Interaction
:
public
corsika
::
process
::
InteractionProcess
<
Interaction
>
{
mutable
int
fCount
=
0
;
mutable
int
fCount
=
0
;
mutable
int
fNucCount
=
0
;
public:
public:
Interaction
()
{}
Interaction
()
{}
~
Interaction
()
{
std
::
cout
<<
"Sibyll::Interaction n="
<<
fCount
<<
std
::
endl
;
}
~
Interaction
()
{
std
::
cout
<<
"Sibyll::Interaction n="
<<
fCount
<<
" Nnuc="
<<
fNucCount
<<
std
::
endl
;}
void
Init
()
{
void
Init
()
{
...
@@ -227,7 +228,8 @@ namespace corsika::process::sibyll {
...
@@ -227,7 +228,8 @@ namespace corsika::process::sibyll {
// print final state
// print final state
int
print_unit
=
6
;
int
print_unit
=
6
;
sib_list_
(
print_unit
);
sib_list_
(
print_unit
);
fNucCount
+=
get_nwounded
()
-
1
;
// delete current particle
// delete current particle
p
.
Delete
();
p
.
Delete
();
...
...
This diff is collapsed.
Click to expand it.
Processes/Sibyll/sibyll2.3c.cc
+
2
−
0
View file @
fc91d2a2
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
#include
<corsika/random/RNGManager.h>
#include
<corsika/random/RNGManager.h>
#include
<random>
#include
<random>
int
get_nwounded
()
{
return
s_chist_
.
nwd
;
}
double
s_rndm_
(
int
&
)
{
double
s_rndm_
(
int
&
)
{
static
corsika
::
random
::
RNG
&
rng
=
static
corsika
::
random
::
RNG
&
rng
=
corsika
::
random
::
RNGManager
::
GetInstance
().
GetRandomStream
(
"s_rndm"
);
corsika
::
random
::
RNGManager
::
GetInstance
().
GetRandomStream
(
"s_rndm"
);
...
...
This diff is collapsed.
Click to expand it.
Processes/Sibyll/sibyll2.3c.h
+
8
−
0
View file @
fc91d2a2
...
@@ -19,6 +19,12 @@ extern struct {
...
@@ -19,6 +19,12 @@ extern struct {
int
np
;
int
np
;
}
s_plist_
;
}
s_plist_
;
// additional information about interactions.
// number of wounded nucleons, number of hard and soft scatterings etc.
extern
struct
{
int
nnsof
[
20
],
nnjet
[
20
],
jdif
[
20
],
nwd
,
njet
,
nsof
;
}
s_chist_
;
extern
struct
{
extern
struct
{
double
cbr
[
223
+
16
+
12
+
8
];
double
cbr
[
223
+
16
+
12
+
8
];
int
kdec
[
1338
+
6
*
(
16
+
12
+
8
)];
int
kdec
[
1338
+
6
*
(
16
+
12
+
8
)];
...
@@ -85,6 +91,8 @@ void sib_sigma_hp_(const int&, const double&, double&, double&, double&, double*
...
@@ -85,6 +91,8 @@ void sib_sigma_hp_(const int&, const double&, double&, double&, double&, double*
double
s_rndm_
(
int
&
);
double
s_rndm_
(
int
&
);
int
get_nwounded
();
// phojet random generator setup
// phojet random generator setup
void
pho_rndin_
(
int
&
,
int
&
,
int
&
,
int
&
);
void
pho_rndin_
(
int
&
,
int
&
,
int
&
,
int
&
);
}
}
...
...
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