IAP GITLAB
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
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
Package Registry
Model registry
Operate
Environments
Terraform modules
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
Pranav Sampathkumar
corsika
Commits
5189e66d
Commit
5189e66d
authored
3 years ago
by
Remy Prechelt
Browse files
Options
Downloads
Plain Diff
Merge branch 'noise_fix_Cascade' into 'master'
Bug in Cascade.inl See merge request
!397
parents
b1288e92
f24b9ea2
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
corsika/detail/framework/core/Cascade.inl
+6
-6
6 additions, 6 deletions
corsika/detail/framework/core/Cascade.inl
with
6 additions
and
6 deletions
corsika/detail/framework/core/Cascade.inl
+
6
−
6
View file @
5189e66d
...
@@ -126,7 +126,7 @@ namespace corsika {
...
@@ -126,7 +126,7 @@ namespace corsika {
// inform ContinuousProcesses (if applicable) that it is responsible for step-limit
// inform ContinuousProcesses (if applicable) that it is responsible for step-limit
// this would become simpler if we follow the idea of Max to enumerate ALL types of
// this would become simpler if we follow the idea of Max to enumerate ALL types of
// processes. Then non-cont
u
nuous are included and no further logic is needed to
// processes. Then non-cont
i
nuous are included and no further logic is needed to
// distinguish between continuous and non-continuous limit.
// distinguish between continuous and non-continuous limit.
ContinuousProcessIndex
limitingId
;
ContinuousProcessIndex
limitingId
;
bool
const
isContinuous
=
continuous_max_dist
<
min_non_continuous
;
bool
const
isContinuous
=
continuous_max_dist
<
min_non_continuous
;
...
@@ -151,7 +151,6 @@ namespace corsika {
...
@@ -151,7 +151,6 @@ namespace corsika {
// assumption: tracking does not change absolute momentum (continuous physics can and
// assumption: tracking does not change absolute momentum (continuous physics can and
// will):
// will):
vParticle
.
setMomentum
(
step
.
getDirection
(
1
)
*
vParticle
.
getMomentum
().
getNorm
());
vParticle
.
setMomentum
(
step
.
getDirection
(
1
)
*
vParticle
.
getMomentum
().
getNorm
());
vParticle
.
setTime
(
vParticle
.
getTime
()
+
step
.
getDuration
());
// apply all continuous processes on particle + track
// apply all continuous processes on particle + track
if
(
sequence_
.
doContinuous
(
vParticle
,
step
,
limitingId
)
==
if
(
sequence_
.
doContinuous
(
vParticle
,
step
,
limitingId
)
==
...
@@ -167,6 +166,7 @@ namespace corsika {
...
@@ -167,6 +166,7 @@ namespace corsika {
}
}
return
;
return
;
}
}
vParticle
.
setTime
(
vParticle
.
getTime
()
+
step
.
getDuration
());
if
(
isContinuous
)
{
if
(
isContinuous
)
{
return
;
// there is nothing further, step is finished
return
;
// there is nothing further, step is finished
}
}
...
@@ -232,11 +232,11 @@ namespace corsika {
...
@@ -232,11 +232,11 @@ namespace corsika {
/*
/*
Create SecondaryView object on Stack. The data container
Create SecondaryView object on Stack. The data container
remains untouched and identical, and 'projectil' is identical
remains untouched and identical, and 'projectil
e
' is identical
to 'vParticle' above this line. However,
to 'vParticle' above this line. However,
projectil.AddSecondaries populate the SecondaryView, which can
projectil
e
.AddSecondaries populate the SecondaryView, which can
then be used afterwards for further processing. Thus: it is
then be used afterwards for further processing. Thus: it is
important to use projectle/view (and not vParticle) for Interaction,
important to use project
i
le/view (and not vParticle) for Interaction,
and Decay!
and Decay!
*/
*/
...
@@ -303,7 +303,7 @@ namespace corsika {
...
@@ -303,7 +303,7 @@ namespace corsika {
if
(
actual_inv_length
*
0.99
>
initial_inv_int_length
)
{
if
(
actual_inv_length
*
0.99
>
initial_inv_int_length
)
{
CORSIKA_LOG_WARN
(
CORSIKA_LOG_WARN
(
"Interaction length decreased during step! This leads to un-physical step "
"Interaction length decreased during step! This leads to un-physical step "
"length. delta_in
n
verse_interaction_length={}"
,
"length. delta_inverse_interaction_length={}"
,
1
/
initial_inv_int_length
-
1
/
actual_inv_length
);
1
/
initial_inv_int_length
-
1
/
actual_inv_length
);
}
}
#endif
#endif
...
...
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