Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nptool
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
np
nptool
Commits
2adb071b
Commit
2adb071b
authored
8 years ago
by
adrien-matta
Browse files
Options
Downloads
Patches
Plain Diff
* Fixing NPIonIonInelasticPhysics.cc
parent
76f25ac2
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
NPSimulation/Core/NPIonIonInelasticPhysic.cc
+6
-11
6 additions, 11 deletions
NPSimulation/Core/NPIonIonInelasticPhysic.cc
with
6 additions
and
11 deletions
NPSimulation/Core/NPIonIonInelasticPhysic.cc
+
6
−
11
View file @
2adb071b
...
@@ -96,17 +96,11 @@ void NPIonIonInelasticPhysic::ConstructProcess()
...
@@ -96,17 +96,11 @@ void NPIonIonInelasticPhysic::ConstructProcess()
ligthBinary
->
SetMinEnergy
(
0
*
MeV
);
ligthBinary
->
SetMinEnergy
(
0
*
MeV
);
ligthBinary
->
SetMaxEnergy
(
10
*
GeV
);
ligthBinary
->
SetMaxEnergy
(
10
*
GeV
);
G4GeneralSpaceNNCrossSection
*
GeneralSpaceNNCrossSection
=
new
G4GeneralSpaceNNCrossSection
;
/*
G4GeneralSpaceNNCrossSection* GeneralSpaceNNCrossSection =
*/
new
G4GeneralSpaceNNCrossSection
;
G4TripathiCrossSection
*
TripathiCrossSections
=
new
G4TripathiCrossSection
;
G4TripathiCrossSection
*
TripathiCrossSections
=
new
G4TripathiCrossSection
;
G4TripathiLightCrossSection
*
TripathiLightCrossSections
=
new
G4TripathiLightCrossSection
;
G4TripathiLightCrossSection
*
TripathiLightCrossSections
=
new
G4TripathiLightCrossSection
;
G4IonsShenCrossSection
*
ShenCrossSections
=
new
G4IonsShenCrossSection
;
G4IonsShenCrossSection
*
ShenCrossSections
=
new
G4IonsShenCrossSection
;
<<<<<<<
HEAD
G4ComponentGGHadronNucleusXsc
*
GlauberGribovCrossSection
=
new
G4ComponentGGHadronNucleusXsc
;
G4CrossSectionInelastic
*
GlauberGribovDataSet
=
new
G4CrossSectionInelastic
(
GlauberGribovCrossSection
);
=======
//G4CrossSectionInelastic* GlauberGribovDataSet = new G4CrossSectionInelastic(GlauberGribovCrossSection);
>>>>>>>
022122
b8890389e03443cc495d6b580ce752d060
// ******************
// ******************
// **** Elastic ****
// **** Elastic ****
...
@@ -141,7 +135,7 @@ void NPIonIonInelasticPhysic::ConstructProcess()
...
@@ -141,7 +135,7 @@ void NPIonIonInelasticPhysic::ConstructProcess()
//protonInelasticProcess -> AddDataSet(ShenCrossSections);
//protonInelasticProcess -> AddDataSet(ShenCrossSections);
//protonInelasticProcess -> AddDataSet(TripathiCrossSections);
//protonInelasticProcess -> AddDataSet(TripathiCrossSections);
//protonInelasticProcess -> AddDataSet(TripathiLightCrossSections);
//protonInelasticProcess -> AddDataSet(TripathiLightCrossSections);
protonInelasticProcess
->
AddDataSet
(
GlauberGribovDataSet
);
//
protonInelasticProcess -> AddDataSet(GlauberGribovDataSet);
protonInelasticProcess
->
RegisterMe
(
ligthBinary
);
protonInelasticProcess
->
RegisterMe
(
ligthBinary
);
//protonInelasticProcess -> RegisterMe(JQMDmodel);
//protonInelasticProcess -> RegisterMe(JQMDmodel);
...
@@ -151,12 +145,13 @@ void NPIonIonInelasticPhysic::ConstructProcess()
...
@@ -151,12 +145,13 @@ void NPIonIonInelasticPhysic::ConstructProcess()
processManager
->
AddDiscreteProcess
(
protonInelasticProcess
);
processManager
->
AddDiscreteProcess
(
protonInelasticProcess
);
double
energy
=
0
;
double
energy
=
0
;
int
Z
=
50
;
//
int Z = 50;
int
A
=
120
;
//
int A = 120;
for
(
int
i
=
0
;
i
<
500
;
i
++
){
for
(
int
i
=
0
;
i
<
500
;
i
++
){
energy
+=
1
;
energy
+=
1
;
G4DynamicParticle
*
dp
=
new
G4DynamicParticle
(
particle
,
G4ThreeVector
(
0
,
0
,
1
),
energy
*
MeV
);
new
G4DynamicParticle
(
particle
,
G4ThreeVector
(
0
,
0
,
1
),
energy
*
MeV
);
//G4Element* element = new G4Element("Sn","Sn",1);
//G4Element* element = new G4Element("Sn","Sn",1);
//G4Isotope *isotope = new G4Isotope("Sn",50,70,120*g/mole);
//G4Isotope *isotope = new G4Isotope("Sn",50,70,120*g/mole);
//element->AddIsotope(isotope,1);
//element->AddIsotope(isotope,1);
...
...
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