Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit cae517f1 authored by Sadr Mohsen's avatar Sadr Mohsen
Browse files

add EMITTED to DISTRIBUTION

parent d9465fb3
No related branches found
No related tags found
1 merge request!17Flat top
...@@ -62,7 +62,7 @@ using view_type = typename ippl::detail::ViewType<ippl::Vector<double, Dim>, 1>: ...@@ -62,7 +62,7 @@ using view_type = typename ippl::detail::ViewType<ippl::Vector<double, Dim>, 1>:
namespace DISTRIBUTION { namespace DISTRIBUTION {
enum { TYPE, FNAME, SIGMAX, SIGMAY, SIGMAZ, SIGMAPX, SIGMAPY, SIGMAPZ, CORR, enum { TYPE, FNAME, SIGMAX, SIGMAY, SIGMAZ, SIGMAPX, SIGMAPY, SIGMAPZ, CORR,
CUTOFFPX, CUTOFFPY, CUTOFFPZ, CUTOFFX, CUTOFFY, CUTOFFLONG, CORRX, CORRY, CUTOFFPX, CUTOFFPY, CUTOFFPZ, CUTOFFX, CUTOFFY, CUTOFFLONG, CORRX, CORRY,
CORRZ, CORRT, SIGMAT, TPULSEFWHM, TRISE, TFALL, FTOSCAMPLITUDE, FTOSCPERIODS, SIZE }; CORRZ, CORRT, SIGMAT, TPULSEFWHM, TRISE, TFALL, FTOSCAMPLITUDE, FTOSCPERIODS, EMITTED, SIZE };
} }
/* /*
...@@ -127,6 +127,10 @@ Distribution::Distribution() ...@@ -127,6 +127,10 @@ Distribution::Distribution()
"flat top portion of emitted GAUSS " "flat top portion of emitted GAUSS "
"distribution", 0.0); "distribution", 0.0);
itsAttr[DISTRIBUTION::EMITTED]
= Attributes::makeBool("EMITTED", "Emitted beam, from cathode, as opposed to "
"an injected beam.", false);
registerOwnership(AttributeHandler::STATEMENT); registerOwnership(AttributeHandler::STATEMENT);
} }
...@@ -332,6 +336,8 @@ void Distribution::setDistParametersFlatTop() { ...@@ -332,6 +336,8 @@ void Distribution::setDistParametersFlatTop() {
if (Attributes::getReal(itsAttr[DISTRIBUTION::CORRZ]) != 0.0) if (Attributes::getReal(itsAttr[DISTRIBUTION::CORRZ]) != 0.0)
correlationMatrix_m[5][4] = Attributes::getReal(itsAttr[DISTRIBUTION::CORRZ]); correlationMatrix_m[5][4] = Attributes::getReal(itsAttr[DISTRIBUTION::CORRZ]);
emitting_m = Attributes::getBool(itsAttr[DISTRIBUTION::EMITTED]);
if (emitting_m) { if (emitting_m) {
sigmaR_m[2] = 0.0; sigmaR_m[2] = 0.0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment