From b20ee69d4110543c7abf09ad9e5a351c70ee8622 Mon Sep 17 00:00:00 2001 From: "oliver.kirsebom@dal.ca" <oliver.kirsebom@dal.ca> Date: Mon, 27 Apr 2020 21:00:53 -0300 Subject: [PATCH] minor changes --- main.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/main.cpp b/main.cpp index a217af8..af449de 100644 --- a/main.cpp +++ b/main.cpp @@ -33,17 +33,17 @@ int main(int argc, char* argv[]) { Particle p{1, 1, Parity::P, 0.5_J}; // proton Particle B11{5, 11, Parity::P, 1.5_J}; // B11 g.s. 3/2+ - double beamEnergy = 2000; + double beamEnergy = 2000; //keV + double r0 = 1.36; //reduced channel radius in fm vector<double> excEnergy{9640, 10844, 11820, 12710}; vector<Spin> spin{3_J, 1_J, 2_J, 1_J}; vector<OrbitalAngularMomentum> lOrb{2_L, 2_L, 2_L, 1_L}; - vector<double> S{0.3, 0.10, 0.15, 1}; //spectroscopic factors relative to 12.71 - for (auto& ss : S) ss *= 0.86; + vector<double> S{0.30, 0.23, 0.11, 0.86}; //spectroscopic factors relative to 12.71 cout << Form("\nDC cross section @ %.2f MeV\n", beamEnergy/1e3) << endl; - cout << " Ex (MeV) l S cs (ub)" << endl; + cout << " Ex (MeV) li lf S cs (ub)" << endl; cout << "--------------------------------" << endl; for (size_t i=0; i<excEnergy.size(); i++) { @@ -51,19 +51,22 @@ int main(int argc, char* argv[]) { vector<shared_ptr<ParticleChannel>> channels; for (size_t l=0; l<6; l++) { auto c = make_shared<ParticleChannel>(p, B11, spin[i], OrbitalAngularMomentum(l)); - c->setR0(1.36); + c->setR0(r0); channels.push_back(c); } auto& final = channels[lOrb[i].getValue()]; double sigmaTot = 0; + string li = ""; for (size_t l=0; l<6; l++) { double sigma = directCaptureCrossSec(channels[l], final, beamEnergy, excEnergy[i], S[i]); + if (sigma > 0) li += Form("%d,", int(l)); sigmaTot += sigma; } - cout << Form(" %.2f %.0f %.2f %.2f", excEnergy[i]/1e3, lOrb[i].getValue(), S[i], sigmaTot) << endl; + li.pop_back(); + cout << Form(" %.2f %s %.0f %.2f %.2f", excEnergy[i]/1e3, li.c_str(), lOrb[i].getValue(), S[i], sigmaTot) << endl; } cout << "--------------------------------\n" << endl; -- GitLab