1
0
Fork 0
mirror of https://github.com/gwm17/Mask.git synced 2024-11-22 18:28:51 -05:00

Compare commits

..

No commits in common. "cf22fb6384de0c5bb1e00bc90b8c39c061e7b853" and "29a136a14b1ab80fdad95901e67d4ee8870c6077" have entirely different histories.

4 changed files with 3 additions and 7 deletions

1
.gitignore vendored
View File

@ -18,7 +18,6 @@ Makefile
build/
lib/
bin/
scripts/
###Keep this file###

View File

@ -141,7 +141,5 @@ void DetectorApp::Run()
else if(m_fileWriter.Write())
++count;
}
std::cout << std::endl;
}

View File

@ -56,8 +56,8 @@ namespace Mask {
m_nuclei[3] = CreateNucleus(zr, ar); //residual
m_nuclei[4] = CreateNucleus(step2Params.Z[1], step2Params.A[1]); //breakup1
m_nuclei[5] = CreateNucleus(zb2, ab2); //breakup2
m_nuclei[6] = CreateNucleus(step3Params.Z[1], step3Params.A[1]); //breakup3
m_nuclei[7] = CreateNucleus(zb4, ab4); //breakup4
m_nuclei[5] = CreateNucleus(step3Params.Z[1], step3Params.A[1]); //breakup3
m_nuclei[5] = CreateNucleus(zb4, ab4); //breakup4
m_step1.BindNuclei(&(m_nuclei[0]), &(m_nuclei[1]), &(m_nuclei[2]), &(m_nuclei[3]));
m_step2.BindNuclei(&(m_nuclei[3]), nullptr, &(m_nuclei[4]), &(m_nuclei[5]));

View File

@ -92,8 +92,7 @@ void RootPlotter::FillData(const Mask::Nucleus& nuc)
MyFill(th_vs_ph_name, th_vs_ph_title, nuc.vec4.Theta()*s_rad2deg, FullPhi(nuc.vec4.Phi())*s_rad2deg, 2);
MyFill(ex_name, ex_title, 260, -1.0, 25, nuc.GetExcitationEnergy());
MyFill(angdist_name, angdist_title, 20, -1.0, 1.0, std::cos(nuc.thetaCM));
MyFill(hist_ke_th_name, hist_ke_th_title, 180, 0.0, 180.0, 400, 0.0, 20.0, nuc.vec4.Theta()*s_rad2deg, nuc.GetKE());
if(nuc.isDetected && nuc.detectedKE > 0.25)
if(nuc.isDetected)
{
MyFill(ke_vs_th_name_det, ke_vs_th_title_det, nuc.vec4.Theta()*s_rad2deg, nuc.detectedKE, 2);
MyFill(ke_vs_ph_name_det, ke_vs_ph_title_det, FullPhi(nuc.vec4.Phi())*s_rad2deg, nuc.detectedKE, 4);