lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 11.3.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2024-12-06 11:11:40 +01:00
parent e58e650b32
commit 32390e802b
1984 changed files with 98713 additions and 83996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/inclxx/incl_physics/src/G4INCLCascade.cc
+13 -13
View File
@@ -356,23 +356,23 @@ namespace G4INCL {
<< " by the INCL++ model" << G4endl;
G4Exception("G4INCLDataFile::readData()","rawppbarFS.dat, ...", FatalException, ed);
}
G4String dataPath0(G4FindDataDir("G4INCLDATA"));
G4String dataPathppbar(dataPath0 + "/rawppbarFS.dat");
G4String dataPathnpbar(dataPath0 + "/rawnpbarFS.dat");
G4String dataPathppbark(dataPath0 + "/rawppbarFSkaonic.dat");
G4String dataPathnpbark(dataPath0 + "/rawnpbarFSkaonic.dat");
const G4String& dataPath0(G4FindDataDir("G4INCLDATA"));
const G4String& dataPathppbar(dataPath0 + "/rawppbarFS.dat");
// const G4String& dataPathnpbar(dataPath0 + "/rawnpbarFS.dat"); // NOT used!
const G4String& dataPathppbark(dataPath0 + "/rawppbarFSkaonic.dat");
// const G4String& dataPathnpbark(dataPath0 + "/rawnpbarFSkaonic.dat"); // NOT used!
#else
G4String path;
std::string path;
if (theConfig) path = theConfig->getINCLXXDataFilePath();
G4String dataPathppbar(path + "/rawppbarFS.dat");
const std::string& dataPathppbar(path + "/rawppbarFS.dat");
INCL_DEBUG("Reading https://doi.org/10.1016/0375-9474(92)90362-N ppbar final states" << dataPathppbar << '\n');
G4String dataPathnpbar(path + "/rawnpbarFS.dat");
const std::string& dataPathnpbar(path + "/rawnpbarFS.dat");
INCL_DEBUG("Reading https://doi.org/10.1016/0375-9474(92)90362-N npbar final states" << dataPathnpbar << '\n');
G4String dataPathppbark(path + "/rawppbarFSkaonic.dat");
const std::string& dataPathppbark(path + "/rawppbarFSkaonic.dat");
INCL_DEBUG("Reading https://doi.org/10.1016/j.physrep.2005.03.002 ppbar kaonic final states" << dataPathppbark << '\n');
G4String dataPathnpbark(path + "/rawnpbarFSkaonic.dat");
const std::string& dataPathnpbark(path + "/rawnpbarFSkaonic.dat");
INCL_DEBUG("Reading https://doi.org/10.1007/BF02818764 and https://link.springer.com/article/10.1007/BF02754930 npbar kaonic final states" << dataPathnpbark << '\n');
#endif
#endif
//read probabilities and particle types from file
std::vector<G4double> probabilities; //will store each FS yield
@@ -390,7 +390,7 @@ namespace G4INCL {
sum = read_file(dataPathppbar, probabilities, particle_types);
rdm = (rdm/(1.-kaonicFSprob))*sum; //99.88 normalize by the sum of probabilities in the file
//now get the line number in the file where the FS particles are stored:
G4int n = findStringNumber(rdm, probabilities)-1;
G4int n = findStringNumber(rdm, std::move(probabilities))-1;
if ( n < 0 ) return theEventInfo;
for (G4int j = 0; j < static_cast<G4int>(particle_types[n].size()); j++) {
if (particle_types[n][j] == "pi0") {
@@ -1228,7 +1228,7 @@ namespace G4INCL {
while (iss >> type) {
types.push_back(type);
}
particle_types.push_back(types);
particle_types.push_back(std::move(types));
}
} else {
#ifdef INCLXX_IN_GEANT4_MODE
source/processes/hadronic/models/inclxx/incl_physics/src/G4INCLCrossSectionsAntiparticles.cc
+19 -22
View File
@@ -188,9 +188,9 @@ namespace G4INCL {
}
else{ // ppbar or nnbar
if(p1->getType()==antiProton || p1->getType()==Proton)
sigma = KinematicsUtils::compute_xs(BFMM204, pLab); // ppbar case
sigma = KinematicsUtils::compute_xs(std::move(BFMM204), pLab); // ppbar case
else
sigma = KinematicsUtils::compute_xs(BFMM204nn, pLab); // nnbar case
sigma = KinematicsUtils::compute_xs(std::move(BFMM204nn), pLab); // nnbar case
return sigma;
}
}
@@ -234,15 +234,12 @@ namespace G4INCL {
const G4double pLab = 0.001*KinematicsUtils::momentumInLab(antinucleon, nucleon); // GeV
if(iso == 2 || iso == -2){ //npbar or pnbar
sigma = KinematicsUtils::compute_xs(BFMM472, pLab);
if(iso == 2 || iso == -2){ // npbar or pnbar
sigma = KinematicsUtils::compute_xs(std::move(BFMM472), pLab);
return sigma;
}
else{ // ppbar or nnbar
if(p1->getType()==antiProton || p1->getType()==Proton)
sigma = KinematicsUtils::compute_xs(BFMM2, pLab); // ppbar case
else
sigma = KinematicsUtils::compute_xs(BFMM2, pLab); // nnbar case
else { // ppbar or nnbar
sigma = KinematicsUtils::compute_xs(std::move(BFMM2), pLab);
return sigma;
}
}
@@ -332,10 +329,10 @@ namespace G4INCL {
return sigma;
}
else{ // ppbar or nnbar
sigma = KinematicsUtils::compute_xs(BFMM113, pLab)
+KinematicsUtils::compute_xs(BFMM139, pLab) +KinematicsUtils::compute_xs(BFMM136, pLab)
+KinematicsUtils::compute_xs(BFMM146, pLab)+KinematicsUtils::compute_xs(BFMM143, pLab)
+KinematicsUtils::compute_xs(BFMM121, pLab)+KinematicsUtils::compute_xs(BFMM149, pLab)
sigma = KinematicsUtils::compute_xs(std::move(BFMM113), pLab)
+KinematicsUtils::compute_xs(std::move(BFMM139), pLab)+KinematicsUtils::compute_xs(std::move(BFMM136), pLab)
+KinematicsUtils::compute_xs(std::move(BFMM146), pLab)+KinematicsUtils::compute_xs(std::move(BFMM143), pLab)
+KinematicsUtils::compute_xs(std::move(BFMM121), pLab)+KinematicsUtils::compute_xs(std::move(BFMM149), pLab)
+BFMM144 +BFMM101; // nnbar case totally same as ppbar
return sigma;
}
@@ -402,11 +399,11 @@ namespace G4INCL {
const G4double pLab = 0.001*KinematicsUtils::momentumInLab(antinucleon, nucleon); // GeV
if(iso == 2 || iso == -2){ //npbar or pnbar
sigma = KinematicsUtils::compute_xs(BFMM491, pLab) + KinematicsUtils::compute_xs(BFMM185, pLab) + KinematicsUtils::compute_xs(BFMM188, pLab);
sigma = KinematicsUtils::compute_xs(std::move(BFMM491), pLab) + KinematicsUtils::compute_xs(std::move(BFMM185), pLab) + KinematicsUtils::compute_xs(std::move(BFMM188), pLab);
return sigma;
}
else{ // ppbar or nnbar
sigma = KinematicsUtils::compute_xs(BFMM199, pLab) + KinematicsUtils::compute_xs(BFMM185, pLab) + KinematicsUtils::compute_xs(BFMM188, pLab);
sigma = KinematicsUtils::compute_xs(std::move(BFMM199), pLab) + KinematicsUtils::compute_xs(std::move(BFMM185), pLab) + KinematicsUtils::compute_xs(std::move(BFMM188), pLab);
return sigma;
}
}
@@ -471,11 +468,11 @@ namespace G4INCL {
const G4double pLab = 0.001*KinematicsUtils::momentumInLab(antinucleon, nucleon); // GeV
if(iso == 2 || iso == -2){ // pnbar or npbar
sigma = KinematicsUtils::compute_xs(BFMM490, pLab) + KinematicsUtils::compute_xs(BFMM490, pLab) + KinematicsUtils::compute_xs(BFMM167, pLab) + KinematicsUtils::compute_xs(BFMM198, pLab);
sigma = KinematicsUtils::compute_xs(BFMM490, pLab) + KinematicsUtils::compute_xs(BFMM490, pLab) + KinematicsUtils::compute_xs(std::move(BFMM167), pLab) + KinematicsUtils::compute_xs(std::move(BFMM198), pLab);
return sigma;
}
else{ // ppbar or nnbar
sigma = KinematicsUtils::compute_xs(BFMM490, pLab) + KinematicsUtils::compute_xs(BFMM490, pLab) + KinematicsUtils::compute_xs(BFMM492, pLab) + KinematicsUtils::compute_xs(BFMM494, pLab);
sigma = KinematicsUtils::compute_xs(BFMM490, pLab) + KinematicsUtils::compute_xs(BFMM490, pLab) + KinematicsUtils::compute_xs(std::move(BFMM492), pLab) + KinematicsUtils::compute_xs(std::move(BFMM494), pLab);
return sigma;
}
}
@@ -536,11 +533,11 @@ namespace G4INCL {
const G4double pLab = 0.001*KinematicsUtils::momentumInLab(antinucleon, nucleon); // GeV
if(iso == 2 || iso == -2){ // pnbar or npbar
sigma = KinematicsUtils::compute_xs(BFMM169, pLab) + KinematicsUtils::compute_xs(BFMM169, pLab) + KinematicsUtils::compute_xs(BFMM197, pLab) + KinematicsUtils::compute_xs(BFMM161, pLab);
sigma = KinematicsUtils::compute_xs(BFMM169, pLab) + KinematicsUtils::compute_xs(BFMM169, pLab) + KinematicsUtils::compute_xs(std::move(BFMM197), pLab) + KinematicsUtils::compute_xs(std::move(BFMM161), pLab);
return sigma;
}
else{ // ppbar or nnbar
sigma = KinematicsUtils::compute_xs(BFMM161, pLab) + KinematicsUtils::compute_xs(BFMM169, pLab) + KinematicsUtils::compute_xs(BFMM197, pLab) + KinematicsUtils::compute_xs(BFMM201, pLab);
sigma = KinematicsUtils::compute_xs(std::move(BFMM161), pLab) + KinematicsUtils::compute_xs(std::move(BFMM169), pLab) + KinematicsUtils::compute_xs(std::move(BFMM197), pLab) + KinematicsUtils::compute_xs(std::move(BFMM201), pLab);
return sigma;
}
}
@@ -580,15 +577,15 @@ namespace G4INCL {
const G4double pLab = 0.001*KinematicsUtils::momentumInLab(antinucleon, nucleon); // GeV
if(iso == 2 || iso == -2){ // pnbar or npbar
sigma = KinematicsUtils::compute_xs(BFMM6, pLab)*KinematicsUtils::compute_xs(BFMM471, pLab)/KinematicsUtils::compute_xs(BFMM1, pLab);
sigma = KinematicsUtils::compute_xs(std::move(BFMM6), pLab)*KinematicsUtils::compute_xs(std::move(BFMM471), pLab)/KinematicsUtils::compute_xs(std::move(BFMM1), pLab);
return sigma;
}
else if(p1->getType()==antiProton || p2->getType()==Proton){ // ppbar case
sigma = KinematicsUtils::compute_xs(BFMM6, pLab);
sigma = KinematicsUtils::compute_xs(std::move(BFMM6), pLab);
return sigma;
}
else{ // nnbar case
sigma = KinematicsUtils::compute_xs(BFMM6, pLab)*KinematicsUtils::compute_xs(BFMM471, pLab)/KinematicsUtils::compute_xs(BFMM1, pLab);
sigma = KinematicsUtils::compute_xs(std::move(BFMM6), pLab)*KinematicsUtils::compute_xs(std::move(BFMM471), pLab)/KinematicsUtils::compute_xs(std::move(BFMM1), pLab);
return sigma;
}
}
source/processes/hadronic/models/inclxx/incl_physics/src/G4INCLNNbarToAnnihilationChannel.cc
+1 -1
View File
@@ -69,7 +69,7 @@ G4double NNbarToAnnihilationChannel::read_file(std::string filename, std::vector
while (iss >> type) {
types.push_back(type);
}
particle_types.push_back(types);
particle_types.push_back(std::move(types));
}
}
else std::cout << "ERROR no fread_file " << filename << std::endl;
source/processes/hadronic/models/inclxx/incl_physics/src/G4INCLNNbarToLLbarChannel.cc
+8 -8
View File
@@ -215,10 +215,10 @@ namespace G4INCL {
nucleon->setType(SigmaPlus);
antinucleon->setType(antiSigmaPlus);
}
else if(rdm*totalppbar < KinematicsUtils::compute_xs(BFMM121, plab)+BFMM144+BFMM101
+KinematicsUtils::compute_xs(BFMM113, plab) + KinematicsUtils::compute_xs(BFMM136, plab)
+KinematicsUtils::compute_xs(BFMM146, plab)+KinematicsUtils::compute_xs(BFMM143, plab)
+KinematicsUtils::compute_xs(BFMM139, plab)+KinematicsUtils::compute_xs(BFMM149, plab)){ //sm smbar
else if(rdm*totalppbar < KinematicsUtils::compute_xs(std::move(BFMM121), plab)+BFMM144+BFMM101
+KinematicsUtils::compute_xs(std::move(BFMM113), plab)+KinematicsUtils::compute_xs(std::move(BFMM136), plab)
+KinematicsUtils::compute_xs(std::move(BFMM146), plab)+KinematicsUtils::compute_xs(std::move(BFMM143), plab)
+KinematicsUtils::compute_xs(std::move(BFMM139), plab)+KinematicsUtils::compute_xs(std::move(BFMM149), plab)){ //sm smbar
nucleon->setType(SigmaMinus);
antinucleon->setType(antiSigmaMinus);
}
@@ -320,10 +320,10 @@ namespace G4INCL {
nucleon->setType(SigmaPlus);
antinucleon->setType(antiSigmaPlus);
}
else if(rdm*totalppbar < KinematicsUtils::compute_xs(BFMM121, plab)+BFMM144+BFMM101
+KinematicsUtils::compute_xs(BFMM113, plab) + KinematicsUtils::compute_xs(BFMM136, plab)
+KinematicsUtils::compute_xs(BFMM146, plab)+KinematicsUtils::compute_xs(BFMM143, plab)
+KinematicsUtils::compute_xs(BFMM139, plab)+KinematicsUtils::compute_xs(BFMM149, plab)){ //sm smbar
else if(rdm*totalppbar < KinematicsUtils::compute_xs(std::move(BFMM121), plab)+BFMM144+BFMM101
+KinematicsUtils::compute_xs(std::move(BFMM113), plab)+KinematicsUtils::compute_xs(std::move(BFMM136), plab)
+KinematicsUtils::compute_xs(std::move(BFMM146), plab)+KinematicsUtils::compute_xs(std::move(BFMM143), plab)
+KinematicsUtils::compute_xs(std::move(BFMM139), plab)+KinematicsUtils::compute_xs(std::move(BFMM149), plab)){ //sm smbar
nucleon->setType(SigmaMinus);
antinucleon->setType(antiSigmaMinus);
}
source/processes/hadronic/models/inclxx/incl_physics/src/G4INCLNNbarToNNbar2piChannel.cc
+6 -6
View File
@@ -107,8 +107,8 @@ namespace G4INCL {
// pnbar total is same as for npbar
// ppbar total is same as for nnbar
const G4double totalppbar = KinematicsUtils::compute_xs(BFMM167, plab) +KinematicsUtils::compute_xs(BFMM198, plab) +2*KinematicsUtils::compute_xs(BFMM490, plab);
const G4double totalpnbar = KinematicsUtils::compute_xs(BFMM492, plab) +KinematicsUtils::compute_xs(BFMM494, plab) +2*KinematicsUtils::compute_xs(BFMM490, plab);
const G4double totalppbar = KinematicsUtils::compute_xs(BFMM167, plab) +KinematicsUtils::compute_xs(std::move(BFMM198), plab) +2*KinematicsUtils::compute_xs(BFMM490, plab);
const G4double totalpnbar = KinematicsUtils::compute_xs(BFMM492, plab) +KinematicsUtils::compute_xs(std::move(BFMM494), plab) +2*KinematicsUtils::compute_xs(BFMM490, plab);
//totalnnbar == totalppbar;
//totalpnbar == totalnpbar;
ParticleType Pion1;
@@ -141,7 +141,7 @@ namespace G4INCL {
antinucleon->setType(Proton);
}
}
else if(rdm*totalppbar < KinematicsUtils::compute_xs(BFMM167, plab)+2*KinematicsUtils::compute_xs(BFMM490, plab)){ //npbarpi+pi0 case
else if(rdm*totalppbar < KinematicsUtils::compute_xs(std::move(BFMM167), plab)+2*KinematicsUtils::compute_xs(std::move(BFMM490), plab)){ //npbarpi+pi0 case
Pion1 = PiPlus;
Pion2 = PiZero;
if(rdm<0.5){
@@ -191,7 +191,7 @@ namespace G4INCL {
antinucleon->setType(Neutron);
}
}
else if(rdm*totalppbar < 2*KinematicsUtils::compute_xs(BFMM490, plab)+KinematicsUtils::compute_xs(BFMM492, plab)){ // n nbar pi+ pi0 case
else if(rdm*totalppbar < 2*KinematicsUtils::compute_xs(std::move(BFMM490), plab)+KinematicsUtils::compute_xs(std::move(BFMM492), plab)){ // n nbar pi+ pi0 case
Pion1 = PiZero;
Pion2 = PiPlus;
if(rdm<0.5){
@@ -243,7 +243,7 @@ namespace G4INCL {
antinucleon->setType(Proton);
}
}
else if(rdm*totalppbar < 2*KinematicsUtils::compute_xs(BFMM490, plab)+KinematicsUtils::compute_xs(BFMM492, plab)){ // n nbar pi- pi0 case
else if(rdm*totalppbar < 2*KinematicsUtils::compute_xs(std::move(BFMM490), plab)+KinematicsUtils::compute_xs(std::move(BFMM492), plab)){ // n nbar pi- pi0 case
Pion1 = PiZero;
Pion2 = PiMinus;
if(rdm<0.5){
@@ -293,7 +293,7 @@ namespace G4INCL {
antinucleon->setType(Proton);
}
}
else if(rdm*totalppbar < KinematicsUtils::compute_xs(BFMM167, plab)+2*KinematicsUtils::compute_xs(BFMM490, plab)){ //npbarpi+pi0 case
else if(rdm*totalppbar < KinematicsUtils::compute_xs(std::move(BFMM167), plab)+2*KinematicsUtils::compute_xs(std::move(BFMM490), plab)){ //npbarpi+pi0 case
Pion1 = PiPlus;
Pion2 = PiZero;
if(rdm<0.5){
source/processes/hadronic/models/inclxx/incl_physics/src/G4INCLNNbarToNNbar3piChannel.cc
+10 -10
View File
@@ -149,9 +149,9 @@ namespace G4INCL {
antinucleon->setType(Proton);
}
}
else if(rdm*totalppbar < KinematicsUtils::compute_xs(BFMM161, plab)
+KinematicsUtils::compute_xs(BFMM169, plab)
+KinematicsUtils::compute_xs(BFMM201, plab)){ //n pbar 2pi+ pi- case
else if(rdm*totalppbar < KinematicsUtils::compute_xs(std::move(BFMM161), plab)
+KinematicsUtils::compute_xs(std::move(BFMM169), plab)
+KinematicsUtils::compute_xs(std::move(BFMM201), plab)){ //n pbar 2pi+ pi- case
Pion1 = PiPlus;
Pion2 = PiPlus;
Pion3 = PiMinus;
@@ -206,8 +206,8 @@ namespace G4INCL {
antinucleon->setType(Neutron);
}
}
else if(rdm*totalppbar < 2*KinematicsUtils::compute_xs(BFMM169, plab)
+KinematicsUtils::compute_xs(BFMM197, plab)){ // n nbar 2pi+ pi- case
else if(rdm*totalppbar < 2*KinematicsUtils::compute_xs(std::move(BFMM169), plab)
+KinematicsUtils::compute_xs(std::move(BFMM197), plab)){ // n nbar 2pi+ pi- case
Pion1 = PiPlus;
Pion2 = PiPlus;
Pion3 = PiMinus;
@@ -264,8 +264,8 @@ namespace G4INCL {
antinucleon->setType(Proton);
}
}
else if(rdm*totalppbar < 2*KinematicsUtils::compute_xs(BFMM169, plab)
+KinematicsUtils::compute_xs(BFMM197, plab)){ // n nbar 2pi- pi+ case
else if(rdm*totalppbar < 2*KinematicsUtils::compute_xs(std::move(BFMM169), plab)
+KinematicsUtils::compute_xs(std::move(BFMM197), plab)){ // n nbar 2pi- pi+ case
Pion1 = PiPlus;
Pion2 = PiMinus;
Pion3 = PiMinus;
@@ -320,9 +320,9 @@ namespace G4INCL {
antinucleon->setType(Proton);
}
}
else if(rdm*totalppbar < KinematicsUtils::compute_xs(BFMM161, plab)
+KinematicsUtils::compute_xs(BFMM169, plab)
+KinematicsUtils::compute_xs(BFMM201, plab)){ //n pbar 2pi+ pi- case
else if(rdm*totalppbar < KinematicsUtils::compute_xs(std::move(BFMM161), plab)
+KinematicsUtils::compute_xs(std::move(BFMM169), plab)
+KinematicsUtils::compute_xs(std::move(BFMM201), plab)){ //n pbar 2pi+ pi- case
Pion1 = PiPlus;
Pion2 = PiPlus;
Pion3 = PiMinus;
source/processes/hadronic/models/inclxx/incl_physics/src/G4INCLNNbarToNNbarpiChannel.cc
+5 -5
View File
@@ -108,7 +108,7 @@ namespace G4INCL {
// pnbar total is same as for npbar
// ppbar total is same as for nnbar
const G4double totalppbar = KinematicsUtils::compute_xs(BFMM199, plab) +KinematicsUtils::compute_xs(BFMM185, plab) +KinematicsUtils::compute_xs(BFMM188, plab);
const G4double totalppbar = KinematicsUtils::compute_xs(std::move(BFMM199), plab) +KinematicsUtils::compute_xs(BFMM185, plab) +KinematicsUtils::compute_xs(BFMM188, plab);
const G4double totalpnbar = KinematicsUtils::compute_xs(BFMM491, plab) +KinematicsUtils::compute_xs(BFMM495, plab) +KinematicsUtils::compute_xs(BFMM188, plab);
//totalnnbar == totalppbar;
//totalpnbar == totalnpbar;
@@ -128,7 +128,7 @@ namespace G4INCL {
antinucleon->setType(Proton);
}
}
else if(rdm*totalppbar < KinematicsUtils::compute_xs(BFMM185, plab)+KinematicsUtils::compute_xs(BFMM188, plab)){ //pnbarpi- case
else if(rdm*totalppbar < KinematicsUtils::compute_xs(std::move(BFMM185), plab)+KinematicsUtils::compute_xs(std::move(BFMM188), plab)){ //pnbarpi- case
PionType = PiMinus;
if(rdm<0.5){
nucleon->setType(Proton);
@@ -163,7 +163,7 @@ namespace G4INCL {
antinucleon->setType(Proton);
}
}
else if(rdm*totalppbar < KinematicsUtils::compute_xs(BFMM491, plab)+KinematicsUtils::compute_xs(BFMM495, plab)){ //pnbarpi0 case
else if(rdm*totalppbar < KinematicsUtils::compute_xs(std::move(BFMM491), plab)+KinematicsUtils::compute_xs(std::move(BFMM495), plab)){ //pnbarpi0 case
PionType = PiZero;
if(rdm<0.5){
nucleon->setType(Proton);
@@ -200,7 +200,7 @@ namespace G4INCL {
antinucleon->setType(Proton);
}
}
else if(rdm*totalppbar < KinematicsUtils::compute_xs(BFMM491, plab)+KinematicsUtils::compute_xs(BFMM495, plab)){ //npbarpi0 case
else if(rdm*totalppbar < KinematicsUtils::compute_xs(std::move(BFMM491), plab)+KinematicsUtils::compute_xs(std::move(BFMM495), plab)){ //npbarpi0 case
PionType = PiZero;
if(rdm<0.5){
nucleon->setType(Neutron);
@@ -235,7 +235,7 @@ namespace G4INCL {
antinucleon->setType(Neutron);
}
}
else if(rdm*totalpnbar < KinematicsUtils::compute_xs(BFMM185, plab)+KinematicsUtils::compute_xs(BFMM188, plab)){ //pnbarpi- case
else if(rdm*totalpnbar < KinematicsUtils::compute_xs(std::move(BFMM185), plab)+KinematicsUtils::compute_xs(std::move(BFMM188), plab)){ //pnbarpi- case
PionType = PiMinus;
if(rdm<0.5){
nucleon->setType(Proton);
source/processes/hadronic/models/inclxx/incl_physics/src/G4INCLPbarAtrestEntryChannel.cc
+14 -14
View File
@@ -92,7 +92,7 @@ namespace G4INCL {
while (iss >> type) {
types.push_back(type);
}
particle_types.push_back(types);
particle_types.push_back(std::move(types));
}
}
else std::cout << "ERROR no fread_file " << filename << std::endl;
@@ -252,23 +252,23 @@ namespace G4INCL {
G4Exception("G4INCLDataFile::readData()","rawppbarFS.dat, ...",
FatalException, ed);
}
G4String dataPath0{G4FindDataDir("G4INCLDATA")};
G4String dataPathppbar(dataPath0 + "/rawppbarFS.dat");
G4String dataPathnpbar(dataPath0 + "/rawnpbarFS.dat");
G4String dataPathppbark(dataPath0 + "/rawppbarFSkaonic.dat");
G4String dataPathnpbark(dataPath0 + "/rawnpbarFSkaonic.dat");
const G4String& dataPath0{G4FindDataDir("G4INCLDATA")};
const G4String& dataPathppbar(dataPath0 + "/rawppbarFS.dat");
const G4String& dataPathnpbar(dataPath0 + "/rawnpbarFS.dat");
const G4String& dataPathppbark(dataPath0 + "/rawppbarFSkaonic.dat");
const G4String& dataPathnpbark(dataPath0 + "/rawnpbarFSkaonic.dat");
#else
Config const *theConfig=theNucleus->getStore()->getConfig();
std::string path;
if(theConfig)
path = theConfig->getINCLXXDataFilePath();
std::string dataPathppbar(path + "/rawppbarFS.dat");
const std::string& dataPathppbar(path + "/rawppbarFS.dat");
INCL_DEBUG("Reading https://doi.org/10.1016/0375-9474(92)90362-N ppbar final states" << dataPathppbar << '\n');
std::string dataPathnpbar(path + "/rawnpbarFS.dat");
const std::string& dataPathnpbar(path + "/rawnpbarFS.dat");
INCL_DEBUG("Reading https://doi.org/10.1016/0375-9474(92)90362-N npbar final states" << dataPathnpbar << '\n');
std::string dataPathppbark(path + "/rawppbarFSkaonic.dat");
const std::string& dataPathppbark(path + "/rawppbarFSkaonic.dat");
INCL_DEBUG("Reading https://doi.org/10.1016/j.physrep.2005.03.002 ppbar kaonic final states" << dataPathppbark << '\n');
std::string dataPathnpbark(path + "/rawnpbarFSkaonic.dat");
const std::string& dataPathnpbark(path + "/rawnpbarFSkaonic.dat");
INCL_DEBUG("Reading https://doi.org/10.1007/BF02818764 and https://link.springer.com/article/10.1007/BF02754930 npbar kaonic final states" << dataPathnpbark << '\n');
#endif
/*std::string path = {"/home/zdemid/INCL/inclcode/data"};
@@ -305,7 +305,7 @@ namespace G4INCL {
sum = read_file(dataPathppbar, probabilities, particle_types);
rdm = (rdm/(1.-kaonicFSprob))*sum; //99.88 normalize by the sum of probabilities in the file
//now get the line number in the file where the FS particles are stored:
G4int n = findStringNumber(rdm, probabilities)-1;
G4int n = findStringNumber(rdm, std::move(probabilities))-1;
if ( n < 0 ) return starlist;
for(G4int j = 0; j < static_cast<G4int>(particle_types[n].size()); j++){
if(particle_types[n][j] == "pi0"){
@@ -360,7 +360,7 @@ namespace G4INCL {
sum = read_file(dataPathppbark, probabilities, particle_types);
rdm = ((1-rdm)/kaonicFSprob)*sum;//2670 normalize by the sum of probabilities in the file
//now get the line number in the file where the FS particles are stored:
G4int n = findStringNumber(rdm, probabilities)-1;
G4int n = findStringNumber(rdm, std::move(probabilities))-1;
if ( n < 0 ) return starlist;
for(G4int j = 0; j < static_cast<G4int>(particle_types[n].size()); j++){
if(particle_types[n][j] == "pi0"){
@@ -416,7 +416,7 @@ namespace G4INCL {
sum = read_file(dataPathnpbar, probabilities, particle_types);
rdm = (rdm/(1.-kaonicFSprob))*sum; //99.95 normalize by the sum of probabilities in the file
//now get the line number in the file where the FS particles are stored:
G4int n = findStringNumber(rdm, probabilities)-1;
G4int n = findStringNumber(rdm, std::move(probabilities))-1;
if ( n < 0 ) return starlist;
for(G4int j = 0; j < static_cast<G4int>(particle_types[n].size()); j++){
if(particle_types[n][j] == "pi0"){
@@ -471,7 +471,7 @@ namespace G4INCL {
sum = read_file(dataPathnpbark, probabilities, particle_types);
rdm = ((1-rdm)/kaonicFSprob)*sum;//3837 normalize by the sum of probabilities in the file
//now get the line number in the file where the FS particles are stored:
G4int n = findStringNumber(rdm, probabilities)-1;
G4int n = findStringNumber(rdm, std::move(probabilities))-1;
if ( n < 0 ) return starlist;
for(G4int j = 0; j < static_cast<G4int>(particle_types[n].size()); j++){
if(particle_types[n][j] == "pi0"){